GridCal 5.0.18__tar.gz → 5.3.2__tar.gz

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/ExecuteGridCal.py

@@ -1,17 +1,7 @@
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GridCal is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GridCal.  If not, see <http://www.gnu.org/licenses/>.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
 import os
 import sys
 import ctypes
@@ -23,6 +13,8 @@ from GridCal.__version__ import about_msg
 from GridCal.Gui.Main.GridCalMain import runGridCal
 import platform
 
+os.environ['JUPYTER_PLATFORM_DIRS'] = "1"
+
 if platform.system() == 'Windows':
     # this makes the icon display properly under windows
     myappid = 'mycompany.myproduct.subproduct.version'  # arbitrary string
@@ -37,3 +29,4 @@ if __name__ == "__main__":
     # os.environ["QT_QPA_PLATFORMTHEME"] = "qt5ct"  # this forces QT-only menus and look and feel
 
     runGridCal()
+

gridcal-5.3.2/GridCal/Gui/AboutDialogue/__init__.py

@@ -0,0 +1,4 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/Gui/AboutDialogue/about_dialogue.py

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
 import os
 import sys
 import chardet
@@ -5,22 +9,24 @@ import subprocess
 from PySide6 import QtWidgets
 from typing import List
 from GridCal.Gui.AboutDialogue.gui import Ui_AboutDialog
-from GridCal.__version__ import __GridCal_VERSION__, contributors_msg, copyright_msg
+from GridCal.__version__ import __GridCal_VERSION__
 from GridCal.update import check_version, get_upgrade_command
-from GridCalEngine.__version__ import __GridCalEngine_VERSION__
+from GridCalEngine.__version__ import __GridCalEngine_VERSION__, copyright_msg, contributors_msg
 from GridCalEngine.Compilers.circuit_to_newton_pa import (NEWTON_PA_AVAILABLE,
-                                                               NEWTON_PA_RECOMMENDED_VERSION,
-                                                               NEWTON_PA_VERSION)
+                                                          NEWTON_PA_RECOMMENDED_VERSION,
+                                                          NEWTON_PA_VERSION)
 from GridCalEngine.Compilers.circuit_to_bentayga import (BENTAYGA_AVAILABLE,
-                                                              BENTAYGA_RECOMMENDED_VERSION,
-                                                              BENTAYGA_VERSION)
+                                                         BENTAYGA_RECOMMENDED_VERSION,
+                                                         BENTAYGA_VERSION)
 from GridCalEngine.Compilers.circuit_to_pgm import (PGM_AVAILABLE,
-                                                         PGM_RECOMMENDED_VERSION,
-                                                         PGM_VERSION)
+                                                    PGM_RECOMMENDED_VERSION,
+                                                    PGM_VERSION)
 
 
 class AboutDialogueGuiGUI(QtWidgets.QDialog):
-
+    """
+    AboutDialogueGuiGUI
+    """
     def __init__(self, parent=None):
         """
 

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/Gui/AboutDialogue/gui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'gui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.3
+## Created by: Qt User Interface Compiler version 6.7.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -25,9 +25,9 @@ class Ui_AboutDialog(object):
     def setupUi(self, AboutDialog):
         if not AboutDialog.objectName():
             AboutDialog.setObjectName(u"AboutDialog")
-        AboutDialog.resize(672, 365)
+        AboutDialog.resize(473, 236)
         icon = QIcon()
-        icon.addFile(u":/Icons/icons/GridCal_icon.svg", QSize(), QIcon.Normal, QIcon.Off)
+        icon.addFile(u":/Icons/icons/GridCal_icon.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         AboutDialog.setWindowIcon(icon)
         self.verticalLayout_2 = QVBoxLayout(AboutDialog)
         self.verticalLayout_2.setObjectName(u"verticalLayout_2")
@@ -41,6 +41,8 @@ class Ui_AboutDialog(object):
         self.mainLabel = QLabel(self.tab)
         self.mainLabel.setObjectName(u"mainLabel")
         self.mainLabel.setLayoutDirection(Qt.LeftToRight)
+        self.mainLabel.setTextFormat(Qt.RichText)
+        self.mainLabel.setScaledContents(True)
         self.mainLabel.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop)
         self.mainLabel.setWordWrap(True)
         self.mainLabel.setOpenExternalLinks(True)
@@ -48,7 +50,7 @@ class Ui_AboutDialog(object):
 
         self.gridLayout.addWidget(self.mainLabel, 0, 1, 2, 2)
 
-        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout.addItem(self.verticalSpacer, 1, 0, 1, 1)
 
@@ -63,17 +65,19 @@ class Ui_AboutDialog(object):
 
         self.versionLabel = QLabel(self.tab)
         self.versionLabel.setObjectName(u"versionLabel")
+        self.versionLabel.setWordWrap(True)
         self.versionLabel.setOpenExternalLinks(True)
         self.versionLabel.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByMouse)
 
-        self.gridLayout.addWidget(self.versionLabel, 3, 1, 1, 1)
+        self.gridLayout.addWidget(self.versionLabel, 3, 1, 1, 2)
 
         self.copyrightLabel = QLabel(self.tab)
         self.copyrightLabel.setObjectName(u"copyrightLabel")
+        self.copyrightLabel.setWordWrap(True)
         self.copyrightLabel.setOpenExternalLinks(True)
         self.copyrightLabel.setTextInteractionFlags(Qt.LinksAccessibleByMouse|Qt.TextSelectableByMouse)
 
-        self.gridLayout.addWidget(self.copyrightLabel, 4, 1, 1, 1)
+        self.gridLayout.addWidget(self.copyrightLabel, 4, 1, 1, 2)
 
         self.tabWidget.addTab(self.tab, "")
         self.tab_2 = QWidget()
@@ -83,6 +87,7 @@ class Ui_AboutDialog(object):
         self.contributorsLabel = QLabel(self.tab_2)
         self.contributorsLabel.setObjectName(u"contributorsLabel")
         self.contributorsLabel.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop)
+        self.contributorsLabel.setWordWrap(True)
 
         self.verticalLayout.addWidget(self.contributorsLabel)
 
@@ -112,6 +117,14 @@ class Ui_AboutDialog(object):
         self.tab_4.setObjectName(u"tab_4")
         self.verticalLayout_3 = QVBoxLayout(self.tab_4)
         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.setScaledContents(True)
+        self.label_2.setWordWrap(True)
+
+        self.verticalLayout_3.addWidget(self.label_2)
+
         self.licenseTextEdit = QTextEdit(self.tab_4)
         self.licenseTextEdit.setObjectName(u"licenseTextEdit")
         font = QFont()
@@ -136,7 +149,7 @@ class Ui_AboutDialog(object):
 
     def retranslateUi(self, AboutDialog):
         AboutDialog.setWindowTitle(QCoreApplication.translate("AboutDialog", u"About GridCal", None))
-        self.mainLabel.setText(QCoreApplication.translate("AboutDialog", u"<html><head/><body><p align=\"justify\"><span style=\" font-weight:600;\">GridCal</span> has been carefully crafted since 2015 to serve as a platform for research and consultancy. </p><p align=\"justify\">Visit <a href=\"https://www.advancedgridinsights.com/gridcal\"><span style=\" text-decoration: underline; color:#26a269;\">https://www.advancedgridinsights.com/gridcal</span></a> for more details.</p><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. GridCal is licensed under the lesser GNU general public license version 3. See the license file for more details.</p><p align=\"justify\">The source of GridCal can be found at: <a href=\"https://github.com/SanPen/GridCal\"><span style=\" text-decoration: underline; color:#26a269;\">https://github.com/SanPen/GridCal</span></a></p></body></html>", None))
+        self.mainLabel.setText(QCoreApplication.translate("AboutDialog", u"<html><head/><body><p align=\"justify\"><span style=\" font-weight:600;\">GridCal</span> has been carefully crafted since 2015 to serve as a platform for research and consultancy. Visit <a href=\"https://www.eroots.tech/\"><span style=\" text-decoration: underline; color:#26a269;\">eRoots</span></a> for more details. The source of GridCal can be found <a href=\"https://github.com/SanPen/GridCal\"><span style=\" text-decoration: underline; color:#26a269;\">here.</span></a></p></body></html>", None))
         self.label.setText("")
         self.versionLabel.setText(QCoreApplication.translate("AboutDialog", u"version", None))
         self.copyrightLabel.setText(QCoreApplication.translate("AboutDialog", u"Copyright", None))
@@ -146,28 +159,32 @@ 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.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. GridCal 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"
 "p, li { white-space: pre-wrap; }\n"
+"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-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;\">| 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-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; marg"
-                        "in-right:0px; -qt-block-indent:0; text-indent:0px;\">+--------------+------------------------------------------+</p></body></html>", None))
+"<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))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), QCoreApplication.translate("AboutDialog", u"License", None))
     # retranslateUi
 

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/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.5.3
+# Created by: The Resource Compiler for Qt version 6.7.2
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/Gui/AboutDialogue/update_gui_file.py

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
 """
 Script to update correctly the main GUI (.py) file from the Qt design (.ui) file
 """

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/Gui/Analysis/AnalysisDialogue.py

@@ -1,33 +1,21 @@
-# GridCal
-# 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
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
 
 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.Devices.multi_circuit import MultiCircuit
-from GridCal.Gui.GeneralDialogues import LogsDialogue, Logger
+from GridCal.Gui.general_dialogues import LogsDialogue, Logger
 
 
 class GridAnalysisGUI(QtWidgets.QMainWindow):
     """
     GridAnalysisGUI
     """
-    def __init__(self, circuit: MultiCircuit = None):
+    def __init__(self, circuit: MultiCircuit):
         """
 
         :param circuit: MultiCircuit
@@ -40,7 +28,7 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
         # set the circuit
         self.circuit = circuit
 
-        self.object_types = [dev.device_type.value for dev in circuit.get_objects_with_profiles_list()]
+        self.object_types = [dev.device_type.value for dev in circuit.get_template_objects_list()]
 
         # declare logs
         self.log = GridErrorLog()
@@ -63,6 +51,7 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
         # declare logs
         self.fixable_errors = grid_analysis(
             circuit=self.circuit,
+            analyze_ts=self.ui.fixTimeSeriesCheckBox.isChecked(),
             imbalance_threshold=self.ui.activePowerImbalanceSpinBox.value() / 100.0,
             v_low=self.ui.genVsetMinSpinBox.value(),
             v_high=self.ui.genVsetMaxSpinBox.value(),
@@ -72,7 +61,10 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
             branch_connection_voltage_tolerance=self.ui.lineNominalVoltageToleranceSpinBox.value() / 100.0,
             min_vcc=self.ui.transformerVccMinSpinBox.value(),
             max_vcc=self.ui.transformerVccMaxSpinBox.value(),
-            logger=self.log)
+            branch_x_threshold=1e-4,
+            condition_number_threshold=1e-4,
+            logger=self.log
+        )
 
         # set logs
         self.ui.logsTreeView.setModel(self.log.get_model())
@@ -82,7 +74,6 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
         Fix all detected fixable errors
         :return:
         """
-        print('Fixing issues...')
         logger = Logger()
         for fixable_err in self.fixable_errors:
             fixable_err.fix(logger=logger,

gridcal-5.3.2/GridCal/Gui/Analysis/__init__.py

@@ -0,0 +1,4 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/Gui/Analysis/gui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'gui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.1
+## Created by: Qt User Interface Compiler version 6.7.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -29,17 +29,17 @@ class Ui_MainWindow(object):
             MainWindow.setObjectName(u"MainWindow")
         MainWindow.resize(912, 540)
         icon = QIcon()
-        icon.addFile(u":/icons/icons/inputs_analysis 2.svg", QSize(), QIcon.Normal, QIcon.Off)
+        icon.addFile(u":/icons/icons/inputs_analysis 2.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         MainWindow.setWindowIcon(icon)
         self.actionSave_diagnostic = QAction(MainWindow)
         self.actionSave_diagnostic.setObjectName(u"actionSave_diagnostic")
         icon1 = QIcon()
-        icon1.addFile(u":/icons/icons/savec.svg", QSize(), QIcon.Normal, QIcon.Off)
+        icon1.addFile(u":/icons/icons/savec.svg", 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.svg", QSize(), QIcon.Normal, QIcon.Off)
+        icon2.addFile(u":/icons/icons/fix.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.actionFix_issues.setIcon(icon2)
         self.actionAnalyze = QAction(MainWindow)
         self.actionAnalyze.setObjectName(u"actionAnalyze")
@@ -152,7 +152,7 @@ class Ui_MainWindow(object):
 
         self.gridLayout.addWidget(self.label_11, 2, 0, 1, 1)
 
-        self.verticalSpacer = QSpacerItem(20, 94, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer = QSpacerItem(20, 94, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout.addItem(self.verticalSpacer, 15, 1, 1, 2)
 
@@ -222,12 +222,6 @@ class Ui_MainWindow(object):
 
         self.gridLayout.addWidget(self.label_6, 9, 0, 1, 1)
 
-        self.fixTimeSeriesCheckBox = QCheckBox(self.frame)
-        self.fixTimeSeriesCheckBox.setObjectName(u"fixTimeSeriesCheckBox")
-        self.fixTimeSeriesCheckBox.setChecked(True)
-
-        self.gridLayout.addWidget(self.fixTimeSeriesCheckBox, 16, 1, 1, 2)
-
         self.genVsetMaxSpinBox = QDoubleSpinBox(self.frame)
         self.genVsetMaxSpinBox.setObjectName(u"genVsetMaxSpinBox")
         self.genVsetMaxSpinBox.setValue(1.050000000000000)
@@ -255,6 +249,12 @@ class Ui_MainWindow(object):
 
         self.gridLayout.addWidget(self.transformerTapModuleMaxSpinBox, 5, 2, 1, 1)
 
+        self.fixTimeSeriesCheckBox = QCheckBox(self.frame)
+        self.fixTimeSeriesCheckBox.setObjectName(u"fixTimeSeriesCheckBox")
+        self.fixTimeSeriesCheckBox.setChecked(True)
+
+        self.gridLayout.addWidget(self.fixTimeSeriesCheckBox, 16, 0, 1, 3)
+
 
         self.horizontalLayout.addWidget(self.frame)
 
@@ -269,7 +269,7 @@ class Ui_MainWindow(object):
 
         self.gridLayout_2.addWidget(self.label_8, 1, 0, 1, 1)
 
-        self.verticalSpacer_2 = QSpacerItem(20, 373, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer_2 = QSpacerItem(20, 373, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout_2.addItem(self.verticalSpacer_2, 3, 0, 1, 1)
 
@@ -301,12 +301,12 @@ class Ui_MainWindow(object):
 
         self.horizontalLayout.addWidget(self.frame_2)
 
-        self.horizontalSpacer = QSpacerItem(565, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+        self.horizontalSpacer = QSpacerItem(565, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout.addItem(self.horizontalSpacer)
 
         icon3 = QIcon()
-        icon3.addFile(u":/icons/icons/gear.svg", QSize(), QIcon.Normal, QIcon.Off)
+        icon3.addFile(u":/icons/icons/gear.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.tabWidget.addTab(self.tab_2, icon3, "")
 
         self.verticalLayout_2.addWidget(self.tabWidget)
@@ -318,7 +318,7 @@ class Ui_MainWindow(object):
         self.toolBar = QToolBar(MainWindow)
         self.toolBar.setObjectName(u"toolBar")
         self.toolBar.setMovable(False)
-        MainWindow.addToolBar(Qt.TopToolBarArea, self.toolBar)
+        MainWindow.addToolBar(Qt.ToolBarArea.TopToolBarArea, self.toolBar)
 
         self.toolBar.addAction(self.actionAnalyze)
         self.toolBar.addAction(self.actionFix_issues)
@@ -367,8 +367,8 @@ class Ui_MainWindow(object):
         self.label_13.setText("")
         self.label_14.setText(QCoreApplication.translate("MainWindow", u"Lines", None))
         self.label_6.setText(QCoreApplication.translate("MainWindow", u"Virtual tap tolerance", None))
-        self.fixTimeSeriesCheckBox.setText(QCoreApplication.translate("MainWindow", u"Fix time series values", None))
         self.transformerVccMinSpinBox.setSuffix(QCoreApplication.translate("MainWindow", u" %", None))
+        self.fixTimeSeriesCheckBox.setText(QCoreApplication.translate("MainWindow", u"Analyze / Fix time series values", None))
         self.label_8.setText(QCoreApplication.translate("MainWindow", u"Active power imbalance", None))
         self.label_16.setText(QCoreApplication.translate("MainWindow", u"System", None))
         self.activePowerImbalanceSpinBox.setSuffix(QCoreApplication.translate("MainWindow", u" %", None))

{GridCal-5.0.18 → gridcal-5.3.2}/GridCal/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.5.1
+# Created by: The Resource Compiler for Qt version 6.7.2
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore