GridCal 5.0.11__tar.gz → 5.0.13__tar.gz

{GridCal-5.0.11 → GridCal-5.0.13}/GridCal/ExecuteGridCal.py

@@ -1,4 +1,4 @@
-# This file is part of GridCal.g
+# This file is part of GridCal.
 #
 # GridCal is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,6 +14,8 @@
 # along with GridCal.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import sys
+import ctypes
+
 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)))
@@ -23,24 +25,15 @@ import platform
 
 if platform.system() == 'Windows':
     # this makes the icon display properly under windows
-    import ctypes
     myappid = 'mycompany.myproduct.subproduct.version'  # arbitrary string
     ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
 
-
 if __name__ == "__main__":
     print('Loading GridCal...')
     print(about_msg)
 
     # Set the application style to the clear theme
     os.environ["QT_QUICK_CONTROLS_STYLE"] = "Basic"
-    os.environ["QT_QPA_PLATFORMTHEME"] = "qt5ct"
-
-    # app = QApplication(sys.argv)
-    # app.setStyle('Fusion')  # ['Breeze', 'Oxygen', 'QtCurve', 'Windows', 'Fusion']
-    #
-    # splash = Splash()
-    # splash.show()
+    # os.environ["QT_QPA_PLATFORMTHEME"] = "qt5ct"  # this forces QT-only menus and look and feel
 
     runGridCal()
-    # sys.exit(app.exec_())

{GridCal-5.0.11 → GridCal-5.0.13}/GridCal/Gui/AboutDialogue/about_dialogue.py

@@ -8,13 +8,13 @@ from GridCal.Gui.AboutDialogue.gui import Ui_AboutDialog
 from GridCal.__version__ import __GridCal_VERSION__, contributors_msg, copyright_msg
 from GridCal.update import check_version, get_upgrade_command
 from GridCalEngine.__version__ import __GridCalEngine_VERSION__
-from GridCalEngine.Core.Compilers.circuit_to_newton_pa import (NEWTON_PA_AVAILABLE,
+from GridCalEngine.Compilers.circuit_to_newton_pa import (NEWTON_PA_AVAILABLE,
                                                                NEWTON_PA_RECOMMENDED_VERSION,
                                                                NEWTON_PA_VERSION)
-from GridCalEngine.Core.Compilers.circuit_to_bentayga import (BENTAYGA_AVAILABLE,
+from GridCalEngine.Compilers.circuit_to_bentayga import (BENTAYGA_AVAILABLE,
                                                               BENTAYGA_RECOMMENDED_VERSION,
                                                               BENTAYGA_VERSION)
-from GridCalEngine.Core.Compilers.circuit_to_pgm import (PGM_AVAILABLE,
+from GridCalEngine.Compilers.circuit_to_pgm import (PGM_AVAILABLE,
                                                          PGM_RECOMMENDED_VERSION,
                                                          PGM_VERSION)
 

{GridCal-5.0.11 → GridCal-5.0.13}/GridCal/Gui/AboutDialogue/gui.py

@@ -25,7 +25,7 @@ class Ui_AboutDialog(object):
     def setupUi(self, AboutDialog):
         if not AboutDialog.objectName():
             AboutDialog.setObjectName(u"AboutDialog")
-        AboutDialog.resize(662, 367)
+        AboutDialog.resize(672, 365)
         icon = QIcon()
         icon.addFile(u":/Icons/icons/GridCal_icon.svg", QSize(), QIcon.Normal, QIcon.Off)
         AboutDialog.setWindowIcon(icon)
@@ -114,6 +114,10 @@ class Ui_AboutDialog(object):
         self.verticalLayout_3.setObjectName(u"verticalLayout_3")
         self.licenseTextEdit = QTextEdit(self.tab_4)
         self.licenseTextEdit.setObjectName(u"licenseTextEdit")
+        font = QFont()
+        font.setFamilies([u"Cousine"])
+        self.licenseTextEdit.setFont(font)
+        self.licenseTextEdit.setTextInteractionFlags(Qt.LinksAccessibleByKeyboard|Qt.LinksAccessibleByMouse|Qt.TextBrowserInteraction|Qt.TextSelectableByKeyboard|Qt.TextSelectableByMouse)
 
         self.verticalLayout_3.addWidget(self.licenseTextEdit)
 
@@ -142,6 +146,28 @@ class Ui_AboutDialog(object):
         self.updateButton.setText(QCoreApplication.translate("AboutDialog", u"Update", None))
         self.updateLabel.setText("")
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QCoreApplication.translate("AboutDialog", u"Libraries", 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"
+"p, li { white-space: pre-wrap; }\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-inden"
+                        "t: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-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;\">| 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; marg"
+                        "in-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p></body></html>", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), QCoreApplication.translate("AboutDialog", u"License", None))
     # retranslateUi
 

{GridCal-5.0.11 → GridCal-5.0.13}/GridCal/Gui/Analysis/AnalysisDialogue.py

@@ -1,5 +1,5 @@
 # GridCal
-# Copyright (C) 2015 - 2023 Santiago Peñate Vera
+# Copyright (C) 2015 - 2024 Santiago Peñate Vera
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,19 +15,17 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import sys
 from typing import List
-
 from PySide6 import QtWidgets
 from GridCal.Gui.Analysis.gui import Ui_MainWindow
 from GridCal.Gui.Analysis.object_plot_analysis import grid_analysis, GridErrorLog, FixableErrorOutOfRange
-from GridCalEngine.Core.Devices.multi_circuit import MultiCircuit
+from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCal.Gui.GeneralDialogues import LogsDialogue, Logger
 
 
 class GridAnalysisGUI(QtWidgets.QMainWindow):
     """
-
+    GridAnalysisGUI
     """
     def __init__(self, circuit: MultiCircuit = None):
         """
@@ -55,21 +53,6 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
 
         self.analyze_all()
 
-    def msg(self, text, title="Warning"):
-        """
-        Message box
-        :param text: Text to display
-        :param title: Name of the window
-        """
-        msg = QtWidgets.QMessageBox()
-        msg.setIcon(QtWidgets.QMessageBox.Icon.Information)
-        msg.setText(text)
-        # msg.setInformativeText("This is additional information")
-        msg.setWindowTitle(title)
-        # msg.setDetailedText("The details are as follows:")
-        msg.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok)
-        retval = msg.exec_()
-
     def analyze_all(self):
         """
         Analyze the model data
@@ -126,12 +109,3 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
 
         if filename != '':
             self.log.save(filename)
-
-
-if __name__ == "__main__":
-    from PySide6 import QtWidgets
-    app = QtWidgets.QApplication(sys.argv)
-    window = GridAnalysisGUI(circuit=None)
-    window.resize(1.61 * 700.0, 700.0)  # golden ratio
-    window.show()
-    sys.exit(app.exec_())