GridCal 5.3.42__tar.gz → 5.3.44__tar.gz

{gridcal-5.3.42 → gridcal-5.3.44}/GridCal/Gui/Diagrams/MapWidget/Branches/line_location_graphic_item.py

@@ -69,7 +69,7 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
 
         self.index = index
 
-        self.resize(r * 10)
+        self.resize(r)
         self.setAcceptHoverEvents(True)  # Enable hover events for the item
         self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable)  # Allow moving the node
         self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsSelectable)  # Allow selecting the node

{gridcal-5.3.42 → gridcal-5.3.44}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -17,7 +17,7 @@ from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER
 from GridCal.Gui.Diagrams.Editors.line_editor import LineEditor
 
-from GridCalEngine.Devices.types import BRANCH_TYPES
+from GridCalEngine.Devices.types import BRANCH_TYPES, ALL_DEV_TYPES
 from GridCalEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:
@@ -132,6 +132,13 @@ class MapLineSegment(QGraphicsLineItem):
         """
         return [self.container]
 
+    def get_associated_devices(self) -> List[ALL_DEV_TYPES]:
+        """
+        This forwards to the map line container for the appropriate deletion of everything
+        :return:
+        """
+        return [self.container.api_object]
+
     def set_width(self, width: float):
         """
 

{gridcal-5.3.42 → gridcal-5.3.44}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -20,7 +20,7 @@ from GridCal.Gui.object_model import ObjectsModel
 from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
 from GridCal.Gui.Diagrams.SchematicWidget import schematic_widget
 
-from GridCalEngine.Devices.types import ALL_DEV_TYPES
+from GridCalEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, BRANCH_TYPES
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices import VoltageLevel
 from GridCalEngine.Devices.Substation.substation import Substation
@@ -795,22 +795,54 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         :return:
         """
         associated_buses = self.editor.circuit.get_substation_buses(substation=self.api_object)
-        associated_buses_graphics = list()
         associated_lines_graphics: List[MapLineContainer] = list()
+        for line in self.editor.circuit.lines:
+            if line.bus_to in associated_buses or line.bus_from in associated_buses:
+                associated_lines_graphics.append(self.editor.graphics_manager.query(elm=line))
 
         # TODO: Connectivity nodes / busbars? Probably this is only when dealing with the schematic
 
-        for bus in associated_buses:
-            associated_buses_graphics.append(self.editor.graphics_manager.query(elm=bus))
+        # for bus in associated_buses:
+        #     associated_buses_graphics.append(self.editor.graphics_manager.query(elm=bus))
 
-        for segment in self.get_hosting_line_segments():
-            associated_lines_graphics.append(segment.container)
+        # for segment in self.get_hosting_line_segments():
+        #     associated_lines_graphics.append(segment.container)
 
         return self.voltage_level_graphics + associated_lines_graphics
 
+
+    def get_associated_devices(self) -> List[ALL_DEV_TYPES]:
+        """
+        This function returns all the api_object devices associated with the selected graphic object.
+        :return: List of the associated devices.
+        """
+        associated_vl = [vl.api_object for vl in self.voltage_level_graphics]
+        associated_buses = self.editor.circuit.get_substation_buses(substation=self.api_object)
+        associated_branches: List[BRANCH_TYPES] = list()
+        associated_shunts: List[INJECTION_DEVICE_TYPES] = list()
+
+        for branch in self.editor.circuit.get_branches():
+            if branch.bus_to in associated_buses or branch.bus_from in associated_buses:
+                associated_branches.append(branch)
+
+        for inj in self.editor.circuit.get_injection_devices_iter():
+            if inj.bus in associated_buses:
+                associated_shunts.append(inj)
+
+        # TODO: Connectivity nodes / busbars? Probably this is only when dealing with the schematic
+
+        # for bus in associated_buses:
+        #     associated_buses_graphics.append(self.editor.graphics_manager.query(elm=bus))
+
+        # for segment in self.get_hosting_line_segments():
+        #     associated_lines_graphics.append(segment.container)
+
+        return associated_vl + associated_branches + associated_shunts + associated_buses
+
     def delete(self):
         """
 
         :return:
         """
+
         self.editor.delete_with_dialogue(selected=[self], delete_from_db=False)

{gridcal-5.3.42 → gridcal-5.3.44}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -506,7 +506,7 @@ class GridMapWidget(BaseDiagramWidget):
                                                  lat=lat,
                                                  lon=lon,
                                                  index=index,
-                                                 r=0.005)
+                                                 r=self.diagram.min_branch_width)
 
         self.graphics_manager.add_device(elm=api_object, graphic=graphic_object)
 
@@ -1180,7 +1180,7 @@ class GridMapWidget(BaseDiagramWidget):
         arrow_size = self.diagram.arrow_size  # self.get_arrow_scale()
 
         # Try colouring the branches
-        if self.circuit.get_branch_number_wo_hvdc():
+        if self.circuit.get_branch_number(add_hvdc=False, add_vsc=False, add_switch=True):
 
             lnorm = np.abs(loadings)
             lnorm[lnorm == np.inf] = 0
@@ -1705,8 +1705,8 @@ class GridMapWidget(BaseDiagramWidget):
 
         line1 = selected_lines[0][0]
         line2 = selected_lines[1][0]
-        line1_graphic = selected_lines[0][1]
-        line2_graphic = selected_lines[1][1]
+        line1_graphic: MapAcLine = selected_lines[0][1]
+        line2_graphic: MapAcLine = selected_lines[1][1]
 
         if line1.template != line2.template:
             self.gui.show_error_toast('Line merging could not be done, lines have different templates. Check if that '
@@ -1823,11 +1823,10 @@ class GridMapWidget(BaseDiagramWidget):
                 pass
 
         self.circuit.add_line(new_line)
-        self.circuit.delete_line(line1)
-        self.circuit.delete_line(line2)
 
-        self.remove_branch_graphic(line=line1_graphic)
-        self.remove_branch_graphic(line=line2_graphic)
+        self.remove_element(device=line1, graphic_object=line1_graphic, delete_from_db=True)
+        self.remove_element(device=line2, graphic_object=line2_graphic, delete_from_db=True)
+
         self.add_api_line(api_object=new_line)
 
         self.gui.show_info_toast(message='Line merging successful!')
@@ -2586,11 +2585,7 @@ class GridMapWidget(BaseDiagramWidget):
         selected_substations = self.get_selected_substations_tup()
 
         if len(selected_lines) != 1 or len(selected_substations) != 2:
-            msg = QMessageBox()
-            msg.setIcon(QMessageBox.Icon.Information)
-            msg.setText("Please select exactly one line and two substations.")
-            msg.setWindowTitle("Selection Error")
-            msg.exec()
+            self.gui.show_error_toast(message="Please select exactly one line and two substations.")
             return
 
         # Get the API objects
@@ -2615,11 +2610,7 @@ class GridMapWidget(BaseDiagramWidget):
                     line_api.bus_from = bus
                     break
             if bus_from_idtag_0 == line_api.bus_from.idtag:
-                msg = QMessageBox()
-                msg.setIcon(QMessageBox.Icon.Information)
-                msg.setText("The new substation did not have any valid bus to connect the line.")
-                msg.setWindowTitle("No valid bus")
-                msg.exec()
+                self.gui.show_error_toast(message="The new substation did not have any valid bus to connect the line.")
                 return
 
         elif substation_api_1.idtag == bus_to.substation.idtag:
@@ -2630,11 +2621,7 @@ class GridMapWidget(BaseDiagramWidget):
                     line_api.bus_to = bus
                     break
             if bus_to_idtag_0 == line_api.bus_to.idtag:
-                msg = QMessageBox()
-                msg.setIcon(QMessageBox.Icon.Information)
-                msg.setText("The new substation did not have any valid bus to connect the line.")
-                msg.setWindowTitle("No valid bus")
-                msg.exec()
+                self.gui.show_error_toast(message="The new substation did not have any valid bus to connect the line.")
                 return
 
 
@@ -2646,11 +2633,7 @@ class GridMapWidget(BaseDiagramWidget):
                     line_api.bus_from = bus
                     break
             if bus_from_idtag_0 == line_api.bus_from.idtag:
-                msg = QMessageBox()
-                msg.setIcon(QMessageBox.Icon.Information)
-                msg.setText("The new substation did not have any valid bus to connect the line.")
-                msg.setWindowTitle("No valid bus")
-                msg.exec()
+                self.gui.show_error_toast(message="The new substation did not have any valid bus to connect the line.")
                 return
 
         elif substation_api_2.idtag == bus_to.substation.idtag:
@@ -2661,33 +2644,21 @@ class GridMapWidget(BaseDiagramWidget):
                     line_api.bus_to = bus
                     break
             if bus_to_idtag_0 == line_api.bus_to.idtag:
-                msg = QMessageBox()
-                msg.setIcon(QMessageBox.Icon.Information)
-                msg.setText("The new substation did not have any valid bus to connect the line.")
-                msg.setWindowTitle("No valid bus")
-                msg.exec()
+                self.gui.show_error_toast(message="The new substation did not have any valid bus to connect the line.")
                 return
 
         else:
-            msg = QMessageBox()
-            msg.setIcon(QMessageBox.Icon.Information)
-            msg.setText("None of the selected substations are related to the line.")
-            msg.setWindowTitle("No Action")
-            msg.exec()
+            self.gui.show_error_toast(message="None of the selected substations are related to the line.")
             return
 
         # Remove past graphic item and add the new one
 
-        self.remove_branch_graphic(line=line_graphic, delete_from_db=False)
+        self.remove_element(device=line_api, graphic_object=line_graphic, delete_from_db=False)
         line = self.add_api_line(api_object=line_api)
         line.calculate_total_length()
 
-        msg = QMessageBox()
-        msg.setIcon(QMessageBox.Icon.Information)
-        msg.setText(f"Line {line_api.name} had its connection to substation {removed_substation} changed to substation "
+        self.gui.show_info_toast(f"Line {line_api.name} had its connection to substation {removed_substation} changed to substation "
                     f"{added_substation}.")
-        msg.setWindowTitle("Operation Successful")
-        msg.exec()
 
 
 def generate_map_diagram(

{gridcal-5.3.42 → gridcal-5.3.44}/GridCal/Gui/Diagrams/SchematicWidget/Substation/busbar_graphics.py

@@ -102,7 +102,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         self.tile.setOpacity(0.7)
 
         # connection terminals the block
-        self._terminal = BarTerminalItem('s', parent=self, editor=self.editor)  # , h=self.h))
+        self._terminal = BarTerminalItem('s', parent=self, editor=self._editor)  # , h=self.h))
         self._terminal.setPen(QPen(Qt.GlobalColor.transparent, self.pen_width, self.style,
                                    Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin))
 

{gridcal-5.3.42 → gridcal-5.3.44}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -291,7 +291,7 @@ class BaseDiagramWidget(QSplitter):
             graphic_object.delete_from_associations()
 
             if delete_from_db:
-                self.circuit.delete_element(obj=graphic_object.api_object)
+                self.circuit.delete_element(obj=device)
 
             # # For any other associated, graphic, delete too
             # for child_graphic in graphic_object.get_associated_widgets():
@@ -315,6 +315,19 @@ class BaseDiagramWidget(QSplitter):
             self.object_editor_table.setModel(None)
 
             return True
+
+        if graphic_object is None and device is not None:
+
+            if delete_from_db:
+                self.circuit.delete_element(obj=device)
+                self.delete_element_utility_function(device=device, propagate=delete_from_db)
+                self.object_editor_table.setModel(None)
+
+            else:
+                pass
+
+            return True
+
         else:
             self.gui.show_warning_toast(f"Graphic object {graphic_object} and device {device} are none")
             self.object_editor_table.setModel(None)
@@ -346,24 +359,24 @@ class BaseDiagramWidget(QSplitter):
         if len(selected) > 0:
 
             # get the set of all affected GenericDiagramWidget instances
-            extended: Set[GenericDiagramWidget] = set()
+            extended: Set[ALL_DEV_TYPES] = set()
 
             for graphic_obj in selected:
 
                 if graphic_obj is not None:
                     if isinstance(graphic_obj, GenericDiagramWidget):
-                        extended.add(graphic_obj)
+                        extended.add(graphic_obj.api_object)
 
-                    for child_graphic in graphic_obj.get_associated_widgets():
-                        if child_graphic is not None:
-                            extended.add(child_graphic)
+                    for child_item in graphic_obj.get_associated_devices():
+                        if child_item is not None:
+                            extended.add(child_item)
 
-            extended_lst: List[GenericDiagramWidget] = list(extended)
+            extended_lst: List[ALL_DEV_TYPES] = list(extended)
 
             dlg = DeleteDialogue(
-                names_list=[f"{graphic_obj.api_object.device_type.value}: "
-                              f"{graphic_obj.api_object.name}"
-                            for graphic_obj in extended_lst],
+                names_list=[f"{device.device_type.value}: "
+                              f"{device.name}"
+                            for device in extended_lst],
                 delete_from_db=delete_from_db,
                 title="Delete Selected",
                 checks=False,
@@ -373,9 +386,10 @@ class BaseDiagramWidget(QSplitter):
             dlg.exec()
 
             if dlg.is_accepted:
-                for graphic_object in extended_lst:
-                    self.remove_element(device=graphic_object.api_object,
-                                        graphic_object=graphic_object,
+                for device in extended_lst:
+
+                    self.remove_element(device=device,
+                                        graphic_object=self.graphics_manager.query(elm=device),
                                         delete_from_db=dlg.delete_from_db)
 
                 return True, dlg.delete_from_db

{gridcal-5.3.42 → gridcal-5.3.44}/GridCal/Gui/Diagrams/generic_graphics.py

@@ -189,6 +189,20 @@ class GenericDiagramWidget:
         return list()
 
 
+    def get_associated_devices(self):
+
+        """
+        Get a list of all graphical elements associated with this widget.
+        In the case of a BusGraphicsItem, it will be all the shunt connections
+        plus the LineGraphicItems connecting to it, etc.
+        This function is meant to be overloaded.
+        :return:
+
+        """
+
+        return list()
+
+
 class Polygon(QGraphicsPolygonItem):
     """
     PolygonItem