VeraGrid 5.6.3__tar.gz → 5.6.5__tar.gz

{veragrid-5.6.3 → veragrid-5.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.6.3
+Version: 5.6.5
 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.6.3 → veragrid-5.6.5}/VeraGrid/Gui/CoordinatesInput/coordinates_dialogue.py

@@ -438,26 +438,34 @@ class CoordinatesInputGUI(QtWidgets.QDialog):
             if self.ui.longitudeCheckBox.isChecked():
                 bus.longitude = self.associations.get_longitude_at(i)
 
+                if bus.substation is not None:
+                    if bus.substation.longitude == 0.0:
+                        bus.substation.longitude = bus.longitude
+
             if self.ui.latitudeCheckBox.isChecked():
                 bus.latitude = self.associations.get_latitude_at(i)
 
-        self.close()
-
+                if bus.substation is not None:
+                    if bus.substation.latitude == 0.0:
+                        bus.substation.latitude = bus.latitude
 
-if __name__ == "__main__":
-    app = QtWidgets.QApplication(sys.argv)
-
-    class TestObj:
-        def __init__(self, name, code, x=0, y=0, latitude=0, longitude=0):
-            self.name = name
-            self.code = code
-            self.x = x
-            self.y = y
-            self.latitude = latitude
-            self.longitude = longitude
+        self.close()
 
 
-    window = CoordinatesInputGUI(list_of_objects=[TestObj('Test object', 'code')] * 10)
-    window.resize(1.61 * 700.0, 600.0)  # golden ratio
-    window.show()
-    sys.exit(app.exec())
+# if __name__ == "__main__":
+#     app = QtWidgets.QApplication(sys.argv)
+#
+#     class TestObj:
+#         def __init__(self, name, code, x=0, y=0, latitude=0, longitude=0):
+#             self.name = name
+#             self.code = code
+#             self.x = x
+#             self.y = y
+#             self.latitude = latitude
+#             self.longitude = longitude
+#
+#
+#     window = CoordinatesInputGUI(list_of_objects=[TestObj('Test object', 'code')] * 10)
+#     window.resize(1.61 * 700.0, 600.0)  # golden ratio
+#     window.show()
+#     sys.exit(app.exec())

{veragrid-5.6.3 → veragrid-5.6.5}/VeraGrid/Gui/Diagrams/MapWidget/Injections/map_generator_graphics.py

@@ -7,8 +7,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 import numpy as np
-from PySide6 import QtWidgets, QtCore
-from PySide6.QtWidgets import QMenu
+
+from PySide6.QtWidgets import QGraphicsSceneContextMenuEvent
 from VeraGridEngine.Devices.Injections.generator import Generator
 from VeraGrid.Gui.Diagrams.Editors.generator_editor import GeneratorQCurveEditor
 from VeraGrid.Gui.messages import yes_no_question, info_msg
@@ -51,21 +51,15 @@ class MapGeneratorGraphicItem(MapInjectionTemplateGraphicItem):
     def api_object(self) -> Generator:
         return self._api_object
 
-    def contextMenuEvent(self, event):
+    def contextMenuEvent(self, event: QGraphicsSceneContextMenuEvent):
         """
         Display context menu
         @param event:
         @return:
         """
-        menu = QMenu()
-        menu.addSection("Generator")
+        menu = self.get_base_context_menu()
 
-        # add_menu_entry(menu=menu,
-        #                text="Active",
-        #                icon_path="",
-        #                function_ptr=self.enable_disable_toggle,
-        #                checkeable=True,
-        #                checked_value=self.api_object.active)
+        menu.addSection("Generator")
 
         add_menu_entry(menu=menu,
                        text="Voltage control",
@@ -74,11 +68,6 @@ class MapGeneratorGraphicItem(MapInjectionTemplateGraphicItem):
                        checkeable=True,
                        checked_value=self.api_object.is_controlled)
 
-        add_menu_entry(menu=menu,
-                       text="Set regulation bus",
-                       icon_path="",
-                       function_ptr=self.set_regulation_bus)
-
         add_menu_entry(menu=menu,
                        text="Rms Editor",
                        function_ptr=self.edit_rms,
@@ -91,13 +80,6 @@ class MapGeneratorGraphicItem(MapInjectionTemplateGraphicItem):
 
         menu.addSeparator()
 
-        add_menu_entry(menu=menu,
-                       text="Plot profiles",
-                       icon_path=":/Icons/icons/plot.png",
-                       function_ptr=self.plot)
-
-        menu.addSeparator()
-
         add_menu_entry(menu=menu,
                        text="Solar photovoltaic wizard",
                        icon_path=":/Icons/icons/solar_power.png",
@@ -110,21 +92,12 @@ class MapGeneratorGraphicItem(MapInjectionTemplateGraphicItem):
 
         menu.addSeparator()
 
-        add_menu_entry(menu, text='Remove',
-                       icon_path=":/Icons/icons/delete_schematic.png",
-                       function_ptr=self.delete)
-
         add_menu_entry(menu=menu,
                        text="Convert to battery",
                        icon_path=":/Icons/icons/add_batt.png",
                        function_ptr=self.to_battery)
 
-        add_menu_entry(menu=menu,
-                       text="Change bus",
-                       icon_path=":/Icons/icons/move_bus.png",
-                       function_ptr=self.change_bus)
-
-        menu.exec_(event.screenPos())
+        menu.exec(event.screenPos())
 
     def edit_rms(self):
         """

{veragrid-5.6.3 → veragrid-5.6.5}/VeraGrid/Gui/Diagrams/MapWidget/Injections/map_injections_template_graphics.py

@@ -203,7 +203,7 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
         add_menu_entry(menu=menu,
                        text="Consolidate coordinates",
                        function_ptr=self.consolidate_coordinates,
-                       icon_path=":/Icons/icons/delete_schematic.png")
+                       icon_path=":/Icons/icons/assign_to_profile.png")
 
         menu.addSeparator()
 
@@ -221,7 +221,6 @@ class MapInjectionTemplateGraphicItem(NodeTemplate, QGraphicsEllipseItem):
         @return:
         """
         menu = self.get_base_context_menu()
-
         menu.exec(event.screenPos())
 
     def consolidate_coordinates(self):

{veragrid-5.6.3 → veragrid-5.6.5}/VeraGrid/Gui/Main/SubClasses/Model/diagrams.py

@@ -1365,7 +1365,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.PowerFlowTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1382,7 +1382,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.StateEstimationDriver.tpe.value:
             if t_idx is None:
@@ -1398,7 +1398,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.ContinuationPowerFlowDriver.tpe.value:
             if t_idx is None:
@@ -1415,7 +1415,7 @@ class DiagramsMain(CompiledArraysMain):
                                    max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.StochasticPowerFlowDriver.tpe.value:
 
@@ -1445,7 +1445,7 @@ class DiagramsMain(CompiledArraysMain):
                                   max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.OptimalPowerFlowDriver.tpe.value:
             if t_idx is None:
@@ -1460,7 +1460,7 @@ class DiagramsMain(CompiledArraysMain):
                                    max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.OptimalPowerFlowTimeSeriesDriver.tpe.value:
 
@@ -1479,7 +1479,7 @@ class DiagramsMain(CompiledArraysMain):
                                       max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.NodalCapacityTimeSeriesDriver.tpe.value:
 
@@ -1507,7 +1507,7 @@ class DiagramsMain(CompiledArraysMain):
                                      max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.LinearAnalysisTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1525,7 +1525,7 @@ class DiagramsMain(CompiledArraysMain):
                                         max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.ContingencyAnalysisDriver.tpe.value:
 
@@ -1544,7 +1544,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.ContingencyAnalysisTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1562,7 +1562,7 @@ class DiagramsMain(CompiledArraysMain):
                                       max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.AvailableTransferCapacityDriver.tpe.value:
             self.default_colouring(t_idx=t_idx,
@@ -1599,7 +1599,7 @@ class DiagramsMain(CompiledArraysMain):
                                    max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.OptimalNetTransferCapacityTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1617,7 +1617,7 @@ class DiagramsMain(CompiledArraysMain):
                                       max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.InputsAnalysisDriver.tpe.value:
 

{veragrid-5.6.3 → veragrid-5.6.5}/VeraGrid/Gui/Main/SubClasses/Model/time_events.py

@@ -158,8 +158,10 @@ class TimeEventsMain(DataBaseTableMain):
                                         if self.profile_input_dialogue.has_profile(i):
                                             # if there was a profile, we want the generator not dispatchable
                                             elm.enabled_dispatch = False
+                                            elm.enabled_dispatch_prof.fill(False)
                                         else:
                                             elm.enabled_dispatch = True
+                                            elm.enabled_dispatch_prof.fill(True)
 
                                     self.show_info_toast("Generators dispatchable status set")
 
@@ -203,6 +205,8 @@ class TimeEventsMain(DataBaseTableMain):
                     self.setup_sim_indices(st=self.start_end_dialogue_window.start_value,
                                            en=self.start_end_dialogue_window.end_value)
 
+                    self.view_objects_data()
+
                     self.show_info_toast("Resampled!")
             else:
                 self.show_error_toast("Empty time series :/")
@@ -239,6 +243,8 @@ class TimeEventsMain(DataBaseTableMain):
 
                             # we need to remove the clustering simulation because it no longer matches the time data
                             self.session.delete_driver(driver_type=SimulationTypes.ClusteringAnalysis_run)
+
+                            self.view_objects_data()
                             self.show_info_toast("Resampled!")
                 else:
                     self.show_error_toast("Run clustering simulation first")

{veragrid-5.6.3 → veragrid-5.6.5}/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.6.3"
+__VeraGrid_VERSION__ = "5.6.5"
 
 url = 'https://github.com/SanPen/VeraGrid'