GridCal 5.3.52__tar.gz → 5.3.53__tar.gz

{gridcal-5.3.52 → gridcal-5.3.53}/GridCal/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -39,7 +39,7 @@ from GridCalEngine.Devices.Substation import Bus
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
 
-SHUNT_GRAPHICS = Union[
+INJECTION_GRAPHICS = Union[
     BatteryGraphicItem,
     ShuntGraphicItem,
     ExternalGridGraphicItem,
@@ -117,7 +117,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         self.r = r
 
         # loads, shunts, generators, etc...
-        self._child_graphics: List[SHUNT_GRAPHICS] = list()
+        self._child_graphics: List[INJECTION_GRAPHICS] = list()
 
         # Enabled for short circuit
         self.sc_enabled = [False, False, False, False]
@@ -173,16 +173,16 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         Get a list of all associated branch graphics
         :return:
         """
-        conn: List[GenericDiagramWidget | SHUNT_GRAPHICS] = self._terminal.get_hosted_graphics()
+        conn: List[GenericDiagramWidget | INJECTION_GRAPHICS] = self._terminal.get_hosted_graphics()
 
         return conn
 
-    def get_associated_widgets(self) -> List[GenericDiagramWidget | SHUNT_GRAPHICS]:
+    def get_associated_widgets(self) -> List[GenericDiagramWidget | INJECTION_GRAPHICS]:
         """
         Get a list of all associated graphics
         :return:
         """
-        conn: List[GenericDiagramWidget | SHUNT_GRAPHICS] = self.get_associated_branch_graphics()
+        conn: List[GenericDiagramWidget | INJECTION_GRAPHICS] = self.get_associated_branch_graphics()
 
         for graphics in self._child_graphics:
             conn.append(graphics)
@@ -562,7 +562,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         if deleted:
             self._terminal.clear()
 
-    def delete_child(self, obj: SHUNT_GRAPHICS | InjectionTemplateGraphicItem):
+    def delete_child(self, obj: INJECTION_GRAPHICS | InjectionTemplateGraphicItem):
         """
         Delete a child object
         :param obj:
@@ -773,6 +773,17 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         else:
             raise Exception("Cannot add device of type {}".format(api_obj.device_type.value))
 
+    def add_child_graphic(self, elm: INJECTION_DEVICE_TYPES, graphic: INJECTION_GRAPHICS):
+        """
+        Add a api object and its graphic to this bus graphics domain
+        :param elm:
+        :param graphic:
+        :return:
+        """
+        self._child_graphics.append(graphic)
+        self.arrange_children()
+        self.editor.graphics_manager.add_device(elm=elm, graphic=graphic)
+
     def add_load(self, api_obj: Union[Load, None] = None):
         """
         Add load object to bus
@@ -783,8 +794,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_load(bus=self._api_object)
 
         _grph = LoadGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_shunt(self, api_obj: Union[Shunt, None] = None):
@@ -796,8 +806,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_shunt(bus=self._api_object)
 
         _grph = ShuntGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_generator(self, api_obj: Union[Generator, None] = None):
@@ -809,8 +818,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_generator(bus=self._api_object)
 
         _grph = GeneratorGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_static_generator(self, api_obj: Union[StaticGenerator, None] = None):
@@ -823,8 +831,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_static_generator(bus=self._api_object)
 
         _grph = StaticGeneratorGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -838,8 +845,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_battery(bus=self._api_object)
 
         _grph = BatteryGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -853,9 +859,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_external_grid(bus=self._api_object)
 
         _grph = ExternalGridGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
-
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_current_injection(self, api_obj: Union[CurrentInjection, None] = None):
@@ -868,9 +872,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_current_injection(bus=self._api_object)
 
         _grph = CurrentInjectionGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
-
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_controllable_shunt(self, api_obj: Union[ControllableShunt, None] = None):
@@ -883,8 +885,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_controllable_shunt(bus=self._api_object)
 
         _grph = ControllableShuntGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 

{gridcal-5.3.52 → gridcal-5.3.53}/GridCal/Gui/Diagrams/SchematicWidget/Substation/busbar_graphics.py

@@ -11,7 +11,7 @@ from PySide6.QtGui import QPen, QCursor, QIcon, QPixmap, QBrush, QColor
 from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent
 
 from GridCal.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
-from GridCal.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import SHUNT_GRAPHICS
+from GridCal.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import INJECTION_GRAPHICS
 from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.generic_graphics import (GenericDiagramWidget, ACTIVE, DEACTIVATED,
@@ -82,7 +82,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         self.w = w if w >= self.min_w else self.min_w
 
         # loads, shunts, generators, etc...
-        self._child_graphics: List[SHUNT_GRAPHICS] = list()
+        self._child_graphics: List[INJECTION_GRAPHICS] = list()
 
         # Enabled for short circuit
         self.sc_enabled = [False, False, False, False]
@@ -509,7 +509,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         if ok:
             self._editor.remove_element(device=self.api_object, graphic_object=self)
 
-    def delete_child(self, obj: SHUNT_GRAPHICS | InjectionTemplateGraphicItem):
+    def delete_child(self, obj: INJECTION_GRAPHICS | InjectionTemplateGraphicItem):
         """
         Delete a child object
         :param obj:
@@ -661,6 +661,17 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         else:
             raise Exception("Cannot add device of type {}".format(api_obj.device_type.value))
 
+    def add_child_graphic(self, elm: INJECTION_DEVICE_TYPES, graphic: INJECTION_GRAPHICS):
+        """
+        Add a api object and its graphic to this bus graphics domain
+        :param elm:
+        :param graphic:
+        :return:
+        """
+        self._child_graphics.append(graphic)
+        self.arrange_children()
+        self._editor.graphics_manager.add_device(elm=elm, graphic=graphic)
+
     def add_load(self, api_obj: Union[Load, None] = None) -> LoadGraphicItem:
         """
         Add load object to bus
@@ -671,8 +682,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_load(cn=self._api_object.cn)
 
         _grph = LoadGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_shunt(self, api_obj: Union[Shunt, None] = None) -> ShuntGraphicItem:
@@ -684,8 +694,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_shunt(cn=self._api_object.cn)
 
         _grph = ShuntGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_generator(self, api_obj: Union[Generator, None] = None) -> GeneratorGraphicItem:
@@ -697,8 +706,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_generator(cn=self._api_object.cn)
 
         _grph = GeneratorGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_static_generator(self, api_obj: Union[StaticGenerator, None] = None) -> StaticGeneratorGraphicItem:
@@ -711,9 +719,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_static_generator(cn=self._api_object.cn)
 
         _grph = StaticGeneratorGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
-
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_battery(self, api_obj: Union[Battery, None] = None) -> BatteryGraphicItem:
@@ -726,8 +732,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_battery(cn=self._api_object.cn)
 
         _grph = BatteryGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -741,8 +746,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_external_grid(cn=self._api_object.cn)
 
         _grph = ExternalGridGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -756,8 +760,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_current_injection(cn=self._api_object.cn)
 
         _grph = CurrentInjectionGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -771,8 +774,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_controllable_shunt(cn=self._api_object.cn)
 
         _grph = ControllableShuntGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 

{gridcal-5.3.52 → gridcal-5.3.53}/GridCal/Gui/Diagrams/SchematicWidget/Substation/cn_graphics.py

@@ -11,7 +11,7 @@ from PySide6.QtGui import QPen, QCursor, QIcon, QPixmap
 from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent
 
 from GridCal.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
-from GridCal.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import SHUNT_GRAPHICS
+from GridCal.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import INJECTION_GRAPHICS
 from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.generic_graphics import (GenericDiagramWidget, ACTIVE, FONT_SCALE)
@@ -79,7 +79,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         self.w = w if w >= self.min_w else self.min_w
 
         # loads, shunts, generators, etc...
-        self._child_graphics: List[SHUNT_GRAPHICS] = list()
+        self._child_graphics: List[INJECTION_GRAPHICS] = list()
 
         # Enabled for short circuit
         self.sc_enabled = [False, False, False, False]
@@ -367,7 +367,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
             self._editor.remove_element(device=self._api_object, graphic_object=self)
 
-    def delete_child(self, obj: SHUNT_GRAPHICS | InjectionTemplateGraphicItem):
+    def delete_child(self, obj: INJECTION_GRAPHICS | InjectionTemplateGraphicItem):
         """
         Delete a child object
         :param obj:
@@ -453,6 +453,17 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         else:
             raise Exception("Cannot add device of type {}".format(api_obj.device_type.value))
 
+    def add_child_graphic(self, elm: INJECTION_DEVICE_TYPES, graphic: INJECTION_GRAPHICS):
+        """
+        Add a api object and its graphic to this bus graphics domain
+        :param elm:
+        :param graphic:
+        :return:
+        """
+        self._child_graphics.append(graphic)
+        self.arrange_children()
+        self._editor.graphics_manager.add_device(elm=elm, graphic=graphic)
+
     def add_load(self, api_obj: Union[Load, None] = None) -> LoadGraphicItem:
         """
         Add load object to bus
@@ -463,8 +474,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_load(cn=self._api_object)
 
         _grph = LoadGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_shunt(self, api_obj: Union[Shunt, None] = None) -> ShuntGraphicItem:
@@ -477,8 +487,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_shunt(cn=self._api_object)
 
         _grph = ShuntGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_generator(self, api_obj: Union[Generator, None] = None) -> GeneratorGraphicItem:
@@ -491,8 +500,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_generator(cn=self._api_object)
 
         _grph = GeneratorGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
         return _grph
 
     def add_static_generator(self, api_obj: Union[StaticGenerator, None] = None) -> StaticGeneratorGraphicItem:
@@ -505,8 +513,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_static_generator(cn=self._api_object)
 
         _grph = StaticGeneratorGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -520,8 +527,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_battery(cn=self._api_object)
 
         _grph = BatteryGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -535,8 +541,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_external_grid(cn=self._api_object)
 
         _grph = ExternalGridGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -550,8 +555,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_current_injection(cn=self._api_object)
 
         _grph = CurrentInjectionGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 
@@ -565,8 +569,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             api_obj = self._editor.circuit.add_controllable_shunt(cn=self._api_object)
 
         _grph = ControllableShuntGraphicItem(parent=self, api_obj=api_obj, editor=self._editor)
-        self._child_graphics.append(_grph)
-        self.arrange_children()
+        self.add_child_graphic(elm=api_obj, graphic=_grph)
 
         return _grph
 

{gridcal-5.3.52 → gridcal-5.3.53}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -687,15 +687,23 @@ class SimulationsMain(TimeEventsMain):
         Get the lists that help defining the inter area objects
         :return: InterAggregationInfo
         """
-        dev_tpe_from = self.exchange_places_dict[self.ui.fromComboBox.currentText()]
-        devs_from = self.circuit.get_elements_by_type(dev_tpe_from)
-        from_idx = gf.get_checked_indices(self.ui.fromListView.model())
-        objects_from = [devs_from[i] for i in from_idx]
-
-        dev_tpe_to = self.exchange_places_dict[self.ui.toComboBox.currentText()]
-        devs_to = self.circuit.get_elements_by_type(dev_tpe_to)
-        to_idx = gf.get_checked_indices(self.ui.toListView.model())
-        objects_to = [devs_to[i] for i in to_idx]
+        if self.ui.fromListView.model() is not None:
+            dev_tpe_from = self.exchange_places_dict[self.ui.fromComboBox.currentText()]
+            devs_from = self.circuit.get_elements_by_type(dev_tpe_from)
+            from_idx = gf.get_checked_indices(self.ui.fromListView.model())
+            objects_from = [devs_from[i] for i in from_idx]
+        else:
+            objects_from = []
+            self.show_error_toast("No from areas!")
+
+        if self.ui.toListView.model() is not None:
+            dev_tpe_to = self.exchange_places_dict[self.ui.toComboBox.currentText()]
+            devs_to = self.circuit.get_elements_by_type(dev_tpe_to)
+            to_idx = gf.get_checked_indices(self.ui.toListView.model())
+            objects_to = [devs_to[i] for i in to_idx]
+        else:
+            objects_to = []
+            self.show_error_toast("No to areas!")
 
         info: dev.InterAggregationInfo = self.circuit.get_inter_aggregation_info(objects_from=objects_from,
                                                                                  objects_to=objects_to)