GridCal 5.0.18__tar.gz → 5.0.21__tar.gz

{GridCal-5.0.18 → GridCal-5.0.21}/GridCal/Gui/Analysis/object_plot_analysis.py

@@ -422,13 +422,13 @@ def grid_analysis(circuit: MultiCircuit,
                                                                property_name='R',
                                                                value=elm.R))
 
-                elif elm.R == 0.0:
+                elif elm.R == 1e-20:
                     logger.add(object_type=object_type.value,
                                element_name=elm.name,
                                element_index=i,
                                severity=LogSeverity.Information,
                                propty='R',
-                               message='The resistance is exactly zero.',
+                               message='The resistance is practically zero.',
                                val=elm.R)
                     fixable_errors.append(FixableErrorOutOfRange(grid_element=elm,
                                                                  property_name='R',
@@ -436,13 +436,13 @@ def grid_analysis(circuit: MultiCircuit,
                                                                  lower_limit=eps_min,
                                                                  upper_limit=eps_max))
 
-                if elm.X == 0.0:
+                if elm.X == 1e-20:
                     logger.add(object_type=object_type.value,
                                element_name=elm.name,
                                element_index=i,
                                severity=LogSeverity.Error,
                                propty='X',
-                               message='The reactance is exactly zero. This hurts numerical conditioning.',
+                               message='The reactance is practically zero. This hurts numerical conditioning.',
                                val=elm.X)
                     fixable_errors.append(FixableErrorOutOfRange(grid_element=elm,
                                                                  property_name='X',
@@ -456,7 +456,7 @@ def grid_analysis(circuit: MultiCircuit,
                                element_index=i,
                                severity=LogSeverity.Error,
                                propty='B',
-                               message='There is no susceptance, this hurts numerical conditioning.',
+                               message='There is no susceptance, this could hurt numerical conditioning.',
                                val=elm.B)
                     fixable_errors.append(FixableErrorOutOfRange(grid_element=elm,
                                                                  property_name='B',

{GridCal-5.0.18 → GridCal-5.0.21}/GridCal/Gui/BusBranchEditorWidget/Branches/dc_line_graphics.py

@@ -229,20 +229,22 @@ class DcLineEditor(QDialog):
 
 class DcLineGraphicItem(LineGraphicTemplateItem):
 
-    def __init__(self, fromPort: TerminalItem, toPort: TerminalItem,
+    def __init__(self,
+                 from_port: TerminalItem,
+                 to_port: TerminalItem,
                  editor: BusBranchEditorWidget,
                  width=5, api_object: DcLine = None):
         """
 
-        :param fromPort:
-        :param toPort:
+        :param from_port:
+        :param to_port:
         :param editor:
         :param width:
         :param api_object:
         """
         LineGraphicTemplateItem.__init__(self=self,
-                                         fromPort=fromPort,
-                                         toPort=toPort,
+                                         from_port=from_port,
+                                         to_port=to_port,
                                          editor=editor,
                                          width=width,
                                          api_object=api_object)

{GridCal-5.0.18 → GridCal-5.0.21}/GridCal/Gui/BusBranchEditorWidget/Branches/hvdc_graphics.py

@@ -28,20 +28,23 @@ if TYPE_CHECKING:  # Only imports the below statements during type checking
 
 class HvdcGraphicItem(LineGraphicTemplateItem):
 
-    def __init__(self, fromPort: TerminalItem, toPort: TerminalItem,
-                 editor: BusBranchEditorWidget, width=5,
+    def __init__(self,
+                 from_port: TerminalItem,
+                 to_port: TerminalItem,
+                 editor: BusBranchEditorWidget,
+                 width=5,
                  api_object: HvdcLine = None):
         """
 
-        :param fromPort:
-        :param toPort:
+        :param from_port:
+        :param to_port:
         :param editor:
         :param width:
         :param api_object:
         """
         LineGraphicTemplateItem.__init__(self=self,
-                                         fromPort=fromPort,
-                                         toPort=toPort,
+                                         from_port=from_port,
+                                         to_port=to_port,
                                          editor=editor,
                                          width=width,
                                          api_object=api_object)

{GridCal-5.0.18/GridCal/Gui/NodeBreakerEditorWidget → GridCal-5.0.21/GridCal/Gui/BusBranchEditorWidget}/Branches/line_editor.py

@@ -18,7 +18,7 @@ import numpy as np
 
 from typing import Union, List
 from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QDoubleSpinBox, QComboBox
+from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QDoubleSpinBox, QComboBox, QCheckBox
 from GridCal.Gui.GuiFunctions import get_list_model
 from GridCalEngine.Devices.Branches.line import Line, SequenceLineType, OverheadLineType, UndergroundLineType
 
@@ -150,6 +150,12 @@ class LineEditor(QDialog):
         self.b_spinner.setDecimals(6)
         self.b_spinner.setValue(B)
 
+        # apply to profile
+        self.apply_to_profile = QCheckBox()
+        self.apply_to_profile.setToolTip("Apply the newly computed values like the rating to the profile")
+        self.apply_to_profile.setChecked(True)
+        self.apply_to_profile.setText("Apply to profiles")
+
         # accept button
         self.accept_btn = QPushButton()
         self.accept_btn.setText('Accept')
@@ -177,6 +183,8 @@ class LineEditor(QDialog):
         self.layout.addWidget(QLabel("B: Susceptance [uS/Km]"))
         self.layout.addWidget(self.b_spinner)
 
+        self.layout.addWidget(self.apply_to_profile)
+
         self.layout.addWidget(self.accept_btn)
 
         self.setLayout(self.layout)
@@ -206,9 +214,15 @@ class LineEditor(QDialog):
             self.line.R = np.round(R / Zbase, 6)
             self.line.X = np.round(X / Zbase, 6)
             self.line.B = np.round(B / Ybase, 6)
-            self.line.rate = np.round(I * Vf * 1.73205080757, 6)  # nominal power in MVA = kA * kV * sqrt(3)
+            old_rate = float(self.line.rate)
+            new_rate = np.round(I * Vf * 1.73205080757, 6)  # nominal power in MVA = kA * kV * sqrt(3)
+            self.line.rate = new_rate
             self.line.length = length
 
+            if self.apply_to_profile.isChecked():
+                prof_old = self.line.rate_prof.toarray()
+                self.line.rate_prof.set(prof_old * new_rate / old_rate)
+
         self.accept()
 
     def load_template(self, template):

{GridCal-5.0.18 → GridCal-5.0.21}/GridCal/Gui/BusBranchEditorWidget/Branches/line_graphics.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 from PySide6.QtCore import Qt, QRectF
 from PySide6.QtGui import QPen, QIcon, QPixmap, QBrush
-from PySide6.QtWidgets import QMenu, QGraphicsRectItem
+from PySide6.QtWidgets import QMenu, QGraphicsRectItem, QGraphicsSceneContextMenuEvent
 from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
 from GridCal.Gui.BusBranchEditorWidget.Branches.line_editor import LineEditor
 from GridCal.Gui.messages import yes_no_question, warning_msg
@@ -36,22 +36,22 @@ class LineGraphicItem(LineGraphicTemplateItem):
     """
 
     def __init__(self,
-                 fromPort: TerminalItem,
-                 toPort: Union[TerminalItem, None],
+                 from_port: TerminalItem,
+                 to_port: Union[TerminalItem, None],
                  editor: BusBranchEditorWidget,
                  width=5,
                  api_object: Line = None):
         """
 
-        :param fromPort:
-        :param toPort:
+        :param from_port:
+        :param to_port:
         :param editor:
         :param width:
         :param api_object:
         """
         LineGraphicTemplateItem.__init__(self,
-                                         fromPort=fromPort,
-                                         toPort=toPort,
+                                         from_port=from_port,
+                                         to_port=to_port,
                                          editor=editor,
                                          width=width,
                                          api_object=api_object)
@@ -108,7 +108,7 @@ class LineGraphicItem(LineGraphicTemplateItem):
                 # change state
                 self.enable_disable_toggle()
 
-    def contextMenuEvent(self, event):
+    def contextMenuEvent(self, event: QGraphicsSceneContextMenuEvent):
         """
         Show context menu
         @param event:
@@ -206,29 +206,16 @@ class LineGraphicItem(LineGraphicTemplateItem):
             toupfc.setIcon(toupfc_icon)
             toupfc.triggered.connect(self.to_upfc)
 
-            menu.exec_(event.screenPos())
+            toser = menu.addAction('Series reactance')
+            toser_icon = QIcon()
+            toser_icon.addPixmap(QPixmap(":/Icons/icons/to_series_reactance.svg"))
+            toser.setIcon(toser_icon)
+            toser.triggered.connect(self.to_series_reactance)
+
+            menu.exec(event.screenPos())
         else:
             pass
 
-    def enable_disable_toggle(self):
-        """
-
-        @return:
-        """
-        if self.api_object is not None:
-            if self.api_object.active:
-                self.set_enable(False)
-            else:
-                self.set_enable(True)
-
-            if self.editor.circuit.has_time_series:
-                ok = yes_no_question('Do you want to update the time series active status accordingly?',
-                                     'Update time series active status')
-
-                if ok:
-                    # change the bus state (time series)
-                    self.editor.set_active_status_to_profile(self.api_object, override_question=True)
-
     def plot_profiles(self):
         """
         Plot the time series profiles
@@ -332,7 +319,8 @@ class LineGraphicItem(LineGraphicTemplateItem):
         :return:
         """
         if self.api_object.convertible_to_vsc():
-            ok = yes_no_question('Are you sure that you want to convert this line into a VSC device?', 'Convert line')
+            ok = yes_no_question('Are you sure that you want to convert this line into a VSC device?',
+                                 'Convert line')
             if ok:
                 self.editor.convert_line_to_vsc(line=self.api_object, line_graphic=self)
         else:
@@ -343,6 +331,27 @@ class LineGraphicItem(LineGraphicTemplateItem):
         Convert this object to UPFC
         :return:
         """
-        ok = yes_no_question('Are you sure that you want to convert this line into a UPFC device?', 'Convert line')
+        ok = yes_no_question('Are you sure that you want to convert this line into a UPFC device?',
+                             'Convert line')
         if ok:
             self.editor.convert_line_to_upfc(line=self.api_object, line_graphic=self)
+
+    def to_series_reactance(self):
+        """
+        Convert this object to series reactance
+        :return:
+        """
+        ok = yes_no_question('Are you sure that you want to convert this line into a series reactance device?',
+                             'Convert line')
+        if ok:
+            self.editor.convert_line_to_series_reactance(line=self.api_object, line_graphic=self)
+
+    def __str__(self):
+
+        if self.api_object is None:
+            return f"Line graphics {hex(id(self))}"
+        else:
+            return f"Graphics of {self.api_object.name} [{hex(id(self))}]"
+
+    def __repr__(self):
+        return str(self)