VeraGrid 5.5.1__tar.gz → 5.5.2__tar.gz

{veragrid-5.5.1 → veragrid-5.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.5.1
+Version: 5.5.2
 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.1 → veragrid-5.5.2}/VeraGrid/ExecuteVeraGrid.py

@@ -5,7 +5,9 @@
 import os
 import sys
 import ctypes
+import platform
 import threading
+
 PACKAGE_PARENT = '..'
 SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
 sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
@@ -14,21 +16,57 @@ from VeraGrid.__version__ import about_msg
 # NOTE: For some reason I cannot begin to comprehend, the activation fails on windows if called before the GUI...
 import VeraGridEngine.Utils.ThirdParty.gslv.gslv_activation
 
+from PySide6.QtCore import QDirIterator, QResource
+from PySide6.QtSvg import QSvgRenderer
 from VeraGrid.Gui.Main.VeraGridMain import runVeraGrid
-
-import platform
+from VeraGrid.Gui.update_gui_all import update_all_icons
 
 if platform.system() == 'Windows':
     # this makes the icon display properly under windows
     myappid = 'mycompany.myproduct.subproduct.version'  # arbitrary string
     ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
 
+
+def check_all_svgs():
+    """
+    Iterate through all resources registered by icons_rc and check SVG validity.
+    :returns: if any icon has errors
+    """
+    it = QDirIterator(":/Icons", QDirIterator.IteratorFlag.Subdirectories)
+    bad_files = []
+
+    while it.hasNext():
+        path = it.next()
+        if path.lower().endswith(".svg"):
+            res = QResource(path)
+            if not res.isValid():
+                print(f"[MISSING] {path}")
+                bad_files.append((path, "missing"))
+                continue
+
+            renderer = QSvgRenderer(path)
+            if not renderer.isValid():
+                print(f"[INVALID] {path}")
+                bad_files.append((path, "invalid"))
+            else:
+                pass
+                # print(f"[OK] {path}")
+
+    print("\nSVG compatibility summary:")
+    for path, status in bad_files:
+        print(f"  {status.upper():<8} {path}")
+
+    if len(bad_files) > 0:
+        update_all_icons()
+
+
 if __name__ == "__main__":
     print('Loading VeraGrid...')
+    check_all_svgs()
     print(about_msg)
 
     # Set the application style to the clear theme
     os.environ["QT_QUICK_CONTROLS_STYLE"] = "Basic"
     # os.environ["QT_QPA_PLATFORMTHEME"] = "qt5ct"  # this forces QT-only menus and look and feel
     threading.stack_size(134217728)
-    runVeraGrid()
+    runVeraGrid()

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/AboutDialogue/gui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'gui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.7.2
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/AboutDialogue/icons_rc.py

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.7.2
+# Created by: The Resource Compiler for Qt version 6.9.3
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore
@@ -419,7 +419,7 @@ qt_resource_struct = b"\
 \x00\x00\x00\x10\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00 \x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x98\xed\x01#\x84\
+\x00\x00\x01\x99\x91\xbe]o\
 "
 
 def qInitResources():

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/Analysis/gui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'gui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.7.2
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -78,20 +78,20 @@ class Ui_MainWindow(object):
         self.label_4.setObjectName(u"label_4")
         palette = QPalette()
         brush = QBrush(QColor(119, 118, 123, 255))
-        brush.setStyle(Qt.SolidPattern)
-        palette.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette.setBrush(QPalette.Active, QPalette.Text, brush)
-        palette.setBrush(QPalette.Active, QPalette.ButtonText, brush)
+        brush.setStyle(Qt.BrushStyle.SolidPattern)
+        palette.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.WindowText, brush)
+        palette.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.Text, brush)
+        palette.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.ButtonText, brush)
         brush1 = QBrush(QColor(0, 0, 0, 255))
-        brush1.setStyle(Qt.SolidPattern)
-        palette.setBrush(QPalette.Inactive, QPalette.WindowText, brush1)
-        palette.setBrush(QPalette.Inactive, QPalette.Text, brush1)
-        palette.setBrush(QPalette.Inactive, QPalette.ButtonText, brush1)
+        brush1.setStyle(Qt.BrushStyle.SolidPattern)
+        palette.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.WindowText, brush1)
+        palette.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.Text, brush1)
+        palette.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.ButtonText, brush1)
         brush2 = QBrush(QColor(190, 190, 190, 255))
-        brush2.setStyle(Qt.SolidPattern)
-        palette.setBrush(QPalette.Disabled, QPalette.WindowText, brush2)
-        palette.setBrush(QPalette.Disabled, QPalette.Text, brush2)
-        palette.setBrush(QPalette.Disabled, QPalette.ButtonText, brush2)
+        brush2.setStyle(Qt.BrushStyle.SolidPattern)
+        palette.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.WindowText, brush2)
+        palette.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.Text, brush2)
+        palette.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.ButtonText, brush2)
         self.label_4.setPalette(palette)
         font = QFont()
         font.setPointSize(14)
@@ -133,15 +133,15 @@ class Ui_MainWindow(object):
         self.label_12 = QLabel(self.frame)
         self.label_12.setObjectName(u"label_12")
         palette1 = QPalette()
-        palette1.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette1.setBrush(QPalette.Active, QPalette.Text, brush)
-        palette1.setBrush(QPalette.Active, QPalette.ButtonText, brush)
-        palette1.setBrush(QPalette.Inactive, QPalette.WindowText, brush1)
-        palette1.setBrush(QPalette.Inactive, QPalette.Text, brush1)
-        palette1.setBrush(QPalette.Inactive, QPalette.ButtonText, brush1)
-        palette1.setBrush(QPalette.Disabled, QPalette.WindowText, brush2)
-        palette1.setBrush(QPalette.Disabled, QPalette.Text, brush2)
-        palette1.setBrush(QPalette.Disabled, QPalette.ButtonText, brush2)
+        palette1.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.WindowText, brush)
+        palette1.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.Text, brush)
+        palette1.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.ButtonText, brush)
+        palette1.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.WindowText, brush1)
+        palette1.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.Text, brush1)
+        palette1.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.ButtonText, brush1)
+        palette1.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.WindowText, brush2)
+        palette1.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.Text, brush2)
+        palette1.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.ButtonText, brush2)
         self.label_12.setPalette(palette1)
         self.label_12.setFont(font)
 
@@ -203,15 +203,15 @@ class Ui_MainWindow(object):
         self.label_14 = QLabel(self.frame)
         self.label_14.setObjectName(u"label_14")
         palette2 = QPalette()
-        palette2.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette2.setBrush(QPalette.Active, QPalette.Text, brush)
-        palette2.setBrush(QPalette.Active, QPalette.ButtonText, brush)
-        palette2.setBrush(QPalette.Inactive, QPalette.WindowText, brush1)
-        palette2.setBrush(QPalette.Inactive, QPalette.Text, brush1)
-        palette2.setBrush(QPalette.Inactive, QPalette.ButtonText, brush1)
-        palette2.setBrush(QPalette.Disabled, QPalette.WindowText, brush2)
-        palette2.setBrush(QPalette.Disabled, QPalette.Text, brush2)
-        palette2.setBrush(QPalette.Disabled, QPalette.ButtonText, brush2)
+        palette2.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.WindowText, brush)
+        palette2.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.Text, brush)
+        palette2.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.ButtonText, brush)
+        palette2.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.WindowText, brush1)
+        palette2.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.Text, brush1)
+        palette2.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.ButtonText, brush1)
+        palette2.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.WindowText, brush2)
+        palette2.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.Text, brush2)
+        palette2.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.ButtonText, brush2)
         self.label_14.setPalette(palette2)
         self.label_14.setFont(font)
 
@@ -276,15 +276,15 @@ class Ui_MainWindow(object):
         self.label_16 = QLabel(self.frame_2)
         self.label_16.setObjectName(u"label_16")
         palette3 = QPalette()
-        palette3.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette3.setBrush(QPalette.Active, QPalette.Text, brush)
-        palette3.setBrush(QPalette.Active, QPalette.ButtonText, brush)
-        palette3.setBrush(QPalette.Inactive, QPalette.WindowText, brush1)
-        palette3.setBrush(QPalette.Inactive, QPalette.Text, brush1)
-        palette3.setBrush(QPalette.Inactive, QPalette.ButtonText, brush1)
-        palette3.setBrush(QPalette.Disabled, QPalette.WindowText, brush2)
-        palette3.setBrush(QPalette.Disabled, QPalette.Text, brush2)
-        palette3.setBrush(QPalette.Disabled, QPalette.ButtonText, brush2)
+        palette3.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.WindowText, brush)
+        palette3.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.Text, brush)
+        palette3.setBrush(QPalette.ColorGroup.Active, QPalette.ColorRole.ButtonText, brush)
+        palette3.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.WindowText, brush1)
+        palette3.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.Text, brush1)
+        palette3.setBrush(QPalette.ColorGroup.Inactive, QPalette.ColorRole.ButtonText, brush1)
+        palette3.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.WindowText, brush2)
+        palette3.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.Text, brush2)
+        palette3.setBrush(QPalette.ColorGroup.Disabled, QPalette.ColorRole.ButtonText, brush2)
         self.label_16.setPalette(palette3)
         self.label_16.setFont(font)
 

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/Analysis/icons_rc.py

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.7.2
+# Created by: The Resource Compiler for Qt version 6.9.3
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore
@@ -827,15 +827,15 @@ qt_resource_struct = b"\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x05\x00\x00\x00\x03\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00(\xad\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]p\
 \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]p\
 \x00\x00\x00j\x00\x00\x00\x00\x00\x01\x00\x00 \xcc\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]p\
 \x00\x00\x00&\x00\x00\x00\x00\x00\x01\x00\x00\x0d^\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]p\
 \x00\x00\x00:\x00\x01\x00\x00\x00\x01\x00\x00\x18|\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]p\
 "
 
 def qInitResources():

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/ContingencyPlanner/gui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'gui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.7.2
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -102,7 +102,7 @@ class Ui_MainWindow(object):
         self.gridLayout_26.addWidget(self.label, 2, 0, 1, 3)
 
 
-        self.formLayout.setWidget(0, QFormLayout.LabelRole, self.frame_71)
+        self.formLayout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.frame_71)
 
         self.frame_72 = QFrame(self.frame_74)
         self.frame_72.setObjectName(u"frame_72")
@@ -161,7 +161,7 @@ class Ui_MainWindow(object):
         self.gridLayout_27.addWidget(self.label_111, 7, 0, 1, 1)
 
 
-        self.formLayout.setWidget(0, QFormLayout.FieldRole, self.frame_72)
+        self.formLayout.setWidget(0, QFormLayout.ItemRole.FieldRole, self.frame_72)
 
         self.frame_75 = QFrame(self.frame_74)
         self.frame_75.setObjectName(u"frame_75")
@@ -187,7 +187,7 @@ class Ui_MainWindow(object):
         self.horizontalLayout_37.addWidget(self.autoNminusXButton)
 
 
-        self.formLayout.setWidget(1, QFormLayout.SpanningRole, self.frame_75)
+        self.formLayout.setWidget(1, QFormLayout.ItemRole.SpanningRole, self.frame_75)
 
 
         self.verticalLayout_2.addWidget(self.frame_74)

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/ContingencyPlanner/icons_rc.py

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.7.2
+# Created by: The Resource Compiler for Qt version 6.9.3
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore
@@ -400,11 +400,11 @@ qt_resource_struct = b"\
 \x00\x00\x00\x10\x00\x02\x00\x00\x00\x03\x00\x00\x00\x03\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00N\x00\x01\x00\x00\x00\x01\x00\x00\x07\x14\
-\x00\x00\x01\x8b\xd7}+r\
+\x00\x00\x01\x99\x91\xbe]r\
 \x00\x00\x00p\x00\x00\x00\x00\x00\x01\x00\x00\x0e\xb0\
-\x00\x00\x01\x8b\xd7}+r\
+\x00\x00\x01\x99\x91\xbe]r\
 \x00\x00\x00 \x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x8b\xd7}+r\
+\x00\x00\x01\x99\x91\xbe]r\
 "
 
 def qInitResources():

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/CoordinatesInput/gui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'gui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.7.2
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/CoordinatesInput/icons_rc.py

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.7.2
+# Created by: The Resource Compiler for Qt version 6.9.3
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore
@@ -1521,27 +1521,27 @@ qt_resource_struct = b"\
 \x00\x00\x00\x10\x00\x02\x00\x00\x00\x0b\x00\x00\x00\x03\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x006\x00\x01\x00\x00\x00\x01\x00\x00\x07v\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]t\
 \x00\x00\x01D\x00\x00\x00\x00\x00\x01\x00\x00J\xde\
-\x00\x00\x01\x88\xae\xf9[%\
+\x00\x00\x01\x99\x91\xbe]t\
 \x00\x00\x00\x86\x00\x00\x00\x00\x00\x01\x00\x00\x17.\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 \x00\x00\x01\x02\x00\x01\x00\x00\x00\x01\x00\x00=U\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 \x00\x00\x00f\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x17\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 \x00\x00\x01d\x00\x01\x00\x00\x00\x01\x00\x00TK\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 \x00\x00\x00\xec\x00\x00\x00\x00\x00\x01\x00\x004i\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 \x00\x00\x01&\x00\x00\x00\x00\x00\x01\x00\x00A\xf0\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]t\
 \x00\x00\x00 \x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 \x00\x00\x00\xa6\x00\x00\x00\x00\x00\x01\x00\x00!'\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 \x00\x00\x00\xc0\x00\x00\x00\x00\x00\x01\x00\x00)v\
-\x00\x00\x01\x88\xae\xf9[!\
+\x00\x00\x01\x99\x91\xbe]s\
 "
 
 def qInitResources():

{veragrid-5.5.1/VeraGrid/Gui → veragrid-5.5.2/VeraGrid/Gui/Diagrams/Editors}/RmsModelEditor/icons_rc.py

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.7.2
+# Created by: The Resource Compiler for Qt version 6.9.3
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore
@@ -248,7 +248,7 @@ qt_resource_struct = b"\
 \x00\x00\x00\x10\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00 \x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x98\xef\x8e\xbd\x8b\
+\x00\x00\x01\x99\xa6\xd8CE\
 "
 
 def qInitResources():

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/Diagrams/Editors/RmsModelEditor/rms_model_editor.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'rms_model_editor.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.7.2
+## Created by: Qt User Interface Compiler version 6.9.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -74,23 +74,23 @@ class Ui_MainWindow(object):
         self.verticalLayout_7.setContentsMargins(-1, 8, -1, -1)
         self.datalistWidget = QListWidget(self.frame_8)
         brush = QBrush(QColor(64, 191, 83, 255))
-        brush.setStyle(Qt.NoBrush)
+        brush.setStyle(Qt.BrushStyle.NoBrush)
         __qlistwidgetitem = QListWidgetItem(self.datalistWidget)
         __qlistwidgetitem.setForeground(brush);
         brush1 = QBrush(QColor(64, 191, 83, 255))
-        brush1.setStyle(Qt.NoBrush)
+        brush1.setStyle(Qt.BrushStyle.NoBrush)
         __qlistwidgetitem1 = QListWidgetItem(self.datalistWidget)
         __qlistwidgetitem1.setForeground(brush1);
         brush2 = QBrush(QColor(26, 95, 180, 255))
-        brush2.setStyle(Qt.NoBrush)
+        brush2.setStyle(Qt.BrushStyle.NoBrush)
         __qlistwidgetitem2 = QListWidgetItem(self.datalistWidget)
         __qlistwidgetitem2.setForeground(brush2);
         brush3 = QBrush(QColor(26, 95, 180, 255))
-        brush3.setStyle(Qt.NoBrush)
+        brush3.setStyle(Qt.BrushStyle.NoBrush)
         __qlistwidgetitem3 = QListWidgetItem(self.datalistWidget)
         __qlistwidgetitem3.setForeground(brush3);
         brush4 = QBrush(QColor(255, 120, 0, 255))
-        brush4.setStyle(Qt.NoBrush)
+        brush4.setStyle(Qt.BrushStyle.NoBrush)
         __qlistwidgetitem4 = QListWidgetItem(self.datalistWidget)
         __qlistwidgetitem4.setForeground(brush4);
         self.datalistWidget.setObjectName(u"datalistWidget")

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/Diagrams/SchematicWidget/Branches/line_graphics_template.py

@@ -37,7 +37,7 @@ if TYPE_CHECKING:  # Only imports the below statements during type checking
     from VeraGrid.Gui.Diagrams.SchematicWidget.Branches.transformer3w_graphics import Transformer3WGraphicItem
     from VeraGrid.Gui.Diagrams.SchematicWidget.Branches.vsc_graphics_3term import VscGraphicItem3Term
 
-NODE_GRAPHIC = BusGraphicItem | FluidNodeGraphicItem
+NODE_GRAPHIC = Union[BusGraphicItem, FluidNodeGraphicItem]
 
 
 class TransformerSymbol(QGraphicsRectItem):

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -33,7 +33,6 @@ from VeraGrid.Gui.Diagrams.SchematicWidget.Injections.controllable_shunt_graphic
     ControllableShunt)
 from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_engine import RmsModelEditorGUI
 
-
 from VeraGrid.Gui.SubstationDesigner.voltage_level_conversion import VoltageLevelConversionWizard
 from VeraGridEngine.enumerations import DeviceType, FaultType, BusGraphicType
 from VeraGridEngine.Devices.types import INJECTION_DEVICE_TYPES
@@ -243,6 +242,13 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
         return conn
 
+    def get_associated_shunt_graphics(self) -> List[INJECTION_GRAPHICS]:
+        """
+        List of associated shunt graphics
+        :return:
+        """
+        return self._child_graphics
+
     def get_associated_widgets(self) -> List[GenericDiagramWidget | INJECTION_GRAPHICS]:
         """
         Get a list of all associated graphics
@@ -576,6 +582,10 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                        icon_path=":/Icons/icons/voltage_level.svg",
                        function_ptr=self.convert_to_voltage_level)
 
+        add_menu_entry(menu, text='Convert to impedances circuit',
+                       icon_path=":/Icons/icons/voltage_level.svg",
+                       function_ptr=self.convert_to_connectivity_grid)
+
         add_menu_entry(menu, text='Expand schematic',
                        icon_path=":/Icons/icons/grid_icon.svg",
                        function_ptr=self.expand_diagram_from_bus)
@@ -636,7 +646,6 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         dlg = RmsModelEditorGUI(self.api_object, parent=self.editor)
         dlg.show()
 
-
     def assign_status_to_profile(self):
         """
         Assign the snapshot rate to the profile
@@ -674,11 +683,16 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
         self.vl_wizard = VoltageLevelConversionWizard()
 
-
-
         # open
         self.vl_wizard.show()
 
+    def convert_to_connectivity_grid(self):
+        """
+        Transform this bus into a grid of buses to be able to compute the bus currents
+        and delete this bus afterwards
+        """
+        self.editor.transform_busbar_to_connectivity_grid(bus_graphics=self)
+
     def expand_diagram_from_bus(self) -> None:
         """
         Expands the diagram from this bus

{veragrid-5.5.1 → veragrid-5.5.2}/VeraGrid/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -41,6 +41,7 @@ from VeraGridEngine.Devices.Diagrams.schematic_diagram import SchematicDiagram
 from VeraGridEngine.Devices.Diagrams.graphic_location import GraphicLocation
 from VeraGridEngine.Simulations.OPF.opf_ts_results import OptimalPowerFlowTimeSeriesResults
 from VeraGridEngine.Simulations.PowerFlow.power_flow_ts_results import PowerFlowTimeSeriesResults
+from VeraGridEngine.Topology.substation_wizards import transform_busbar_to_connectivity_grid
 from VeraGridEngine.enumerations import DeviceType, ResultTypes, TerminalType, BusGraphicType
 from VeraGridEngine.basic_structures import Vec, CxVec, IntVec, Logger
 
@@ -4711,19 +4712,19 @@ class SchematicWidget(BaseDiagramWidget):
             if idx_bus_list[0][1] == line_graphics.api_object.bus_from:
                 idx, old_bus, old_bus_graphic_item = idx_bus_list[0]
                 idx, new_bus, new_bus_graphic_item = idx_bus_list[1]
-                side = 'f'
+
             elif idx_bus_list[1][1] == line_graphics.api_object.bus_from:
                 idx, new_bus, new_bus_graphic_item = idx_bus_list[0]
                 idx, old_bus, old_bus_graphic_item = idx_bus_list[1]
-                side = 'f'
+
             elif idx_bus_list[0][1] == line_graphics.api_object.bus_to:
                 idx, old_bus, old_bus_graphic_item = idx_bus_list[0]
                 idx, new_bus, new_bus_graphic_item = idx_bus_list[1]
-                side = 't'
+
             elif idx_bus_list[1][1] == line_graphics.api_object.bus_to:
                 idx, new_bus, new_bus_graphic_item = idx_bus_list[0]
                 idx, old_bus, old_bus_graphic_item = idx_bus_list[1]
-                side = 't'
+
             else:
                 error_msg(text="The 'from' or 'to' bus to change has not been selected!",
                           title='Change bus')
@@ -4734,14 +4735,17 @@ class SchematicWidget(BaseDiagramWidget):
                                  title='Change bus')
 
             if ok:
-                if side == 'f':
-                    line_graphics.api_object.bus_from = new_bus
-                    line_graphics.set_from_port(new_bus_graphic_item.get_terminal())
-                elif side == 't':
-                    line_graphics.api_object.bus_to = new_bus
-                    line_graphics.set_to_port(new_bus_graphic_item.get_terminal())
-                else:
-                    raise Exception('Unsupported side value {}'.format(side))
+                new_bus_graphic_item.get_terminal().reassign_terminal(
+                    graphic_obj=line_graphics,
+                    another_terminal=old_bus_graphic_item.get_terminal()
+                )
+
+                line_graphics.api_object.reassign_bus(
+                    old_bus=old_bus,
+                    new_bus=new_bus
+                )
+
+                new_bus_graphic_item.get_terminal().update()
 
         else:
             warning_msg("you must select the origin and destination buses!",
@@ -4878,6 +4882,43 @@ class SchematicWidget(BaseDiagramWidget):
 
         self.draw_additional_diagram(diagram=diagram)
 
+    def transform_busbar_to_connectivity_grid(self, bus_graphics: BusGraphicItem):
+        """
+        Transform the bus into a grid of buses to be able to compute the bus currents
+        :param bus_graphics: BusGraphicItem
+        """
+
+        # convert a bus into many small buses connected by impedances
+        new_buses, new_lines = transform_busbar_to_connectivity_grid(grid=self.circuit,
+                                                                     busbar=bus_graphics.api_object)
+
+        # add the new buses
+        self.add_buses(buses=new_buses)
+
+        # connected branches
+        branch_graphics = bus_graphics.get_associated_branch_graphics()
+
+        # Note: graphical shunts have been added already
+        # the order of the buses matches the order of the branches because the
+        # transformation function already works like that
+        for i, branch_graphic in enumerate(branch_graphics):
+            new_bus_graphic: BusGraphicItem = self.graphics_manager.query(new_buses[i])
+
+            new_bus_graphic.terminal.reassign_terminal(
+                graphic_obj=branch_graphic,
+                another_terminal=bus_graphics.terminal
+            )
+
+            branch_graphic.api_object.reassign_bus(
+                old_bus=bus_graphics.api_object,
+                new_bus=new_bus_graphic.api_object
+            )
+
+            new_bus_graphic.get_terminal().update()
+
+        # Finally delete the old bus
+        self.delete_element_utility_function(device=bus_graphics.api_object)
+
 
 def generate_schematic_diagram(buses: List[Bus],
                                lines: List[Line],