GridCal 5.3.34__tar.gz → 5.3.36__tar.gz

{gridcal-5.3.34 → gridcal-5.3.36}/GridCal/Gui/CascadingSteps/gui.py

@@ -71,7 +71,7 @@ class Ui_Dialog(object):
         self.clear_cascade_pushButton = QPushButton(self.frame_11)
         self.clear_cascade_pushButton.setObjectName(u"clear_cascade_pushButton")
         icon3 = QIcon()
-        icon3.addFile(u":/Icons/icons/delete.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        icon3.addFile(u":/Icons/icons/delete_with_dialogue.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.clear_cascade_pushButton.setIcon(icon3)
 
         self.horizontalLayout_3.addWidget(self.clear_cascade_pushButton)

{gridcal-5.3.34/GridCal/Gui/Diagrams/SchematicWidget/Injections → gridcal-5.3.36/GridCal/Gui/Diagrams/Editors}/controllable_shunt_editor.py

@@ -85,6 +85,7 @@ class ControllableShuntEditor(QDialog):
 
         self.setLayout(layout)
 
+
     def get_active_steps(self) -> np.ndarray:
         """
 

{gridcal-5.3.34/GridCal/Gui/Diagrams/SchematicWidget/Injections → gridcal-5.3.36/GridCal/Gui/Diagrams/Editors}/generator_editor.py

@@ -249,7 +249,7 @@ class GeneratorQCurveEditor(QDialog):
             row = selected_indexes[0].row()
             self.table_model.delRow(row)
         else:
-            # if no selection, delete the last row
+            # if no selection, delete_with_dialogue the last row
             self.table_model.delLastRow()
 
     def sort(self):

{gridcal-5.3.34/GridCal/Gui/Diagrams/SchematicWidget/Branches → gridcal-5.3.36/GridCal/Gui/Diagrams/Editors}/line_editor.py

@@ -7,11 +7,10 @@ from __future__ import annotations
 import numpy as np
 
 from typing import Union, List
-from GridCal.Gui.messages import warning_msg
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QDoubleSpinBox, QComboBox, QCheckBox
 from GridCal.Gui.gui_functions import get_list_model
-from GridCal.Gui.messages import error_msg
+from GridCal.Gui.messages import error_msg, warning_msg, yes_no_question
 from GridCalEngine.Devices.Branches.line import Line, SequenceLineType, OverheadLineType, UndergroundLineType
 
 
@@ -169,6 +168,17 @@ class LineEditor(QDialog):
         self.b_spinner.setValue(b_us)
         self.b_spinner.setSuffix(" uS/Km")
 
+        # Circuit Index
+        max_circuits = 0
+        if isinstance(self.current_template, OverheadLineType):
+            max_circuits = self.current_template.n_circuits
+        self.circuit_idx = QDoubleSpinBox()
+        self.circuit_idx.setMinimum(1)
+        self.circuit_idx.setMaximum(max_circuits)
+        self.circuit_idx.setDecimals(0)
+        self.circuit_idx.setValue(float(self.line.circuit_idx))
+        self.circuit_idx.setSuffix("")
+
         # apply to profile
         self.apply_to_profile = QCheckBox()
         self.apply_to_profile.setToolTip("Apply the newly computed values like the rating to the profile")
@@ -184,6 +194,9 @@ class LineEditor(QDialog):
         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(""))
 
@@ -223,22 +236,35 @@ class LineEditor(QDialog):
             if self.selected_template is not None:
                 self.line.disable_auto_updates()
                 self.line.set_length(val=length)
+                self.line.set_circuit_idx(val=int(self.circuit_idx.value()), obj=self.selected_template)
                 self.line.apply_template(obj=self.selected_template, Sbase=self.Sbase, freq=self.frequency)
                 self.line.enable_auto_updates()
+                self.accept()
             else:
-                wf = 2 * np.pi * self.frequency
-                self.line.fill_design_properties(
-                    r_ohm=self.r_spinner.value(),  # ohm / km
-                    x_ohm=self.x_spinner.value(),  # ohm / km
-                    c_nf=self.b_spinner.value() * 1e3 / wf,  # nF / km
-                    length=length,  # km
-                    Imax=self.i_spinner.value(),  # KA
-                    freq=self.frequency,  # Hz
-                    Sbase=self.Sbase,  # MVA
-                    apply_to_profile=self.apply_to_profile.isChecked()
+                response = yes_no_question(
+                    text="Warning: You did not load template values. The circuit index will not be updated. "
+                         "Line parameters will be based on the provided values for Length, Max Current, Resistance, "
+                         "Reactance, and Susceptance.\n\n"
+                         "Do you want to continue without a template?",
+                    title="No Template Selected"
                 )
 
-            self.accept()
+                if response:  # User selected Yes
+                    wf = 2 * np.pi * self.frequency
+                    self.line.fill_design_properties(
+                        r_ohm=self.r_spinner.value(),  # ohm / km
+                        x_ohm=self.x_spinner.value(),  # ohm / km
+                        c_nf=self.b_spinner.value() * 1e3 / wf,  # nF / km
+                        length=length,  # km
+                        Imax=self.i_spinner.value(),  # KA
+                        freq=self.frequency,  # Hz
+                        Sbase=self.Sbase,  # MVA
+                        apply_to_profile=self.apply_to_profile.isChecked()
+                    )
+                    self.accept()
+                else:
+                    # User canceled, do nothing
+                    return
         else:
             error_msg(text="The length cannot be 0!", title="Accept line design values")
 
@@ -268,13 +294,14 @@ class LineEditor(QDialog):
         elif isinstance(template, OverheadLineType):
             if self.current_template.check():
                 R1, X1, Bsh1, I_kA = self.current_template.get_sequence_values(
-                    circuit_idx=self.line.circuit_idx,
+                    circuit_idx=int(self.circuit_idx.value()),
                     seq=1
                 )
                 self.i_spinner.setValue(I_kA)
                 self.r_spinner.setValue(R1)
                 self.x_spinner.setValue(X1)
                 self.b_spinner.setValue(Bsh1)
+                self.circuit_idx.setMaximum(self.current_template.n_circuits)
             else:
                 warning_msg(text=f"The template {self.current_template.name} contains errors",
                             title="Load template")
@@ -291,3 +318,20 @@ class LineEditor(QDialog):
 
             if idx > -1:
                 self.load_template(template=self.templates[idx])
+
+    def update_max_circuits(self):
+        """
+        Update the maximum number of circuits
+        :return:
+        """
+
+        if self.templates is not None:
+            idx = self.catalogue_combo.currentIndex()
+
+            if idx > -1:
+                template = self.templates[idx]
+
+                if isinstance(template, OverheadLineType):
+                    self.circuit_idx.setMaximum(template.n_circuits)
+                else:
+                    self.circuit_idx.setMaximum(1)

{gridcal-5.3.34/GridCal/Gui/Diagrams/SchematicWidget/Branches → gridcal-5.3.36/GridCal/Gui/Diagrams/Editors}/transformer3w_editor.py

@@ -92,7 +92,7 @@ class Transformer3WEditor(QDialog):
         super(Transformer3WEditor, self).__init__()
 
         # keep pointer to the line object
-        self.transformer_obj = tr3
+        self._api_object = tr3
 
         self.Sbase = Sbase
 
@@ -159,6 +159,10 @@ class Transformer3WEditor(QDialog):
 
         self.setWindowTitle('Transformer editor')
 
+    @property
+    def api_object(self) -> Transformer3W:
+        return self._api_object
+
     def accept_click(self):
         """
         Create transformer type and get the impedances
@@ -166,21 +170,21 @@ class Transformer3WEditor(QDialog):
         """
 
         if self.modify_on_accept:
-            self.transformer_obj.fill_from_design_values(V1=self.w1.vn_spinner.value(),
-                                                         V2=self.w2.vn_spinner.value(),
-                                                         V3=self.w3.vn_spinner.value(),
-                                                         Sn1=self.w1.sn_spinner.value(),
-                                                         Sn2=self.w2.sn_spinner.value(),
-                                                         Sn3=self.w3.sn_spinner.value(),
-                                                         Pcu12=self.w1.pcu_spinner.value(),
-                                                         Pcu23=self.w2.pcu_spinner.value(),
-                                                         Pcu31=self.w3.pcu_spinner.value(),
-                                                         Vsc12=self.w1.vsc_spinner.value(),
-                                                         Vsc23=self.w2.vsc_spinner.value(),
-                                                         Vsc31=self.w3.vsc_spinner.value(),
-                                                         Pfe=self.pfe_spinner.value(),
-                                                         I0=self.I0_spinner.value(),
-                                                         Sbase=self.Sbase)
+            self._api_object.fill_from_design_values(V1=self.w1.vn_spinner.value(),
+                                                     V2=self.w2.vn_spinner.value(),
+                                                     V3=self.w3.vn_spinner.value(),
+                                                     Sn1=self.w1.sn_spinner.value(),
+                                                     Sn2=self.w2.sn_spinner.value(),
+                                                     Sn3=self.w3.sn_spinner.value(),
+                                                     Pcu12=self.w1.pcu_spinner.value(),
+                                                     Pcu23=self.w2.pcu_spinner.value(),
+                                                     Pcu31=self.w3.pcu_spinner.value(),
+                                                     Vsc12=self.w1.vsc_spinner.value(),
+                                                     Vsc23=self.w2.vsc_spinner.value(),
+                                                     Vsc31=self.w3.vsc_spinner.value(),
+                                                     Pfe=self.pfe_spinner.value(),
+                                                     I0=self.I0_spinner.value(),
+                                                     Sbase=self.Sbase)
 
         self.accept()
 

{gridcal-5.3.34 → gridcal-5.3.36}/GridCal/Gui/Diagrams/MapWidget/Branches/line_location_graphic_item.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
-from typing import Tuple, TYPE_CHECKING
+from typing import Tuple, List, TYPE_CHECKING
 from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent
 from GridCal.Gui.gui_functions import add_menu_entry
 from PySide6 import QtWidgets
@@ -87,6 +87,21 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         # Assign color to the node
         self.set_default_color()
 
+    @property
+    def api_object(self) -> LineLocation:
+        return self._api_object
+
+    @property
+    def editor(self) -> GridMapWidget:
+        return self._editor
+
+    def get_associated_widgets(self) -> List[MapLineContainer]:
+        """
+        This forwards to the map line container for the appropriate deletion of everything
+        :return:
+        """
+        return [self.line_container]
+
     def get_center_pos(self) -> QPointF:
         """
 
@@ -114,7 +129,6 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
 
         if self.enabled:
             self.update_real_pos()
-            self.needs_update = True
             self.line_container.update_connectors()
 
     def update_position_at_the_diagram(self) -> None:
@@ -125,16 +139,14 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         center_point = self.get_pos()
 
         self.lat, self.lon = self.editor.to_lat_lon(x=center_point.x() + real_position.x(),
-                                                    y=center_point.y() + real_position.y())
+                                                     y=center_point.y() + real_position.y())
 
         # print(f'Updating node position id:{self.api_object.idtag}, lat:{self.lat}, lon:{self.lon}')
 
         self.editor.update_diagram_element(device=self.api_object,
-                                           latitude=self.lat,
-                                           longitude=self.lon,
-                                           graphic_object=self)
-
-        print()
+                                            latitude=self.lat,
+                                            longitude=self.lon,
+                                            graphic_object=self)
 
     def update_database_position(self) -> None:
         """
@@ -144,7 +156,7 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         center_point = self.get_pos()
 
         self.lat, self.lon = self.editor.to_lat_lon(x=center_point.x() + real_position.x(),
-                                                    y=center_point.y() + real_position.y())
+                                                     y=center_point.y() + real_position.y())
 
         # print(f'Updating node position id:{self.api_object.idtag}, lat:{self.lat}, lon:{self.lon}')
 
@@ -241,48 +253,19 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         """
         menu = QMenu()
 
-        # add_menu_entry(menu=menu,
-        #                text="Merge",
-        #                icon_path="",
-        #                function_ptr=self.MergeFunction)
-        #
-        # add_menu_entry(menu=menu,
-        #                text="Split",
-        #                icon_path=":/Icons/icons/divide.svg",
-        #                function_ptr=self.SplitFunction)
-
         add_menu_entry(menu=menu,
                        text="Delete",
-                       icon_path=":/Icons/icons/delete.svg",
+                       icon_path=":/Icons/icons/delete_schematic.svg",
                        function_ptr=self.remove)
 
         menu.exec_(event.screenPos())
 
-    def AddFunction(self):
-        """
-
-        :return:
-        """
-        self.line_container.insert_new_node_at_position(index=self.index)
-        # Implement the functionality for Action 1 here
-        pass
-
-    def SplitFunction(self):
-        """
-
-        :return:
-        """
-        self.line_container.split_Line(index=self.index)
-        # Implement the functionality for Action 1 here
-        pass
-
     def remove(self):
         """
         Remove
         """
         self.line_container.removeNode(node=self)
 
-
     def setNodeColor(self, inner_color: QColor, border_color: QColor = None) -> None:
         """
 
@@ -344,3 +327,5 @@ class LineLocationGraphicItem(QtWidgets.QGraphicsEllipseItem, NodeTemplate):
         pen = self.pen()
         pen.setWidth(width)
         self.setPen(pen)
+
+

{gridcal-5.3.34 → gridcal-5.3.36}/GridCal/Gui/Diagrams/MapWidget/Branches/map_ac_line.py

@@ -24,3 +24,7 @@ class MapAcLine(MapLineContainer):
         :param draw_labels:
         """
         MapLineContainer.__init__(self, editor=editor, api_object=api_object, draw_labels=draw_labels)
+
+    @property
+    def api_object(self) -> Line:
+        return self._api_object

{gridcal-5.3.34 → gridcal-5.3.36}/GridCal/Gui/Diagrams/MapWidget/Branches/map_dc_line.py

@@ -24,3 +24,7 @@ class MapDcLine(MapLineContainer):
         :param draw_labels:
         """
         MapLineContainer.__init__(self, editor=editor, api_object=api_object, draw_labels=draw_labels)
+
+    @property
+    def api_object(self) -> DcLine:
+        return self._api_object

{gridcal-5.3.34 → gridcal-5.3.36}/GridCal/Gui/Diagrams/MapWidget/Branches/map_fluid_path.py

@@ -25,3 +25,6 @@ class MapFluidPathLine(MapLineContainer):
         """
         MapLineContainer.__init__(self, editor=editor, api_object=api_object, draw_labels=draw_labels)
 
+    @property
+    def api_object(self) -> FluidPath:
+        return self._api_object

{gridcal-5.3.34 → gridcal-5.3.36}/GridCal/Gui/Diagrams/MapWidget/Branches/map_hvdc_line.py

@@ -24,3 +24,7 @@ class MapHvdcLine(MapLineContainer):
         :param draw_labels:
         """
         MapLineContainer.__init__(self, editor=editor, api_object=api_object, draw_labels=draw_labels)
+
+    @property
+    def api_object(self) -> HvdcLine:
+        return self._api_object

{gridcal-5.3.34 → gridcal-5.3.36}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -44,12 +44,18 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
                                       draw_labels=draw_labels)
         QGraphicsItemGroup.__init__(self)
 
-        self.editor: GridMapWidget = editor  # reassign to make clear the editor type
-
         self.nodes_list: List[LineLocationGraphicItem] = list()
         self.segments_list: List[MapLineSegment] = list()
         self.enabled = True
 
+    @property
+    def api_object(self) -> Union[BRANCH_TYPES, FluidPath]:
+        return self._api_object
+
+    @property
+    def editor(self) -> GridMapWidget:
+        return self._editor
+
     def set_width_scale(self, width: float, arrow_width: float):
         """
         Set the width scale of the line
@@ -68,7 +74,7 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
         Remove all segments from the scene
         """
         for segment in self.segments_list:
-            self.editor.remove_only_graphic_element(segment)
+            self.editor._remove_from_scene(segment)
 
         self.segments_list = list()
 
@@ -77,7 +83,7 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
         Remove all the nodes from the scene
         """
         for node in self.nodes_list:
-            self.editor.remove_from_scene(node)
+            self.editor._remove_from_scene(node)
 
         self.nodes_list = list()
 
@@ -127,8 +133,8 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
 
         :return:
         """
-        for conector in self.segments_list:
-            conector.update_endings()
+        for connector in self.segments_list:
+            connector.update_endings()
 
     def end_update(self) -> None:
         """
@@ -158,10 +164,10 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
                 loc_data = None
 
             graphic_obj = self.editor.create_line_location_graphic(line_container=self,
-                                                                   api_object=elm,
-                                                                   lat=elm.lat if loc_data is None else loc_data.latitude,
-                                                                   lon=elm.long if loc_data is None else loc_data.longitude,
-                                                                   index=self.number_of_nodes())  # 2.7 ...
+                                                                    api_object=elm,
+                                                                    lat=elm.lat if loc_data is None else loc_data.latitude,
+                                                                    lon=elm.long if loc_data is None else loc_data.longitude,
+                                                                    index=self.number_of_nodes())  # 2.7 ...
 
             self.register_new_node(node=graphic_obj)
 
@@ -215,8 +221,8 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
                 connection_elements.append(substation_to_graphics)
                 substation_to_graphics.line_container = self
 
-        br_scale = self.editor.get_branch_width()
-        arrow_scale = self.editor.get_arrow_scale()
+        # br_scale = self.editor.get_branch_width()
+        # arrow_scale = self.editor.get_arrow_scale()
 
         # second pass: create the segments
         for i in range(1, len(connection_elements)):
@@ -231,9 +237,6 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
             elm2.needsUpdate = True
             segment_graphic_object.needsUpdate = True
 
-            # segment_graphic_object.set_width(br_scale * segment_graphic_object.width)  # Assign the pen to the line item
-            # segment_graphic_object.set_arrow_sizes(arrow_scale)
-
             # register the segment in the line
             self.add_segment(segment=segment_graphic_object)
 
@@ -242,8 +245,6 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
 
         self.update_connectors()
 
-        # self.editor.update_device_sizes()
-
     def substation_to(self):
         """
 
@@ -290,10 +291,10 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
             # Create a new graphical node item
 
             graphic_obj = self.editor.create_line_location_graphic(line_container=self,
-                                                                   api_object=new_api_object,
-                                                                   lat=new_api_object.lat,
-                                                                   lon=new_api_object.long,
-                                                                   index=index)
+                                                                    api_object=new_api_object,
+                                                                    lat=new_api_object.lat,
+                                                                    lon=new_api_object.long,
+                                                                    index=index)
 
             idx = 0
 
@@ -339,10 +340,10 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
             # Create a new graphical node item
 
             graphic_obj = self.editor.create_line_location_graphic(line_container=self,
-                                                                   api_object=new_api_object,
-                                                                   lat=new_api_object.lat,
-                                                                   lon=new_api_object.long,
-                                                                   index=0)
+                                                                    api_object=new_api_object,
+                                                                    lat=new_api_object.lat,
+                                                                    lon=new_api_object.long,
+                                                                    index=0)
 
             # Add the node to the nodes list
             self.nodes_list.insert(0, graphic_obj)
@@ -385,10 +386,10 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
             # Create a new graphical node item
 
             graphic_obj = self.editor.create_line_location_graphic(line_container=self,
-                                                                   api_object=new_api_object,
-                                                                   lat=new_api_object.lat,
-                                                                   lon=new_api_object.long,
-                                                                   index=index)
+                                                                    api_object=new_api_object,
+                                                                    lat=new_api_object.lat,
+                                                                    lon=new_api_object.long,
+                                                                    index=index)
 
             idx = 0
 
@@ -532,5 +533,22 @@ class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
         # Update the line's length property
         if total_length > 0.0:
             self.api_object.length = total_length
-            
+
         return total_length
+
+    def get_extra_graphics(self):
+        """
+        This function gets the graphic objects associated to a MapLineContainer
+        return: The list of the associated graphic objects, which are the nodes and segments of the line.
+        """
+        return self.segments_list + self.nodes_list
+
+    def delete(self):
+        """
+        Delete this object and all the other objects
+        """
+        for segment in self.segments_list:
+            segment.delete_from_associations()
+
+        self.editor.delete_with_dialogue(selected=[self], delete_from_db=False)
+