GridCal 5.1.25__tar.gz → 5.1.26__tar.gz

{GridCal-5.1.25 → GridCal-5.1.26}/GridCal/Gui/Analysis/AnalysisDialogue.py

@@ -27,7 +27,7 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
     """
     GridAnalysisGUI
     """
-    def __init__(self, circuit: MultiCircuit = None):
+    def __init__(self, circuit: MultiCircuit):
         """
 
         :param circuit: MultiCircuit
@@ -72,7 +72,8 @@ 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)
+            logger=self.log
+        )
 
         # set logs
         self.ui.logsTreeView.setModel(self.log.get_model())
@@ -82,7 +83,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.1.25 → GridCal-5.1.26}/GridCal/Gui/Analysis/object_plot_analysis.py

@@ -379,6 +379,14 @@ def analyze_lines(elements: List[Line],
                        propty="bus_to",
                        message="The bus to is None")
 
+        if elm.bus_to == elm.bus_from:
+            logger.add(object_type=elm.device_type.value,
+                       element_name=elm,
+                       element_index=i,
+                       severity=LogSeverity.Error,
+                       propty="bus_from, bus_to",
+                       message="Branch connected in loop (bus_from = bus_to)")
+
         if V1 > 0 and V2 > 0:
             per = V1 / V2
             if per < (1.0 - branch_connection_voltage_tolerance):
@@ -530,6 +538,14 @@ def analyze_transformers(elements: List[Transformer2W],
                        propty="bus_to",
                        message="The bus to is None")
 
+        if elm.bus_to == elm.bus_from:
+            logger.add(object_type=elm.device_type.value,
+                       element_name=elm,
+                       element_index=i,
+                       severity=LogSeverity.Error,
+                       propty="bus_from, bus_to",
+                       message="Branch connected in loop (bus_from = bus_to)")
+
         if elm.name == '':
             logger.add(object_type=object_type.value,
                        element_name=elm.name,
@@ -1168,6 +1184,18 @@ def grid_analysis(circuit: MultiCircuit,
                          logger=logger,
                          fixable_errors=fixable_errors)
 
+    analyze_transformers(elements=circuit.get_windings(),
+                         object_type=DeviceType.WindingDevice,
+                         transformer_virtual_tap_tolerance=transformer_virtual_tap_tolerance,
+                         eps_min=eps_min,
+                         eps_max=eps_max,
+                         min_vcc=min_vcc,
+                         max_vcc=max_vcc,
+                         tap_min=tap_min,
+                         tap_max=tap_max,
+                         logger=logger,
+                         fixable_errors=fixable_errors)
+
     Pgg, Pgg_prof = analyze_generators(elements=circuit.get_generators(),
                                        object_type=DeviceType.GeneratorDevice,
                                        time_profile=circuit.get_time_array(),

{GridCal-5.1.25 → GridCal-5.1.26}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -4386,21 +4386,6 @@ def generate_schematic_diagram(buses: List[Bus],
     add_devices_list(cls="fluid_paths", dev_lst=fluid_paths)
 
     # --------------------------------------------------------------------------------------------------------------
-    # if text_func is not None:
-    #     text_func('Creating schematic transformer3w devices')
-    #
-    # nn = len(transformers3w)
-    # for i, elm in enumerate(transformers3w):
-    #
-    #     if prog_func is not None:
-    #         prog_func((i + 1) / nn * 100.0)
-    #
-    #     x = int(elm.x * explode_factor)
-    #     y = int(elm.y * explode_factor)
-    #     diagram.set_point(device=elm, location=GraphicLocation(x=x, y=y))
-    #     diagram.set_point(device=elm.winding1, location=GraphicLocation())
-    #     diagram.set_point(device=elm.winding2, location=GraphicLocation())
-    #     diagram.set_point(device=elm.winding3, location=GraphicLocation())
 
     return diagram
 
@@ -4434,7 +4419,7 @@ List[FluidPath]]:
     bus_dict = circuit.get_bus_index_dict()
 
     # get all Branches
-    all_branches = circuit.get_branches()
+    all_branches = circuit.get_branches() + circuit.get_switches()
     branch_dict = {b: i for i, b in enumerate(all_branches)}
 
     # create a pool of buses
@@ -4519,7 +4504,7 @@ List[FluidPath]]:
             switches.append(obj)
 
         else:
-            raise Exception('Unrecognized branch type ' + obj.device_type.value)
+            raise Exception(f'Unrecognized branch type {obj.device_type.value}')
 
     return (list(buses), list(busbars), list(cns), lines, dc_lines, transformers2w, transformers3w,
             windings, hvdc_lines, vsc_converters, upfc_devices, series_reactances, switches,

{GridCal-5.1.25 → GridCal-5.1.26}/GridCal/Gui/Main/MainWindow.py

@@ -3582,62 +3582,35 @@ class Ui_mainWindow(object):
         self.gridLayout_21 = QGridLayout(self.frame_18)
         self.gridLayout_21.setObjectName(u"gridLayout_21")
         self.gridLayout_21.setContentsMargins(-1, 0, -1, -1)
-        self.investment_evaluation_method_ComboBox = QComboBox(self.frame_18)
-        self.investment_evaluation_method_ComboBox.setObjectName(u"investment_evaluation_method_ComboBox")
-        self.investment_evaluation_method_ComboBox.setFont(font1)
-
-        self.gridLayout_21.addWidget(self.investment_evaluation_method_ComboBox, 24, 2, 1, 1)
-
-        self.label_94 = QLabel(self.frame_18)
-        self.label_94.setObjectName(u"label_94")
-        self.label_94.setMinimumSize(QSize(24, 24))
-        self.label_94.setMaximumSize(QSize(24, 24))
-        self.label_94.setPixmap(QPixmap(u":/Icons/icons/clustering.svg"))
-        self.label_94.setScaledContents(True)
-
-        self.gridLayout_21.addWidget(self.label_94, 8, 0, 1, 1)
-
-        self.label_61 = QLabel(self.frame_18)
-        self.label_61.setObjectName(u"label_61")
-        self.label_61.setFont(font1)
+        self.label_31 = QLabel(self.frame_18)
+        self.label_31.setObjectName(u"label_31")
 
-        self.gridLayout_21.addWidget(self.label_61, 17, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_31, 20, 0, 1, 1)
 
-        self.label_121 = QLabel(self.frame_18)
-        self.label_121.setObjectName(u"label_121")
+        self.line_24 = QFrame(self.frame_18)
+        self.line_24.setObjectName(u"line_24")
         palette28 = QPalette()
-        palette28.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette28.setBrush(QPalette.Inactive, QPalette.WindowText, brush)
+        palette28.setBrush(QPalette.Active, QPalette.WindowText, brush3)
+        palette28.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
         palette28.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.label_121.setPalette(palette28)
-        self.label_121.setFont(font4)
-        self.label_121.setAlignment(Qt.AlignBottom|Qt.AlignLeading|Qt.AlignLeft)
+        self.line_24.setPalette(palette28)
+        self.line_24.setFrameShadow(QFrame.Plain)
+        self.line_24.setLineWidth(4)
+        self.line_24.setFrameShape(QFrame.Shape.HLine)
 
-        self.gridLayout_21.addWidget(self.label_121, 21, 1, 1, 2)
+        self.gridLayout_21.addWidget(self.line_24, 14, 0, 1, 3)
 
-        self.label_89 = QLabel(self.frame_18)
-        self.label_89.setObjectName(u"label_89")
+        self.label_121 = QLabel(self.frame_18)
+        self.label_121.setObjectName(u"label_121")
         palette29 = QPalette()
         palette29.setBrush(QPalette.Active, QPalette.WindowText, brush)
         palette29.setBrush(QPalette.Inactive, QPalette.WindowText, brush)
         palette29.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.label_89.setPalette(palette29)
-        self.label_89.setFont(font4)
-        self.label_89.setAlignment(Qt.AlignBottom|Qt.AlignLeading|Qt.AlignLeft)
-
-        self.gridLayout_21.addWidget(self.label_89, 13, 1, 1, 2)
-
-        self.label_33 = QLabel(self.frame_18)
-        self.label_33.setObjectName(u"label_33")
-        self.label_33.setFont(font1)
-
-        self.gridLayout_21.addWidget(self.label_33, 10, 0, 1, 2)
-
-        self.label_3 = QLabel(self.frame_18)
-        self.label_3.setObjectName(u"label_3")
-        self.label_3.setFont(font1)
+        self.label_121.setPalette(palette29)
+        self.label_121.setFont(font4)
+        self.label_121.setAlignment(Qt.AlignBottom|Qt.AlignLeading|Qt.AlignLeft)
 
-        self.gridLayout_21.addWidget(self.label_3, 24, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_121, 21, 1, 1, 2)
 
         self.line_29 = QFrame(self.frame_18)
         self.line_29.setObjectName(u"line_29")
@@ -3652,41 +3625,91 @@ class Ui_mainWindow(object):
 
         self.gridLayout_21.addWidget(self.line_29, 9, 0, 1, 3)
 
+        self.node_distances_elements_spinBox = QSpinBox(self.frame_18)
+        self.node_distances_elements_spinBox.setObjectName(u"node_distances_elements_spinBox")
+        self.node_distances_elements_spinBox.setFont(font1)
+        self.node_distances_elements_spinBox.setMinimum(1)
+        self.node_distances_elements_spinBox.setMaximum(99999)
+        self.node_distances_elements_spinBox.setValue(2)
+
+        self.gridLayout_21.addWidget(self.node_distances_elements_spinBox, 17, 2, 1, 1)
+
+        self.label_89 = QLabel(self.frame_18)
+        self.label_89.setObjectName(u"label_89")
+        palette31 = QPalette()
+        palette31.setBrush(QPalette.Active, QPalette.WindowText, brush)
+        palette31.setBrush(QPalette.Inactive, QPalette.WindowText, brush)
+        palette31.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.label_89.setPalette(palette31)
+        self.label_89.setFont(font4)
+        self.label_89.setAlignment(Qt.AlignBottom|Qt.AlignLeading|Qt.AlignLeft)
+
+        self.gridLayout_21.addWidget(self.label_89, 13, 1, 1, 2)
+
+        self.internal_investment_methods_radioButton = QRadioButton(self.frame_18)
+        self.internal_investment_methods_radioButton.setObjectName(u"internal_investment_methods_radioButton")
+        self.internal_investment_methods_radioButton.setFont(font1)
+        self.internal_investment_methods_radioButton.setChecked(True)
+
+        self.gridLayout_21.addWidget(self.internal_investment_methods_radioButton, 25, 0, 1, 3)
+
+        self.label_88 = QLabel(self.frame_18)
+        self.label_88.setObjectName(u"label_88")
+        self.label_88.setMinimumSize(QSize(24, 24))
+        self.label_88.setMaximumSize(QSize(24, 24))
+        self.label_88.setPixmap(QPixmap(u":/Icons/icons/color_grid.svg"))
+        self.label_88.setScaledContents(True)
+
+        self.gridLayout_21.addWidget(self.label_88, 13, 0, 1, 1)
+
+        self.cluster_number_spinBox = QSpinBox(self.frame_18)
+        self.cluster_number_spinBox.setObjectName(u"cluster_number_spinBox")
+        self.cluster_number_spinBox.setFont(font1)
+        self.cluster_number_spinBox.setMinimum(1)
+        self.cluster_number_spinBox.setMaximum(999999)
+        self.cluster_number_spinBox.setValue(200)
+
+        self.gridLayout_21.addWidget(self.cluster_number_spinBox, 10, 2, 1, 1)
+
         self.label_44 = QLabel(self.frame_18)
         self.label_44.setObjectName(u"label_44")
 
         self.gridLayout_21.addWidget(self.label_44, 18, 0, 1, 2)
 
-        self.line_30 = QFrame(self.frame_18)
-        self.line_30.setObjectName(u"line_30")
-        palette31 = QPalette()
-        palette31.setBrush(QPalette.Active, QPalette.WindowText, brush3)
-        palette31.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
-        palette31.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.line_30.setPalette(palette31)
-        self.line_30.setFrameShadow(QFrame.Plain)
-        self.line_30.setLineWidth(4)
-        self.line_30.setFrameShape(QFrame.Shape.HLine)
+        self.plugins_investment_methods_radioButton = QRadioButton(self.frame_18)
+        self.plugins_investment_methods_radioButton.setObjectName(u"plugins_investment_methods_radioButton")
+        self.plugins_investment_methods_radioButton.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.line_30, 22, 0, 1, 3)
+        self.gridLayout_21.addWidget(self.plugins_investment_methods_radioButton, 29, 0, 1, 3)
 
-        self.label_31 = QLabel(self.frame_18)
-        self.label_31.setObjectName(u"label_31")
+        self.label_7 = QLabel(self.frame_18)
+        self.label_7.setObjectName(u"label_7")
 
-        self.gridLayout_21.addWidget(self.label_31, 20, 0, 1, 1)
+        self.gridLayout_21.addWidget(self.label_7, 12, 0, 1, 2)
 
-        self.node_distances_sigma_doubleSpinBox = QDoubleSpinBox(self.frame_18)
-        self.node_distances_sigma_doubleSpinBox.setObjectName(u"node_distances_sigma_doubleSpinBox")
-        self.node_distances_sigma_doubleSpinBox.setFont(font1)
-        self.node_distances_sigma_doubleSpinBox.setDecimals(6)
-        self.node_distances_sigma_doubleSpinBox.setSingleStep(0.010000000000000)
-        self.node_distances_sigma_doubleSpinBox.setValue(0.750000000000000)
+        self.label_153 = QLabel(self.frame_18)
+        self.label_153.setObjectName(u"label_153")
+        self.label_153.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.node_distances_sigma_doubleSpinBox, 16, 2, 1, 1)
+        self.gridLayout_21.addWidget(self.label_153, 28, 0, 1, 2)
 
-        self.verticalSpacer_16 = QSpacerItem(20, 250, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        self.plugins_investment_evaluation_method_ComboBox = QComboBox(self.frame_18)
+        self.plugins_investment_evaluation_method_ComboBox.setObjectName(u"plugins_investment_evaluation_method_ComboBox")
+        self.plugins_investment_evaluation_method_ComboBox.setFont(font1)
 
-        self.gridLayout_21.addItem(self.verticalSpacer_16, 31, 1, 1, 1)
+        self.gridLayout_21.addWidget(self.plugins_investment_evaluation_method_ComboBox, 30, 2, 1, 1)
+
+        self.label_33 = QLabel(self.frame_18)
+        self.label_33.setObjectName(u"label_33")
+        self.label_33.setFont(font1)
+
+        self.gridLayout_21.addWidget(self.label_33, 10, 0, 1, 2)
+
+        self.investment_evaluation_objfunc_ComboBox = QComboBox(self.frame_18)
+        self.investment_evaluation_objfunc_ComboBox.setObjectName(u"investment_evaluation_objfunc_ComboBox")
+        self.investment_evaluation_objfunc_ComboBox.setFont(font1)
+
+        self.gridLayout_21.addWidget(self.investment_evaluation_objfunc_ComboBox, 28, 2, 1, 1)
 
         self.frame_59 = QFrame(self.frame_18)
         self.frame_59.setObjectName(u"frame_59")
@@ -3710,72 +3733,67 @@ class Ui_mainWindow(object):
 
         self.gridLayout_21.addWidget(self.frame_59, 8, 1, 1, 1)
 
-        self.node_distances_elements_spinBox = QSpinBox(self.frame_18)
-        self.node_distances_elements_spinBox.setObjectName(u"node_distances_elements_spinBox")
-        self.node_distances_elements_spinBox.setFont(font1)
-        self.node_distances_elements_spinBox.setMinimum(1)
-        self.node_distances_elements_spinBox.setMaximum(99999)
-        self.node_distances_elements_spinBox.setValue(2)
-
-        self.gridLayout_21.addWidget(self.node_distances_elements_spinBox, 17, 2, 1, 1)
-
-        self.label_38 = QLabel(self.frame_18)
-        self.label_38.setObjectName(u"label_38")
-        self.label_38.setFont(font1)
+        self.node_distances_sigma_doubleSpinBox = QDoubleSpinBox(self.frame_18)
+        self.node_distances_sigma_doubleSpinBox.setObjectName(u"node_distances_sigma_doubleSpinBox")
+        self.node_distances_sigma_doubleSpinBox.setFont(font1)
+        self.node_distances_sigma_doubleSpinBox.setDecimals(6)
+        self.node_distances_sigma_doubleSpinBox.setSingleStep(0.010000000000000)
+        self.node_distances_sigma_doubleSpinBox.setValue(0.750000000000000)
 
-        self.gridLayout_21.addWidget(self.label_38, 16, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.node_distances_sigma_doubleSpinBox, 16, 2, 1, 1)
 
-        self.label_7 = QLabel(self.frame_18)
-        self.label_7.setObjectName(u"label_7")
+        self.label_61 = QLabel(self.frame_18)
+        self.label_61.setObjectName(u"label_61")
+        self.label_61.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.label_7, 12, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_61, 17, 0, 1, 2)
 
-        self.line_24 = QFrame(self.frame_18)
-        self.line_24.setObjectName(u"line_24")
-        palette33 = QPalette()
-        palette33.setBrush(QPalette.Active, QPalette.WindowText, brush3)
-        palette33.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
-        palette33.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.line_24.setPalette(palette33)
-        self.line_24.setFrameShadow(QFrame.Plain)
-        self.line_24.setLineWidth(4)
-        self.line_24.setFrameShape(QFrame.Shape.HLine)
+        self.max_investments_evluation_number_spinBox = QSpinBox(self.frame_18)
+        self.max_investments_evluation_number_spinBox.setObjectName(u"max_investments_evluation_number_spinBox")
+        self.max_investments_evluation_number_spinBox.setFont(font1)
+        self.max_investments_evluation_number_spinBox.setMinimum(1)
+        self.max_investments_evluation_number_spinBox.setMaximum(999999999)
+        self.max_investments_evluation_number_spinBox.setValue(4)
 
-        self.gridLayout_21.addWidget(self.line_24, 14, 0, 1, 3)
+        self.gridLayout_21.addWidget(self.max_investments_evluation_number_spinBox, 23, 2, 1, 1)
 
-        self.investment_evaluation_objfunc_ComboBox = QComboBox(self.frame_18)
-        self.investment_evaluation_objfunc_ComboBox.setObjectName(u"investment_evaluation_objfunc_ComboBox")
-        self.investment_evaluation_objfunc_ComboBox.setFont(font1)
+        self.label_94 = QLabel(self.frame_18)
+        self.label_94.setObjectName(u"label_94")
+        self.label_94.setMinimumSize(QSize(24, 24))
+        self.label_94.setMaximumSize(QSize(24, 24))
+        self.label_94.setPixmap(QPixmap(u":/Icons/icons/clustering.svg"))
+        self.label_94.setScaledContents(True)
 
-        self.gridLayout_21.addWidget(self.investment_evaluation_objfunc_ComboBox, 26, 2, 1, 1)
+        self.gridLayout_21.addWidget(self.label_94, 8, 0, 1, 1)
 
-        self.cluster_number_spinBox = QSpinBox(self.frame_18)
-        self.cluster_number_spinBox.setObjectName(u"cluster_number_spinBox")
-        self.cluster_number_spinBox.setFont(font1)
-        self.cluster_number_spinBox.setMinimum(1)
-        self.cluster_number_spinBox.setMaximum(999999)
-        self.cluster_number_spinBox.setValue(200)
+        self.verticalSpacer_16 = QSpacerItem(20, 250, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
-        self.gridLayout_21.addWidget(self.cluster_number_spinBox, 10, 2, 1, 1)
+        self.gridLayout_21.addItem(self.verticalSpacer_16, 33, 1, 1, 1)
 
-        self.label_51 = QLabel(self.frame_18)
-        self.label_51.setObjectName(u"label_51")
-        self.label_51.setFont(font1)
+        self.label_83 = QLabel(self.frame_18)
+        self.label_83.setObjectName(u"label_83")
+        self.label_83.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.label_51, 29, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_83, 30, 0, 1, 2)
 
-        self.internal_investment_methods_radioButton = QRadioButton(self.frame_18)
-        self.internal_investment_methods_radioButton.setObjectName(u"internal_investment_methods_radioButton")
-        self.internal_investment_methods_radioButton.setFont(font1)
-        self.internal_investment_methods_radioButton.setChecked(True)
+        self.line_30 = QFrame(self.frame_18)
+        self.line_30.setObjectName(u"line_30")
+        palette33 = QPalette()
+        palette33.setBrush(QPalette.Active, QPalette.WindowText, brush3)
+        palette33.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
+        palette33.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.line_30.setPalette(palette33)
+        self.line_30.setFrameShadow(QFrame.Plain)
+        self.line_30.setLineWidth(4)
+        self.line_30.setFrameShape(QFrame.Shape.HLine)
 
-        self.gridLayout_21.addWidget(self.internal_investment_methods_radioButton, 23, 0, 1, 3)
+        self.gridLayout_21.addWidget(self.line_30, 22, 0, 1, 3)
 
-        self.label_153 = QLabel(self.frame_18)
-        self.label_153.setObjectName(u"label_153")
-        self.label_153.setFont(font1)
+        self.label_38 = QLabel(self.frame_18)
+        self.label_38.setObjectName(u"label_38")
+        self.label_38.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.label_153, 26, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_38, 16, 0, 1, 2)
 
         self.label_120 = QLabel(self.frame_18)
         self.label_120.setObjectName(u"label_120")
@@ -3786,41 +3804,28 @@ class Ui_mainWindow(object):
 
         self.gridLayout_21.addWidget(self.label_120, 21, 0, 1, 1)
 
-        self.max_investments_evluation_number_spinBox = QSpinBox(self.frame_18)
-        self.max_investments_evluation_number_spinBox.setObjectName(u"max_investments_evluation_number_spinBox")
-        self.max_investments_evluation_number_spinBox.setFont(font1)
-        self.max_investments_evluation_number_spinBox.setMinimum(1)
-        self.max_investments_evluation_number_spinBox.setMaximum(999999999)
-        self.max_investments_evluation_number_spinBox.setValue(4)
-
-        self.gridLayout_21.addWidget(self.max_investments_evluation_number_spinBox, 29, 2, 1, 1)
-
-        self.label_88 = QLabel(self.frame_18)
-        self.label_88.setObjectName(u"label_88")
-        self.label_88.setMinimumSize(QSize(24, 24))
-        self.label_88.setMaximumSize(QSize(24, 24))
-        self.label_88.setPixmap(QPixmap(u":/Icons/icons/color_grid.svg"))
-        self.label_88.setScaledContents(True)
+        self.label_3 = QLabel(self.frame_18)
+        self.label_3.setObjectName(u"label_3")
+        self.label_3.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.label_88, 13, 0, 1, 1)
+        self.gridLayout_21.addWidget(self.label_3, 26, 0, 1, 2)
 
-        self.plugins_investment_methods_radioButton = QRadioButton(self.frame_18)
-        self.plugins_investment_methods_radioButton.setObjectName(u"plugins_investment_methods_radioButton")
-        self.plugins_investment_methods_radioButton.setFont(font1)
+        self.investment_evaluation_method_ComboBox = QComboBox(self.frame_18)
+        self.investment_evaluation_method_ComboBox.setObjectName(u"investment_evaluation_method_ComboBox")
+        self.investment_evaluation_method_ComboBox.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.plugins_investment_methods_radioButton, 27, 0, 1, 3)
+        self.gridLayout_21.addWidget(self.investment_evaluation_method_ComboBox, 26, 2, 1, 1)
 
-        self.label_83 = QLabel(self.frame_18)
-        self.label_83.setObjectName(u"label_83")
-        self.label_83.setFont(font1)
+        self.label_87 = QLabel(self.frame_18)
+        self.label_87.setObjectName(u"label_87")
 
-        self.gridLayout_21.addWidget(self.label_83, 28, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_87, 24, 0, 1, 2)
 
-        self.plugins_investment_evaluation_method_ComboBox = QComboBox(self.frame_18)
-        self.plugins_investment_evaluation_method_ComboBox.setObjectName(u"plugins_investment_evaluation_method_ComboBox")
-        self.plugins_investment_evaluation_method_ComboBox.setFont(font1)
+        self.label_51 = QLabel(self.frame_18)
+        self.label_51.setObjectName(u"label_51")
+        self.label_51.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.plugins_investment_evaluation_method_ComboBox, 28, 2, 1, 1)
+        self.gridLayout_21.addWidget(self.label_51, 23, 0, 1, 2)
 
 
         self.horizontalLayout_6.addWidget(self.frame_18)
@@ -5576,22 +5581,8 @@ class Ui_mainWindow(object):
 #if QT_CONFIG(tooltip)
         self.ml_tab.setToolTip(QCoreApplication.translate("mainWindow", u"Machine-learning related settings", None))
 #endif // QT_CONFIG(tooltip)
-#if QT_CONFIG(tooltip)
-        self.investment_evaluation_method_ComboBox.setToolTip(QCoreApplication.translate("mainWindow", u"Select the investment evaluation method", None))
-#endif // QT_CONFIG(tooltip)
-        self.label_94.setText("")
-        self.label_61.setText(QCoreApplication.translate("mainWindow", u"Min. group size", None))
-        self.label_121.setText(QCoreApplication.translate("mainWindow", u"Investment evaluation", None))
-        self.label_89.setText(QCoreApplication.translate("mainWindow", u"Node grouping", None))
-        self.label_33.setText(QCoreApplication.translate("mainWindow", u"Number of clusters", None))
-        self.label_3.setText(QCoreApplication.translate("mainWindow", u"Method", None))
-        self.label_44.setText("")
         self.label_31.setText("")
-#if QT_CONFIG(tooltip)
-        self.node_distances_sigma_doubleSpinBox.setToolTip(QCoreApplication.translate("mainWindow", u"M\u00e1ximum standard deviation to determine the groups", None))
-#endif // QT_CONFIG(tooltip)
-        self.node_distances_sigma_doubleSpinBox.setSuffix(QCoreApplication.translate("mainWindow", u" \u03c3", None))
-        self.label_93.setText(QCoreApplication.translate("mainWindow", u"Clustering", None))
+        self.label_121.setText(QCoreApplication.translate("mainWindow", u"Investment evaluation", None))
 #if QT_CONFIG(tooltip)
         self.node_distances_elements_spinBox.setToolTip(QCoreApplication.translate("mainWindow", u"Minimum size of the group", None))
 #endif // QT_CONFIG(tooltip)
@@ -5599,23 +5590,38 @@ class Ui_mainWindow(object):
         self.node_distances_elements_spinBox.setStatusTip("")
 #endif // QT_CONFIG(statustip)
         self.node_distances_elements_spinBox.setSuffix(QCoreApplication.translate("mainWindow", u" elements", None))
-        self.label_38.setText(QCoreApplication.translate("mainWindow", u"Nodal distances", None))
-        self.label_7.setText("")
+        self.label_89.setText(QCoreApplication.translate("mainWindow", u"Node grouping", None))
+        self.internal_investment_methods_radioButton.setText(QCoreApplication.translate("mainWindow", u"Internal method", None))
+        self.label_88.setText("")
 #if QT_CONFIG(tooltip)
         self.cluster_number_spinBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Number of clusters, this affects all the simulations that deal with clustering</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
         self.cluster_number_spinBox.setSuffix(QCoreApplication.translate("mainWindow", u" Clusters", None))
-        self.label_51.setText(QCoreApplication.translate("mainWindow", u"Maximum evaluations", None))
-        self.internal_investment_methods_radioButton.setText(QCoreApplication.translate("mainWindow", u"Internal method", None))
+        self.label_44.setText("")
+        self.plugins_investment_methods_radioButton.setText(QCoreApplication.translate("mainWindow", u"Plugin method", None))
+        self.label_7.setText("")
         self.label_153.setText(QCoreApplication.translate("mainWindow", u"Objective function", None))
-        self.label_120.setText("")
+        self.label_33.setText(QCoreApplication.translate("mainWindow", u"Number of clusters", None))
+        self.label_93.setText(QCoreApplication.translate("mainWindow", u"Clustering", None))
+#if QT_CONFIG(tooltip)
+        self.node_distances_sigma_doubleSpinBox.setToolTip(QCoreApplication.translate("mainWindow", u"M\u00e1ximum standard deviation to determine the groups", None))
+#endif // QT_CONFIG(tooltip)
+        self.node_distances_sigma_doubleSpinBox.setSuffix(QCoreApplication.translate("mainWindow", u" \u03c3", None))
+        self.label_61.setText(QCoreApplication.translate("mainWindow", u"Min. group size", None))
 #if QT_CONFIG(tooltip)
         self.max_investments_evluation_number_spinBox.setToolTip(QCoreApplication.translate("mainWindow", u"Number of maximum evaluations for the optimization methods", None))
 #endif // QT_CONFIG(tooltip)
         self.max_investments_evluation_number_spinBox.setSuffix(QCoreApplication.translate("mainWindow", u" x number of investments", None))
-        self.label_88.setText("")
-        self.plugins_investment_methods_radioButton.setText(QCoreApplication.translate("mainWindow", u"Plugin method", None))
-        self.label_83.setText(QCoreApplication.translate("mainWindow", u"Plugin", None))
+        self.label_94.setText("")
+        self.label_83.setText(QCoreApplication.translate("mainWindow", u"Method", None))
+        self.label_38.setText(QCoreApplication.translate("mainWindow", u"Nodal distances", None))
+        self.label_120.setText("")
+        self.label_3.setText(QCoreApplication.translate("mainWindow", u"Method", None))
+#if QT_CONFIG(tooltip)
+        self.investment_evaluation_method_ComboBox.setToolTip(QCoreApplication.translate("mainWindow", u"Select the investment evaluation method", None))
+#endif // QT_CONFIG(tooltip)
+        self.label_87.setText("")
+        self.label_51.setText(QCoreApplication.translate("mainWindow", u"Maximum evaluations", None))
         self.label_55.setText(QCoreApplication.translate("mainWindow", u"Method", None))
         self.label_78.setText("")
         self.label_79.setText(QCoreApplication.translate("mainWindow", u"Cascading", None))

{GridCal-5.1.25 → GridCal-5.1.26}/GridCal/Gui/Main/SubClasses/Model/diagrams.py

@@ -1025,6 +1025,12 @@ class DiagramsMain(CompiledArraysMain):
                     elif isinstance(sel_obj, dev.UPFC):
                         root_bus = sel_obj.bus_from
 
+                    elif isinstance(sel_obj, dev.Switch):
+                        root_bus = sel_obj.bus_from
+
+                    else:
+                        root_bus = None
+
                     if root_bus is not None:
 
                         dlg = InputNumberDialogue(min_value=1, max_value=99,

{GridCal-5.1.25 → GridCal-5.1.26}/GridCal/Gui/Main/SubClasses/Settings/configuration.py

@@ -436,6 +436,10 @@ class ConfigurationMain(ResultsMain):
 
         self.circuit.snapshot_time = date_time_value
 
+    def plugin_main_function_triggered(self, arg):
+
+        print(arg)
+
     def add_plugins(self):
         """
         Add the plugins information and create the menu entries
@@ -457,19 +461,33 @@ class ConfigurationMain(ResultsMain):
             # maybe add the main function
             if plugin_info.main_fcn.function_ptr is not None:
 
-                add_menu_entry(menu=self.ui.menuplugins,
-                               text=plugin_info.name,
-                               icon_path=":/Icons/icons/plugin.svg",
-                               icon_pixmap=plugin_info.icon,
-                               function_ptr=lambda: plugin_info.main_fcn.function_ptr(self))
-
-            else:
-                pass
-                # print(f"{plugin_info.name} has no function_ptr, see trace for errors :/")
+                """
+                Really hard core magic to avoid lambdas shadow each other due to late binding
+                
+                lambda e, func=func: func(self)
+                
+                explanation:
+                - e is a bool parameter that the QAction sends when triggered
+                - func=func is there for the lambda to force the usage of the value of func 
+                  during the iteration and not after the loop
+                - func(self) is then what I wanted to lambda in the first place                
+                """
+                # func = plugin_info.main_fcn.function_ptr
+                # lmbd = lambda e, func=func: func(self)  # This is not an error, it is correct
+
+                action = add_menu_entry(
+                    menu=self.ui.menuplugins,
+                    text=plugin_info.name,
+                    icon_path=":/Icons/icons/plugin.svg",
+                    icon_pixmap=plugin_info.icon,
+                    function_ptr=plugin_info.main_fcn.get_pointer_lambda(gui_instance=self)
+                )
 
             # maybe add the investments function
             if plugin_info.investments_fcn.function_ptr is not None:
-                self.plugins_investment_evaluation_method_dict[plugin_info.investments_fcn.name] = plugin_info.investments_fcn.function_ptr
+                self.plugins_investment_evaluation_method_dict[
+                    plugin_info.investments_fcn.alias
+                ] = plugin_info.investments_fcn.function_ptr
 
         # create combobox model for the plugin investments
         lst = list(self.plugins_investment_evaluation_method_dict.keys())