Merge branch 'devel'

# Conflicts:
#	.idea/workspace.xml

src/GridCal/Gui/LoadDesigner/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.5.3
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore

src/GridCal/Gui/LoadDesigner/load_designer.py

@@ -1,12 +1,25 @@
-
+# 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/>.
 import sys
 import numpy as np
 import pandas as pd
 from datetime import timedelta
 from PySide6.QtWidgets import QApplication
 from PySide6 import QtCore, QtWidgets
 
-from GridCal.Gui.LoadDesigner.gui import Ui_Dialog
+from GridCal.Gui.LoadDesigner.load_designer_ui import Ui_Dialog
 
 
 class LoadPointsModel(QtCore.QAbstractTableModel):

src/GridCal/Gui/LoadDesigner/gui.py → src/GridCal/Gui/LoadDesigner/load_designer_ui.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 ################################################################################
-## Form generated from reading UI file 'gui.ui'
+## Form generated from reading UI file 'load_designer_ui.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.1
+## Created by: Qt User Interface Compiler version 6.5.3
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/GridCal/Gui/LoadDesigner/update_gui_file.py

@@ -5,5 +5,5 @@
 
 if __name__ == '__main__':
     convert_resource_file(source='icons.qrc')
-    for f in ['gui.ui']:
-        convert_ui_file(source=f)
+    for f in ['load_designer_ui.ui']:
+        convert_ui_file(source=f)

src/GridCal/Gui/Main/ConsoleLog.py

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

src/GridCal/Gui/Main/MainWindow.ui

@@ -8802,6 +8802,7 @@ QProgressBar::chunk{
     <addaction name="actionProcess_topology"/>
     <addaction name="actionFuse_devices"/>
     <addaction name="actionre_index_time"/>
+    <addaction name="actionScale"/>
     <addaction name="separator"/>
     <addaction name="actionLaunch_data_analysis_tool"/>
     <addaction name="actionFix_generators_active_based_on_the_power"/>
@@ -9930,6 +9931,18 @@ QProgressBar::chunk{
     <string>Select buses by country</string>
    </property>
   </action>
+  <action name="actionScale">
+   <property name="icon">
+    <iconset resource="icons.qrc">
+     <normaloff>:/Icons/icons/scale.svg</normaloff>:/Icons/icons/scale.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Scale</string>
+   </property>
+   <property name="toolTip">
+    <string>Scale the system load and or generation</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="icons.qrc"/>

src/GridCal/Gui/Main/SubClasses/Model/objects.py

@@ -33,6 +33,7 @@
 from GridCal.Gui.TowerBuilder.LineBuilderDialogue import TowerBuilderGUI
 from GridCal.Gui.GeneralDialogues import LogsDialogue
 from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+from GridCal.Gui.SystemScaler.system_scaler import SystemScaler
 
 
 class ObjectsTableMain(DiagramsMain):
@@ -74,6 +75,7 @@ def __init__(self, parent=None):
         # menu trigger
         self.ui.actionDelete_inconsistencies.triggered.connect(self.delete_inconsistencies)
         self.ui.actionClean_database.triggered.connect(self.clean_database)
+        self.ui.actionScale.triggered.connect(self.scale)
 
         # tree click
         self.ui.dataStructuresTreeView.clicked.connect(self.view_objects_data)
@@ -1003,3 +1005,11 @@ def clean_database(self):
             if len(logger) > 0:
                 dlg = LogsDialogue('DB clean logger', logger)
                 dlg.exec()
+
+    def scale(self):
+        """
+        Show the system scaler window
+        The scaler window may modify the circuit
+        """
+        system_scaler_window = SystemScaler(grid=self.circuit, parent=self)
+        system_scaler_window.exec()

src/GridCal/Gui/Main/icons.qrc

@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="Icons">
+    <file>icons/scale.svg</file>
     <file>icons/time_series set.svg</file>
     <file>icons/time_series span.svg</file>
     <file>icons/time_series.svg</file>