VeraGrid 5.5.4__tar.gz → 5.5.6__tar.gz

{veragrid-5.5.4 → veragrid-5.5.6}/PKG-INFO

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

veragrid-5.5.6/VeraGrid/Gui/Diagrams/Editors/RmsModelEditor/rms_templates.py

@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+
+Class

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/Editors/transformer3w_editor.py

@@ -193,15 +193,15 @@ class Transformer3WEditor(QDialog):
         self.accept()
 
 
-if __name__ == '__main__':
-    import sys
-    from VeraGridEngine.Devices.Substation.bus import Bus
-
-    app = QApplication(sys.argv)
-
-    b1 = Bus()
-    b2 = Bus()
-    b3 = Bus()
-    tr3 = Transformer3W(bus1=b1, bus2=b2, bus3=b3)
-    editor = Transformer3WEditor(tr3, 100.0)
-    editor.exec()
+# if __name__ == '__main__':
+#     import sys
+#     from VeraGridEngine.Devices.Substation.bus import Bus
+#
+#     app = QApplication(sys.argv)
+#
+#     b1 = Bus()
+#     b2 = Bus()
+#     b3 = Bus()
+#     tr3 = Transformer3W(bus1=b1, bus2=b2, bus3=b3)
+#     editor = Transformer3WEditor(tr3, 100.0)
+#     editor.exec()

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/SchematicWidget/Fluid/fluid_p2x_graphics.py

@@ -33,16 +33,11 @@ class FluidP2xGraphicItem(InjectionTemplateGraphicItem):
                                               editor=editor,
                                               device_type_name='fluid_p2x',
                                               w=40,
-                                              h=40,
-                                              glyph=Circle(self, 40, 40, "P2X"))
+                                              h=40)
 
-    @property
-    def api_object(self) -> FluidP2x:
-        return self._api_object
-
-    @property
-    def editor(self) -> SchematicWidget:
-        return self._editor
+        self.set_glyph(
+            glyph=Circle(self, 40, 40, "P2X", self.update_nexus)
+        )
 
     def recolour_mode(self):
         """

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/SchematicWidget/Fluid/fluid_pump_graphics.py

@@ -33,17 +33,11 @@ class FluidPumpGraphicItem(InjectionTemplateGraphicItem):
                                               editor=editor,
                                               device_type_name='fluid_pump',
                                               w=40,
-                                              h=40,
-                                              glyph=Circle(self, 40, 40, "P")
-                                              )
+                                              h=40)
 
-    @property
-    def api_object(self) -> FluidPump:
-        return self._api_object
-
-    @property
-    def editor(self) -> SchematicWidget:
-        return self._editor
+        self.set_glyph(
+            glyph=Circle(self, 40, 40, "P", self.update_nexus)
+        )
 
     def recolour_mode(self):
         """

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/SchematicWidget/Fluid/fluid_turbine_graphics.py

@@ -33,16 +33,11 @@ class FluidTurbineGraphicItem(InjectionTemplateGraphicItem):
                                               editor=editor,
                                               device_type_name='fluid_turbine',
                                               w=40,
-                                              h=40,
-                                              glyph=Circle(self, 40, 40, "T"))
+                                              h=40)
 
-    @property
-    def api_object(self) -> FluidTurbine:
-        return self._api_object
-
-    @property
-    def editor(self) -> SchematicWidget:
-        return self._editor
+        self.set_glyph(
+            glyph=Circle(self, 40, 40, "T", self.update_nexus)
+        )
 
     def recolour_mode(self) -> None:
         """

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/generator_graphics.py

@@ -125,6 +125,10 @@ class GeneratorGraphicItem(InjectionTemplateGraphicItem):
         menu.exec_(event.screenPos())
 
     def edit_rms(self):
+        """
+
+        :return:
+        """
         templates = [t.name for t in
                      self.editor.circuit.sequence_line_types]  # TODO: find where to build and save the templates
 

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/injections_template_graphics.py

@@ -63,7 +63,6 @@ class InjectionTemplateGraphicItem(GenericDiagramWidget, QGraphicsItemGroup):
         self.nexus = QGraphicsLineItem()
         self.nexus.setPen(QPen(self.color, self.width, self.style))
 
-
     def set_glyph(self, glyph: Square | Circle | Polygon | Condenser):
         """
 
@@ -247,7 +246,10 @@ class InjectionTemplateGraphicItem(GenericDiagramWidget, QGraphicsItemGroup):
         self.scale = scale
 
     def get_base_context_menu(self) -> QMenu:
-
+        """
+        Generate the base menu for injections
+        :return:
+        """
         menu = QMenu()
 
         add_menu_entry(menu=menu,

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/load_graphics.py

@@ -40,12 +40,13 @@ class LoadGraphicItem(InjectionTemplateGraphicItem):
                                               h=20)
 
         # triangle
-        self.set_glyph(glyph=Polygon(self,
-                                     polygon=QPolygonF([QPointF(0, 0),
-                                                        QPointF(self.w, 0),
-                                                        QPointF(self.w / 2, self.h)]),
-                                     update_nexus_fcn=self.update_nexus)
-                       )
+        self.set_glyph(glyph=Polygon(
+            self,
+            polygon=QPolygonF([QPointF(0, 0),
+                               QPointF(self.w, 0),
+                               QPointF(self.w / 2, self.h)]),
+            update_nexus_fcn=self.update_nexus)
+        )
 
     @property
     def api_object(self) -> Load:
@@ -58,29 +59,32 @@ class LoadGraphicItem(InjectionTemplateGraphicItem):
         @return:
         """
         if self.api_object is not None:
-            menu = QMenu()
+            menu = self.get_base_context_menu()
             menu.addSection("Load")
 
-
             add_menu_entry(menu=menu,
-                        text="Rms Editor",
-                        function_ptr=self.edit_rms,
-                        icon_path=":/Icons/icons/edit.png")
+                           text="Rms Editor",
+                           function_ptr=self.edit_rms,
+                           icon_path=":/Icons/icons/edit.png")
 
             menu.exec(event.screenPos())
         else:
-            pass
+            self.editor.gui.show_error_toast("The graphic has no API object!")
 
     def edit_rms(self):
+        """
+
+        :return:
+        """
         templates = [t.name for t in
                      self.editor.circuit.sequence_line_types]  # TODO: find where to build and save the templates
 
         choice_dialog = RmsChoiceDialog(templates, parent=self.editor)
-        if choice_dialog.exec() == QtWidgets.QDialog.Accepted:
+        if choice_dialog.exec() == QtWidgets.QDialog.DialogCode.Accepted:
             if choice_dialog.choice == "template":
                 template_name = choice_dialog.selected_template
                 print(f"User chose template: {template_name}")
                 # TODO: missing finding the template object and apply it to self.api_object
             elif choice_dialog.choice == "editor":
                 dlg = RmsModelEditorGUI(self.api_object.rms_model, parent=self.editor)
-                dlg.show()
+                dlg.show()

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -8,8 +8,8 @@ from typing import Union, TYPE_CHECKING, List, Dict
 import webbrowser
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt, QRectF, QRect, QPointF
-from PySide6.QtGui import QPen, QCursor, QIcon, QPixmap, QBrush, QColor
-from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent
+from PySide6.QtGui import QPen, QCursor, QBrush, QColor
+from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent, QGraphicsItem
 
 from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from VeraGrid.Gui.messages import yes_no_question, warning_msg
@@ -256,9 +256,13 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
         for graphics in self._child_graphics:
             conn.append(graphics)
+            conn.append(graphics.nexus)
 
         return conn
 
+    def get_extra_graphics(self) -> List[QGraphicsItem]:
+        return self.get_associated_widgets()
+
     def get_nexus_point(self) -> QPointF:
         """
         Get the connection point for the children nexus line

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/base_diagram_widget.py

@@ -333,7 +333,8 @@ class BaseDiagramWidget(QSplitter):
             self.object_editor_table.setModel(None)
             return False
 
-    def delete_element_utility_function(self, device: ALL_DEV_TYPES, propagate: bool = True):
+    def delete_element_utility_function(self, device: ALL_DEV_TYPES, propagate: bool = True,
+                                        graphic_object: QGraphicsItem | None = None):
         """
         This function is a utility function to call this function in other diagrams through the GUI
         :param device: ALL_DEV_TYPES
@@ -341,7 +342,9 @@ class BaseDiagramWidget(QSplitter):
         :return:
         """
         self.diagram.delete_device(device=device)
-        graphic_object: QGraphicsItem = self.graphics_manager.delete_device(device=device)
+
+        if graphic_object is None:
+            graphic_object: QGraphicsItem = self.graphics_manager.delete_device(device=device)
 
         if graphic_object is not None:
             self._remove_from_scene(graphic_object)
@@ -375,7 +378,7 @@ class BaseDiagramWidget(QSplitter):
 
             dlg = DeleteDialogue(
                 names_list=[f"{device.device_type.value}: "
-                              f"{device.name}"
+                            f"{device.name}"
                             for device in extended_lst],
                 delete_from_db=delete_from_db,
                 title="Delete Selected",
@@ -387,7 +390,6 @@ class BaseDiagramWidget(QSplitter):
 
             if dlg.is_accepted:
                 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)
@@ -413,7 +415,16 @@ class BaseDiagramWidget(QSplitter):
         :param elements: list of elements to delete
         """
         for elm in elements:
-            self.delete_element_utility_function(elm)
+            graphic_object: QGraphicsItem = self.graphics_manager.delete_device(device=elm)
+
+            # this calls internally to delete_element_utility_function
+            self.remove_element(
+                device=elm,
+                graphic_object=graphic_object
+            )
+
+            self.delete_element_utility_function(elm,
+                                                 graphic_object=graphic_object)
 
     def set_time_index(self, time_index: Union[int, None]):
         """

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Diagrams/generic_graphics.py

@@ -8,7 +8,7 @@ import VeraGrid.ThirdParty.darkdetect as darkdetect
 from PySide6.QtCore import Qt, QPointF, QLineF
 from PySide6.QtWidgets import (QGraphicsLineItem, QGraphicsItem, QGraphicsPolygonItem, QGraphicsItemGroup,
                                QGraphicsRectItem, QGraphicsEllipseItem, QGraphicsTextItem)
-from PySide6.QtGui import QColor, QPen, QPolygon
+from PySide6.QtGui import QColor, QPen, QPolygon, QPolygonF
 from VeraGridEngine.Devices.types import ALL_DEV_TYPES
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
@@ -188,7 +188,6 @@ class GenericDiagramWidget:
         """
         return list()
 
-
     def get_associated_devices(self):
 
         """
@@ -208,7 +207,7 @@ class Polygon(QGraphicsPolygonItem):
     PolygonItem
     """
 
-    def __init__(self, parent, polygon: QPolygon, update_nexus_fcn: Callable[[QPointF], None]):
+    def __init__(self, parent, polygon: QPolygon | QPolygonF, update_nexus_fcn: Callable[[QPointF], None]):
         """
         Constructor
         :param parent:

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/GridReduce/grid_reduce.py

@@ -39,13 +39,14 @@ class GridReduceDialogue(QtWidgets.QDialog):
         self.ui = Ui_ReduceDialog()
         self.ui.setupUi(self)
         self.setWindowTitle('Grid reduction')
+        self.setModal(True)
 
         self.logger = Logger()
         self.logs_dialogue: LogsDialogue | None = None
 
         self.ui.listView.setModel(get_list_model(list(selected_buses_set)))
 
-        methods = [GridReductionMethod.DiShi, GridReductionMethod.PTDF, GridReductionMethod.Ward]
+        methods = [GridReductionMethod.PTDF, GridReductionMethod.DiShi, GridReductionMethod.Ward]
         self.methods_dict = {m.value: m for m in methods}
         self.ui.methodComboBox.setModel(get_list_model([m.value for m in methods]))
 
@@ -53,6 +54,8 @@ class GridReduceDialogue(QtWidgets.QDialog):
         self._session: SimulationSession = session
         self._selected_buses_set: Set[Bus] = selected_buses_set
 
+        self.did_reduce = False
+
         self.ui.reduceButton.clicked.connect(self.reduce_grid)
 
     def reduce_grid(self):
@@ -110,21 +113,11 @@ class GridReduceDialogue(QtWidgets.QDialog):
                     )
 
                 elif method == GridReductionMethod.PTDF:
-                    # get the previous power flow
-                    nc = compile_numerical_circuit_at(circuit=self._grid, t_idx=None)
-                    lin = LinearAnalysis(nc=nc)
-
-                    if self._grid.has_time_series:
-                        lin_ts = LinearAnalysisTs(grid=self._grid)
-                    else:
-                        lin_ts = None
 
                     # NOTE: self._grid gets reduced in-place
                     grid_reduced, logger = ptdf_reduction(
                         grid=self._grid,
                         reduction_bus_indices=reduction_bus_indices,
-                        PTDF=lin.PTDF,
-                        lin_ts=lin_ts
                     )
                 else:
                     raise NotImplementedError("Reduction method not supported")
@@ -132,6 +125,8 @@ class GridReduceDialogue(QtWidgets.QDialog):
                 if logger.has_logs():
                     self.logs_dialogue = LogsDialogue(name="Import profiles", logger=logger)
                     self.logs_dialogue.exec()
+
+                self.did_reduce = True
             else:
                 pass  # not ok
         else:

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Main/ConsoleLog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'ConsoleLog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.10.0
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Main/MainWindow.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'MainWindow.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.10.0
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Main/SubClasses/Model/data_base.py

@@ -659,7 +659,6 @@ class DataBaseTableMain(DiagramsMain):
     def grid_reduction_from_table_selection(self):
         """
         Crop model to buses selection
-        :return:
         """
         selected_buses, selected_objects = self.get_selected_table_buses()
 
@@ -671,12 +670,14 @@ class DataBaseTableMain(DiagramsMain):
                                                               session=self.session,
                                                               selected_buses_set=selected_buses)
 
-            self.grid_reduction_dialogue.show()
+            self.grid_reduction_dialogue.exec()
+
+            if self.grid_reduction_dialogue.did_reduce:
+                self.delete_from_all_diagrams(elements=[bus for i, bus, graphic in selected_buses])
 
     def grid_reduction_from_schematic_selection(self):
         """
-
-        :return:
+        Call the grid reduction dialogue on the schematic selection
         """
         selected_buses = self.get_selected_buses()
 
@@ -684,13 +685,16 @@ class DataBaseTableMain(DiagramsMain):
             # get the previous power flow
             _, pf_res = self.session.power_flow
 
-            selected_buses_set = {bus for i, bus, graphic in selected_buses}
+            selected_buses_set: Set[dev.Bus] = {bus for i, bus, graphic in selected_buses}
 
             self.grid_reduction_dialogue = GridReduceDialogue(grid=self.circuit,
                                                               session=self.session,
                                                               selected_buses_set=selected_buses_set)
 
-            self.grid_reduction_dialogue.show()
+            self.grid_reduction_dialogue.exec()
+
+            if self.grid_reduction_dialogue.did_reduce:
+                self.delete_from_all_diagrams(elements=[bus for i, bus, graphic in selected_buses])
 
     def add_objects(self):
         """

{veragrid-5.5.4 → veragrid-5.5.6}/VeraGrid/Gui/Main/SubClasses/Model/diagrams.py

@@ -2766,6 +2766,8 @@ class DiagramsMain(CompiledArraysMain):
             if isinstance(diagram_widget, SchematicWidget):
                 diagram_widget.delete_diagram_elements(elements)
 
+
+
             elif isinstance(diagram_widget, GridMapWidget):
                 pass