GridCal 5.1.23__tar.gz → 5.1.24__tar.gz

{GridCal-5.1.23 → GridCal-5.1.24}/GridCal/Gui/Main/MainWindow.py

@@ -31,7 +31,7 @@ class Ui_mainWindow(object):
     def setupUi(self, mainWindow):
         if not mainWindow.objectName():
             mainWindow.setObjectName(u"mainWindow")
-        mainWindow.resize(1346, 811)
+        mainWindow.resize(1346, 820)
         mainWindow.setBaseSize(QSize(0, 0))
         font = QFont()
         font.setPointSize(10)
@@ -3330,16 +3330,13 @@ class Ui_mainWindow(object):
         self.verticalLayout_29.setObjectName(u"verticalLayout_29")
         self.label_41 = QLabel(self.frame_34)
         self.label_41.setObjectName(u"label_41")
-        font8 = QFont()
-        font8.setFamilies([u"Ubuntu"])
-        font8.setPointSize(9)
-        self.label_41.setFont(font8)
+        self.label_41.setFont(font1)
 
         self.verticalLayout_29.addWidget(self.label_41)
 
         self.areaFromListView = QListView(self.frame_34)
         self.areaFromListView.setObjectName(u"areaFromListView")
-        self.areaFromListView.setFont(font8)
+        self.areaFromListView.setFont(font1)
 
         self.verticalLayout_29.addWidget(self.areaFromListView)
 
@@ -3352,13 +3349,13 @@ class Ui_mainWindow(object):
         self.verticalLayout_19.setObjectName(u"verticalLayout_19")
         self.label_21 = QLabel(self.frame_35)
         self.label_21.setObjectName(u"label_21")
-        self.label_21.setFont(font8)
+        self.label_21.setFont(font1)
 
         self.verticalLayout_19.addWidget(self.label_21)
 
         self.areaToListView = QListView(self.frame_35)
         self.areaToListView.setObjectName(u"areaToListView")
-        self.areaToListView.setFont(font8)
+        self.areaToListView.setFont(font1)
 
         self.verticalLayout_19.addWidget(self.areaToListView)
 
@@ -3585,37 +3582,112 @@ 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.label_7 = QLabel(self.frame_18)
-        self.label_7.setObjectName(u"label_7")
+        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.label_7, 12, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.investment_evaluation_method_ComboBox, 24, 2, 1, 1)
 
-        self.verticalSpacer_16 = QSpacerItem(20, 250, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+        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.addItem(self.verticalSpacer_16, 29, 1, 1, 1)
+        self.gridLayout_21.addWidget(self.label_94, 8, 0, 1, 1)
 
-        self.label_120 = QLabel(self.frame_18)
-        self.label_120.setObjectName(u"label_120")
-        self.label_120.setMinimumSize(QSize(24, 24))
-        self.label_120.setMaximumSize(QSize(24, 24))
-        self.label_120.setPixmap(QPixmap(u":/Icons/icons/expansion_planning.svg"))
-        self.label_120.setScaledContents(True)
+        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_120, 21, 0, 1, 1)
+        self.gridLayout_21.addWidget(self.label_61, 17, 0, 1, 2)
 
-        self.line_30 = QFrame(self.frame_18)
-        self.line_30.setObjectName(u"line_30")
+        self.label_121 = QLabel(self.frame_18)
+        self.label_121.setObjectName(u"label_121")
         palette28 = QPalette()
-        palette28.setBrush(QPalette.Active, QPalette.WindowText, brush3)
-        palette28.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
+        palette28.setBrush(QPalette.Active, QPalette.WindowText, brush)
+        palette28.setBrush(QPalette.Inactive, QPalette.WindowText, brush)
         palette28.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.line_30.setPalette(palette28)
+        self.label_121.setPalette(palette28)
+        self.label_121.setFont(font4)
+        self.label_121.setAlignment(Qt.AlignBottom|Qt.AlignLeading|Qt.AlignLeft)
+
+        self.gridLayout_21.addWidget(self.label_121, 21, 1, 1, 2)
+
+        self.label_89 = QLabel(self.frame_18)
+        self.label_89.setObjectName(u"label_89")
+        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.gridLayout_21.addWidget(self.label_3, 24, 0, 1, 2)
+
+        self.line_29 = QFrame(self.frame_18)
+        self.line_29.setObjectName(u"line_29")
+        palette30 = QPalette()
+        palette30.setBrush(QPalette.Active, QPalette.WindowText, brush3)
+        palette30.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
+        palette30.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.line_29.setPalette(palette30)
+        self.line_29.setFrameShadow(QFrame.Plain)
+        self.line_29.setLineWidth(4)
+        self.line_29.setFrameShape(QFrame.Shape.HLine)
+
+        self.gridLayout_21.addWidget(self.line_29, 9, 0, 1, 3)
+
+        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.gridLayout_21.addWidget(self.line_30, 22, 0, 1, 3)
 
+        self.label_31 = QLabel(self.frame_18)
+        self.label_31.setObjectName(u"label_31")
+
+        self.gridLayout_21.addWidget(self.label_31, 20, 0, 1, 1)
+
+        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.node_distances_sigma_doubleSpinBox, 16, 2, 1, 1)
+
+        self.verticalSpacer_16 = QSpacerItem(20, 250, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
+
+        self.gridLayout_21.addItem(self.verticalSpacer_16, 31, 1, 1, 1)
+
         self.frame_59 = QFrame(self.frame_18)
         self.frame_59.setObjectName(u"frame_59")
         self.frame_59.setFrameShape(QFrame.NoFrame)
@@ -3625,11 +3697,11 @@ class Ui_mainWindow(object):
         self.horizontalLayout_32.setContentsMargins(0, 0, 0, 0)
         self.label_93 = QLabel(self.frame_59)
         self.label_93.setObjectName(u"label_93")
-        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_93.setPalette(palette29)
+        palette32 = QPalette()
+        palette32.setBrush(QPalette.Active, QPalette.WindowText, brush)
+        palette32.setBrush(QPalette.Inactive, QPalette.WindowText, brush)
+        palette32.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
+        self.label_93.setPalette(palette32)
         self.label_93.setFont(font4)
         self.label_93.setAlignment(Qt.AlignBottom|Qt.AlignLeading|Qt.AlignLeft)
 
@@ -3638,25 +3710,14 @@ class Ui_mainWindow(object):
 
         self.gridLayout_21.addWidget(self.frame_59, 8, 1, 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.label_31 = QLabel(self.frame_18)
-        self.label_31.setObjectName(u"label_31")
-
-        self.gridLayout_21.addWidget(self.label_31, 20, 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.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.max_investments_evluation_number_spinBox, 27, 2, 1, 1)
+        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")
@@ -3664,25 +3725,30 @@ class Ui_mainWindow(object):
 
         self.gridLayout_21.addWidget(self.label_38, 16, 0, 1, 2)
 
-        self.label_3 = QLabel(self.frame_18)
-        self.label_3.setObjectName(u"label_3")
-        self.label_3.setFont(font1)
+        self.label_7 = QLabel(self.frame_18)
+        self.label_7.setObjectName(u"label_7")
 
-        self.gridLayout_21.addWidget(self.label_3, 23, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_7, 12, 0, 1, 2)
 
         self.line_24 = QFrame(self.frame_18)
         self.line_24.setObjectName(u"line_24")
-        palette30 = QPalette()
-        palette30.setBrush(QPalette.Active, QPalette.WindowText, brush3)
-        palette30.setBrush(QPalette.Inactive, QPalette.WindowText, brush3)
-        palette30.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.line_24.setPalette(palette30)
+        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.gridLayout_21.addWidget(self.line_24, 14, 0, 1, 3)
 
+        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, 26, 2, 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)
@@ -3692,11 +3758,42 @@ class Ui_mainWindow(object):
 
         self.gridLayout_21.addWidget(self.cluster_number_spinBox, 10, 2, 1, 1)
 
+        self.label_51 = QLabel(self.frame_18)
+        self.label_51.setObjectName(u"label_51")
+        self.label_51.setFont(font1)
+
+        self.gridLayout_21.addWidget(self.label_51, 29, 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.gridLayout_21.addWidget(self.internal_investment_methods_radioButton, 23, 0, 1, 3)
+
         self.label_153 = QLabel(self.frame_18)
         self.label_153.setObjectName(u"label_153")
         self.label_153.setFont(font1)
 
-        self.gridLayout_21.addWidget(self.label_153, 25, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_153, 26, 0, 1, 2)
+
+        self.label_120 = QLabel(self.frame_18)
+        self.label_120.setObjectName(u"label_120")
+        self.label_120.setMinimumSize(QSize(24, 24))
+        self.label_120.setMaximumSize(QSize(24, 24))
+        self.label_120.setPixmap(QPixmap(u":/Icons/icons/expansion_planning.svg"))
+        self.label_120.setScaledContents(True)
+
+        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")
@@ -3707,98 +3804,23 @@ class Ui_mainWindow(object):
 
         self.gridLayout_21.addWidget(self.label_88, 13, 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.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.investment_evaluation_method_ComboBox, 23, 2, 1, 1)
+        self.gridLayout_21.addWidget(self.plugins_investment_methods_radioButton, 27, 0, 1, 3)
 
-        self.label_44 = QLabel(self.frame_18)
-        self.label_44.setObjectName(u"label_44")
+        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_44, 18, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.label_83, 28, 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.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.addWidget(self.investment_evaluation_objfunc_ComboBox, 25, 2, 1, 1)
-
-        self.line_29 = QFrame(self.frame_18)
-        self.line_29.setObjectName(u"line_29")
-        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_29.setPalette(palette31)
-        self.line_29.setFrameShadow(QFrame.Plain)
-        self.line_29.setLineWidth(4)
-        self.line_29.setFrameShape(QFrame.Shape.HLine)
-
-        self.gridLayout_21.addWidget(self.line_29, 9, 0, 1, 3)
-
-        self.label_51 = QLabel(self.frame_18)
-        self.label_51.setObjectName(u"label_51")
-        self.label_51.setFont(font1)
-
-        self.gridLayout_21.addWidget(self.label_51, 27, 0, 1, 2)
-
-        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_89 = QLabel(self.frame_18)
-        self.label_89.setObjectName(u"label_89")
-        palette32 = QPalette()
-        palette32.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette32.setBrush(QPalette.Inactive, QPalette.WindowText, brush)
-        palette32.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.label_89.setPalette(palette32)
-        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.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.node_distances_sigma_doubleSpinBox, 16, 2, 1, 1)
-
-        self.label_121 = QLabel(self.frame_18)
-        self.label_121.setObjectName(u"label_121")
-        palette33 = QPalette()
-        palette33.setBrush(QPalette.Active, QPalette.WindowText, brush)
-        palette33.setBrush(QPalette.Inactive, QPalette.WindowText, brush)
-        palette33.setBrush(QPalette.Disabled, QPalette.WindowText, brush1)
-        self.label_121.setPalette(palette33)
-        self.label_121.setFont(font4)
-        self.label_121.setAlignment(Qt.AlignBottom|Qt.AlignLeading|Qt.AlignLeft)
-
-        self.gridLayout_21.addWidget(self.label_121, 21, 1, 1, 2)
-
-        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_61 = QLabel(self.frame_18)
-        self.label_61.setObjectName(u"label_61")
-        self.label_61.setFont(font1)
-
-        self.gridLayout_21.addWidget(self.label_61, 17, 0, 1, 2)
+        self.gridLayout_21.addWidget(self.plugins_investment_evaluation_method_ComboBox, 28, 2, 1, 1)
 
 
         self.horizontalLayout_6.addWidget(self.frame_18)
@@ -4400,7 +4422,7 @@ class Ui_mainWindow(object):
         mainWindow.setCentralWidget(self.centralwidget)
         self.menuBar = QMenuBar(mainWindow)
         self.menuBar.setObjectName(u"menuBar")
-        self.menuBar.setGeometry(QRect(0, 0, 1346, 20))
+        self.menuBar.setGeometry(QRect(0, 0, 1346, 24))
         self.menuBar.setFont(font)
         self.menuProject = QMenu(self.menuBar)
         self.menuProject.setObjectName(u"menuProject")
@@ -5554,35 +5576,22 @@ 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)
-        self.label_7.setText("")
-        self.label_120.setText("")
-        self.label_93.setText(QCoreApplication.translate("mainWindow", u"Clustering", None))
-        self.label_33.setText(QCoreApplication.translate("mainWindow", u"Number of clusters", None))
-        self.label_31.setText("")
-#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_38.setText(QCoreApplication.translate("mainWindow", u"Nodal distances", None))
-        self.label_3.setText(QCoreApplication.translate("mainWindow", u"Method", None))
-#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_153.setText(QCoreApplication.translate("mainWindow", u"Objective function", None))
-        self.label_88.setText("")
 #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_44.setText("")
-        self.label_51.setText(QCoreApplication.translate("mainWindow", u"Maximum evaluations", None))
         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_121.setText(QCoreApplication.translate("mainWindow", u"Investment evaluation", None))
+        self.label_93.setText(QCoreApplication.translate("mainWindow", u"Clustering", 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)
@@ -5590,7 +5599,23 @@ 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_61.setText(QCoreApplication.translate("mainWindow", u"Min. group size", None))
+        self.label_38.setText(QCoreApplication.translate("mainWindow", u"Nodal distances", None))
+        self.label_7.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_153.setText(QCoreApplication.translate("mainWindow", u"Objective function", None))
+        self.label_120.setText("")
+#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_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.23 → GridCal-5.1.24}/GridCal/Gui/Main/SubClasses/Settings/configuration.py

@@ -25,6 +25,7 @@ from GridCal.Gui.Main.SubClasses.Results.results import ResultsMain
 from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
 from GridCal.Gui.Diagrams.generic_graphics import set_dark_mode, set_light_mode
 from GridCal.Gui.plugins import PluginsInfo
+import GridCal.Gui.GuiFunctions as gf
 from GridCal.Gui.GuiFunctions import add_menu_entry
 
 
@@ -448,15 +449,27 @@ class ConfigurationMain(ResultsMain):
 
         self.plugins_info.read()  # force refresh
 
-        for plugin_info in self.plugins_info.plugins:
+        self.plugins_investment_evaluation_method_dict = dict()
 
-            if plugin_info.function_ptr is not None:
+        # for every plugin...
+        for key, plugin_info in self.plugins_info.plugins.items():
+
+            # 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.function_ptr(self))
+                               function_ptr=lambda: plugin_info.main_fcn.function_ptr(self))
 
             else:
                 print(f"{plugin_info.name} has no function_ptr, see trace for errors :/")
+
+            # 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
+
+        # create combobox model for the plugin investments
+        lst = list(self.plugins_investment_evaluation_method_dict.keys())
+        self.ui.plugins_investment_evaluation_method_ComboBox.setModel(gf.get_list_model(lst))

{GridCal-5.1.23 → GridCal-5.1.24}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -171,6 +171,7 @@ class SimulationsMain(TimeEventsMain):
             InvestmentEvaluationMethod.MixedVariableGA,
         ]
         self.investment_evaluation_method_dict = OrderedDict()
+        self.plugins_investment_evaluation_method_dict = OrderedDict()
         lst = list()
         for method in investment_methods:
             self.investment_evaluation_method_dict[method.value] = method
@@ -2442,23 +2443,38 @@ class SimulationsMain(TimeEventsMain):
 
                 if not self.session.is_this_running(SimulationTypes.InvestmentsEvaluation_run):
 
-                    # evaluation method
-                    method = self.investment_evaluation_method_dict[
-                        self.ui.investment_evaluation_method_ComboBox.currentText()
-                    ]
+                    if self.ui.internal_investment_methods_radioButton.isChecked():
+                        # evaluation method
+                        method = self.investment_evaluation_method_dict[
+                            self.ui.investment_evaluation_method_ComboBox.currentText()
+                        ]
 
-                    # maximum number of function evalñuations as a factor of the number of investments
+                        obj_fn_tpe = self.investment_evaluation_objfunc_dict[
+                            self.ui.investment_evaluation_objfunc_ComboBox.currentText()
+                        ]
+
+                        fn_ptr = None
+
+                    elif self.ui.plugins_investment_methods_radioButton.isChecked():
+
+                        method = InvestmentEvaluationMethod.FromPlugin
+                        obj_fn_tpe = InvestmentsEvaluationObjectives.FromPlugin
+                        fn_ptr = self.plugins_investment_evaluation_method_dict[
+                            self.ui.plugins_investment_evaluation_method_ComboBox.currentText()
+                        ]
+                    else:
+                        raise Exception("Unrecognized investment simulation mode")
+
+                    # maximum number of function evaluations as a factor of the number of investments
                     max_eval = self.ui.max_investments_evluation_number_spinBox.value() * len(
                         self.circuit.investments_groups)
 
-                    objf_tpe = self.investment_evaluation_objfunc_dict[
-                        self.ui.investment_evaluation_objfunc_ComboBox.currentText()
-                    ]
-
+                    # compose the options
                     options = sim.InvestmentsEvaluationOptions(solver=method,
                                                                max_eval=max_eval,
                                                                pf_options=self.get_selected_power_flow_options(),
-                                                               objf_tpe=objf_tpe
+                                                               objf_tpe=obj_fn_tpe,
+                                                               plugin_fcn_ptr=fn_ptr
                                                                )
 
                     opf_time_series_results = self.get_opf_ts_results(

{GridCal-5.1.23 → GridCal-5.1.24}/GridCal/Gui/ProfilesInput/excel_sheet_selection.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'excel_sheet_selection.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.6.2
+## Created by: Qt User Interface Compiler version 6.7.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -44,7 +44,6 @@ class Ui_ExcelSelectionDialog(object):
 
         self.retranslateUi(ExcelSelectionDialog)
         self.buttonBox.accepted.connect(ExcelSelectionDialog.accept)
-        self.butonBox.accepted.connect(ExcelSelectionDialog.accept)
         self.buttonBox.rejected.connect(ExcelSelectionDialog.reject)
 
         QMetaObject.connectSlotsByName(ExcelSelectionDialog)