GridCal 5.1.5__tar.gz → 5.1.7__tar.gz

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/CascadingSteps/cascading_steps.py

@@ -67,7 +67,7 @@ class CascadingStepsGUI(QtWidgets.QDialog):
                 options = self.gridcal_main.get_selected_power_flow_options()
                 options.solver_type = SolverType.LM
                 max_isl = self.gridcal_main.ui.cascading_islands_spinBox.value()
-                drv = sim.Cascading(self.gridcal_main.circuit.copy(), options, max_additional_islands=max_isl)
+                drv = sim.CascadingDriver(self.gridcal_main.circuit.copy(), options, max_additional_islands=max_isl)
 
                 self.gridcal_main.session.run(drv,
                                               post_func=self.gridcal_main.post_cascade,
@@ -101,9 +101,9 @@ class CascadingStepsGUI(QtWidgets.QDialog):
                 max_isl = self.gridcal_main.ui.cascading_islands_spinBox.value()
                 n_lsh_samples = self.gridcal_main.ui.max_iterations_stochastic_spinBox.value()
 
-                drv = sim.Cascading(self.gridcal_main.circuit.copy(), options,
-                                    max_additional_islands=max_isl,
-                                    n_lhs_samples_=n_lsh_samples)
+                drv = sim.CascadingDriver(self.gridcal_main.circuit.copy(), options,
+                                          max_additional_islands=max_isl,
+                                          n_lhs_samples_=n_lsh_samples)
 
                 self.gridcal_main.session.run(drv,
                                               post_func=self.gridcal_main.post_cascade,

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/dc_line_graphics.py

@@ -233,7 +233,8 @@ class DcLineGraphicItem(LineGraphicTemplateItem):
                  from_port: Union[BarTerminalItem, RoundTerminalItem],
                  to_port: Union[BarTerminalItem, RoundTerminalItem],
                  editor: DiagramEditorWidget,
-                 width=5, api_object: DcLine = None):
+                 width=5, api_object: DcLine = None,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -247,7 +248,8 @@ class DcLineGraphicItem(LineGraphicTemplateItem):
                                          to_port=to_port,
                                          editor=editor,
                                          width=width,
-                                         api_object=api_object)
+                                         api_object=api_object,
+                                         draw_labels=draw_labels)
 
     def contextMenuEvent(self, event):
         """

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/hvdc_graphics.py

@@ -34,7 +34,8 @@ class HvdcGraphicItem(LineGraphicTemplateItem):
                  to_port: Union[BarTerminalItem, RoundTerminalItem],
                  editor: DiagramEditorWidget,
                  width=5,
-                 api_object: HvdcLine = None):
+                 api_object: HvdcLine = None,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -48,7 +49,8 @@ class HvdcGraphicItem(LineGraphicTemplateItem):
                                          to_port=to_port,
                                          editor=editor,
                                          width=width,
-                                         api_object=api_object)
+                                         api_object=api_object,
+                                         draw_labels=draw_labels)
 
     def contextMenuEvent(self, event):
         """

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/line_graphics.py

@@ -41,7 +41,8 @@ class LineGraphicItem(LineGraphicTemplateItem):
                  to_port: Union[BarTerminalItem, RoundTerminalItem, None],
                  editor: DiagramEditorWidget,
                  width=5,
-                 api_object: Line = None):
+                 api_object: Line = None,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -49,13 +50,15 @@ class LineGraphicItem(LineGraphicTemplateItem):
         :param editor:
         :param width:
         :param api_object:
+        :param draw_labels:
         """
         LineGraphicTemplateItem.__init__(self,
                                          from_port=from_port,
                                          to_port=to_port,
                                          editor=editor,
                                          width=width,
-                                         api_object=api_object)
+                                         api_object=api_object,
+                                         draw_labels=draw_labels)
 
     def remove_symbol(self) -> None:
         """

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/line_graphics_template.py

@@ -424,7 +424,8 @@ class LineGraphicTemplateItem(GenericDBWidget, QGraphicsLineItem):
                  editor: DiagramEditorWidget,
                  width=5,
                  api_object: Union[Line, Transformer2W, VSC, UPFC, HvdcLine, DcLine, FluidPath, None] = None,
-                 arrow_size=10):
+                 arrow_size=10,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -433,8 +434,9 @@ class LineGraphicTemplateItem(GenericDBWidget, QGraphicsLineItem):
         :param width:
         :param api_object:
         :param arrow_size:
+        :param draw_labels:
         """
-        GenericDBWidget.__init__(self, parent=None, api_object=api_object, editor=editor, draw_labels=True)
+        GenericDBWidget.__init__(self, parent=None, api_object=api_object, editor=editor, draw_labels=draw_labels)
         QGraphicsLineItem.__init__(self)
 
         if isinstance(api_object, Transformer2W):

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/series_reactance_graphics.py

@@ -32,7 +32,8 @@ class SeriesReactanceGraphicItem(LineGraphicTemplateItem):
                  from_port: Union[BarTerminalItem, RoundTerminalItem],
                  to_port: Union[BarTerminalItem, RoundTerminalItem],
                  editor: DiagramEditorWidget, width=5,
-                 api_object: SeriesReactance = None):
+                 api_object: SeriesReactance = None,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -46,7 +47,8 @@ class SeriesReactanceGraphicItem(LineGraphicTemplateItem):
                                          to_port=to_port,
                                          editor=editor,
                                          width=width,
-                                         api_object=api_object)
+                                         api_object=api_object,
+                                         draw_labels=draw_labels)
 
     def contextMenuEvent(self, event):
         """

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/transformer2w_graphics.py

@@ -39,8 +39,10 @@ class TransformerGraphicItem(LineGraphicTemplateItem):
     def __init__(self,
                  from_port: Union[BarTerminalItem, RoundTerminalItem],
                  to_port: Union[BarTerminalItem, RoundTerminalItem],
-                 editor: DiagramEditorWidget, width=5,
-                 api_object: Transformer2W = None):
+                 editor: DiagramEditorWidget,
+                 width=5,
+                 api_object: Transformer2W = None,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -54,7 +56,8 @@ class TransformerGraphicItem(LineGraphicTemplateItem):
                                          to_port=to_port,
                                          editor=editor,
                                          width=width,
-                                         api_object=api_object)
+                                         api_object=api_object,
+                                         draw_labels=draw_labels)
 
     def contextMenuEvent(self, event):
         """

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/upfc_graphics.py

@@ -31,7 +31,8 @@ class UpfcGraphicItem(LineGraphicTemplateItem):
 
     def __init__(self, from_port: BarTerminalItem, to_port: BarTerminalItem,
                  editor: DiagramEditorWidget, width=5,
-                 api_object: UPFC = None):
+                 api_object: UPFC = None,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -45,7 +46,8 @@ class UpfcGraphicItem(LineGraphicTemplateItem):
                                          to_port=to_port,
                                          editor=editor,
                                          width=width,
-                                         api_object=api_object)
+                                         api_object=api_object,
+                                         draw_labels=draw_labels)
 
     def contextMenuEvent(self, event):
         """

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Branches/vsc_graphics.py

@@ -36,7 +36,8 @@ class VscGraphicItem(LineGraphicTemplateItem):
                  from_port: Union[BarTerminalItem, RoundTerminalItem],
                  to_port: Union[BarTerminalItem, RoundTerminalItem],
                  editor: DiagramEditorWidget, width=5,
-                 api_object: VSC = None):
+                 api_object: VSC = None,
+                 draw_labels: bool = True):
         """
 
         :param from_port:
@@ -50,7 +51,8 @@ class VscGraphicItem(LineGraphicTemplateItem):
                                          to_port=to_port,
                                          editor=editor,
                                          width=width,
-                                         api_object=api_object)
+                                         api_object=api_object,
+                                         draw_labels=draw_labels)
 
     def contextMenuEvent(self, event):
         """

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Fluid/fluid_node_graphics.py

@@ -93,9 +93,10 @@ class FluidNodeGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
     """
 
     def __init__(self, editor: DiagramEditorWidget, fluid_node: FluidNode,
-                 parent=None, index=0, h: int = 20, w: int = 80, x: int = 0, y: int = 0):
+                 parent=None, index=0, h: int = 20, w: int = 80, x: int = 0, y: int = 0,
+                 draw_labels: bool = True):
 
-        GenericDBWidget.__init__(self, parent=parent, api_object=fluid_node, editor=editor, draw_labels=True)
+        GenericDBWidget.__init__(self, parent=parent, api_object=fluid_node, editor=editor, draw_labels=draw_labels)
         QtWidgets.QGraphicsRectItem.__init__(self, parent)
 
         self.min_w = 180.0
@@ -181,6 +182,7 @@ class FluidNodeGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                                            w=self.w,
                                            h=self.h,
                                            r=self.rotation(),
+                                           draw_labels=self.draw_labels,
                                            graphic_object=self)
 
     def set_position(self, x, y):
@@ -262,6 +264,7 @@ class FluidNodeGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                                            w=self.w,
                                            h=int(self.min_h),
                                            r=self.rotation(),
+                                           draw_labels=self.draw_labels,
                                            graphic_object=self)
 
         return self.w, self.min_h

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Fluid/fluid_path_graphics.py

@@ -41,7 +41,8 @@ class FluidPathGraphicItem(LineGraphicTemplateItem):
                  editor: DiagramEditorWidget,
                  width=10,
                  api_object: FluidPath = None,
-                 arrow_size=15):
+                 arrow_size=15,
+                 draw_labels: bool = True):
         """
         
         :param from_port:
@@ -51,7 +52,7 @@ class FluidPathGraphicItem(LineGraphicTemplateItem):
         :param api_object:
         :param arrow_size:
         """
-        GenericDBWidget.__init__(self, parent=None, api_object=api_object, editor=editor, draw_labels=True)
+        GenericDBWidget.__init__(self, parent=None, api_object=api_object, editor=editor, draw_labels=draw_labels)
         LineGraphicTemplateItem.__init__(self,
                                          from_port=from_port,
                                          to_port=to_port,

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Substation/bus_graphics.py

@@ -70,7 +70,8 @@ class BusGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                  h: int = 40,
                  w: int = 80,
                  x: int = 0,
-                 y: int = 0):
+                 y: int = 0,
+                 draw_labels: bool = True):
         """
 
         :param parent:
@@ -82,7 +83,7 @@ class BusGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
         :param x:
         :param y:
         """
-        GenericDBWidget.__init__(self, parent=parent, api_object=bus, editor=editor, draw_labels=True)
+        GenericDBWidget.__init__(self, parent=parent, api_object=bus, editor=editor, draw_labels=draw_labels)
         QtWidgets.QGraphicsRectItem.__init__(self, parent)
 
         self.min_w = 180.0
@@ -160,6 +161,7 @@ class BusGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                                            w=self.w,
                                            h=self.h,
                                            r=self.rotation(),
+                                           draw_labels=self.draw_labels,
                                            graphic_object=self)
 
     def add_big_marker(self, color: Union[None, QColor] = Qt.red, tool_tip_text: str = ""):
@@ -258,6 +260,7 @@ class BusGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                                            w=self.w,
                                            h=int(self.min_h),
                                            r=self.rotation(),
+                                           draw_labels=self.draw_labels,
                                            graphic_object=self)
 
         return self.w, self.min_h
@@ -431,11 +434,11 @@ class BusGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
         da.setIcon(del_icon)
         da.triggered.connect(self.remove)
 
-        re = menu.addAction('Reduce')
+        re = menu.addAction('Expand schematic')
         re_icon = QIcon()
-        re_icon.addPixmap(QPixmap(":/Icons/icons/grid_reduction.svg"))
+        re_icon.addPixmap(QPixmap(":/Icons/icons/grid_icon.svg"))
         re.setIcon(re_icon)
-        re.triggered.connect(self.reduce)
+        re.triggered.connect(self.expand_diagram_from_bus)
 
         menu.addSection("Add")
 
@@ -501,16 +504,6 @@ class BusGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
         """
         self._terminal.remove_all_connections()
 
-    def reduce(self):
-        """
-        Reduce this bus
-        :return:
-        """
-        ok = yes_no_question('Are you sure that you want to reduce this bus', 'Reduce bus')
-        if ok:
-            reduce_buses(self.editor.circuit, [self.api_object])
-            self.remove()
-
     def remove(self, ask: bool = True) -> None:
         """
         Remove this element
@@ -538,6 +531,12 @@ class BusGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
         else:
             self.set_tile_color(QBrush(DEACTIVATED['color']))
 
+    def expand_diagram_from_bus(self) -> None:
+        """
+        Expands the diagram from this bus
+        """
+        self.editor.expand_diagram_from_bus(root_bus=self.api_object)
+
     def enable_disable_toggle(self):
         """
         Toggle bus element state

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Substation/busbar_graphics.py

@@ -159,6 +159,7 @@ class BusBarGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                                            w=self.w,
                                            h=self.h,
                                            r=self.rotation(),
+                                           draw_labels=self.draw_labels,
                                            graphic_object=self)
 
     def add_big_marker(self, color: Union[None, QColor] = Qt.red, tool_tip_text: str = ""):
@@ -257,6 +258,7 @@ class BusBarGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                                            w=w,
                                            h=int(self.min_h),
                                            r=self.rotation(),
+                                           draw_labels=self.draw_labels,
                                            graphic_object=self)
 
         return w, self.min_h

{GridCal-5.1.5 → GridCal-5.1.7}/GridCal/Gui/Diagrams/DiagramEditorWidget/Substation/cn_graphics.py

@@ -43,7 +43,6 @@ from GridCal.Gui.Diagrams.DiagramEditorWidget.Injections.controllable_shunt_grap
 
 from GridCalEngine.enumerations import DeviceType, FaultType
 from GridCalEngine.Devices.types import INJECTION_DEVICE_TYPES
-from GridCalEngine.Simulations.Topology.topology_reduction_driver import reduce_buses
 from GridCalEngine.Devices.Substation.connectivity_node import ConnectivityNode
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
@@ -146,6 +145,7 @@ class CnGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
                                            w=self.w,
                                            h=self.h,
                                            r=self.rotation(),
+                                           draw_labels=self.draw_labels,
                                            graphic_object=self)
 
     def set_position(self, x: int, y: int) -> None: