VeraGrid 5.5.5__tar.gz → 5.5.7__tar.gz

{veragrid-5.5.5 → veragrid-5.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.5.5
+Version: 5.5.7
 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.7/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.5 → veragrid-5.5.7}/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.5 → veragrid-5.5.7}/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.5 → veragrid-5.5.7}/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.5 → veragrid-5.5.7}/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.5 → veragrid-5.5.7}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/injections_template_graphics.py

@@ -246,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.5 → veragrid-5.5.7}/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.5 → veragrid-5.5.7}/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
@@ -207,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.5 → veragrid-5.5.7}/VeraGrid/Gui/Main/SubClasses/Model/compiled_arrays.py

@@ -79,6 +79,7 @@ class CompiledArraysMain(ServerMain):
         mdl = self.ui.simulationDataStructureTableView.model()
         mode = self.ui.arrayModeComboBox.currentText()
         mdl.copy_to_clipboard(mode=mode)
+        self.show_info_toast('Copied!')
 
     def copy_simulation_objects_data_to_numpy(self):
         """
@@ -87,6 +88,7 @@ class CompiledArraysMain(ServerMain):
         mdl = self.ui.simulationDataStructureTableView.model()
         mode = 'numpy'
         mdl.copy_to_clipboard(mode=mode)
+        self.show_info_toast('Copied!')
 
     def plot_simulation_objects_data(self):
         """

{veragrid-5.5.5 → veragrid-5.5.7}/VeraGrid/Gui/Main/SubClasses/Model/time_events.py

@@ -494,7 +494,11 @@ class TimeEventsMain(DataBaseTableMain):
             col_idx = 0
 
         if mdl is not None:
-            mdl.copy_to_clipboard(cols=list(cols))
+            ok = mdl.copy_to_clipboard(cols=list(cols))
+            if ok:
+                self.show_info_toast('Copied!')
+            else:
+                self.show_warning_toast('Nothing to copy')
         else:
             warning_msg('There is no profile displayed, please display one', 'Copy profile to clipboard')
 

{veragrid-5.5.5 → veragrid-5.5.7}/VeraGrid/Gui/Main/SubClasses/Results/results.py

@@ -234,7 +234,7 @@ class ResultsMain(SimulationsMain):
         mdl = self.ui.resultsTableView.model()
         if mdl is not None:
             mdl.copy_to_clipboard()
-            print('Copied!')
+            self.show_info_toast('Copied!')
         else:
             warning_msg('There is no profile displayed, please display one', 'Copy profile to clipboard')
 
@@ -245,7 +245,7 @@ class ResultsMain(SimulationsMain):
         mdl = self.ui.resultsTableView.model()
         if mdl is not None:
             mdl.copy_numpy_to_clipboard()
-            print('Copied!')
+            self.show_info_toast('Copied!')
         else:
             warning_msg('There is no profile displayed, please display one', 'Copy profile to clipboard')
 

{veragrid-5.5.5 → veragrid-5.5.7}/VeraGrid/Gui/gui_functions.py

@@ -1035,7 +1035,7 @@ def add_menu_entry(menu: QtWidgets.QMenu,
 
     if checkeable:
         entry.setCheckable(checkeable)
-        entry.setChecked(checked_value)
+        entry.setChecked(bool(checked_value))
 
     if icon_pixmap is None:
         if len(icon_path) > 0:

{veragrid-5.5.5 → veragrid-5.5.7}/VeraGrid/Gui/profiles_model.py

@@ -315,7 +315,7 @@ class ProfilesModel(WrappableTableModel):
             # there are no elements
             pass
 
-    def copy_to_clipboard(self, cols: Union[None, List[int]] = None) -> None:
+    def copy_to_clipboard(self, cols: Union[None, List[int]] = None) -> bool:
         """
         Copy profiles to clipboard
         :param cols:
@@ -357,10 +357,10 @@ class ProfilesModel(WrappableTableModel):
             cb.clear()
             cb.setText(data)
 
-            print('Copied!')
+            return True
         else:
             # there are no elements
-            pass
+            return False
 
     def add_state(self, columns: List[int], action_name: str = ''):
         """

veragrid-5.5.7/VeraGrid/Gui/rms_plot_variables_dialog.py

@@ -0,0 +1,79 @@
+# 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
+
+
+from PySide6.QtWidgets import (
+    QDialog, QVBoxLayout, QHBoxLayout, QLabel, QPushButton,
+    QComboBox, QListWidget, QDialogButtonBox
+)
+
+import matplotlib.pyplot as plt
+
+
+class RmsPlotDialog(QDialog):
+    def __init__(self, devices_options: dict[str, str], results_table, uid2idx: dict[int, int], vars_glob_name2uid,
+                 parent=None):
+        """
+        :param devices: dict {device: [Var]}
+        """
+        super().__init__(parent)
+        self.setWindowTitle("Plot Variables")
+        self.uid2idx = uid2idx
+        self.vars_glob_name2uid = vars_glob_name2uid
+        self.devices = devices_options
+        self.results_table = results_table
+        self.selected_vars = []
+
+        layout = QVBoxLayout(self)
+
+        # --- Device selector ---
+        dev_layout = QHBoxLayout()
+        dev_layout.addWidget(QLabel("Device:"))
+        self.device_combo = QComboBox()
+        self.device_combo.addItems(list(devices_options.keys()))
+        self.device_combo.currentIndexChanged.connect(self.update_variables)
+        dev_layout.addWidget(self.device_combo)
+        layout.addLayout(dev_layout)
+
+        # --- Variable selector ---
+        var_layout = QHBoxLayout()
+        var_layout.addWidget(QLabel("Variable:"))
+        self.var_combo = QComboBox()
+        var_layout.addWidget(self.var_combo)
+        layout.addLayout(var_layout)
+
+        # --- Add button ---
+        add_btn = QPushButton("Add")
+        add_btn.clicked.connect(self.add_variable)
+        layout.addWidget(add_btn)
+
+        # --- List of selected vars ---
+        self.list_widget = QListWidget()
+        layout.addWidget(self.list_widget)
+
+        # --- Buttons ---
+        self.buttons = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel)
+        self.buttons.accepted.connect(self.plot_selected)
+        self.buttons.rejected.connect(self.reject)
+        layout.addWidget(self.buttons)
+
+        self.update_variables(0)
+
+    def update_variables(self, index):
+        device = self.device_combo.currentText()
+        self.var_combo.clear()
+        self.var_combo.addItems(self.devices[device])
+
+    def add_variable(self):
+        var = self.var_combo.currentText()
+        item_str = var
+        if item_str not in self.selected_vars:
+            self.selected_vars.append(self.vars_glob_name2uid[item_str])
+            self.list_widget.addItem(item_str)
+
+    def plot_selected(self):
+        selected_col_idx = [self.uid2idx[uid] for uid in self.selected_vars]
+        self.results_table.plot(selected_col_idx=selected_col_idx)
+        plt.show()

{veragrid-5.5.5 → veragrid-5.5.7}/VeraGrid/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # remember to keep a three-number version!!!
-__VeraGrid_VERSION__ = "5.5.5"
+__VeraGrid_VERSION__ = "5.5.7"
 
 url = 'https://github.com/SanPen/VeraGrid'