GridCal 5.1.43__tar.gz → 5.1.46__tar.gz

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -122,7 +122,7 @@ class MapLineContainer(GenericDiagramWidget):
         """
         self.segments_list.append(segment)
 
-    def set_colour(self, color: QColor, w, style: Qt.PenStyle, tool_tip: str = '') -> None:
+    def set_colour(self, color: QColor, style: Qt.PenStyle, tool_tip: str = '') -> None:
         """
         Set color and style
         :param color: QColor instance
@@ -133,7 +133,7 @@ class MapLineContainer(GenericDiagramWidget):
         """
         for segment in self.segments_list:
             segment.setToolTip(tool_tip)
-            segment.set_colour(color=color, w=w, style=style)
+            segment.set_colour(color=color, style=style)
 
     def update_connectors(self) -> None:
         """

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -76,7 +76,7 @@ class MapLineSegment(QGraphicsLineItem):
         self.first.add_position_change_callback(self.set_from_side_coordinates)
         self.second.add_position_change_callback(self.set_to_side_coordinates)
 
-        self.set_colour(self.color, self.width, self.style)
+        self.set_colour(self.color, self.style)
         self.update_endings()
         self.needsUpdate = True
         self.setZValue(0)
@@ -115,7 +115,7 @@ class MapLineSegment(QGraphicsLineItem):
         self.arrow_p_to.label.setScale(width)
         self.arrow_q_to.label.setScale(width)
 
-    def set_colour(self, color: QColor, w: float, style: Qt.PenStyle):
+    def set_colour(self, color: QColor, style: Qt.PenStyle):
         """
         Set color and style
         :param color: QColor instance
@@ -124,14 +124,13 @@ class MapLineSegment(QGraphicsLineItem):
         :return:
         """
 
-        pen = QPen(color, w, style, Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin)
-        pen.setWidthF(w)
+        pen = QPen(color, self.width, style, Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin)
 
         self.setPen(pen)
-        self.arrow_p_from.set_colour(color, w, style)
-        self.arrow_q_from.set_colour(color, w, style)
-        self.arrow_p_to.set_colour(color, w, style)
-        self.arrow_q_to.set_colour(color, w, style)
+        self.arrow_p_from.set_colour(color, self.arrow_p_from.w, style)
+        self.arrow_q_from.set_colour(color, self.arrow_q_from.w, style)
+        self.arrow_p_to.set_colour(color, self.arrow_p_to.w, style)
+        self.arrow_q_to.set_colour(color, self.arrow_q_to.w, style)
 
     def set_from_side_coordinates(self, x: float, y: float):
         """
@@ -286,7 +285,7 @@ class MapLineSegment(QGraphicsLineItem):
             self.color = OTHER['color']
 
         # Set pen for everyone
-        self.set_colour(self.color, self.width, self.style)
+        self.set_colour(self.color, self.style)
 
     def enable_disable_label_drawing(self):
         """

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -84,9 +84,9 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         self.setAcceptHoverEvents(True)
 
         # Allow selecting the node
-        self.setFlag(self.GraphicsItemFlag.ItemIsSelectable | QGraphicsRectItem.ItemIsMovable)
+        self.setFlag(self.GraphicsItemFlag.ItemIsSelectable | self.GraphicsItemFlag.ItemIsMovable)
 
-        self.setCursor(QCursor(Qt.PointingHandCursor))
+        self.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
         # Create a pen with reduced line width
         self.change_pen_width(0.5)
@@ -113,6 +113,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
             rect = self.rect()
             rect.setWidth(r)
             rect.setHeight(r)
+            self.radius = r
 
             # change the width and height while keeping the same center
             r2 = r / 2
@@ -121,8 +122,8 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
             # Set the new rectangle with the updated dimensions
             self.setRect(new_x, new_y, r, r)
-            self.radius = r
 
+            # update the callbacks position for the lines to move accordingly
             self.set_callabacks(new_x + r2, new_y + r2)
 
             for vl_graphics in self.voltage_level_graphics:
@@ -130,7 +131,21 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
             self.update_diagram()
 
-    def set_api_object_color(self):
+    def resize_voltage_levels(self):
+        """
+
+        :return:
+        """
+        max_vl = 1.0  # 1 KV
+        for vl_graphics in self.voltage_level_graphics:
+            max_vl = max(max_vl, vl_graphics.api_object.Vnom)
+
+        for vl_graphics in self.voltage_level_graphics:
+            # radius here is the width, therefore we need to send W/2
+            scale = vl_graphics.api_object.Vnom / max_vl * 0.5
+            vl_graphics.set_size(r=self.radius * scale)
+
+    def set_api_object_color(self) -> None:
         """
         Gather the API object color and update this objects
         """
@@ -169,12 +184,20 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         Set the Zorder based on the voltage level voltage
         """
-        # TODO: Check this
-        sorted_objects = sorted(self.voltage_level_graphics, key=lambda x: x.api_object.Vnom)
+        max_vl = 1.0  # 1 KV
+        for vl_graphics in self.voltage_level_graphics:
+            max_vl = max(max_vl, vl_graphics.api_object.Vnom)
+
+        for vl_graphics in self.voltage_level_graphics:
+            scale = vl_graphics.api_object.Vnom / max_vl * 0.8
+            vl_graphics.set_size(r=self.radius * scale)
+            vl_graphics.center_on_substation()
+
+        sorted_objects = sorted(self.voltage_level_graphics, key=lambda x: -x.api_object.Vnom)
         for i, vl_graphics in enumerate(sorted_objects):
             vl_graphics.setZValue(i)
 
-    def update_diagram(self):
+    def update_diagram(self) -> None:
         """
         Updates the element position in the diagram (to save)
         :return: 
@@ -246,7 +269,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         # self.editor.map.view.in_item = True
         self.set_color(self.hoover_color, self.color)
         self.hovered = True
-        QApplication.instance().setOverrideCursor(Qt.PointingHandCursor)
+        QApplication.instance().setOverrideCursor(Qt.CursorShape.PointingHandCursor)
 
     def hoverLeaveEvent(self, event: QtWidgets.QGraphicsSceneHoverEvent) -> None:
         """
@@ -266,34 +289,39 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
         add_menu_entry(menu=menu,
                        text="Add voltage level",
-                       icon_path="",
+                       icon_path=":/Icons/icons/plus.svg",
                        function_ptr=self.add_voltage_level)
 
         add_menu_entry(menu=menu,
                        text="Create line from here",
-                       icon_path="",
+                       icon_path=":/Icons/icons/plus.svg",
                        function_ptr=self.create_new_line)
 
         add_menu_entry(menu=menu,
-                       text="Move to API coordinates",
-                       icon_path="",
+                       text="Set coordinates to DB",
+                       icon_path=":/Icons/icons/down.svg",
                        function_ptr=self.move_to_api_coordinates)
 
         add_menu_entry(menu=menu,
-                       text="Remove",
-                       icon_path="",
+                       text="Remove from schematic",
+                       icon_path=":/Icons/icons/delete_schematic.svg",
                        function_ptr=self.remove_function)
 
-        add_menu_entry(menu=menu,
-                       text="ADD node",
-                       icon_path=":/Icons/icons/divide.svg",
-                       function_ptr=self.add_function)
+        # add_menu_entry(menu=menu,
+        #                text="ADD node",
+        #                icon_path=":/Icons/icons/plus.svg",
+        #                function_ptr=self.add_function)
 
         add_menu_entry(menu=menu,
                        text="Show diagram",
-                       icon_path="",
+                       icon_path=":/Icons/icons/grid_icon.svg",
                        function_ptr=self.new_substation_diagram)
 
+        add_menu_entry(menu=menu,
+                       text="Plot",
+                       icon_path=":/Icons/icons/plot.svg",
+                       function_ptr=self.plot)
+
         menu.exec_(event.screenPos())
 
     def create_new_line(self):
@@ -343,7 +371,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                              "Remove substation graphics")
 
         if ok:
-            self.editor.removeSubstation(self)
+            self.editor.removeSubstation(substation=self)
 
     def move_to_api_coordinates(self):
         """
@@ -364,6 +392,13 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         self.editor.new_substation_diagram(substation=self.api_object)
 
+    def plot(self):
+        """
+        Plot the substations data
+        """
+        i = self.editor.circuit.get_substations().index(self.api_object)
+        self.editor.plot_substation(i, self.api_object)
+
     def add_voltage_level(self) -> None:
         """
         Add Voltage Level
@@ -392,9 +427,8 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
             self.editor.circuit.add_voltage_level(vl)
             self.editor.circuit.add_bus(obj=bus)
-
-            self.editor.add_api_voltage_level(substation_graphics=self,
-                                              api_object=vl)
+            self.editor.add_api_voltage_level(substation_graphics=self, api_object=vl)
+            self.sort_voltage_levels()
 
     def set_color(self, inner_color: QColor = None, border_color: QColor = None) -> None:
         """
@@ -433,14 +467,6 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
         return center_point
 
-    # def resize(self, new_radius: float) -> None:
-    #     """
-    #     Resize the node.
-    #     :param new_radius: New radius for the node.
-    #     """
-    #     self.radius = new_radius
-    #     self.setRect(self.x - new_radius, self.y - new_radius, new_radius * 2, new_radius * 2)
-
     def change_pen_width(self, width: float) -> None:
         """
         Change the pen width for the node.

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/MapWidget/Substation/voltage_level_graphic_item.py

@@ -26,7 +26,6 @@ from GridCal.Gui.gui_functions import add_menu_entry
 
 from GridCalEngine.Devices.Substation.voltage_level import VoltageLevel
 from GridCalEngine.Devices.Substation.bus import Bus
-from GridCalEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.MapWidget.grid_map_widget import GridMapWidget
@@ -64,21 +63,25 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
                                       api_object=api_object,
                                       editor=editor,
                                       draw_labels=draw_labels)
-        QGraphicsEllipseItem.__init__(self, parent_center.x(), parent_center.y(), r * api_object.Vnom * 0.01,
-                                      r * api_object.Vnom * 0.01, parent)
+        QGraphicsEllipseItem.__init__(self,
+                                      parent_center.x(),
+                                      parent_center.y(),
+                                      r * api_object.Vnom * 0.01,
+                                      r * api_object.Vnom * 0.01,
+                                      parent)
 
         parent.register_voltage_level(vl=self)
 
         self.editor: GridMapWidget = editor  # to reinforce the type
+
         self.api_object: VoltageLevel = api_object  # to reinforce the type
 
         self.radius = r * api_object.Vnom * 0.01
-        # print(f"VL created at x:{parent_center.x()}, y:{parent_center.y()}")
 
         self.setAcceptHoverEvents(True)  # Enable hover events for the item
-        # self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable)  # Allow moving the node
-        self.setFlag(
-            self.GraphicsItemFlag.ItemIsSelectable | self.GraphicsItemFlag.ItemIsMovable)  # Allow selecting the node
+
+        # Allow moving the node
+        self.setFlag(self.GraphicsItemFlag.ItemIsSelectable | self.GraphicsItemFlag.ItemIsMovable)
 
         # Create a pen with reduced line width
         self.change_pen_width(0.5)
@@ -114,6 +117,26 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         self.setRect(x, y, self.rect().width(), self.rect().height())
         return x, y
 
+    def set_size(self, r: float):
+        """
+
+        :param r: radius in pixels
+        :return:
+        """
+        # if r != self.radius:
+        rect = self.rect()
+        rect.setWidth(r)
+        rect.setHeight(r)
+        self.radius = r
+
+        # change the width and height while keeping the same center
+        r2 = r / 2
+        new_x = rect.x() - r2
+        new_y = rect.y() - r2
+
+        # Set the new rectangle with the updated dimensions
+        self.setRect(new_x, new_y, r, r)
+
     def updateDiagram(self) -> None:
         """
 
@@ -124,8 +147,6 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         lat, long = self.editor.to_lat_lon(x=center_point.x() + real_position.x(),
                                            y=center_point.y() + real_position.y())
 
-        print(f'Updating VL position id:{self.api_object.idtag}, lat:{lat}, lon:{long}')
-
         self.editor.update_diagram_element(device=self.api_object,
                                            latitude=lat,
                                            longitude=long,

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -20,6 +20,9 @@ from typing import Union, List, Tuple, Dict, TYPE_CHECKING
 import json
 import numpy as np
 import math
+import pandas as pd
+from matplotlib import pyplot as plt
+
 from PySide6.QtWidgets import QGraphicsItem
 from collections.abc import Callable
 from PySide6.QtSvg import QSvgGenerator
@@ -40,9 +43,11 @@ from GridCalEngine.Devices.Substation.substation import Substation
 from GridCalEngine.Devices.Substation.voltage_level import VoltageLevel
 from GridCalEngine.Devices.Branches.line_locations import LineLocation
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-from GridCalEngine.enumerations import DeviceType
+from GridCalEngine.enumerations import DeviceType, ResultTypes
 from GridCalEngine.Devices.types import ALL_DEV_TYPES
 from GridCalEngine.basic_structures import Logger
+from GridCalEngine.Simulations.OPF.opf_ts_results import OptimalPowerFlowTimeSeriesResults
+from GridCalEngine.Simulations.PowerFlow.power_flow_ts_results import PowerFlowTimeSeriesResults
 
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_ac_line import MapAcLine
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_dc_line import MapDcLine
@@ -57,7 +62,7 @@ import GridCal.Gui.Visualization.visualization as viz
 import GridCalEngine.Devices.Diagrams.palettes as palettes
 from GridCal.Gui.Diagrams.graphics_manager import ALL_MAP_GRAPHICS
 from GridCal.Gui.Diagrams.MapWidget.Tiles.tiles import Tiles
-from GridCal.Gui.Diagrams.base_diagram_widget import BaseDiagramWidget, qimage_to_cv
+from GridCal.Gui.Diagrams.base_diagram_widget import BaseDiagramWidget
 from GridCal.Gui.messages import error_msg
 
 if TYPE_CHECKING:
@@ -870,10 +875,9 @@ class GridMapWidget(BaseDiagramWidget):
         """
 
         # SANTIAGO: NO TOCAR ESTO ES EL COMPORTAMIENTO DESEADO
-
         self.update_device_sizes()
 
-    def update_device_sizes(self):
+    def get_branch_width(self):
         """
 
         :return:
@@ -882,6 +886,13 @@ class GridMapWidget(BaseDiagramWidget):
         min_zoom = self.map.min_level
         zoom = self.map.zoom_factor
         scale = self.diagram.min_branch_width + (zoom - min_zoom) / (max_zoom - min_zoom)
+        return scale
+
+    def update_device_sizes(self):
+        """
+
+        :return:
+        """
 
         # rescale lines
         for dev_tpe in [DeviceType.LineDevice,
@@ -889,14 +900,14 @@ class GridMapWidget(BaseDiagramWidget):
                         DeviceType.HVDCLineDevice,
                         DeviceType.FluidPathDevice]:
             graphics_dict = self.graphics_manager.get_device_type_dict(device_type=dev_tpe)
-            for key, lne in graphics_dict.items():
-                lne.set_width_scale(scale)
+            for key, elm_graphics in graphics_dict.items():
+                elm_graphics.set_width_scale(self.get_branch_width())
 
         # rescale substations
         data: Dict[str, SubstationGraphicItem] = self.graphics_manager.get_device_type_dict(DeviceType.SubstationDevice)
-        for se_key, se in data.items():
-            se.set_api_object_color()
-            se.set_size(r=self.diagram.min_bus_width)
+        for se_key, elm_graphics in data.items():
+            elm_graphics.set_api_object_color()
+            elm_graphics.set_size(r=self.diagram.min_bus_width)
 
     def change_size_and_pen_width_all(self, new_radius, pen_width):
         """
@@ -1070,9 +1081,10 @@ class GridMapWidget(BaseDiagramWidget):
                         weight = int(
                             np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
                     else:
-                        weight = 0.5
+                        weight = self.get_branch_width()
 
-                    graphic_object.set_colour(color=color, w=weight, style=style, tool_tip=tooltip)
+                    graphic_object.set_colour(color=color, style=style, tool_tip=tooltip)
+                    graphic_object.set_width_scale(weight)
 
                     if hasattr(graphic_object, 'set_arrows_with_power'):
                         graphic_object.set_arrows_with_power(
@@ -1130,7 +1142,7 @@ class GridMapWidget(BaseDiagramWidget):
                         weight = int(
                             np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
                     else:
-                        weight = 0.5
+                        weight = self.get_branch_width()
 
                     tooltip = str(i) + ': ' + graphic_object.api_object.name
                     tooltip += '\n' + loading_label + ': ' + "{:10.4f}".format(
@@ -1145,7 +1157,8 @@ class GridMapWidget(BaseDiagramWidget):
                     else:
                         graphic_object.set_arrows_with_hvdc_power(Pf=hvdc_Pf[i], Pt=-hvdc_Pf[i])
 
-                    graphic_object.set_colour(color=color, w=weight, style=style, tool_tip=tooltip)
+                    graphic_object.set_colour(color=color, style=style, tool_tip=tooltip)
+                    graphic_object.set_width_scale(weight)
 
     def get_image(self, transparent: bool = False) -> QImage:
         """
@@ -1213,6 +1226,7 @@ class GridMapWidget(BaseDiagramWidget):
                           logger=self.logger)
 
         return GridMapWidget(
+            gui=self.gui,
             tile_src=self.map.tile_src,
             start_level=self.diagram.start_level,
             longitude=self.diagram.longitude,
@@ -1233,6 +1247,80 @@ class GridMapWidget(BaseDiagramWidget):
             gelm.api_object.latitude = gelm.lat
             gelm.api_object.longitude = gelm.lon
 
+    def plot_substation(self, i: int, api_object: Substation):
+        """
+        Plot branch results
+        :param i: bus index
+        :param api_object: Substation API object
+        :return:
+        """
+
+        fig = plt.figure(figsize=(12, 8))
+        ax_1 = fig.add_subplot(211)
+        ax_1.set_title('Power', fontsize=14)
+        ax_1.set_ylabel('Injections [MW]', fontsize=11)
+
+        ax_2 = fig.add_subplot(212, sharex=ax_1)
+        ax_2.set_title('Time', fontsize=14)
+        ax_2.set_ylabel('Voltage [p.u]', fontsize=11)
+
+        # set time
+        x = self.circuit.get_time_array()
+
+        if x is not None:
+            if len(x) > 0:
+
+                # Get all devices grouped by bus
+                all_data = self.circuit.get_injection_devices_grouped_by_substation()
+
+                # search drivers for voltage data
+                for driver, results in self.gui.session.drivers_results_iter():
+                    if results is not None:
+                        if isinstance(results, PowerFlowTimeSeriesResults):
+                            table = results.mdl(result_type=ResultTypes.BusVoltageModule)
+                            table.plot_device(ax=ax_2, device_idx=i)
+                        elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
+                            table = results.mdl(result_type=ResultTypes.BusVoltageModule)
+                            table.plot_device(ax=ax_2, device_idx=i)
+
+                # Injections
+                # filter injections by bus
+                bus_devices = all_data.get(api_object, None)
+                if bus_devices:
+
+                    power_data = dict()
+                    for tpe_name, devices in bus_devices.items():
+                        for device in devices:
+                            if device.device_type == DeviceType.LoadDevice:
+                                power_data[device.name] = -device.P_prof.toarray()
+                            elif device.device_type == DeviceType.GeneratorDevice:
+                                power_data[device.name] = device.P_prof.toarray()
+                            elif device.device_type == DeviceType.ShuntDevice:
+                                power_data[device.name] = -device.G_prof.toarray()
+                            elif device.device_type == DeviceType.StaticGeneratorDevice:
+                                power_data[device.name] = device.P_prof.toarray()
+                            elif device.device_type == DeviceType.ExternalGridDevice:
+                                power_data[device.name] = device.P_prof.toarray()
+                            elif device.device_type == DeviceType.BatteryDevice:
+                                power_data[device.name] = device.P_prof.toarray()
+                            else:
+                                raise Exception("Missing shunt device for plotting")
+
+                    df = pd.DataFrame(data=power_data, index=x)
+
+                    try:
+                        # yt area plots
+                        df.plot.area(ax=ax_1)
+                    except ValueError:
+                        # use regular plots
+                        df.plot(ax=ax_1)
+
+                plt.legend()
+                fig.suptitle(api_object.name, fontsize=20)
+
+                # plot the profiles
+                plt.show()
+
 
 def generate_map_diagram(substations: List[Substation],
                          voltage_levels: List[VoltageLevel],

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/MapWidget/map_widget.py

@@ -124,7 +124,7 @@ class MapView(QGraphicsView):
         # Create a QGraphicsProxyWidget for the QLabel
         self.label_proxy_widget = QGraphicsProxyWidget()
         self.label_proxy_widget.setWidget(self.attribution_label)
-        self.label_proxy_widget.setFlag(QGraphicsItem.ItemIgnoresTransformations)
+        self.label_proxy_widget.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIgnoresTransformations)
         self.update_label_position()
 
         # Add the proxy widget to the scene
@@ -150,6 +150,8 @@ class MapView(QGraphicsView):
 
         self.scale(initial_zoom_factor, initial_zoom_factor)
 
+        self.setRenderHints(QPainter.RenderHint.Antialiasing | QPainter.RenderHint.SmoothPixmapTransform)
+
     def set_notice(self, val: str):
         """
 

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -452,87 +452,6 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                        icon_path=":/Icons/icons/plot.svg",
                        function_ptr=self.plot_profiles)
 
-
-        # arr = menu.addAction('Arrange')
-        # arr_icon = QIcon()
-        # arr_icon.addPixmap(QPixmap(":/Icons/icons/automatic_layout.svg"))
-        # arr.setIcon(arr_icon)
-        # arr.triggered.connect(self.arrange_children)
-        #
-        # ra5 = menu.addAction('Assign active state to profile')
-        # ra5_icon = QIcon()
-        # ra5_icon.addPixmap(QPixmap(":/Icons/icons/assign_to_profile.svg"))
-        # ra5.setIcon(ra5_icon)
-        # ra5.triggered.connect(self.assign_status_to_profile)
-        #
-        # ra3 = menu.addAction('Delete all the connections')
-        # del2_icon = QIcon()
-        # del2_icon.addPixmap(QPixmap(":/Icons/icons/delete_conn.svg"))
-        # ra3.setIcon(del2_icon)
-        # ra3.triggered.connect(self.delete_all_connections)
-        #
-        # da = menu.addAction('Delete')
-        # del_icon = QIcon()
-        # del_icon.addPixmap(QPixmap(":/Icons/icons/delete_db.svg"))
-        # da.setIcon(del_icon)
-        # da.triggered.connect(self.remove)
-        #
-        # re = menu.addAction('Expand schematic')
-        # re_icon = QIcon()
-        # re_icon.addPixmap(QPixmap(":/Icons/icons/grid_icon.svg"))
-        # re.setIcon(re_icon)
-        # re.triggered.connect(self.expand_diagram_from_bus)
-        #
-        # menu.addSection("Add")
-        #
-        # al = menu.addAction('Load')
-        # al_icon = QIcon()
-        # al_icon.addPixmap(QPixmap(":/Icons/icons/add_load.svg"))
-        # al.setIcon(al_icon)
-        # al.triggered.connect(self.add_load)
-        #
-        # ac_i = menu.addAction('Current injection')
-        # ac_i_icon = QIcon()
-        # ac_i_icon.addPixmap(QPixmap(":/Icons/icons/add_load.svg"))
-        # ac_i.setIcon(ac_i_icon)
-        # ac_i.triggered.connect(self.add_current_injection)
-        #
-        # ash = menu.addAction('Shunt')
-        # ash_icon = QIcon()
-        # ash_icon.addPixmap(QPixmap(":/Icons/icons/add_shunt.svg"))
-        # ash.setIcon(ash_icon)
-        # ash.triggered.connect(self.add_shunt)
-        #
-        # acsh = menu.addAction('Controllable shunt')
-        # acsh_icon = QIcon()
-        # acsh_icon.addPixmap(QPixmap(":/Icons/icons/add_shunt.svg"))
-        # acsh.setIcon(acsh_icon)
-        # acsh.triggered.connect(self.add_controllable_shunt)
-        #
-        # acg = menu.addAction('Generator')
-        # acg_icon = QIcon()
-        # acg_icon.addPixmap(QPixmap(":/Icons/icons/add_gen.svg"))
-        # acg.setIcon(acg_icon)
-        # acg.triggered.connect(self.add_generator)
-        #
-        # asg = menu.addAction('Static generator')
-        # asg_icon = QIcon()
-        # asg_icon.addPixmap(QPixmap(":/Icons/icons/add_stagen.svg"))
-        # asg.setIcon(asg_icon)
-        # asg.triggered.connect(self.add_static_generator)
-        #
-        # ab = menu.addAction('Battery')
-        # ab_icon = QIcon()
-        # ab_icon.addPixmap(QPixmap(":/Icons/icons/add_batt.svg"))
-        # ab.setIcon(ab_icon)
-        # ab.triggered.connect(self.add_battery)
-        #
-        # aeg = menu.addAction('External grid')
-        # aeg_icon = QIcon()
-        # aeg_icon.addPixmap(QPixmap(":/Icons/icons/add_external_grid.svg"))
-        # aeg.setIcon(aeg_icon)
-        # aeg.triggered.connect(self.add_external_grid)
-
         add_menu_entry(menu,
                        text='Arrange',
                        icon_path=":/Icons/icons/automatic_layout.svg",

{GridCal-5.1.43 → GridCal-5.1.46}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -53,7 +53,8 @@ from GridCalEngine.Devices.Injections.generator import Generator
 from GridCalEngine.Devices.Fluid import FluidNode, FluidPath
 from GridCalEngine.Devices.Diagrams.schematic_diagram import SchematicDiagram
 from GridCalEngine.Devices.Diagrams.graphic_location import GraphicLocation
-from GridCalEngine.Simulations import PowerFlowTimeSeriesResults
+from GridCalEngine.Simulations.OPF.opf_ts_results import OptimalPowerFlowTimeSeriesResults
+from GridCalEngine.Simulations.PowerFlow.power_flow_ts_results import PowerFlowTimeSeriesResults
 from GridCalEngine.enumerations import DeviceType, ResultTypes
 from GridCalEngine.basic_structures import Vec, CxVec, IntVec, Logger
 
@@ -3736,7 +3737,10 @@ class SchematicWidget(BaseDiagramWidget):
                     if results is not None:
                         if isinstance(results, PowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot(ax=ax_2, selected_col_idx=[i])
+                            table.plot_device(ax=ax_2, device_idx=i)
+                        elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
+                            table = results.mdl(result_type=ResultTypes.BusVoltageModule)
+                            table.plot_device(ax=ax_2, device_idx=i)
 
                 # Injections
                 # filter injections by bus