VeraGrid 5.5.11__tar.gz → 5.5.13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.5.11
+Version: 5.5.13
 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.13}/VeraGrid/Gui/Diagrams/Editors/transformer_editor.py

@@ -67,8 +67,10 @@ class TransformerEditor(QDialog):
             self.catalogue_combo.setModel(get_list_model(self.templates))
 
             if self.current_template is not None:
-                idx = self.templates.index(self.current_template)
-                if idx > -1:
+
+                try:
+                    idx = self.templates.index(self.current_template)
+
                     self.catalogue_combo.setCurrentIndex(idx)
 
                     # set the template parameters
@@ -78,6 +80,9 @@ class TransformerEditor(QDialog):
                     I0 = self.current_template.I0  # %
                     Vsc = self.current_template.Vsc  # %
 
+                except ValueError as e:
+                    print(f"Template not found for {self.transformer_obj.name}")
+
         # load template
         self.load_template_btn = QPushButton()
         self.load_template_btn.setText('Load template values')

{veragrid-5.5.11 → veragrid-5.5.13}/VeraGrid/Gui/Diagrams/MapWidget/Branches/line_location_graphic_item.py

@@ -238,7 +238,7 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         Event handler for when the mouse enters the item.
         """
         self.hovered = True
-        self.setNodeColor(QColor(Qt.GlobalColor.red), QColor(Qt.GlobalColor.red))
+        self.set_node_color(QColor(Qt.GlobalColor.red), QColor(Qt.GlobalColor.red))
 
     def hoverLeaveEvent(self, event: QtWidgets.QGraphicsSceneHoverEvent) -> None:
         """
@@ -288,9 +288,9 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         """
         Remove
         """
-        self.line_container.removeNode(node=self)
+        self.line_container.remove_node(node=self)
 
-    def setNodeColor(self, inner_color: QColor, border_color: QColor = None) -> None:
+    def set_node_color(self, inner_color: QColor, border_color: QColor = None) -> None:
         """
 
         :param inner_color:
@@ -312,7 +312,7 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         :return:
         """
         # Example: color assignment
-        self.setNodeColor(self.colorInner, self.colorBorder)
+        self.set_node_color(self.colorInner, self.colorBorder)
 
     def get_pos(self) -> QPointF:
         """

{veragrid-5.5.11 → veragrid-5.5.13}/VeraGrid/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -174,7 +174,7 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
         # second pass: create the segments
         self.redraw_segments()
 
-    def removeNode(self, node: LineLocationGraphicItem):
+    def remove_node(self, node: LineLocationGraphicItem):
         """
 
         :param node:
@@ -411,11 +411,12 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
             # Return the newly created node
             return graphic_obj
 
-        # else:
-        #     logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
-        #     logging.info("Invalid node index")
+        else:
+            #     logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
+            #     logging.info("Invalid node index")
+            return None
 
-    def split_Line(self, index):
+    def split_line(self, index):
         """
         Split Line
         :param index:
@@ -461,6 +462,7 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
         else:
             # Handle invalid index
             error_msg("Index out of range or invalid", "split line")
+            return list(), list()
 
     def disable_line(self):
         """

{veragrid-5.5.11 → veragrid-5.5.13}/VeraGrid/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -651,57 +651,6 @@ class GridMapWidget(BaseDiagramWidget):
             # Delete the substation itself
             self.circuit.delete_substation(obj=api_object)
 
-    #
-    # def show_devices_to_disconnect_dialog(self,
-    #                                       devices: List[ALL_DEV_TYPES],
-    #                                       buses: List[Bus],
-    #                                       voltage_levels: List[VoltageLevel],
-    #                                       dialog_title: str):
-    #     """
-    #     Show a dialog with the list of all devices that will be disconnected
-    #
-    #     :param devices: List of devices to be disconnected
-    #     :param buses: List of buses associated with the substation
-    #     :param voltage_levels: List of voltage levels associated with the substation
-    #     :param dialog_title: Title for the dialog
-    #     """
-    #
-    #
-    #     # Combine all devices
-    #     all_devices = devices + buses + voltage_levels
-    #
-    #     if not all_devices:
-    #         info_msg('No devices to disconnect', dialog_title)
-    #         return
-    #
-    #     # Create custom properties for name, type, and ID tag
-    #     name_prop = GCProp(prop_name='name', tpe=str, units='', definition='Device name',
-    #                        display=True, editable=False)
-    #
-    #     type_prop = GCProp(prop_name='device_type', tpe=DeviceType, units='', definition='Device type',
-    #                        display=True, editable=False)
-    #
-    #     idtag_prop = GCProp(prop_name='idtag', tpe=str, units='', definition='ID tag',
-    #                         display=True, editable=False)
-    #
-    #     custom_props = [name_prop, type_prop, idtag_prop]
-    #
-    #     # Create and show the dialog
-    #     dialog = ElementsDialogue(name=dialog_title, elements=all_devices)
-    #
-    #     # Replace the model with our custom one that only shows name, type, and idtag
-    #     model = ObjectsModel(objects=all_devices,
-    #                          time_index=None,
-    #                          property_list=custom_props,
-    #                          parent=dialog.objects_table,
-    #                          editable=False)
-    #
-    #     dialog.objects_table.setModel(model)
-    #
-    #     # Make the dialog modal so the user must acknowledge it before continuing
-    #     dialog.setModal(True)
-    #     dialog.exec()
-
     def remove_branch_graphic(self, line: MAP_BRANCH_GRAPHIC_TYPES | MapLineContainer, delete_from_db: bool = False):
         """
         Removes line from diagram and scene
@@ -1110,10 +1059,19 @@ class GridMapWidget(BaseDiagramWidget):
         """
         lat = 0.0
         lon = 0.0
+        lat_max = -1e20
+        lat_min = 1e20
+        lon_max = -1e20
+        lon_min = 1e20
         n = 0
         for graphic_obj in self.graphics_manager.get_device_type_list(DeviceType.SubstationDevice):
             lat += graphic_obj.lat
             lon += graphic_obj.lon
+
+            lat_max = max(lat_max, graphic_obj.lat)
+            lat_min = min(lat_min, graphic_obj.lat)
+            lon_max = max(lon_max, graphic_obj.lon)
+            lon_min = min(lon_min, graphic_obj.lon)
             n += 1
 
         if n > 0:
@@ -1121,6 +1079,18 @@ class GridMapWidget(BaseDiagramWidget):
             lon /= n
             self.map.pan_position(latitude=lat, longitude=lon)
 
+            # this is to also move the diagram layer according to the map
+            # z = self.map.best_zoom_from_bbox(min_lat=lat_min,
+            #                                  max_lat=lat_max,
+            #                                  min_lon=lon_min,
+            #                                  max_lon=lon_max)
+
+            self.map.set_zoom_level(level=self.map.level)
+            # self.map.set_zoom_level(level=z)
+
+        else:
+            self.gui.show_warning_toast("No points to center :/")
+
     def colour_results(self,
                        Sbus: CxVec,
                        bus_active: IntVec,

{veragrid-5.5.11 → veragrid-5.5.13}/VeraGrid/Gui/Diagrams/MapWidget/map_widget.py

@@ -1521,14 +1521,14 @@ class MapWidget(QWidget):
         under the cursor.
         """
 
-        # if not given cursor coords, assume view centre
+        # if not given cursor coordinates, assume view centre
         if view_x is None:
             view_x = self.view_width // 4
 
         if view_y is None:
             view_y = self.view_height // 4
 
-        # get geo coords of view point
+        # get geo coordinates of view point
         longitude, latitude = self.view_to_geo_float(view_x, view_y)
 
         # get tile source to use the new level
@@ -1602,6 +1602,50 @@ class MapWidget(QWidget):
         # redraw the widget
         self.update()
 
+    def best_zoom_from_bbox(self,
+                            min_lat: float,
+                            max_lat: float,
+                            min_lon: float,
+                            max_lon: float) -> int:
+        """
+        Determine the most appropriate zoom level for the given lat/lon bounding box,
+        based on the MapWidget's tile source and viewport size.
+        :param min_lat: minimum latitude of bounding box
+        :param max_lat: maximum latitude of bounding box
+        :param min_lon: minimum longitude of bounding box
+        :param max_lon: maximum longitude of bounding box
+        :return: best zoom level (int)
+        """
+        tile_src = self.tile_src
+        view_width = self.view_width
+        view_height = self.view_height
+        tile_size_x = self.tile_width
+        tile_size_y = self.tile_height
+
+        # search from high zoom (more detail) to low zoom (zoomed out)
+        for z in range(tile_src.max_level, tile_src.min_level - 1, -1):
+            if not tile_src.set_level(z):
+                continue
+
+            # convert bbox corners to fractional tile coordinates at this zoom
+            tx_min, ty_min = tile_src.Geo2Tile(longitude=min_lon, latitude=min_lat)
+            tx_max, ty_max = tile_src.Geo2Tile(longitude=max_lon, latitude=max_lat)
+
+            # tile extents in X/Y
+            dx_tiles = abs(tx_max - tx_min)
+            dy_tiles = abs(ty_max - ty_min)
+
+            # pixel span at this zoom
+            width_px = dx_tiles * tile_size_x
+            height_px = dy_tiles * tile_size_y
+
+            # if fits in viewport, good zoom level
+            if width_px <= view_width and height_px <= view_height:
+                return z
+
+        # otherwise return the minimum zoom
+        return tile_src.min_level
+
     def rectify_key_tile(self) -> None:
         """
         Adjust state variables to ensure map centred if map is smaller than view.

{veragrid-5.5.11 → veragrid-5.5.13}/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.15  # 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.13}/VeraGrid/Gui/GridReduce/grid_reduce.py

@@ -110,7 +110,7 @@ class GridReduceDialogue(QtWidgets.QDialog):
                     grid_reduced, logger = ward_standard_reduction(
                         grid=self._grid,
                         reduction_bus_indices=reduction_bus_indices,
-                        V0=pf_res.voltage
+                        V0=pf_res.voltage,
                     )
 
                 elif method == GridReductionMethod.PTDF:

{veragrid-5.5.11 → veragrid-5.5.13}/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.10.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################