VeraGrid 5.6.9__tar.gz → 5.6.11__tar.gz

{veragrid-5.6.9 → veragrid-5.6.11}/PKG-INFO

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

@@ -40,8 +40,6 @@ elif os.name == "posix" or sys.platform.startswith("linux"):
             print(f"Could not set process name: {e}")
 
 
-
-
 if __name__ == "__main__":
     print('Loading VeraGrid...')
     # check_all_svgs()

{veragrid-5.6.9 → veragrid-5.6.11}/VeraGrid/Gui/AboutDialogue/about_dialogue.py

@@ -7,8 +7,10 @@ import sys
 import chardet
 import subprocess
 from PySide6 import QtWidgets
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QClipboard
 from typing import List
-from VeraGrid.Gui.AboutDialogue.gui import Ui_AboutDialog
+from VeraGrid.Gui.AboutDialogue.about_gui import Ui_AboutDialog
 from VeraGrid.__version__ import __VeraGrid_VERSION__
 from VeraGrid.update import check_version, get_upgrade_command
 from VeraGridEngine.__version__ import __VeraGridEngine_VERSION__, copyright_msg, contributors_msg
@@ -25,6 +27,77 @@ from VeraGridEngine.Compilers.circuit_to_pgm import (PGM_AVAILABLE,
                                                      PGM_RECOMMENDED_VERSION,
                                                      PGM_VERSION)
 
+try:
+    from importlib.metadata import distributions
+
+
+    def get_packages():
+        """
+        Get system libraries info
+        :return:
+        """
+        for d in distributions():
+            name = d.metadata.get("Name", "")
+            version = d.version
+            license_ = d.metadata.get("License", "")
+
+            # Installation directory
+            try:
+                install_path = str(d.locate_file(""))
+            except Exception:
+                install_path = ""
+
+            # Dependencies
+            deps = d.metadata.get_all("Requires-Dist") or []
+            deps_text = ", ".join(deps)
+
+            yield name, version, license_, install_path, deps_text
+
+except ImportError:
+    import pkg_resources
+
+
+    def get_packages():
+        """
+        Get system libraries info
+        :return:
+        """
+        for d in pkg_resources.working_set:
+            name = d.project_name
+            version = d.version
+            license_ = getattr(d, "license", "")
+
+            install_path = d.location
+
+            # Dependencies (requires)
+            deps = d.requires()
+            deps_text = ", ".join(str(dep) for dep in deps)
+
+            yield name, version, license_, install_path, deps_text
+
+
+def make_item(text):
+    """Create a read-only table item."""
+    item = QtWidgets.QTableWidgetItem(text)
+    item.setFlags(item.flags() & ~Qt.ItemFlag.ItemIsEditable)
+    return item
+
+
+def sanitize_tsv_field(text: str) -> str:
+    """
+
+    :param text:
+    :return:
+    """
+    if text is None:
+        return ""
+    # Replace tabs and newlines with safe placeholders
+    text = text.replace("\t", " ")  # remove tabs
+    text = text.replace("\r\n", " ")  # Windows newlines
+    text = text.replace("\n", " ")  # Unix newlines
+    text = text.replace("\r", " ")  # Old mac newlines
+    return text.strip()
+
 
 class AboutDialogueGuiGUI(QtWidgets.QDialog):
     """
@@ -42,6 +115,59 @@ class AboutDialogueGuiGUI(QtWidgets.QDialog):
         self.setWindowTitle('About VeraGrid')
         self.setAcceptDrops(True)
 
+        self.fill_optional_libs()
+        self.fill_libs()
+
+        # check the version in pypi
+        version_code, latest_version = check_version()
+
+        self.upgrade_cmd: List[str] = ['']
+
+        if version_code == 1:
+            addendum = '\nThere is a newer version: ' + latest_version
+
+            self.upgrade_cmd = get_upgrade_command(latest_version)
+            command = ' '.join(self.upgrade_cmd)
+            self.ui.updateLabel.setText('\n\nTerminal command to update:\n\n' + command)
+            self.ui.updateButton.setVisible(True)
+
+        elif version_code == -1:
+            addendum = '\nThis version is newer than the version available in the repositories (' + latest_version + ')'
+            self.ui.updateLabel.setText(addendum)
+            self.ui.updateButton.setVisible(False)
+
+        elif version_code == 0:
+            addendum = '\nVeraGrid is up to date.'
+            self.ui.updateLabel.setText(addendum)
+            self.ui.updateButton.setVisible(False)
+
+        elif version_code == -2:
+            addendum = '\nIt was impossible to check for a newer version'
+            self.ui.updateLabel.setText(addendum)
+            self.ui.updateButton.setVisible(False)
+
+        else:
+            addendum = ''
+            self.ui.updateLabel.setText(addendum)
+            self.ui.updateButton.setVisible(False)
+
+        # self.ui.mainLabel.setText(about_msg)
+        self.ui.versionLabel.setText('VeraGrid version: ' + __VeraGrid_VERSION__ + ', ' + addendum)
+        self.ui.copyrightLabel.setText(copyright_msg)
+        self.ui.contributorsLabel.setText(contributors_msg)
+
+        # click
+        self.ui.updateButton.clicked.connect(self.update)
+
+        self.ui.copyLibsButton.clicked.connect(self.copy_libs)
+
+        self.show_license()
+
+    def fill_optional_libs(self):
+        """
+
+        :return:
+        """
         self.ui.librariesTableWidget.setColumnCount(4)
         self.ui.librariesTableWidget.setRowCount(5)
         self.ui.librariesTableWidget.setHorizontalHeaderLabels(["Name", "version", "supported version", "licensed"])
@@ -85,48 +211,24 @@ class AboutDialogueGuiGUI(QtWidgets.QDialog):
         self.ui.librariesTableWidget.setItem(4, 2, QtWidgets.QTableWidgetItem(PGM_RECOMMENDED_VERSION))
         self.ui.librariesTableWidget.setItem(4, 3, QtWidgets.QTableWidgetItem(str(PGM_AVAILABLE)))
 
-        # check the version in pypi
-        version_code, latest_version = check_version()
+    def fill_libs(self):
 
-        self.upgrade_cmd: List[str] = ['']
+        self.ui.allLibsTableWidget.setColumnCount(5)
+        self.ui.allLibsTableWidget.setHorizontalHeaderLabels([
+            "Package", "Version", "License", "Installation Path", "Dependencies"
+        ])
 
-        if version_code == 1:
-            addendum = '\nThere is a newer version: ' + latest_version
+        pkgs = sorted(get_packages(), key=lambda x: x[0].lower())
+        self.ui.allLibsTableWidget.setRowCount(len(pkgs))
 
-            self.upgrade_cmd = get_upgrade_command(latest_version)
-            command = ' '.join(self.upgrade_cmd)
-            self.ui.updateLabel.setText('\n\nTerminal command to update:\n\n' + command)
-            self.ui.updateButton.setVisible(True)
+        for row, (name, version, license_, path, deps) in enumerate(pkgs):
+            self.ui.allLibsTableWidget.setItem(row, 0, make_item(name))
+            self.ui.allLibsTableWidget.setItem(row, 1, make_item(version))
+            self.ui.allLibsTableWidget.setItem(row, 2, make_item(license_))
+            self.ui.allLibsTableWidget.setItem(row, 3, make_item(path))
+            self.ui.allLibsTableWidget.setItem(row, 4, make_item(deps))
 
-        elif version_code == -1:
-            addendum = '\nThis version is newer than the version available in the repositories (' + latest_version + ')'
-            self.ui.updateLabel.setText(addendum)
-            self.ui.updateButton.setVisible(False)
-
-        elif version_code == 0:
-            addendum = '\nVeraGrid is up to date.'
-            self.ui.updateLabel.setText(addendum)
-            self.ui.updateButton.setVisible(False)
-
-        elif version_code == -2:
-            addendum = '\nIt was impossible to check for a newer version'
-            self.ui.updateLabel.setText(addendum)
-            self.ui.updateButton.setVisible(False)
-
-        else:
-            addendum = ''
-            self.ui.updateLabel.setText(addendum)
-            self.ui.updateButton.setVisible(False)
-
-        # self.ui.mainLabel.setText(about_msg)
-        self.ui.versionLabel.setText('VeraGrid version: ' + __VeraGrid_VERSION__ + ', ' + addendum)
-        self.ui.copyrightLabel.setText(copyright_msg)
-        self.ui.contributorsLabel.setText(contributors_msg)
-
-        # click
-        self.ui.updateButton.clicked.connect(self.update)
-
-        self.show_license()
+        self.ui.allLibsTableWidget.resizeColumnsToContents()
 
     def msg(self, text, title="Warning"):
         """
@@ -157,6 +259,36 @@ class AboutDialogueGuiGUI(QtWidgets.QDialog):
         else:
             self.msg('VeraGrid updated successfully')
 
+    def copy_libs(self):
+        """
+
+        :return:
+        """
+        rows = self.ui.allLibsTableWidget.rowCount()
+        cols = self.ui.allLibsTableWidget.columnCount()
+
+        lines = []
+        # Header
+        header = "\t".join(
+            self.ui.allLibsTableWidget.horizontalHeaderItem(c).text()
+            for c in range(cols)
+        )
+        lines.append(header)
+
+        # Data
+        for r in range(rows):
+            row_vals = []
+            for c in range(cols):
+                item = self.ui.allLibsTableWidget.item(r, c)
+                txt = sanitize_tsv_field(item.text().replace("\t", "    ") if item else "")
+
+                row_vals.append(txt)
+            lines.append("\t".join(row_vals))
+
+        tsv_text = "\n".join(lines)
+
+        QtWidgets.QApplication.clipboard().setText(tsv_text, QClipboard.Mode.Clipboard)
+
     def show_license(self):
         """
         Show the license

veragrid-5.6.9/VeraGrid/Gui/AboutDialogue/gui.py → veragrid-5.6.11/VeraGrid/Gui/AboutDialogue/about_gui.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'about_gui.ui'
 ##
 ## Created by: Qt User Interface Compiler version 6.9.2
 ##
@@ -19,19 +19,19 @@ from PySide6.QtWidgets import (QApplication, QDialog, QGridLayout, QHeaderView,
     QLabel, QPushButton, QSizePolicy, QSpacerItem,
     QTabWidget, QTableWidget, QTableWidgetItem, QTextEdit,
     QVBoxLayout, QWidget)
-from .icons_rc import *
+from VeraGrid.Gui.Icons.icons_rc import *
 
 class Ui_AboutDialog(object):
     def setupUi(self, AboutDialog):
         if not AboutDialog.objectName():
             AboutDialog.setObjectName(u"AboutDialog")
-        AboutDialog.resize(473, 236)
+        AboutDialog.resize(640, 365)
         icon = QIcon()
-        icon.addFile(u":/Icons/icons/VeraGrid_icon.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon.addFile(u":/Program icon/icons/VeraGrid_icon.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         AboutDialog.setWindowIcon(icon)
         self.verticalLayout_2 = QVBoxLayout(AboutDialog)
         self.verticalLayout_2.setObjectName(u"verticalLayout_2")
-        self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout_2.setContentsMargins(2, 2, 2, 2)
         self.tabWidget = QTabWidget(AboutDialog)
         self.tabWidget.setObjectName(u"tabWidget")
         self.tab = QWidget()
@@ -40,13 +40,13 @@ class Ui_AboutDialog(object):
         self.gridLayout.setObjectName(u"gridLayout")
         self.mainLabel = QLabel(self.tab)
         self.mainLabel.setObjectName(u"mainLabel")
-        self.mainLabel.setLayoutDirection(Qt.LeftToRight)
-        self.mainLabel.setTextFormat(Qt.RichText)
+        self.mainLabel.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
+        self.mainLabel.setTextFormat(Qt.TextFormat.RichText)
         self.mainLabel.setScaledContents(True)
-        self.mainLabel.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop)
+        self.mainLabel.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop)
         self.mainLabel.setWordWrap(True)
         self.mainLabel.setOpenExternalLinks(True)
-        self.mainLabel.setTextInteractionFlags(Qt.TextBrowserInteraction)
+        self.mainLabel.setTextInteractionFlags(Qt.TextInteractionFlag.TextBrowserInteraction)
 
         self.gridLayout.addWidget(self.mainLabel, 0, 1, 2, 2)
 
@@ -67,7 +67,7 @@ class Ui_AboutDialog(object):
         self.versionLabel.setObjectName(u"versionLabel")
         self.versionLabel.setWordWrap(True)
         self.versionLabel.setOpenExternalLinks(True)
-        self.versionLabel.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByMouse)
+        self.versionLabel.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse)
 
         self.gridLayout.addWidget(self.versionLabel, 3, 1, 1, 2)
 
@@ -75,10 +75,18 @@ class Ui_AboutDialog(object):
         self.copyrightLabel.setObjectName(u"copyrightLabel")
         self.copyrightLabel.setWordWrap(True)
         self.copyrightLabel.setOpenExternalLinks(True)
-        self.copyrightLabel.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByMouse)
+        self.copyrightLabel.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextSelectableByMouse)
 
         self.gridLayout.addWidget(self.copyrightLabel, 4, 1, 1, 2)
 
+        self.label_3 = QLabel(self.tab)
+        self.label_3.setObjectName(u"label_3")
+        self.label_3.setMaximumSize(QSize(32, 32))
+        self.label_3.setPixmap(QPixmap(u":/Program icon/icons/VeraGrid_icon.png"))
+        self.label_3.setScaledContents(True)
+
+        self.gridLayout.addWidget(self.label_3, 3, 0, 2, 1)
+
         self.tabWidget.addTab(self.tab, "")
         self.tab_2 = QWidget()
         self.tab_2.setObjectName(u"tab_2")
@@ -86,31 +94,56 @@ class Ui_AboutDialog(object):
         self.verticalLayout.setObjectName(u"verticalLayout")
         self.contributorsLabel = QLabel(self.tab_2)
         self.contributorsLabel.setObjectName(u"contributorsLabel")
-        self.contributorsLabel.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop)
+        self.contributorsLabel.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop)
         self.contributorsLabel.setWordWrap(True)
 
         self.verticalLayout.addWidget(self.contributorsLabel)
 
         self.tabWidget.addTab(self.tab_2, "")
-        self.tab_3 = QWidget()
-        self.tab_3.setObjectName(u"tab_3")
-        self.gridLayout_2 = QGridLayout(self.tab_3)
-        self.gridLayout_2.setObjectName(u"gridLayout_2")
-        self.updateButton = QPushButton(self.tab_3)
+        self.tab_5 = QWidget()
+        self.tab_5.setObjectName(u"tab_5")
+        self.gridLayout_3 = QGridLayout(self.tab_5)
+        self.gridLayout_3.setObjectName(u"gridLayout_3")
+        self.copyLibsButton = QPushButton(self.tab_5)
+        self.copyLibsButton.setObjectName(u"copyLibsButton")
+        icon1 = QIcon()
+        icon1.addFile(u":/Icons/icons/copy.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.copyLibsButton.setIcon(icon1)
+
+        self.gridLayout_3.addWidget(self.copyLibsButton, 2, 5, 1, 1)
+
+        self.updateButton = QPushButton(self.tab_5)
         self.updateButton.setObjectName(u"updateButton")
         self.updateButton.setMaximumSize(QSize(80, 16777215))
+        icon2 = QIcon()
+        icon2.addFile(u":/Icons/icons/sync.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.updateButton.setIcon(icon2)
 
-        self.gridLayout_2.addWidget(self.updateButton, 2, 1, 1, 1)
+        self.gridLayout_3.addWidget(self.updateButton, 2, 0, 1, 1)
 
-        self.librariesTableWidget = QTableWidget(self.tab_3)
-        self.librariesTableWidget.setObjectName(u"librariesTableWidget")
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
-        self.gridLayout_2.addWidget(self.librariesTableWidget, 0, 0, 1, 2)
+        self.gridLayout_3.addItem(self.horizontalSpacer, 2, 1, 1, 4)
+
+        self.allLibsTableWidget = QTableWidget(self.tab_5)
+        self.allLibsTableWidget.setObjectName(u"allLibsTableWidget")
 
-        self.updateLabel = QLabel(self.tab_3)
+        self.gridLayout_3.addWidget(self.allLibsTableWidget, 0, 0, 1, 6)
+
+        self.updateLabel = QLabel(self.tab_5)
         self.updateLabel.setObjectName(u"updateLabel")
 
-        self.gridLayout_2.addWidget(self.updateLabel, 2, 0, 1, 1)
+        self.gridLayout_3.addWidget(self.updateLabel, 1, 0, 1, 6)
+
+        self.tabWidget.addTab(self.tab_5, "")
+        self.tab_3 = QWidget()
+        self.tab_3.setObjectName(u"tab_3")
+        self.gridLayout_2 = QGridLayout(self.tab_3)
+        self.gridLayout_2.setObjectName(u"gridLayout_2")
+        self.librariesTableWidget = QTableWidget(self.tab_3)
+        self.librariesTableWidget.setObjectName(u"librariesTableWidget")
+
+        self.gridLayout_2.addWidget(self.librariesTableWidget, 0, 0, 1, 2)
 
         self.tabWidget.addTab(self.tab_3, "")
         self.tab_4 = QWidget()
@@ -119,7 +152,7 @@ class Ui_AboutDialog(object):
         self.verticalLayout_3.setObjectName(u"verticalLayout_3")
         self.label_2 = QLabel(self.tab_4)
         self.label_2.setObjectName(u"label_2")
-        self.label_2.setTextFormat(Qt.RichText)
+        self.label_2.setTextFormat(Qt.TextFormat.RichText)
         self.label_2.setScaledContents(True)
         self.label_2.setWordWrap(True)
 
@@ -130,7 +163,7 @@ class Ui_AboutDialog(object):
         font = QFont()
         font.setFamilies([u"Cousine"])
         self.licenseTextEdit.setFont(font)
-        self.licenseTextEdit.setTextInteractionFlags(Qt.LinksAccessibleByKeyboard|Qt.LinksAccessibleByMouse|Qt.TextBrowserInteraction|Qt.TextSelectableByKeyboard|Qt.TextSelectableByMouse)
+        self.licenseTextEdit.setTextInteractionFlags(Qt.TextInteractionFlag.LinksAccessibleByKeyboard|Qt.TextInteractionFlag.LinksAccessibleByMouse|Qt.TextInteractionFlag.TextBrowserInteraction|Qt.TextInteractionFlag.TextSelectableByKeyboard|Qt.TextInteractionFlag.TextSelectableByMouse)
 
         self.verticalLayout_3.addWidget(self.licenseTextEdit)
 
@@ -153,12 +186,21 @@ class Ui_AboutDialog(object):
         self.label.setText("")
         self.versionLabel.setText(QCoreApplication.translate("AboutDialog", u"version", None))
         self.copyrightLabel.setText(QCoreApplication.translate("AboutDialog", u"Copyright", None))
+        self.label_3.setText("")
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QCoreApplication.translate("AboutDialog", u"About", None))
         self.contributorsLabel.setText(QCoreApplication.translate("AboutDialog", u"TextLabel", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QCoreApplication.translate("AboutDialog", u"Contributors", None))
-        self.updateButton.setText(QCoreApplication.translate("AboutDialog", u"Update", None))
+#if QT_CONFIG(tooltip)
+        self.copyLibsButton.setToolTip(QCoreApplication.translate("AboutDialog", u"Copy the table", None))
+#endif // QT_CONFIG(tooltip)
+        self.copyLibsButton.setText("")
+#if QT_CONFIG(tooltip)
+        self.updateButton.setToolTip(QCoreApplication.translate("AboutDialog", u"Update VeraGrid. If you are on windows don't do this.", None))
+#endif // QT_CONFIG(tooltip)
+        self.updateButton.setText("")
         self.updateLabel.setText("")
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QCoreApplication.translate("AboutDialog", u"Libraries", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), QCoreApplication.translate("AboutDialog", u"Libraries", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QCoreApplication.translate("AboutDialog", u"Optional libraries", None))
         self.label_2.setText(QCoreApplication.translate("AboutDialog", u"<html><head/><body><p align=\"justify\">This program comes with absolutelly no warranty. This is free software, and you are welcome to redistribute it under the conditions set by the license. VeraGrid is licensed under the <a href=\"https://www.mozilla.org/en-US/MPL/2.0/\"><span style=\" text-decoration: underline; color:#26a269;\">Mozilla Public License V2</span></a>.</p></body></html>", None))
         self.licenseTextEdit.setHtml(QCoreApplication.translate("AboutDialog", u"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
@@ -166,25 +208,25 @@ class Ui_AboutDialog(object):
 "hr { height: 1px; border-width: 0; }\n"
 "li.unchecked::marker { content: \"\\2610\"; }\n"
 "li.checked::marker { content: \"\\2612\"; }\n"
-"</style></head><body style=\" font-family:'Cousine'; font-size:11pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+==============+==========================================+</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">| Package      | License                                  |</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+==============+=========="
-                        "================================+</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">| setuptools   | MIT                                      |</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">| wheel        | MIT                                      |</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">| PySide6      | LGPL                                     |</p>\n"
-"<p style=\" margin-top:0px; margin-bot"
-                        "tom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">| numpy        | BSD                                      |</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">| scipy        | BSD                                      |</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"
-                        "\">| networkx     | BSD                                      |</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p></body></html>", None))
+"</style></head><body style=\" font-family:'Cousine'; font-size:10pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+==============+==========================================+</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| Package      | License                                  |</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; mar"
+                        "gin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+==============+==========================================+</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| setuptools   | MIT                                      |</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+--------------+------------------------------------------+</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| wheel        | MIT                                      |</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+--------------+------"
+                        "------------------------------------+</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| PySide6      | LGPL                                     |</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+--------------+------------------------------------------+</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| numpy        | BSD                                      |</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+--------------+------------------------------------------+</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-le"
+                        "ft:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| scipy        | BSD                                      |</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+--------------+------------------------------------------+</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">| networkx     | BSD                                      |</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">+--------------+------------------------------------------+</span></p></body></html>", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), QCoreApplication.translate("AboutDialog", u"License", None))
     # retranslateUi
 

{veragrid-5.6.9 → veragrid-5.6.11}/VeraGrid/Gui/AboutDialogue/update_gui_file.py

@@ -8,6 +8,5 @@ Script to update correctly the main GUI (.py) file from the Qt design (.ui) file
 from VeraGrid.Gui.update_gui_common import convert_resource_file, convert_ui_file
 
 if __name__ == '__main__':
-    convert_resource_file(source='icons.qrc')
-    for f in ['gui.ui']:
+    for f in ['about_gui.ui']:
         convert_ui_file(source=f)

{veragrid-5.6.9 → veragrid-5.6.11}/VeraGrid/Gui/Analysis/AnalysisDialogue.py

@@ -5,7 +5,7 @@
 
 from typing import List
 from PySide6 import QtWidgets
-from VeraGrid.Gui.Analysis.gui import Ui_MainWindow
+from VeraGrid.Gui.Analysis.analysis_gui import Ui_MainWindow
 from VeraGrid.Gui.Analysis.object_plot_analysis import grid_analysis, GridErrorLog, FixableErrorOutOfRange
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGrid.Gui.general_dialogues import LogsDialogue, Logger

veragrid-5.6.9/VeraGrid/Gui/Analysis/gui.py → veragrid-5.6.11/VeraGrid/Gui/Analysis/analysis_gui.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'analysis_gui.ui'
 ##
 ## Created by: Qt User Interface Compiler version 6.9.2
 ##
@@ -21,7 +21,7 @@ from PySide6.QtWidgets import (QApplication, QCheckBox, QDoubleSpinBox, QFrame,
     QMainWindow, QSizePolicy, QSpacerItem, QStatusBar,
     QTabWidget, QToolBar, QTreeView, QVBoxLayout,
     QWidget)
-from .icons_rc import *
+from VeraGrid.Gui.Icons.icons_rc import *
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
@@ -34,16 +34,18 @@ class Ui_MainWindow(object):
         self.actionSave_diagnostic = QAction(MainWindow)
         self.actionSave_diagnostic.setObjectName(u"actionSave_diagnostic")
         icon1 = QIcon()
-        icon1.addFile(u":/icons/icons/savec.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon1.addFile(u":/Icons/icons/savec.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.actionSave_diagnostic.setIcon(icon1)
         self.actionFix_issues = QAction(MainWindow)
         self.actionFix_issues.setObjectName(u"actionFix_issues")
         icon2 = QIcon()
-        icon2.addFile(u":/icons/icons/fix.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon2.addFile(u":/Icons/icons/fix.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.actionFix_issues.setIcon(icon2)
         self.actionAnalyze = QAction(MainWindow)
         self.actionAnalyze.setObjectName(u"actionAnalyze")
-        self.actionAnalyze.setIcon(icon)
+        icon3 = QIcon()
+        icon3.addFile(u":/Icons/icons/inputs_analysis 2.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.actionAnalyze.setIcon(icon3)
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.verticalLayout_2 = QVBoxLayout(self.centralwidget)
@@ -58,7 +60,7 @@ class Ui_MainWindow(object):
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.logsTreeView = QTreeView(self.tab)
         self.logsTreeView.setObjectName(u"logsTreeView")
-        self.logsTreeView.setFrameShape(QFrame.NoFrame)
+        self.logsTreeView.setFrameShape(QFrame.Shape.NoFrame)
 
         self.verticalLayout.addWidget(self.logsTreeView)
 
@@ -70,8 +72,8 @@ class Ui_MainWindow(object):
         self.frame = QFrame(self.tab_2)
         self.frame.setObjectName(u"frame")
         self.frame.setMaximumSize(QSize(400, 16777215))
-        self.frame.setFrameShape(QFrame.NoFrame)
-        self.frame.setFrameShadow(QFrame.Raised)
+        self.frame.setFrameShape(QFrame.Shape.NoFrame)
+        self.frame.setFrameShadow(QFrame.Shadow.Raised)
         self.gridLayout = QGridLayout(self.frame)
         self.gridLayout.setObjectName(u"gridLayout")
         self.label_4 = QLabel(self.frame)
@@ -260,8 +262,8 @@ class Ui_MainWindow(object):
 
         self.frame_2 = QFrame(self.tab_2)
         self.frame_2.setObjectName(u"frame_2")
-        self.frame_2.setFrameShape(QFrame.NoFrame)
-        self.frame_2.setFrameShadow(QFrame.Raised)
+        self.frame_2.setFrameShape(QFrame.Shape.NoFrame)
+        self.frame_2.setFrameShadow(QFrame.Shadow.Raised)
         self.gridLayout_2 = QGridLayout(self.frame_2)
         self.gridLayout_2.setObjectName(u"gridLayout_2")
         self.label_8 = QLabel(self.frame_2)
@@ -305,9 +307,9 @@ class Ui_MainWindow(object):
 
         self.horizontalLayout.addItem(self.horizontalSpacer)
 
-        icon3 = QIcon()
-        icon3.addFile(u":/icons/icons/gear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.tabWidget.addTab(self.tab_2, icon3, "")
+        icon4 = QIcon()
+        icon4.addFile(u":/icons/icons/gear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.tabWidget.addTab(self.tab_2, icon4, "")
 
         self.verticalLayout_2.addWidget(self.tabWidget)
 

{veragrid-5.6.9 → veragrid-5.6.11}/VeraGrid/Gui/Analysis/update_gui_file.py

@@ -17,9 +17,7 @@ if __name__ == '__main__':
         rcc_cmd += '.exe'
         uic_cmd += '.exe'
 
-    convert_resource_file(source='icons.qrc', rcc_cmd=rcc_cmd)
-
-    for f in ['gui.ui']:
+    for f in ['analysis_gui.ui']:
         convert_ui_file(source=f, uic_cmd=uic_cmd)
 
 

{veragrid-5.6.9 → veragrid-5.6.11}/VeraGrid/Gui/ContingencyPlanner/contingency_planner_dialogue.py

@@ -6,7 +6,7 @@ import sys
 from PySide6 import QtWidgets
 from typing import List
 
-from VeraGrid.Gui.ContingencyPlanner.gui import Ui_MainWindow
+from VeraGrid.Gui.ContingencyPlanner.contingency_planner_gui import Ui_MainWindow
 import VeraGridEngine.Devices as dev
 from VeraGridEngine.enumerations import DeviceType
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit

veragrid-5.6.9/VeraGrid/Gui/ContingencyPlanner/gui.py → veragrid-5.6.11/VeraGrid/Gui/ContingencyPlanner/contingency_planner_gui.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'contingency_planner_gui.ui'
 ##
 ## Created by: Qt User Interface Compiler version 6.9.2
 ##
@@ -20,7 +20,7 @@ from PySide6.QtWidgets import (QApplication, QCheckBox, QDialog, QDoubleSpinBox,
     QFormLayout, QFrame, QGridLayout, QHBoxLayout,
     QLabel, QListView, QPushButton, QSizePolicy,
     QSpacerItem, QSpinBox, QVBoxLayout, QWidget)
-from .icons_rc import *
+from VeraGrid.Gui.Icons.icons_rc import *
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):