VeraGrid 5.5.15__tar.gz → 5.5.17__tar.gz

{veragrid-5.5.15 → veragrid-5.5.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.5.15
+Version: 5.5.17
 Summary: VeraGrid is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/VeraGrid
 Author: Santiago Peñate Vera et. Al.

{veragrid-5.5.15 → veragrid-5.5.17}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/injections_template_graphics.py

@@ -208,34 +208,7 @@ class InjectionTemplateGraphicItem(GenericDiagramWidget, QGraphicsItemGroup):
         """
         Change the generator bus
         """
-        idx_bus_list = self._editor.get_selected_buses()
-
-        if len(idx_bus_list) == 2:
-
-            # detect the bus and its combinations
-            if idx_bus_list[0][1] == self.api_object.bus:
-                idx, old_bus, old_bus_graphic_item = idx_bus_list[0]
-                idx, new_bus, new_bus_graphic_item = idx_bus_list[1]
-            elif idx_bus_list[1][1] == self.api_object.bus:
-                idx, new_bus, new_bus_graphic_item = idx_bus_list[0]
-                idx, old_bus, old_bus_graphic_item = idx_bus_list[1]
-            else:
-                error_msg("The bus to change has not been selected!", 'Change bus')
-                return
-
-            ok = yes_no_question(
-                text=f"Are you sure that you want to relocate the bus from {old_bus.name} to {new_bus.name}?",
-                title='Change bus')
-
-            if ok:
-                self.api_object.bus = new_bus
-                new_bus_graphic_item.add_object(api_obj=self.api_object)
-                new_bus_graphic_item.update()
-                self._editor.remove_element(device=self.api_object, graphic_object=self)
-
-        else:
-            warning_msg("you have to select the origin and destination buses!",
-                        title='Change bus')
+        self._editor.change_injection_bus(injection_graphics=self)
 
     def rescale(self, scale: float = 1.0):
         """

{veragrid-5.5.15 → veragrid-5.5.17}/VeraGrid/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -50,7 +50,7 @@ from VeraGridEngine.enumerations import TerminalType
 
 from VeraGrid.Gui.SubstationDesigner.voltage_level_conversion import VoltageLevelConversionWizard
 from VeraGrid.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
-from VeraGrid.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import BusGraphicItem
+from VeraGrid.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import BusGraphicItem, INJECTION_GRAPHICS
 from VeraGrid.Gui.Diagrams.SchematicWidget.Fluid.fluid_node_graphics import FluidNodeGraphicItem
 from VeraGrid.Gui.Diagrams.SchematicWidget.Fluid.fluid_path_graphics import FluidPathGraphicItem
 from VeraGrid.Gui.Diagrams.SchematicWidget.Branches.line_graphics import LineGraphicItem
@@ -88,6 +88,7 @@ BRANCH_GRAPHICS = Union[
     SwitchGraphicItem
 ]
 
+
 OPTIONAL_PORT = Union[BarTerminalItem, RoundTerminalItem, None]
 
 
@@ -4821,6 +4822,48 @@ class SchematicWidget(BaseDiagramWidget):
 
         self.draw_additional_diagram(diagram=diagram)
 
+    def change_injection_bus(self, injection_graphics: INJECTION_GRAPHICS):
+        """
+
+        :param injection_graphics:
+        :return:
+        """
+
+        idx_bus_list = self.get_selected_buses()
+
+        if len(idx_bus_list) == 2:
+
+            # detect the bus and its combinations
+            if idx_bus_list[0][1] == injection_graphics.api_object.bus:
+                idx, old_bus, old_bus_graphic_item = idx_bus_list[0]
+                idx, new_bus, new_bus_graphic_item = idx_bus_list[1]
+            elif idx_bus_list[1][1] == injection_graphics.api_object.bus:
+                idx, new_bus, new_bus_graphic_item = idx_bus_list[0]
+                idx, old_bus, old_bus_graphic_item = idx_bus_list[1]
+            else:
+                error_msg("The bus to change has not been selected!", 'Change bus')
+                return
+
+            ok = yes_no_question(
+                text=f"Are you sure that you want to relocate the bus from {old_bus.name} to {new_bus.name}?",
+                title='Change bus')
+
+            if ok:
+
+                # set the API object new bus
+                injection_graphics.api_object.bus = new_bus
+
+                # add the graphics for the new bus
+                new_bus_graphic_item.add_object(api_obj=injection_graphics.api_object)
+                new_bus_graphic_item.update()
+
+                self._remove_from_scene(injection_graphics.nexus)
+                self._remove_from_scene(injection_graphics)
+
+        else:
+            warning_msg("you have to select the origin and destination buses!",
+                        title='Change bus')
+
     def reconnect_bus_graphics(self,
                                bus_graphics: BusGraphicItem,
                                new_buses: List[Bus]):

{veragrid-5.5.15 → veragrid-5.5.17}/VeraGrid/Gui/Main/MainWindow.py

@@ -1435,15 +1435,33 @@ class Ui_mainWindow(object):
 
         self.horizontalLayout.addWidget(self.edit_profiles_from_models_pushButton)
 
+        self.crop_profiles_pushButton = QPushButton(self.frame)
+        self.crop_profiles_pushButton.setObjectName(u"crop_profiles_pushButton")
+        icon94 = QIcon()
+        icon94.addFile(u":/Icons/icons/time_series_crop.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.crop_profiles_pushButton.setIcon(icon94)
+        self.crop_profiles_pushButton.setFlat(False)
+
+        self.horizontalLayout.addWidget(self.crop_profiles_pushButton)
+
+        self.crop_cluster_profiles_pushButton = QPushButton(self.frame)
+        self.crop_cluster_profiles_pushButton.setObjectName(u"crop_cluster_profiles_pushButton")
+        icon95 = QIcon()
+        icon95.addFile(u":/Icons/icons/time_series_crop_cluster.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.crop_cluster_profiles_pushButton.setIcon(icon95)
+        self.crop_cluster_profiles_pushButton.setFlat(False)
+
+        self.horizontalLayout.addWidget(self.crop_cluster_profiles_pushButton)
+
         self.horizontalSpacer = QSpacerItem(183, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout.addItem(self.horizontalSpacer)
 
         self.plot_time_series_pushButton = QPushButton(self.frame)
         self.plot_time_series_pushButton.setObjectName(u"plot_time_series_pushButton")
-        icon94 = QIcon()
-        icon94.addFile(u":/Icons/icons/plot.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.plot_time_series_pushButton.setIcon(icon94)
+        icon96 = QIcon()
+        icon96.addFile(u":/Icons/icons/plot.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.plot_time_series_pushButton.setIcon(icon96)
 
         self.horizontalLayout.addWidget(self.plot_time_series_pushButton)
 
@@ -1468,25 +1486,25 @@ class Ui_mainWindow(object):
         self.horizontalLayout_4.setContentsMargins(0, 0, 0, 0)
         self.copy_profile_pushButton = QPushButton(self.frame_12)
         self.copy_profile_pushButton.setObjectName(u"copy_profile_pushButton")
-        icon95 = QIcon()
-        icon95.addFile(u":/Icons/icons/copy.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.copy_profile_pushButton.setIcon(icon95)
+        icon97 = QIcon()
+        icon97.addFile(u":/Icons/icons/copy.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.copy_profile_pushButton.setIcon(icon97)
 
         self.horizontalLayout_4.addWidget(self.copy_profile_pushButton)
 
         self.paste_profiles_pushButton = QPushButton(self.frame_12)
         self.paste_profiles_pushButton.setObjectName(u"paste_profiles_pushButton")
-        icon96 = QIcon()
-        icon96.addFile(u":/Icons/icons/paste.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.paste_profiles_pushButton.setIcon(icon96)
+        icon98 = QIcon()
+        icon98.addFile(u":/Icons/icons/paste.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.paste_profiles_pushButton.setIcon(icon98)
 
         self.horizontalLayout_4.addWidget(self.paste_profiles_pushButton)
 
         self.set_linear_combination_profile_pushButton = QPushButton(self.frame_12)
         self.set_linear_combination_profile_pushButton.setObjectName(u"set_linear_combination_profile_pushButton")
-        icon97 = QIcon()
-        icon97.addFile(u":/Icons/icons/copy2right.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.set_linear_combination_profile_pushButton.setIcon(icon97)
+        icon99 = QIcon()
+        icon99.addFile(u":/Icons/icons/copy2right.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.set_linear_combination_profile_pushButton.setIcon(icon99)
 
         self.horizontalLayout_4.addWidget(self.set_linear_combination_profile_pushButton)
 
@@ -1514,25 +1532,25 @@ class Ui_mainWindow(object):
 
         self.profile_multiply_pushButton = QPushButton(self.frame_12)
         self.profile_multiply_pushButton.setObjectName(u"profile_multiply_pushButton")
-        icon98 = QIcon()
-        icon98.addFile(u":/Icons/icons/multiply.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.profile_multiply_pushButton.setIcon(icon98)
+        icon100 = QIcon()
+        icon100.addFile(u":/Icons/icons/multiply.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.profile_multiply_pushButton.setIcon(icon100)
 
         self.horizontalLayout_4.addWidget(self.profile_multiply_pushButton)
 
         self.profile_divide_pushButton = QPushButton(self.frame_12)
         self.profile_divide_pushButton.setObjectName(u"profile_divide_pushButton")
-        icon99 = QIcon()
-        icon99.addFile(u":/Icons/icons/divide.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.profile_divide_pushButton.setIcon(icon99)
+        icon101 = QIcon()
+        icon101.addFile(u":/Icons/icons/divide.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.profile_divide_pushButton.setIcon(icon101)
 
         self.horizontalLayout_4.addWidget(self.profile_divide_pushButton)
 
         self.set_profile_value_pushButton = QPushButton(self.frame_12)
         self.set_profile_value_pushButton.setObjectName(u"set_profile_value_pushButton")
-        icon100 = QIcon()
-        icon100.addFile(u":/Icons/icons/copy2up.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.set_profile_value_pushButton.setIcon(icon100)
+        icon102 = QIcon()
+        icon102.addFile(u":/Icons/icons/copy2up.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.set_profile_value_pushButton.setIcon(icon102)
 
         self.horizontalLayout_4.addWidget(self.set_profile_value_pushButton)
 
@@ -1547,9 +1565,9 @@ class Ui_mainWindow(object):
 
         self.verticalLayout_42.addWidget(self.frame_12)
 
-        icon101 = QIcon()
-        icon101.addFile(u":/Icons/icons/time_series.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.tabWidget_5.addTab(self.tab_16, icon101, "")
+        icon103 = QIcon()
+        icon103.addFile(u":/Icons/icons/time_series.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.tabWidget_5.addTab(self.tab_16, icon103, "")
 
         self.verticalLayout_26.addWidget(self.tabWidget_5)
 
@@ -1588,9 +1606,9 @@ class Ui_mainWindow(object):
         self.compute_simulation_data_pushButton = QPushButton(self.frame_28)
         self.compute_simulation_data_pushButton.setObjectName(u"compute_simulation_data_pushButton")
         self.compute_simulation_data_pushButton.setMaximumSize(QSize(32, 16777215))
-        icon102 = QIcon()
-        icon102.addFile(u":/Icons/icons/calculator.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.compute_simulation_data_pushButton.setIcon(icon102)
+        icon104 = QIcon()
+        icon104.addFile(u":/Icons/icons/calculator.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.compute_simulation_data_pushButton.setIcon(icon104)
 
         self.gridLayout_19.addWidget(self.compute_simulation_data_pushButton, 0, 0, 1, 1)
 
@@ -1624,23 +1642,23 @@ class Ui_mainWindow(object):
 
         self.copyArraysToNumpyButton = QPushButton(self.frame_29)
         self.copyArraysToNumpyButton.setObjectName(u"copyArraysToNumpyButton")
-        icon103 = QIcon()
-        icon103.addFile(u":/Icons/icons/array.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.copyArraysToNumpyButton.setIcon(icon103)
+        icon105 = QIcon()
+        icon105.addFile(u":/Icons/icons/array.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.copyArraysToNumpyButton.setIcon(icon105)
 
         self.gridLayout_23.addWidget(self.copyArraysToNumpyButton, 0, 1, 1, 1)
 
         self.plotArraysButton = QPushButton(self.frame_29)
         self.plotArraysButton.setObjectName(u"plotArraysButton")
         self.plotArraysButton.setMinimumSize(QSize(32, 0))
-        self.plotArraysButton.setIcon(icon94)
+        self.plotArraysButton.setIcon(icon96)
 
         self.gridLayout_23.addWidget(self.plotArraysButton, 0, 6, 1, 1)
 
         self.copyArraysButton = QPushButton(self.frame_29)
         self.copyArraysButton.setObjectName(u"copyArraysButton")
         self.copyArraysButton.setMinimumSize(QSize(32, 0))
-        self.copyArraysButton.setIcon(icon95)
+        self.copyArraysButton.setIcon(icon97)
 
         self.gridLayout_23.addWidget(self.copyArraysButton, 0, 2, 1, 1)
 
@@ -1648,9 +1666,9 @@ class Ui_mainWindow(object):
 
         self.horizontalLayout_7.addWidget(self.simulationDataSplitter)
 
-        icon104 = QIcon()
-        icon104.addFile(u":/Icons/icons/spmat.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.tabWidget_3.addTab(self.compiledArraysTab, icon104, "")
+        icon106 = QIcon()
+        icon106.addFile(u":/Icons/icons/spmat.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.tabWidget_3.addTab(self.compiledArraysTab, icon106, "")
         self.commentsTab = QWidget()
         self.commentsTab.setObjectName(u"commentsTab")
         self.verticalLayout_18 = QVBoxLayout(self.commentsTab)
@@ -1660,9 +1678,9 @@ class Ui_mainWindow(object):
 
         self.verticalLayout_18.addWidget(self.comments_textEdit)
 
-        icon105 = QIcon()
-        icon105.addFile(u":/Icons/icons/edit.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.tabWidget_3.addTab(self.commentsTab, icon105, "")
+        icon107 = QIcon()
+        icon107.addFile(u":/Icons/icons/edit.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.tabWidget_3.addTab(self.commentsTab, icon107, "")
 
         self.verticalLayout_9.addWidget(self.tabWidget_3)
 
@@ -1841,45 +1859,45 @@ class Ui_mainWindow(object):
 
         self.results_traspose_checkBox = QCheckBox(self.frame_8)
         self.results_traspose_checkBox.setObjectName(u"results_traspose_checkBox")
-        icon106 = QIcon()
-        icon106.addFile(u":/Icons/icons/transpose.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.results_traspose_checkBox.setIcon(icon106)
+        icon108 = QIcon()
+        icon108.addFile(u":/Icons/icons/transpose.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.results_traspose_checkBox.setIcon(icon108)
 
         self.horizontalLayout_2.addWidget(self.results_traspose_checkBox)
 
         self.results_as_cdf_checkBox = QCheckBox(self.frame_8)
         self.results_as_cdf_checkBox.setObjectName(u"results_as_cdf_checkBox")
-        icon107 = QIcon()
-        icon107.addFile(u":/Icons/icons/cdf.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.results_as_cdf_checkBox.setIcon(icon107)
+        icon109 = QIcon()
+        icon109.addFile(u":/Icons/icons/cdf.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.results_as_cdf_checkBox.setIcon(icon109)
 
         self.horizontalLayout_2.addWidget(self.results_as_cdf_checkBox)
 
         self.results_as_abs_checkBox = QCheckBox(self.frame_8)
         self.results_as_abs_checkBox.setObjectName(u"results_as_abs_checkBox")
-        icon108 = QIcon()
-        icon108.addFile(u":/Icons/icons/abs.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.results_as_abs_checkBox.setIcon(icon108)
+        icon110 = QIcon()
+        icon110.addFile(u":/Icons/icons/abs.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.results_as_abs_checkBox.setIcon(icon110)
 
         self.horizontalLayout_2.addWidget(self.results_as_abs_checkBox)
 
         self.stacked_plot_checkBox = QCheckBox(self.frame_8)
         self.stacked_plot_checkBox.setObjectName(u"stacked_plot_checkBox")
-        icon109 = QIcon()
-        icon109.addFile(u":/Icons/icons/stacked_plot.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.stacked_plot_checkBox.setIcon(icon109)
+        icon111 = QIcon()
+        icon111.addFile(u":/Icons/icons/stacked_plot.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.stacked_plot_checkBox.setIcon(icon111)
 
         self.horizontalLayout_2.addWidget(self.stacked_plot_checkBox)
 
         self.copy_results_pushButton = QPushButton(self.frame_8)
         self.copy_results_pushButton.setObjectName(u"copy_results_pushButton")
-        self.copy_results_pushButton.setIcon(icon95)
+        self.copy_results_pushButton.setIcon(icon97)
 
         self.horizontalLayout_2.addWidget(self.copy_results_pushButton)
 
         self.copy_numpy_button = QPushButton(self.frame_8)
         self.copy_numpy_button.setObjectName(u"copy_numpy_button")
-        self.copy_numpy_button.setIcon(icon103)
+        self.copy_numpy_button.setIcon(icon105)
 
         self.horizontalLayout_2.addWidget(self.copy_numpy_button)
 
@@ -1891,7 +1909,7 @@ class Ui_mainWindow(object):
 
         self.plot_data_pushButton = QPushButton(self.frame_8)
         self.plot_data_pushButton.setObjectName(u"plot_data_pushButton")
-        self.plot_data_pushButton.setIcon(icon94)
+        self.plot_data_pushButton.setIcon(icon96)
 
         self.horizontalLayout_2.addWidget(self.plot_data_pushButton)
 
@@ -1901,7 +1919,7 @@ class Ui_mainWindow(object):
 
         self.verticalLayout_40.addWidget(self.frame_5)
 
-        self.tabWidget_4.addTab(self.tab_7, icon103, "")
+        self.tabWidget_4.addTab(self.tab_7, icon105, "")
         self.tab_14 = QWidget()
         self.tab_14.setObjectName(u"tab_14")
         self.verticalLayout_41 = QVBoxLayout(self.tab_14)
@@ -1942,7 +1960,7 @@ class Ui_mainWindow(object):
 
         self.verticalLayout_13.addWidget(self.frame_33)
 
-        self.tabWidget.addTab(self.ResultsTab, icon94, "")
+        self.tabWidget.addTab(self.ResultsTab, icon96, "")
         self.main_console_tab = QWidget()
         self.main_console_tab.setObjectName(u"main_console_tab")
         self.verticalLayout_22 = QVBoxLayout(self.main_console_tab)
@@ -2001,9 +2019,9 @@ class Ui_mainWindow(object):
 
         self.runSourceCodeButton = QPushButton(self.frame_55)
         self.runSourceCodeButton.setObjectName(u"runSourceCodeButton")
-        icon110 = QIcon()
-        icon110.addFile(u":/Icons/icons/next.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.runSourceCodeButton.setIcon(icon110)
+        icon112 = QIcon()
+        icon112.addFile(u":/Icons/icons/next.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.runSourceCodeButton.setIcon(icon112)
 
         self.horizontalLayout_3.addWidget(self.runSourceCodeButton)
 
@@ -2073,9 +2091,9 @@ class Ui_mainWindow(object):
 
         self.verticalLayout_33.addWidget(self.consoleFrame)
 
-        icon111 = QIcon()
-        icon111.addFile(u":/Icons/icons/console.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.tabWidget_2.addTab(self.pythonConsoleTab, icon111, "")
+        icon113 = QIcon()
+        icon113.addFile(u":/Icons/icons/console.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.tabWidget_2.addTab(self.pythonConsoleTab, icon113, "")
         self.sourceCodeTab = QWidget()
         self.sourceCodeTab.setObjectName(u"sourceCodeTab")
         self.verticalLayout_39 = QVBoxLayout(self.sourceCodeTab)
@@ -2099,7 +2117,7 @@ class Ui_mainWindow(object):
 
         self.verticalLayout_22.addWidget(self.frame_10)
 
-        self.tabWidget.addTab(self.main_console_tab, icon111, "")
+        self.tabWidget.addTab(self.main_console_tab, icon113, "")
         self.SettingsTab = QWidget()
         self.SettingsTab.setObjectName(u"SettingsTab")
         self.gridLayout_8 = QGridLayout(self.SettingsTab)
@@ -5054,7 +5072,7 @@ class Ui_mainWindow(object):
         mainWindow.setCentralWidget(self.centralwidget)
         self.menuBar = QMenuBar(mainWindow)
         self.menuBar.setObjectName(u"menuBar")
-        self.menuBar.setGeometry(QRect(0, 0, 1372, 33))
+        self.menuBar.setGeometry(QRect(0, 0, 1372, 39))
         self.menuBar.setFont(font)
         self.menuProject = QMenu(self.menuBar)
         self.menuProject.setObjectName(u"menuProject")
@@ -5774,6 +5792,14 @@ class Ui_mainWindow(object):
         self.edit_profiles_from_models_pushButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:700;\">Import profiles from grid models. </span></p><p>This is, load many individual grids in any of the supported VeraGrid formats and take the operational data from them, aplying them to all the profiles.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
         self.edit_profiles_from_models_pushButton.setText("")
+#if QT_CONFIG(tooltip)
+        self.crop_profiles_pushButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Time series  crop to the selected time interval</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.crop_profiles_pushButton.setText("")
+#if QT_CONFIG(tooltip)
+        self.crop_cluster_profiles_pushButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Time series crop to the clusteres time indices.</p><p>For that you need cluster simulation in memory</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.crop_cluster_profiles_pushButton.setText("")
 #if QT_CONFIG(tooltip)
         self.plot_time_series_pushButton.setToolTip(QCoreApplication.translate("mainWindow", u"Plot the selected object's profile", None))
 #endif // QT_CONFIG(tooltip)

{veragrid-5.5.15 → veragrid-5.5.17}/VeraGrid/Gui/Main/SubClasses/Model/data_base.py

@@ -677,7 +677,7 @@ class DataBaseTableMain(DiagramsMain):
             self.grid_reduction_dialogue.exec()
 
             if self.grid_reduction_dialogue.did_reduce:
-                self.delete_from_all_diagrams(elements=[bus for i, bus, graphic in selected_buses])
+                self.delete_from_all_diagrams(elements=list(selected_buses))
 
     def grid_reduction_from_schematic_selection(self):
         """

{veragrid-5.5.15 → veragrid-5.5.17}/VeraGrid/Gui/Main/SubClasses/Model/time_events.py

@@ -10,10 +10,11 @@ from matplotlib import pyplot as plt
 
 from VeraGrid.Gui.object_proxy_model import ObjectModelFilterProxy
 from VeraGridEngine.basic_structures import Logger
-from VeraGridEngine.enumerations import DeviceType
+from VeraGridEngine.enumerations import DeviceType, SimulationTypes
 from VeraGridEngine.Devices.types import ALL_DEV_TYPES
-from VeraGrid.Gui.general_dialogues import NewProfilesStructureDialogue, TimeReIndexDialogue, LogsDialogue
-from VeraGrid.Gui.messages import yes_no_question, warning_msg, info_msg
+from VeraGrid.Gui.general_dialogues import (NewProfilesStructureDialogue, TimeReIndexDialogue, LogsDialogue,
+                                            StartEndSelectionDialogue)
+from VeraGrid.Gui.messages import yes_no_question, warning_msg, info_msg, error_msg
 from VeraGrid.Gui.Main.SubClasses.Model.data_base import DataBaseTableMain
 from VeraGrid.Gui.ProfilesInput.models_dialogue import ModelsInputGUI
 from VeraGrid.Gui.ProfilesInput.profile_dialogue import ProfileInputGUI, GeneratorsProfileOptionsDialogue
@@ -41,6 +42,9 @@ class TimeEventsMain(DataBaseTableMain):
         self.ui.new_profiles_structure_pushButton.clicked.connect(self.new_profiles_structure)
         self.ui.delete_profiles_structure_pushButton.clicked.connect(self.delete_profiles_structure)
         self.ui.edit_profiles_pushButton.clicked.connect(self.import_profiles)
+        self.ui.crop_profiles_pushButton.clicked.connect(self.crop_profiles)
+        self.ui.crop_cluster_profiles_pushButton.clicked.connect(self.crop_profiles_cluster)
+
         self.ui.edit_profiles_from_models_pushButton.clicked.connect(self.import_profiles_from_models)
         self.ui.set_profile_state_button.clicked.connect(self.set_profile_state_to_snapshot)
         self.ui.profile_add_pushButton.clicked.connect(lambda: self.modify_profiles('+'))
@@ -177,6 +181,74 @@ class TimeEventsMain(DataBaseTableMain):
             else:
                 self.show_error_toast("There are no objects...", duration=3000)
 
+    def crop_profiles(self):
+        """
+        Crop (resample) the profiles
+        """
+        if self.circuit.has_time_series:
+            if self.circuit.get_time_number() > 0:
+                self.start_end_dialogue_window = StartEndSelectionDialogue(min_value=0,
+                                                                           max_value=len(self.circuit.time_profile),
+                                                                           time_array=self.circuit.time_profile)
+
+                self.start_end_dialogue_window.setModal(True)
+                self.start_end_dialogue_window.exec()
+
+                if self.start_end_dialogue_window.is_accepted:
+                    self.circuit.resample_profiles2(
+                        t0=self.start_end_dialogue_window.start_value,
+                        t1=self.start_end_dialogue_window.end_value + 1
+                    )
+
+                    self.setup_sim_indices(st=self.start_end_dialogue_window.start_value,
+                                           en=self.start_end_dialogue_window.end_value)
+
+                    self.show_info_toast("Resampled!")
+            else:
+                self.show_error_toast("Empty time series :/")
+
+        else:
+            self.show_warning_toast("No profiles to crop :/")
+
+    def crop_profiles_cluster(self):
+        """
+        Crop (resample) the profiles
+        """
+        if self.circuit.has_time_series:
+            if self.circuit.get_time_number() > 0:
+                _, clustering_results = self.session.clustering
+
+                if clustering_results is not None:
+                    n = len(clustering_results.time_indices)
+
+                    if n != self.ui.cluster_number_spinBox.value():
+                        error_msg("The number of clusters in the stored results is different from the specified :(\n"
+                                  "Run another clustering analysis.")
+
+                        return
+                    else:
+                        # all ok
+                        ok = yes_no_question("Are you sure that you want to crop "
+                                             "the profiles to the clustered results?\n"
+                                             "This cannot be undone.\n"
+                                             "Also, the clustering will be removed after this.")
+
+                        if ok:
+                            self.circuit.resample_profiles(indices=clustering_results.time_indices)
+                            self.setup_sim_indices(st=0, en=self.circuit.get_time_number() - 1)
+
+                            # we need to remove the clustering simulation because it no longer matches the time data
+                            self.session.delete_driver(driver_type=SimulationTypes.ClusteringAnalysis_run)
+                            self.show_info_toast("Resampled!")
+                else:
+                    self.show_error_toast("Run clustering simulation first")
+
+            else:
+                self.show_error_toast("Empty time series :/")
+
+        else:
+            self.show_warning_toast("No profiles to crop :/")
+
     def modify_profiles(self, operation='+'):
         """
         Edit profiles with a linear combination
@@ -391,7 +463,6 @@ class TimeEventsMain(DataBaseTableMain):
                 fig = plt.figure(figsize=(12, 8))
                 ax = fig.add_subplot(111)
 
-
                 units_dict = {attr: pair.units for attr, pair in objects[0].registered_properties.items()}
 
                 data_tpe = objects[0].get_property_by_name(magnitude).tpe
@@ -521,3 +592,4 @@ class TimeEventsMain(DataBaseTableMain):
             mdl.paste_from_clipboard(row_idx=row_idx, col_idx=col_idx)
         else:
             warning_msg('There is no profile displayed, please display one', 'Paste profile to clipboard')
+