VeraGrid 5.5.11__tar.gz → 5.5.12__tar.gz

{veragrid-5.5.11 → veragrid-5.5.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.5.11
+Version: 5.5.12
 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.11 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -403,6 +403,9 @@ class SchematicWidget(BaseDiagramWidget):
         # nodes distance "explosion" factor
         self.expand_factor = 1.1
 
+        # Scale the view / do the zoom
+        self.scale_factor = 1.02  # 1.15
+
         # Zoom indicator
         self._zoom = 0
 
@@ -511,16 +514,14 @@ class SchematicWidget(BaseDiagramWidget):
         """
         self.editor_graphics_view.setTransformationAnchor(QGraphicsView.ViewportAnchor.AnchorUnderMouse)
 
-        # Scale the view / do the zoom
-        scale_factor = 1.15
         # print(event.angleDelta().x(), event.angleDelta().y(), event.angleDelta().manhattanLength() )
         if event.angleDelta().y() > 0:
             # Zoom in
-            self.zoom_in(scale_factor)
+            self.zoom_in()
 
         else:
             # Zooming out
-            self.zoom_out(scale_factor)
+            self.zoom_out()
 
     def graphicsKeyPressEvent(self, event: QKeyEvent):
         """
@@ -531,19 +532,17 @@ class SchematicWidget(BaseDiagramWidget):
         if event.key() == Qt.Key.Key_Delete:
             self.delete_selected_from_widget(delete_from_db=True)
 
-    def zoom_in(self, scale_factor: float = 1.15) -> None:
+    def zoom_in(self) -> None:
         """
-
-        :param scale_factor:
+        zoom in
         """
-        self.editor_graphics_view.scale(scale_factor, scale_factor)
+        self.editor_graphics_view.scale(self.scale_factor, self.scale_factor)
 
-    def zoom_out(self, scale_factor: float = 1.15) -> None:
+    def zoom_out(self) -> None:
         """
-
-        :param scale_factor:
+        Zoom out
         """
-        self.editor_graphics_view.scale(1.0 / scale_factor, 1.0 / scale_factor)
+        self.editor_graphics_view.scale(1.0 / self.scale_factor, 1.0 / self.scale_factor)
 
     def create_bus_graphics(self, bus: Bus, x: float, y: float, h: float, w: float,
                             draw_labels: bool = True, r: float = 0.0) -> BusGraphicItem | None:
@@ -1555,62 +1554,6 @@ class SchematicWidget(BaseDiagramWidget):
                                              from_port=self.started_branch.get_terminal_from(),
                                              to_port=self.started_branch.get_terminal_to())
 
-                        elif self.started_branch.connected_between_bus_and_cn():
-
-                            self.create_line(bus_from=self.started_branch.get_bus_from(),
-                                             cn_to=self.started_branch.get_cn_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_cn_and_bus():
-
-                            self.create_line(bus_to=self.started_branch.get_bus_to(),
-                                             cn_from=self.started_branch.get_cn_from(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_cn():
-
-                            self.create_line(cn_from=self.started_branch.get_cn_from(),
-                                             cn_to=self.started_branch.get_cn_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_busbar_and_bus():
-
-                            self.create_line(cn_from=self.started_branch.get_busbar_from().cn,
-                                             bus_to=self.started_branch.get_bus_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_bus_and_busbar():
-
-                            self.create_line(bus_from=self.started_branch.get_bus_from(),
-                                             cn_to=self.started_branch.get_busbar_to().cn,
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_busbar_and_cn():
-
-                            self.create_line(cn_from=self.started_branch.get_busbar_from().cn,
-                                             cn_to=self.started_branch.get_cn_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_cn_and_busbar():
-
-                            self.create_line(cn_from=self.started_branch.get_cn_from(),
-                                             cn_to=self.started_branch.get_busbar_to().cn,
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_busbar():
-
-                            self.create_line(cn_from=self.started_branch.get_busbar_from().cn,
-                                             cn_to=self.started_branch.get_busbar_to().cn,
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
                         else:
                             warn('unknown connection')
 
@@ -4766,10 +4709,6 @@ class SchematicWidget(BaseDiagramWidget):
 
             generator_graphics.api_object.control_bus = sel_bus
 
-            if (yes_no_question(text="Do you want to set the profile?", title="Set regulation bus")
-                    and self.circuit.has_time_series):
-                generator_graphics.api_object.control_bus_prof.fill(sel_bus)
-
         else:
             error_msg(text="You need to select exactly one bus to be set as the generator regulation bus",
                       title="Set regulation bus")

{veragrid-5.5.11 → veragrid-5.5.12}/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.9.2
+## Created by: Qt User Interface Compiler version 6.9.3
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

{veragrid-5.5.11 → veragrid-5.5.12}/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.9.2
+## Created by: Qt User Interface Compiler version 6.9.3
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

{veragrid-5.5.11 → veragrid-5.5.12}/VeraGrid/Gui/Main/SubClasses/simulations.py

@@ -30,7 +30,7 @@ import VeraGridEngine.Devices as dev
 import VeraGridEngine.Simulations as sim
 import VeraGridEngine.Simulations.PowerFlow.grid_analysis as grid_analysis
 from VeraGridEngine.Compilers.circuit_to_newton_pa import get_newton_mip_solvers_list
-from VeraGridEngine.Utils.MIP.selected_interface import get_ortools_available_mip_solvers
+from VeraGridEngine.Utils.MIP.selected_interface import get_available_mip_solvers
 from VeraGridEngine.IO.file_system import opf_file_path
 from VeraGridEngine.IO.veragrid.remote import RemoteInstruction
 from VeraGridEngine.Compilers.circuit_to_data import compile_numerical_circuit_at
@@ -325,7 +325,7 @@ class SimulationsMain(TimeEventsMain):
             self.ui.solver_comboBox.setModel(gf.get_list_model(list(self.solvers_dict.keys())))
             self.ui.solver_comboBox.setCurrentIndex(0)
 
-            mip_solvers = get_ortools_available_mip_solvers()
+            mip_solvers = get_available_mip_solvers(tpe=MIPFramework.PuLP)
             self.ui.mip_solver_comboBox.setModel(gf.get_list_model(mip_solvers))
 
         elif eng == EngineType.NewtonPA:
@@ -381,7 +381,7 @@ class SimulationsMain(TimeEventsMain):
             self.ui.solver_comboBox.setCurrentIndex(0)
 
             # MIP solvers
-            mip_solvers = get_ortools_available_mip_solvers()
+            mip_solvers = get_available_mip_solvers(tpe=MIPFramework.PuLP)
             self.ui.mip_solver_comboBox.setModel(gf.get_list_model(mip_solvers))
 
         elif eng == EngineType.Bentayga:

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