GridCal 5.3.22__tar.gz → 5.3.23__tar.gz

{gridcal-5.3.22 → gridcal-5.3.23}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -6,7 +6,8 @@ from __future__ import annotations
 import webbrowser
 from typing import List, TYPE_CHECKING, Tuple
 from PySide6 import QtWidgets
-from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsRectItem
+from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsRectItem, \
+    QMessageBox
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor
 from GridCal.Gui.Diagrams.MapWidget.Substation.node_template import NodeTemplate
@@ -20,10 +21,11 @@ from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices import VoltageLevel
 from GridCalEngine.Devices.Substation.substation import Substation
 from GridCalEngine.enumerations import DeviceType
+from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
+from GridCal.Gui.Diagrams.SchematicWidget import schematic_widget
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.MapWidget.grid_map_widget import GridMapWidget
-    from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
 
 
 class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
@@ -108,7 +110,10 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         :param se: other SubstationGraphicItem
         """
         self._callbacks += se._callbacks
-        self.voltage_level_graphics += se.voltage_level_graphics
+        for vl_graphic in se.voltage_level_graphics:
+            self.register_voltage_level(vl=vl_graphic.get_copy(new_parent=self))
+
+        self.sort_voltage_levels()
 
     def set_size(self, r: float):
         """
@@ -237,6 +242,23 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
                                            longitude=long,
                                            graphic_object=self)
 
+    def refresh(self, pos: QPointF):
+        """
+        This function refreshes the x, y coordinates of the graphic item
+        Returns:
+
+        """
+
+        x = pos.x() - self.rect().width() / 2
+        y = pos.y() - self.rect().height() / 2
+        self.setRect(x, y, self.rect().width(), self.rect().height())
+        self.set_callbacks(pos.x(), pos.y())
+
+        for vl_graphics in self.voltage_level_graphics:
+            vl_graphics.center_on_substation()
+
+        self.update_position_at_the_diagram()  # always update
+
     def get_center_pos(self) -> QPointF:
         """
         Get the center position
@@ -254,22 +276,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         if self.hovered:
             # super().mouseMoveEvent(event)
             pos = self.mapToParent(event.pos())
-            x = pos.x() - self.rect().width() / 2
-            y = pos.y() - self.rect().height() / 2
-            self.setRect(x, y, self.rect().width(), self.rect().height())
-            self.set_callbacks(pos.x(), pos.y())
-
-            for vl_graphics in self.voltage_level_graphics:
-                vl_graphics.center_on_substation()
-
-            self.update_position_at_the_diagram()  # always update
-
-        # QGraphicsRectItem.mouseMoveEvent(self, event)
-        # pos = self.mapToParent(event.pos())
-        # x = pos.x() + self.rect().width() / 2
-        # y = pos.y() + self.rect().height() / 2
-        # self.set_callbacks(x, y)
-        # self.update_position_at_the_diagram()  # always update
+            self.refresh(pos=pos)
 
     def mousePressEvent(self, event: QGraphicsSceneMouseEvent):
         """
@@ -413,7 +420,8 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
             "Remove substation from schematic")
 
         if ok:
-            self.editor.remove_substation(substation=self, delete_from_db=False)
+            self.editor.remove_substation(api_object=self.api_object, delete_from_db=False, substation_buses=[],
+                                          voltage_levels=[])
 
     def remove_function_from_schematic_and_db(self) -> None:
         """
@@ -514,8 +522,6 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         dialog.setModal(True)
         dialog.exec()
 
-
-
     def move_to_api_coordinates(self):
         """
         Function to move the graphics to the Database location
@@ -544,7 +550,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         dlg.exec()
 
         if dlg.is_accepted:
-
+            selected_buses = []
             deleted_api_objs: List[Substation] = list()
 
             # Collect all codes to merge
@@ -556,15 +562,18 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
                 if merged_codes == "":
                     merged_codes = se_graphics.api_object.code
                 else:
-                    merged_codes = merged_codes + ',' + se_graphics.api_object.code
+                    if se_graphics.api_object.code != "":
+                        merged_codes = merged_codes + ',' + se_graphics.api_object.code
 
                 deleted_api_objs.append(se_graphics.api_object)
 
                 if se_graphics != self:
                     self.merge(se=se_graphics)
-                    self.editor.remove_substation(substation=se_graphics,
-                                                  delete_from_db=True,
-                                                  delete_connections=False)
+                    sub = self.editor.graphics_manager.delete_device(se_graphics.api_object)
+                    self.editor.map.diagram_scene.removeItem(sub)
+                    # self.editor.remove_substation(substation=se_graphics,
+                    #                               delete_from_db=True,
+                    #                               delete_connections=False)
 
             # Update the code of the base substation
             self.api_object.code = merged_codes  # Needed?
@@ -578,11 +587,14 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
             # re-index the stuff pointing at deleted api elements to this api object
             for vl in self.editor.circuit.voltage_levels:
                 if vl.substation in deleted_api_objs:
+                    print(f'{vl.substation.name} changed to {self.api_object.name} for {vl.name}')
                     vl.substation = self.api_object
 
             for bus in self.editor.circuit.buses:
                 if bus.substation in deleted_api_objs:
+                    print(f'{bus.substation.name} changed to {self.api_object.name} for {bus.name}')
                     bus.substation = self.api_object
+                    selected_buses.append(bus)
 
             # remove connections that are from and to the same substation
             for tpe in [DeviceType.LineDevice, DeviceType.DCLineDevice, DeviceType.HVDCLineDevice]:
@@ -590,7 +602,54 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
                     if elm.api_object.get_substation_from() == elm.api_object.get_substation_to():
                         self.editor.remove_branch_graphic(elm, delete_from_db=True)
 
-        self.update_position_at_the_diagram()  # always update
+            for substation in deleted_api_objs:
+                if substation == self.api_object:
+                    pass
+                else:
+                    self.editor.circuit.delete_substation(obj=substation)
+
+            self.refresh(pos=self.get_pos())  # always update
+
+            if len(selected_buses):
+
+                dlg = CheckListDialogue(
+                    objects_list=[f'Create schematic diagram for the recipient substation {self.api_object.name}',
+                                  f'Unify buses and voltage levels with the same nominal voltage in recipient '
+                                  f'substation {self.api_object.name}'],
+                    title=f"Finishing merging proces in substation{self.api_object.name}"
+                )
+                dlg.setModal(True)
+                dlg.exec()
+
+
+                if dlg.accepted:
+                    for index in dlg.selected_indices:
+                        if index == 0:
+                            diagram = schematic_widget.make_diagram_from_buses(circuit=self.editor.circuit,
+                                                                               buses=selected_buses,
+                                                                               name=self.api_object.name + " diagram")
+
+                            diagram_widget = schematic_widget.SchematicWidget(gui=self.editor.gui,
+                                                                              circuit=self.editor.circuit,
+                                                                              diagram=diagram,
+                                                                              default_bus_voltage=self.editor.gui.ui.defaultBusVoltageSpinBox.value(),
+                                                                              time_index=self.editor.gui.get_diagram_slider_index())
+
+                            self.editor.gui.add_diagram_widget_and_diagram(diagram_widget=diagram_widget,
+                                                                           diagram=diagram)
+                            self.editor.gui.set_diagrams_list_view()
+                            self.editor.gui.set_diagram_widget(widget=diagram_widget)
+                        elif index == 1:
+                            pass
+                            #TODO: Merge items
+                else:
+                    self.editor.gui.show_info_toast(
+                        message='Merge ended. There was no diagram produced. The buses and voltages were not unified.')
+
+            else:
+                self.editor.gui.show_info_toast(
+                    message='The substation merged have no associated buses. No schematic can be produced.')
+
 
     def new_substation_diagram(self):
         """

{gridcal-5.3.22 → gridcal-5.3.23}/GridCal/Gui/Diagrams/MapWidget/Substation/voltage_level_graphic_item.py

@@ -149,6 +149,18 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
                                            longitude=long,
                                            graphic_object=self)
 
+    def get_copy(self, new_parent: SubstationGraphicItem):
+        """
+        Returns a copy of the VoltageLevelGraphicItem with a different parent
+        :param new_parent: New Substation Graphic item parent
+        :return: Copy of the VL Grpahic Item with new parent.
+        """
+        return VoltageLevelGraphicItem(parent=new_parent, editor=new_parent.editor, api_object=self.api_object,
+                                       r=self.radius / self.api_object.Vnom / 0.01, draw_labels=self.draw_labels)
+
+
+
+
     def mouseMoveEvent(self, event: QtWidgets.QGraphicsSceneMouseEvent) -> None:
         """
         Event handler for mouse move events.

{gridcal-5.3.22 → gridcal-5.3.23}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -2482,7 +2482,8 @@ def get_devices_to_expand(circuit: MultiCircuit, substations: List[Substation],
 
         if bus.voltage_level is not None:
             voltage_levels.add(bus.voltage_level)
-            substations_extended.add(bus.substation)
+            if bus.substation not in substations_extended:
+                substations_extended.add(bus.substation)
 
         if level < max_level:
 
@@ -2521,7 +2522,13 @@ def get_devices_to_expand(circuit: MultiCircuit, substations: List[Substation],
         else:
             raise Exception(f'Unrecognized branch type {obj.device_type.value}')
 
-    return list(substations_extended), list(voltage_levels), lines, dc_lines, hvdc_lines
+    list_substations_extended = list(substations_extended)
+
+    for substation in substations:
+        if substation not in list_substations_extended:
+            list_substations_extended.append(substation)
+
+    return list_substations_extended, list(voltage_levels), lines, dc_lines, hvdc_lines
 
 
 def make_diagram_from_substations(circuit: MultiCircuit,

{gridcal-5.3.22 → gridcal-5.3.23}/GridCal/Gui/GridMerge/build_diff_tree.py

@@ -95,8 +95,8 @@ def populate_tree(tree_widget, base: MultiCircuit, diff: MultiCircuit,
 
                     child_item = QtWidgets.QTreeWidgetItem(
                         parent_item,
-                        [f"{elm.device_type.value}", "Mod", f"{elm.idtag}", f"{elm.name}",
-                         prop.name, str(base_val), str(new_val)]
+                        [f"{diff_name}", f"{elm.device_type.value}", "Mod", f"{elm.idtag}", 
+                         f"{elm.name}", prop.name, str(base_val), str(new_val)]
                     )
                     child_item.setCheckState(0, Qt.CheckState.Unchecked)
 

{gridcal-5.3.22 → gridcal-5.3.23}/GridCal/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.3.22"
+__GridCal_VERSION__ = "5.3.23"
 
 url = 'https://github.com/SanPen/GridCal'
 

{gridcal-5.3.22 → gridcal-5.3.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 5.3.22
+Version: 5.3.23
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.