VeraGrid 5.5.9__tar.gz → 5.5.12__tar.gz

{veragrid-5.5.9 → veragrid-5.5.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGrid
-Version: 5.5.9
+Version: 5.5.12
 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.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/Editors/controllable_shunt_editor.py

@@ -126,7 +126,13 @@ class ControllableShuntEditor(QDialog):
 
     def accept_click(self):
         """
-
-        :return:
+        Modify and exit
         """
+        self.api_object.active_steps = self.get_active_steps()
+        self.api_object.g_steps = self.get_g_steps()
+        self.api_object.Gmax = self.api_object.g_steps.max()
+        self.api_object.Gmin = self.api_object.g_steps.min()
+        self.api_object.b_steps = self.get_b_steps()
+        self.api_object.Bmax = self.api_object.b_steps.max()
+        self.api_object.Bmin = self.api_object.b_steps.min()
         self.accept()

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/Editors/line_editor.py

@@ -12,6 +12,7 @@ from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QDouble
 from VeraGrid.Gui.gui_functions import get_list_model
 from VeraGrid.Gui.messages import error_msg, warning_msg, yes_no_question
 from VeraGridEngine.Devices.Branches.line import Line, SequenceLineType, OverheadLineType, UndergroundLineType
+from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 
 
 class LineEditor(QDialog):
@@ -21,28 +22,32 @@ class LineEditor(QDialog):
 
     def __init__(self,
                  line: Line,
-                 Sbase=100,
-                 frequency=50,
-                 templates: Union[List[SequenceLineType | OverheadLineType | UndergroundLineType], None] = None,
-                 current_template: SequenceLineType | OverheadLineType | UndergroundLineType | None = None):
+                 grid: MultiCircuit):
         """
         Line Editor constructor
         :param line: Branch object to update
-        :param templates: List of templates
-        :param Sbase: Base power in MVA
+        :param grid: MultiCircuit
         """
         super(LineEditor, self).__init__()
 
         # keep pointer to the line object
         self.line = line
 
-        self.Sbase = Sbase
+        self.Sbase = grid.Sbase
 
-        self.frequency = frequency
+        self.frequency = grid.fBase
 
-        self.templates = templates
+        Vnom = line.get_max_bus_nominal_voltage()
+        self.templates = list()
 
-        self.current_template = current_template
+        for lst in [grid.sequence_line_types,
+                    grid.underground_cable_types,
+                    grid.overhead_line_types]:
+            for temp in lst:
+                if Vnom == temp.Vnom:
+                    self.templates.append(temp)
+
+        self.current_template = line.template
 
         self.selected_template = None
 
@@ -83,43 +88,42 @@ class LineEditor(QDialog):
 
         # catalogue
         self.catalogue_combo = QComboBox()
-        if self.templates is not None:
-            if len(self.templates) > 0:
-                self.catalogue_combo.setModel(get_list_model(self.templates))
-
-                if self.current_template is not None:
-                    try:
-                        idx = self.templates.index(self.current_template)
-                        self.catalogue_combo.setCurrentIndex(idx)
-
-                        if isinstance(self.current_template, SequenceLineType):
-                            I_KA = self.current_template.Imax
-                            r_ohm = self.current_template.R
-                            x_ohm = self.current_template.X
-                            b_us = self.current_template.B
-
-                        if isinstance(self.current_template, UndergroundLineType):
-                            I_KA = self.current_template.Imax
-                            r_ohm = self.current_template.R
-                            x_ohm = self.current_template.X
-                            b_us = self.current_template.B
-
-                        elif isinstance(self.current_template, OverheadLineType):
-
-                            if self.current_template.check():
-                                R1, X1, Bsh1, I_kA = self.current_template.get_sequence_values(
-                                    circuit_idx=self.line.circuit_idx,
-                                    seq=1
-                                )
-                                r_ohm = R1
-                                x_ohm = X1
-                                b_us = Bsh1
-                            else:
-                                warning_msg(text=f"The template {self.current_template.name} contains errors",
-                                            title="Load template")
-
-                    except ValueError:
-                        pass
+        if len(self.templates) > 0:
+            self.catalogue_combo.setModel(get_list_model(self.templates))
+
+            if self.current_template is not None:
+                try:
+                    idx = self.templates.index(self.current_template)
+                    self.catalogue_combo.setCurrentIndex(idx)
+
+                    if isinstance(self.current_template, SequenceLineType):
+                        I_KA = self.current_template.Imax
+                        r_ohm = self.current_template.R
+                        x_ohm = self.current_template.X
+                        b_us = self.current_template.B
+
+                    if isinstance(self.current_template, UndergroundLineType):
+                        I_KA = self.current_template.Imax
+                        r_ohm = self.current_template.R
+                        x_ohm = self.current_template.X
+                        b_us = self.current_template.B
+
+                    elif isinstance(self.current_template, OverheadLineType):
+
+                        if self.current_template.check():
+                            R1, X1, Bsh1, I_kA = self.current_template.get_sequence_values(
+                                circuit_idx=self.line.circuit_idx,
+                                seq=1
+                            )
+                            r_ohm = R1
+                            x_ohm = X1
+                            b_us = Bsh1
+                        else:
+                            warning_msg(text=f"The template {self.current_template.name} contains errors",
+                                        title="Load template")
+
+                except ValueError:
+                    pass
 
         # load template
         self.load_template_btn = QPushButton()
@@ -138,7 +142,7 @@ class LineEditor(QDialog):
         self.i_spinner = QDoubleSpinBox()
         self.i_spinner.setMinimum(0)
         self.i_spinner.setMaximum(9999999)
-        self.i_spinner.setDecimals(2)
+        self.i_spinner.setDecimals(6)
         self.i_spinner.setValue(I_KA)
         self.i_spinner.setSuffix(' KA')
 
@@ -189,14 +193,13 @@ class LineEditor(QDialog):
         self.accept_btn.clicked.connect(self.accept_click)
 
         # add all to the GUI
-        if templates is not None:
-            self.layout.addWidget(QLabel("Available templates"))
-            self.layout.addWidget(self.catalogue_combo)
-            self.catalogue_combo.currentIndexChanged.connect(self.update_max_circuits)
-            self.layout.addWidget((QLabel("Circuit index:")))
-            self.layout.addWidget(self.circuit_idx)
-            self.layout.addWidget(self.load_template_btn)
-            self.layout.addWidget(QLabel(""))
+        self.layout.addWidget(QLabel("Available templates"))
+        self.layout.addWidget(self.catalogue_combo)
+        self.catalogue_combo.currentIndexChanged.connect(self.update_max_circuits)
+        self.layout.addWidget((QLabel("Circuit index:")))
+        self.layout.addWidget(self.circuit_idx)
+        self.layout.addWidget(self.load_template_btn)
+        self.layout.addWidget(QLabel(""))
 
         self.layout.addWidget(QLabel("L: Line length"))
         self.layout.addWidget(self.l_spinner)

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/Editors/transformer_editor.py

@@ -9,6 +9,7 @@ from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QComboB
 from VeraGrid.Gui.gui_functions import get_list_model, create_spinbox
 from VeraGridEngine.Devices.Branches.transformer import Transformer2W
 from VeraGridEngine.Devices.Branches.transformer_type import TransformerType, reverse_transformer_short_circuit_study
+from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 
 
 class TransformerEditor(QDialog):
@@ -16,24 +17,24 @@ class TransformerEditor(QDialog):
     TransformerEditor
     """
 
-    def __init__(self, branch: Transformer2W, Sbase=100, modify_on_accept=True, templates=None, current_template=None):
+    def __init__(self, branch: Transformer2W, grid: MultiCircuit, modify_on_accept=True):
         """
         Transformer
         :param branch:
-        :param Sbase:
+        :param grid: MultiCircuit
         """
         super(TransformerEditor, self).__init__()
 
         # keep pointer to the line object
         self.transformer_obj = branch
 
-        self.Sbase = Sbase
+        self.Sbase = grid.Sbase
 
         self.modify_on_accept = modify_on_accept
 
-        self.templates = self.filter_valid_templates(templates)
+        self.templates = self.filter_valid_templates(grid.transformer_types)
 
-        self.current_template = current_template
+        self.current_template = branch.template
 
         self.selected_template = None
 
@@ -54,28 +55,28 @@ class TransformerEditor(QDialog):
                                                                         G=self.transformer_obj.G,
                                                                         B=self.transformer_obj.B,
                                                                         rate=self.transformer_obj.rate,
-                                                                        Sbase=Sbase)
+                                                                        Sbase=self.Sbase)
 
         # ------------------------------------------------------------------------------------------
 
         # catalogue
         self.catalogue_combo = QComboBox()
-        if templates is not None:
-            if len(self.templates) > 0:
 
-                self.catalogue_combo.setModel(get_list_model(self.templates))
+        if len(self.templates) > 0:
 
-                if self.current_template is not None:
-                    idx = self.templates.index(self.current_template)
-                    if idx > -1:
-                        self.catalogue_combo.setCurrentIndex(idx)
+            self.catalogue_combo.setModel(get_list_model(self.templates))
 
-                        # set the template parameters
-                        Sn = self.current_template.Sn  # MVA
-                        Pcu = self.current_template.Pcu  # kW
-                        Pfe = self.current_template.Pfe  # kW
-                        I0 = self.current_template.I0  # %
-                        Vsc = self.current_template.Vsc  # %
+            if self.current_template is not None:
+                idx = self.templates.index(self.current_template)
+                if idx > -1:
+                    self.catalogue_combo.setCurrentIndex(idx)
+
+                    # set the template parameters
+                    Sn = self.current_template.Sn  # MVA
+                    Pcu = self.current_template.Pcu  # kW
+                    Pfe = self.current_template.Pfe  # kW
+                    I0 = self.current_template.I0  # %
+                    Vsc = self.current_template.Vsc  # %
 
         # load template
         self.load_template_btn = QPushButton()
@@ -107,11 +108,10 @@ class TransformerEditor(QDialog):
         # add all to the GUI
 
         # add all to the GUI
-        if templates is not None:
-            self.layout.addWidget(QLabel("Suitable templates"))
-            self.layout.addWidget(self.catalogue_combo)
-            self.layout.addWidget(self.load_template_btn)
-            self.layout.addWidget(QLabel(""))
+        self.layout.addWidget(QLabel("Suitable templates"))
+        self.layout.addWidget(self.catalogue_combo)
+        self.layout.addWidget(self.load_template_btn)
+        self.layout.addWidget(QLabel(""))
 
         self.layout.addWidget(QLabel("Sn: Nominal power [MVA]"))
         self.layout.addWidget(self.sn_spinner)

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -415,13 +415,7 @@ class MapLineSegment(QGraphicsLineItem):
                 if Vnom == temp.Vnom:
                     templates.append(temp)
 
-        dlg = LineEditor(
-            line=self.api_object,
-            Sbase=self.editor.circuit.Sbase,
-            frequency=self.editor.circuit.fBase,
-            templates=templates,
-            current_template=self.api_object.template
-        )
+        dlg = LineEditor(line=self.api_object, grid=self.editor.circuit)
         dlg.exec()
 
     def plot_profiles(self) -> None:

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -19,6 +19,7 @@ from PySide6.QtCore import (Qt, QMimeData, QIODevice, QByteArray, QDataStream, Q
 from PySide6.QtGui import (QIcon, QPixmap, QImage, QStandardItemModel, QStandardItem, QColor, QDropEvent)
 
 from VeraGrid.Gui.Diagrams.MapWidget.Branches.map_line_container import MapLineContainer
+from VeraGrid.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import BusGraphicItem
 from VeraGrid.Gui.Diagrams.generic_graphics import GenericDiagramWidget
 from VeraGrid.Gui.SubstationDesigner.substation_designer import SubstationDesigner
 from VeraGrid.Gui.general_dialogues import InputNumberDialogue
@@ -272,15 +273,19 @@ class GridMapWidget(BaseDiagramWidget):
         """
         self.diagram = diagram
 
-    def delete_element_utility_function(self, device: ALL_DEV_TYPES, propagate: bool = True):
+    def delete_element_utility_function(self, device: ALL_DEV_TYPES, propagate: bool = True,
+                                        graphic_object: QGraphicsItem | None = None):
         """
 
         :param device:
         :param propagate: Propagate the action to other diagrams?
+        :param graphic_object: graphic_object
         :return:
         """
         self.diagram.delete_device(device=device)
-        graphic_object: ALL_MAP_GRAPHICS = self.graphics_manager.delete_device(device=device)
+
+        if graphic_object is None:
+            graphic_object: ALL_MAP_GRAPHICS = self.graphics_manager.delete_device(device=device)
 
         if graphic_object is not None:
             self._remove_from_scene(graphic_object)
@@ -522,6 +527,25 @@ class GridMapWidget(BaseDiagramWidget):
         """
         return [s for s in self.map.view.selected_items() if isinstance(s, SubstationGraphicItem)]
 
+    def get_selected_buses(self) -> List[Tuple[int, Bus, BusGraphicItem | None]]:
+        """
+        Get a list of buses from the selected substations
+        :return:
+        """
+        buses: List[Tuple[int, Bus, BusGraphicItem | None]] = list()
+        se_graphics = self.get_selected_substations()
+
+        se_api_set = set()
+        for se_graphic in se_graphics:
+            if se_graphic.api_object is not None:
+                se_api_set.add(se_graphic.api_object)
+
+        for i, bus in enumerate(self.circuit.buses):
+            if bus.substation in se_api_set:
+                buses.append((i, bus, None))
+
+        return buses
+
     def get_substations(self) -> List[Tuple[int, Substation, SubstationGraphicItem]]:
         """
         Get all the substations

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/SchematicWidget/Branches/line_graphics.py

@@ -20,7 +20,6 @@ from VeraGrid.Gui.Diagrams.Editors.RmsModelEditor.rms_model_editor_engine import
 from VeraGridEngine.Devices.Branches.line import Line, SequenceLineType
 from VeraGridEngine.enumerations import DeviceType
 
-
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from VeraGrid.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
 
@@ -223,28 +222,19 @@ class LineGraphicItem(LineGraphicTemplateItem):
         Open the appropriate editor dialogue
         :return:
         """
-        Sbase = self.editor.circuit.Sbase
-        Vnom = self.api_object.get_max_bus_nominal_voltage()
-        templates = list()
-
-        for lst in [self.editor.circuit.sequence_line_types,
-                    self.editor.circuit.underground_cable_types,
-                    self.editor.circuit.overhead_line_types]:
-            for temp in lst:
-                if Vnom == temp.Vnom:
-                    templates.append(temp)
-
-        current_template = self.api_object.template
-        dlg = LineEditor(line=self.api_object, Sbase=Sbase, frequency=self.editor.circuit.fBase,
-                         templates=templates, current_template=current_template)
+        dlg = LineEditor(line=self.api_object, grid=self.editor.circuit)
         if dlg.exec():
             pass
 
     def edit_rms(self):
-        templates = [t.name for t in self.editor.circuit.sequence_line_types] # TODO: find where to build and save the templates
+        """
+
+        """
+        templates = [t.name for t in
+                     self.editor.circuit.sequence_line_types]  # TODO: find where to build and save the templates
 
         choice_dialog = RmsChoiceDialog(templates, parent=self.editor)
-        if choice_dialog.exec() == QtWidgets.QDialog.Accepted:
+        if choice_dialog.exec() == QtWidgets.QDialog.DialogCode.Accepted:
             if choice_dialog.choice == "template":
                 template_name = choice_dialog.selected_template
                 print(f"User chose template: {template_name}")

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/SchematicWidget/Branches/transformer2w_graphics.py

@@ -167,13 +167,7 @@ class TransformerGraphicItem(LineGraphicTemplateItem):
         Open the appropriate editor dialogue
         :return:
         """
-        Sbase = self.editor.circuit.Sbase
-        templates = self.editor.circuit.transformer_types
-        current_template = self.api_object.template
-        dlg = TransformerEditor(self.api_object, Sbase,
-                                modify_on_accept=True,
-                                templates=templates,
-                                current_template=current_template)
+        dlg = TransformerEditor(self.api_object, grid=self.editor.circuit, modify_on_accept=True)
         if dlg.exec():
             pass
 
@@ -200,13 +194,13 @@ class TransformerGraphicItem(LineGraphicTemplateItem):
                 self.editor.circuit.add_transformer_type(self.api_object.template)
             else:
                 # raise dialogue to set the template
-                dlg = TransformerEditor(self.api_object, Sbase, modify_on_accept=False)
+                dlg = TransformerEditor(self.api_object, grid=self.editor.circuit, modify_on_accept=False)
                 if dlg.exec():
                     tpe = dlg.get_template()
                     self.editor.circuit.add_transformer_type(tpe)
         else:
             # raise dialogue to set the template
-            dlg = TransformerEditor(self.api_object, Sbase, modify_on_accept=False)
+            dlg = TransformerEditor(self.api_object, grid=self.editor.circuit, modify_on_accept=False)
             if dlg.exec():
                 tpe = dlg.get_template()
                 self.editor.circuit.add_transformer_type(tpe)

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/SchematicWidget/Injections/controllable_shunt_graphics.py

@@ -85,10 +85,4 @@ class ControllableShuntGraphicItem(InjectionTemplateGraphicItem):
         """
         dlg = ControllableShuntEditor(api_object=self.api_object)
         if dlg.exec():
-            self.api_object.active_steps = dlg.get_active_steps()
-            self.api_object.g_steps = dlg.get_g_steps()
-            self.api_object.Gmax = self.api_object.g_steps.max()
-            self.api_object.Gmin = self.api_object.g_steps.min()
-            self.api_object.b_steps = dlg.get_b_steps()
-            self.api_object.Bmax = self.api_object.b_steps.max()
-            self.api_object.Bmin = self.api_object.b_steps.min()
+            pass

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -403,6 +403,9 @@ class SchematicWidget(BaseDiagramWidget):
         # nodes distance "explosion" factor
         self.expand_factor = 1.1
 
+        # Scale the view / do the zoom
+        self.scale_factor = 1.02  # 1.15
+
         # Zoom indicator
         self._zoom = 0
 
@@ -511,16 +514,14 @@ class SchematicWidget(BaseDiagramWidget):
         """
         self.editor_graphics_view.setTransformationAnchor(QGraphicsView.ViewportAnchor.AnchorUnderMouse)
 
-        # Scale the view / do the zoom
-        scale_factor = 1.15
         # print(event.angleDelta().x(), event.angleDelta().y(), event.angleDelta().manhattanLength() )
         if event.angleDelta().y() > 0:
             # Zoom in
-            self.zoom_in(scale_factor)
+            self.zoom_in()
 
         else:
             # Zooming out
-            self.zoom_out(scale_factor)
+            self.zoom_out()
 
     def graphicsKeyPressEvent(self, event: QKeyEvent):
         """
@@ -531,19 +532,17 @@ class SchematicWidget(BaseDiagramWidget):
         if event.key() == Qt.Key.Key_Delete:
             self.delete_selected_from_widget(delete_from_db=True)
 
-    def zoom_in(self, scale_factor: float = 1.15) -> None:
+    def zoom_in(self) -> None:
         """
-
-        :param scale_factor:
+        zoom in
         """
-        self.editor_graphics_view.scale(scale_factor, scale_factor)
+        self.editor_graphics_view.scale(self.scale_factor, self.scale_factor)
 
-    def zoom_out(self, scale_factor: float = 1.15) -> None:
+    def zoom_out(self) -> None:
         """
-
-        :param scale_factor:
+        Zoom out
         """
-        self.editor_graphics_view.scale(1.0 / scale_factor, 1.0 / scale_factor)
+        self.editor_graphics_view.scale(1.0 / self.scale_factor, 1.0 / self.scale_factor)
 
     def create_bus_graphics(self, bus: Bus, x: float, y: float, h: float, w: float,
                             draw_labels: bool = True, r: float = 0.0) -> BusGraphicItem | None:
@@ -1555,62 +1554,6 @@ class SchematicWidget(BaseDiagramWidget):
                                              from_port=self.started_branch.get_terminal_from(),
                                              to_port=self.started_branch.get_terminal_to())
 
-                        elif self.started_branch.connected_between_bus_and_cn():
-
-                            self.create_line(bus_from=self.started_branch.get_bus_from(),
-                                             cn_to=self.started_branch.get_cn_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_cn_and_bus():
-
-                            self.create_line(bus_to=self.started_branch.get_bus_to(),
-                                             cn_from=self.started_branch.get_cn_from(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_cn():
-
-                            self.create_line(cn_from=self.started_branch.get_cn_from(),
-                                             cn_to=self.started_branch.get_cn_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_busbar_and_bus():
-
-                            self.create_line(cn_from=self.started_branch.get_busbar_from().cn,
-                                             bus_to=self.started_branch.get_bus_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_bus_and_busbar():
-
-                            self.create_line(bus_from=self.started_branch.get_bus_from(),
-                                             cn_to=self.started_branch.get_busbar_to().cn,
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_busbar_and_cn():
-
-                            self.create_line(cn_from=self.started_branch.get_busbar_from().cn,
-                                             cn_to=self.started_branch.get_cn_to(),
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_cn_and_busbar():
-
-                            self.create_line(cn_from=self.started_branch.get_cn_from(),
-                                             cn_to=self.started_branch.get_busbar_to().cn,
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
-                        elif self.started_branch.connected_between_busbar():
-
-                            self.create_line(cn_from=self.started_branch.get_busbar_from().cn,
-                                             cn_to=self.started_branch.get_busbar_to().cn,
-                                             from_port=self.started_branch.get_terminal_from(),
-                                             to_port=self.started_branch.get_terminal_to())
-
                         else:
                             warn('unknown connection')
 
@@ -4766,10 +4709,6 @@ class SchematicWidget(BaseDiagramWidget):
 
             generator_graphics.api_object.control_bus = sel_bus
 
-            if (yes_no_question(text="Do you want to set the profile?", title="Set regulation bus")
-                    and self.circuit.has_time_series):
-                generator_graphics.api_object.control_bus_prof.fill(sel_bus)
-
         else:
             error_msg(text="You need to select exactly one bus to be set as the generator regulation bus",
                       title="Set regulation bus")

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Diagrams/base_diagram_widget.py

@@ -273,7 +273,7 @@ class BaseDiagramWidget(QSplitter):
 
     def remove_element(self,
                        device: ALL_DEV_TYPES,
-                       graphic_object: GenericDiagramWidget | None = None,
+                       graphic_object: GenericDiagramWidget | QGraphicsItem | None = None,
                        delete_from_db: bool = False) -> bool:
         """
         Remove device from the diagram and the database.
@@ -339,6 +339,7 @@ class BaseDiagramWidget(QSplitter):
         This function is a utility function to call this function in other diagrams through the GUI
         :param device: ALL_DEV_TYPES
         :param propagate: propagate
+        :param graphic_object: QGraphicsItem
         :return:
         """
         self.diagram.delete_device(device=device)
@@ -409,7 +410,7 @@ class BaseDiagramWidget(QSplitter):
         self.delete_with_dialogue(selected=self._get_selected(),
                                   delete_from_db=delete_from_db)
 
-    def delete_diagram_elements(self, elements: List[ALL_DEV_TYPES]):
+    def delete_diagram_elements(self, elements: List[ALL_DEV_TYPES], propagate: bool):
         """
         Delete device from the diagram registry
         :param elements: list of elements to delete

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/GridReduce/grid_reduce.py

@@ -15,10 +15,8 @@ from VeraGrid.Session.session import SimulationSession
 from VeraGridEngine.Devices.Substation.bus import Bus
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGridEngine.Topology.GridReduction.di_shi_grid_reduction import di_shi_reduction
-from VeraGridEngine.Topology.GridReduction.ptdf_grid_reduction import ptdf_reduction
+from VeraGridEngine.Topology.GridReduction.ptdf_grid_reduction import ptdf_reduction, ptdf_reduction_projected
 from VeraGridEngine.Topology.GridReduction.ward_equivalents import ward_standard_reduction
-from VeraGridEngine.Simulations.LinearFactors.linear_analysis import LinearAnalysis, LinearAnalysisTs
-from VeraGridEngine.Compilers.circuit_to_data import compile_numerical_circuit_at
 from VeraGridEngine.basic_structures import Logger
 from VeraGridEngine.enumerations import GridReductionMethod
 
@@ -46,7 +44,10 @@ class GridReduceDialogue(QtWidgets.QDialog):
 
         self.ui.listView.setModel(get_list_model(list(selected_buses_set)))
 
-        methods = [GridReductionMethod.PTDF, GridReductionMethod.DiShi, GridReductionMethod.Ward]
+        methods = [GridReductionMethod.PTDF,
+                   GridReductionMethod.PTDFProjected,
+                   GridReductionMethod.DiShi,
+                   GridReductionMethod.Ward]
         self.methods_dict = {m.value: m for m in methods}
         self.ui.methodComboBox.setModel(get_list_model([m.value for m in methods]))
 
@@ -119,6 +120,15 @@ class GridReduceDialogue(QtWidgets.QDialog):
                         grid=self._grid,
                         reduction_bus_indices=reduction_bus_indices,
                     )
+
+                elif method == GridReductionMethod.PTDFProjected:
+
+                    # NOTE: self._grid gets reduced in-place
+                    grid_reduced, logger = ptdf_reduction_projected(
+                        grid=self._grid,
+                        reduction_bus_indices=reduction_bus_indices,
+                    )
+
                 else:
                     raise NotImplementedError("Reduction method not supported")
 

{veragrid-5.5.9 → veragrid-5.5.12}/VeraGrid/Gui/Main/ConsoleLog.py

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