VeraGrid 5.6.15__tar.gz → 5.6.18__tar.gz

{veragrid-5.6.15 → veragrid-5.6.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.6.15
+Version: 5.6.18
 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.15 → veragrid-5.6.18}/VeraGrid/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -16,7 +16,7 @@ from VeraGrid.Gui.messages import yes_no_question, warning_msg
 from VeraGrid.Gui.gui_functions import add_menu_entry
 from VeraGrid.Gui.general_dialogues import ShortCircuitSelector
 from VeraGrid.Gui.Diagrams.generic_graphics import (GenericDiagramWidget, ACTIVE, DEACTIVATED,
-                                                    FONT_SCALE, EMERGENCY, TRANSPARENT)
+                                                    FONT_SCALE, TRANSPARENT)
 from VeraGrid.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, HandleItem, RoundTerminalItem
 from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.load_graphics import LoadGraphicItem, Load
 from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.generator_graphics import GeneratorGraphicItem, Generator
@@ -699,7 +699,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
         self.w = ShortCircuitSelector()
         self.w.exec()
-        
+
         if self.w.was_accepted:
             sc = ShortCircuitEvent(
                 name=f"{self.api_object.name} {self.w.fault.value}",
@@ -708,7 +708,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                 method=self.w.method,
                 phases=self.w.phases
             )
-    
+
             self.editor.circuit.add_short_circuit_definition(sc)
 
     def enable_disable_dc(self):
@@ -921,7 +921,8 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
         return _grph
 
-    def set_values(self, i: int, Vm: float, Va: float, P: float, Q: float, tpe: str, format_str="{:10.2f}"):
+    def set_values(self, i: int, Vm: float, Va: float, P: float | None, Q: float | None,
+                   tpe: str, format_str="{:10.2f}"):
         """
 
         :param i:

{veragrid-5.6.15 → veragrid-5.6.18}/VeraGrid/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -10,6 +10,7 @@ import numpy as np
 import pandas as pd
 from typing import List, Set, Dict, Union, Tuple, TYPE_CHECKING
 from collections.abc import Callable
+from collections import defaultdict
 from warnings import warn
 import networkx as nx
 import pyproj
@@ -20,14 +21,12 @@ from PySide6.QtCore import (Qt, QPoint, QSize, QPointF, QRect, QRectF, QMimeData
 from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel, QStandardItem, QColor, QPen, QBrush,
                            QDragEnterEvent, QDragMoveEvent, QDropEvent, QWheelEvent, QKeyEvent, QMouseEvent,
                            QContextMenuEvent)
-from PySide6.QtWidgets import (QGraphicsView, QGraphicsScene, QGraphicsSceneMouseEvent, QGraphicsItem, QDialog,
-                               QPushButton)
+from PySide6.QtWidgets import (QGraphicsView, QGraphicsScene, QGraphicsSceneMouseEvent, QGraphicsItem)
 from PySide6.QtSvg import QSvgGenerator
 
 from VeraGridEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, FLUID_TYPES, BRANCH_TYPES
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGridEngine.Devices.Substation.bus import Bus
-from VeraGridEngine.Devices.Substation.substation import Substation
 from VeraGridEngine.Devices.Branches.line import Line
 from VeraGridEngine.Devices.Branches.dc_line import DcLine
 from VeraGridEngine.Devices.Branches.transformer import Transformer2W
@@ -140,7 +139,7 @@ class SchematicLibraryModel(QStandardItemModel):
         :return: QByteArray
         """
         data = QByteArray()
-        stream = QDataStream(data, QIODevice.WriteOnly)
+        stream = QDataStream(data, QIODevice.OpenModeFlag.WriteOnly)
         stream.writeQString(val)
         return data
 
@@ -198,7 +197,7 @@ class SchematicLibraryModel(QStandardItemModel):
                 txt = self.data(idx, Qt.ItemDataRole.DisplayRole)
 
                 data = QByteArray()
-                stream = QDataStream(data, QIODevice.WriteOnly)
+                stream = QDataStream(data, QIODevice.OpenModeFlag.WriteOnly)
                 stream.writeQString(txt)
 
                 mimedata.setData('component/name', data)
@@ -4800,7 +4799,7 @@ class SchematicWidget(BaseDiagramWidget):
                 grid=self.circuit,
                 bus=bus_graphics.api_object,
                 vl_type=vl_wizard.get_vl_type(),
-                add_disconnectors=vl_wizard.add_brakers_checkbox.isChecked(),
+                add_disconnectors=vl_wizard.add_breakers_checkbox.isChecked(),
                 bar_by_segments=vl_wizard.bar_by_segments_checkbox.isChecked(),
                 skip_injections_reconnection=True,
                 enable_transfer_bus=vl_wizard.enable_transfer_bus_checkbox.isChecked(),
@@ -5119,6 +5118,17 @@ List[FluidPath]]:
     all_branches = circuit.get_branches(add_vsc=True, add_hvdc=True, add_switch=True)
     branch_dict = {b: i for i, b in enumerate(all_branches)}
 
+    # Build index of branches by bus for O(1) lookup instead of scanning all branches
+    # This changes the algorithm complexity from O(n*m) to O(n+m) where n=buses, m=branches
+    # Hence drawing voltage level conversions should be much faster, thus fixing REE complaints
+    branches_by_bus = defaultdict(list)
+    has_winding = False
+    for br in all_branches:
+        branches_by_bus[br.bus_from].append(br)
+        branches_by_bus[br.bus_to].append(br)
+        if isinstance(br, Winding):
+            has_winding = True
+
     # create a pool of buses
     bus_pool = [(b, 0) for b in buses]  # store the bus objects and their level from the root
 
@@ -5134,7 +5144,8 @@ List[FluidPath]]:
     fluid_nodes = set()
     selected_branches = set()
     visited = set()
-    max_level_offset = 0
+    # If there are windings, we need an extra level to represent whole 3-winding transformers
+    max_level_offset = 1 if has_winding else 0
 
     while len(bus_pool) > 0:
 
@@ -5149,31 +5160,23 @@ List[FluidPath]]:
 
         if level < (max_level + max_level_offset):
 
-            for i, br in enumerate(all_branches):
+            # Use the built index for O(1) lookup of branches connected to this bus
+            for br in branches_by_bus.get(bus, []):
 
-                if isinstance(br, Winding):
-                    # if we find a winding, we need to add 1 extra search level
-                    # to be able to represent the whole 3-winding transformer
-                    max_level_offset = 1
+                # Always add the branch if connected to current bus
+                selected_branches.add(br)
 
+                # Determine the other bus and add if not visited
                 if br.bus_from == bus:
-                    # Always add the branch if connected to current bus
-                    selected_branches.add(br)
-                    # Only add the other bus to pool if not visited
-                    if br.bus_to not in visited:
-                        bus_pool.append((br.bus_to, level + 1))
-                        visited.add(br.bus_to)
-
+                    other_bus = br.bus_to
                 elif br.bus_to == bus:
-                    # Always add the branch if connected to current bus
-                    selected_branches.add(br)
-                    # Only add the other bus to pool if not visited
-                    if br.bus_from not in visited:
-                        bus_pool.append((br.bus_from, level + 1))
-                        visited.add(br.bus_from)
-
+                    other_bus = br.bus_from
                 else:
-                    pass
+                    other_bus = None
+
+                if other_bus not in visited:
+                    bus_pool.append((other_bus, level + 1))
+                    visited.add(other_bus)
 
     # sort Branches
     lines: List[Line] = list()

{veragrid-5.6.15 → veragrid-5.6.18}/VeraGrid/Gui/Diagrams/SchematicWidget/terminal_item.py

@@ -262,7 +262,19 @@ class BarTerminalItem(BaseTerminal, QGraphicsRectItem):
         n = len(self._hosting_connections)
         dx = w / (n + 1)
 
-        for i, (connection, call_back) in enumerate(self._hosting_connections.items()):
+        # Sort connections by the x position  to avoid crossing lines
+        def get_other_end_x(connection: "LineGraphicTemplateItem") -> float:
+            """Get the x position of the other end of the line"""
+            if connection.get_terminal_to() is self:
+                # This terminal is the 'to' port, so use the 'from' position
+                return connection.pos1.x() if connection.pos1 else 0.0
+            else:
+                # This terminal is the 'from' port, so use the 'to' position
+                return connection.pos2.x() if connection.pos2 else 0.0
+
+        sorted_connections = sorted(self._hosting_connections.items(), key=lambda item: get_other_end_x(item[0]))
+
+        for i, (connection, call_back) in enumerate(sorted_connections):
             if call_back is not None:
                 call_back(value + QPointF(float(i + 1) * dx, h2))
 

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

{veragrid-5.6.15 → veragrid-5.6.18}/VeraGrid/Gui/SubstationDesigner/voltage_level_conversion.py

@@ -4,11 +4,10 @@
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
 
-import sys
 from typing import List, Tuple, Dict
 from collections import defaultdict
 from PySide6.QtWidgets import (
-    QWidget, QDialog, QVBoxLayout, QHBoxLayout, QGroupBox, QLabel,
+    QDialog, QVBoxLayout, QHBoxLayout, QGroupBox, QLabel,
     QComboBox, QCheckBox, QTableWidget, QTableWidgetItem, QMessageBox,
     QPushButton, QHeaderView, QStyledItemDelegate, QSpinBox, QAbstractItemView
 )
@@ -40,7 +39,7 @@ class SpinBoxDelegate(QStyledItemDelegate):
         spinbox.setMaximum(self.maximum)
         return spinbox
 
-    def setEditorData(self, editor: QWidget, index: QModelIndex | QPersistentModelIndex):
+    def setEditorData(self, editor: QSpinBox, index: QModelIndex | QPersistentModelIndex):
         """
 
         :param editor:
@@ -52,7 +51,7 @@ class SpinBoxDelegate(QStyledItemDelegate):
         else:
             editor.setValue(self.minimum)
 
-    def setModelData(self, editor, model, index):
+    def setModelData(self, editor: QSpinBox, model, index):
         """
 
         :param editor:
@@ -81,7 +80,7 @@ class ComboBoxDelegate(QStyledItemDelegate):
         combo.addItems(self.items)
         return combo
 
-    def setEditorData(self, editor, index):
+    def setEditorData(self, editor: QComboBox, index: QModelIndex | QPersistentModelIndex):
         """
 
         :param editor:
@@ -93,7 +92,7 @@ class ComboBoxDelegate(QStyledItemDelegate):
         else:
             editor.setCurrentIndex(0)
 
-    def setModelData(self, editor, model, index):
+    def setModelData(self, editor: QComboBox, model, index):
         """
 
         :param editor:
@@ -108,7 +107,7 @@ class TableEntry:
     Table entry
     """
 
-    def __init__(self, device, bay: str, main_bar: str):
+    def __init__(self, device: str, bay: str, main_bar: str):
         self.device = device
         self.bay = bay
         self.main_bar = main_bar
@@ -181,7 +180,8 @@ class ReorderableTableWidget(QTableWidget):
     def move_row_down(self) -> None:
         """Move the selected row down by one position."""
         current_row = self.currentRow()
-        if current_row < self.rowCount() - 1 and current_row >= 0:
+        # if current_row < self.rowCount() - 1 and current_row >= 0:
+        if self.rowCount() - 1 > current_row >= 0:
             self._swap_rows(current_row, current_row + 1)
             self.selectRow(current_row + 1)
             if self._auto_update_bay_numbers:
@@ -210,10 +210,15 @@ class ReorderableTableWidget(QTableWidget):
 
     def _update_bay_numbers(self) -> None:
         """Update bay numbers to match row positions."""
+        bay_num = 1
         for row in range(self.rowCount()):
             bay_item = self.item(row, 1)
             if bay_item:
-                bay_item.setText(f"Bay{row + 1}")
+                # Skip visual indicator rows (like "Double bar connection" with "-")
+                if bay_item.text() == "-":
+                    continue
+                bay_item.setText(f"Bay{bay_num}")
+                bay_num += 1
 
 
 class VoltageLevelConversionWizard(QDialog):
@@ -270,14 +275,15 @@ class VoltageLevelConversionWizard(QDialog):
 
         # First row of checkboxes
         row1_layout = QHBoxLayout()
-        self.add_brakers_checkbox = QCheckBox("Use breakers")
-        self.add_brakers_checkbox.setChecked(True)
-        self.add_brakers_checkbox.setToolTip("If disabled, connections are made using branches instead of breakers")
-        row1_layout.addWidget(self.add_brakers_checkbox)
+        self.add_breakers_checkbox = QCheckBox("Use breakers")
+        self.add_breakers_checkbox.setChecked(True)
+        self.add_breakers_checkbox.setToolTip("If disabled, connections are made using branches instead of breakers")
+        row1_layout.addWidget(self.add_breakers_checkbox)
 
-        self.keep_original_ratio_checkbox = QCheckBox("Keep original ratio")
+        self.keep_original_ratio_checkbox = QCheckBox("Keep original rates")
         self.keep_original_ratio_checkbox.setChecked(False)
-        self.keep_original_ratio_checkbox.setToolTip("If enabled, breakers inherit the ratio of the original branch. Otherwise, 9999 is assigned")
+        self.keep_original_ratio_checkbox.setToolTip("If enabled, breakers inherit the rates "
+                                                     "of the original branch. Otherwise, 9999 is assigned")
         row1_layout.addWidget(self.keep_original_ratio_checkbox)
         row1_layout.addStretch()
         options_layout.addLayout(row1_layout)
@@ -406,10 +412,7 @@ class VoltageLevelConversionWizard(QDialog):
         self.table.setRowCount(n_positions)
 
         # Collect device names
-        dev_names = []
-        for elm in self.bus_branches + self.bus_injections:
-            dev_names.append(elm.name)
-        dev_names.append("(Spare)")  # Always allow spare as an option
+        dev_names: List[str] = list()
 
         # Fill data. For Breaker-and-a-Half, alternate bus assignments in pairs
         data: List[TableEntry] = list()
@@ -422,7 +425,12 @@ class VoltageLevelConversionWizard(QDialog):
             else:
                 bay_num = i + 1
                 assigned_bus = "JBP1"
-            data.append(TableEntry(elm.name, f"Bay{bay_num}", assigned_bus))
+
+            name = f"{elm.name} ({elm.device_type.value})"
+            data.append(TableEntry(name, f"Bay{bay_num}", assigned_bus))
+            dev_names.append(name)
+
+        dev_names.append("(Spare)")  # Always allow spare as an option
 
         # Apply delegates
         self.table.setItemDelegateForColumn(0, ComboBoxDelegate(dev_names, self.table))
@@ -443,6 +451,25 @@ class VoltageLevelConversionWizard(QDialog):
             self.table.setItem(row, 1, bay_item)
             self.table.setItem(row, 2, main_bar_item)
 
+        # Add visual indicator row for Double bar scheme
+        if vl_type == VoltageLevelTypes.DoubleBar:
+            connection_row = self.table.rowCount()
+            self.table.insertRow(connection_row)
+
+            connection_device_item = QTableWidgetItem("Double bar connection")
+            connection_bay_item = QTableWidgetItem("-")
+            connection_bus_item = QTableWidgetItem("JBP1")
+
+            # Make all cells non-editable and non-selectable for this visual indicator row
+            non_interactive_flags = Qt.ItemFlag.ItemIsEnabled  # Only enabled, not editable or selectable
+            connection_device_item.setFlags(non_interactive_flags)
+            connection_bay_item.setFlags(non_interactive_flags)
+            connection_bus_item.setFlags(non_interactive_flags)
+
+            self.table.setItem(connection_row, 0, connection_device_item)
+            self.table.setItem(connection_row, 1, connection_bay_item)
+            self.table.setItem(connection_row, 2, connection_bus_item)
+
     def add_spare_position(self) -> None:
         """
         Add a spare position row to the table.
@@ -530,6 +557,7 @@ class VoltageLevelConversionWizard(QDialog):
         """
         Get the bay assignments from the table.
         :return: List of (device_name, bay_number, assigned_bus) tuples
+                 Note: device_name is the plain device name (without device type suffix)
         """
         assignments = []
         for row in range(self.table.rowCount()):
@@ -537,7 +565,22 @@ class VoltageLevelConversionWizard(QDialog):
             bay_item = self.table.item(row, 1)
             main_bar_item = self.table.item(row, 2)
 
-            device = device_item.text() if device_item else ""
+            device_display = device_item.text() if device_item else ""
+
+            # Skip visual indicator rows (like "Double bar connection")
+            if device_display == "Double bar connection":
+                continue
+
+            # Extract plain device name from display format "DeviceName (DeviceType)"
+            # Keep "(Spare)" as-is since it's a special marker
+            if device_display == "(Spare)":
+                device_name = device_display
+            elif " (" in device_display and device_display.endswith(")"):
+                # Extract name before the " (DeviceType)" suffix
+                device_name = device_display.rsplit(" (", 1)[0]
+            else:
+                device_name = device_display
+
             bay_str = bay_item.text() if bay_item else "Bay1"
             main_bar = main_bar_item.text() if main_bar_item else "JBP1"
 
@@ -547,7 +590,7 @@ class VoltageLevelConversionWizard(QDialog):
             except ValueError:
                 bay_num = 1
 
-            assignments.append((device, bay_num, main_bar))
+            assignments.append((device_name, bay_num, main_bar))
 
         return assignments
 
@@ -577,9 +620,12 @@ class VoltageLevelConversionWizard(QDialog):
 
 
 # if __name__ == "__main__":
+#     import sys
+#     from PySide6.QtWidgets import QApplication
 #     import VeraGridEngine as vg
 #
-#     fname = "/home/santi/Documentos/Git/GitHub/VeraGrid_bkup/src/tests/data/grids/lynn5node.gridcal"
+#     # fname = "/home/santi/Documentos/Git/GitHub/VeraGrid_bkup/src/tests/data/grids/lynn5node.gridcal"
+#     fname = "/Users/santi/Git/eRoots/VeraGrid/Grids_and_profiles/grids/Lynn 5 Bus pv.gridcal"
 #     _grid = vg.open_file(fname)
 #
 #     app = QApplication(sys.argv)

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