GridCal 5.1.36__tar.gz → 5.1.37__tar.gz

{GridCal-5.1.36 → GridCal-5.1.37}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -282,7 +282,8 @@ class MapLineSegment(QGraphicsLineItem):
                     templates.append(temp)
 
         current_template = self.api_object.template
-        dlg = LineEditor(self.api_object, Sbase, templates, current_template)
+        dlg = LineEditor(line=self.api_object, Sbase=Sbase, frequency=self.editor.circuit.fBase,
+                         templates=templates, current_template=current_template)
         if dlg.exec_():
             pass
 

{GridCal-5.1.36 → GridCal-5.1.37}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_editor.py

@@ -29,8 +29,10 @@ class LineEditor(QDialog):
     LineEditor
     """
 
-    def __init__(self, line: Line,
+    def __init__(self,
+                 line: Line,
                  Sbase=100,
+                 frequency=50,
                  templates: Union[List[Union[SequenceLineType, OverheadLineType, UndergroundLineType]], None] = None,
                  current_template=None):
         """
@@ -46,6 +48,8 @@ class LineEditor(QDialog):
 
         self.Sbase = Sbase
 
+        self.frequency = frequency
+
         self.templates = templates
 
         self.current_template = current_template
@@ -130,6 +134,7 @@ class LineEditor(QDialog):
         self.l_spinner.setMaximum(9999999)
         self.l_spinner.setDecimals(6)
         self.l_spinner.setValue(length)
+        self.l_spinner.setSuffix(' Km')
 
         # Max current
         self.i_spinner = QDoubleSpinBox()
@@ -137,6 +142,7 @@ class LineEditor(QDialog):
         self.i_spinner.setMaximum(9999999)
         self.i_spinner.setDecimals(2)
         self.i_spinner.setValue(I)
+        self.i_spinner.setSuffix(' KA')
 
         # R
         self.r_spinner = QDoubleSpinBox()
@@ -144,6 +150,7 @@ class LineEditor(QDialog):
         self.r_spinner.setMaximum(9999999)
         self.r_spinner.setDecimals(6)
         self.r_spinner.setValue(R)
+        self.r_spinner.setSuffix(' Ω/Km')
 
         # X
         self.x_spinner = QDoubleSpinBox()
@@ -151,6 +158,7 @@ class LineEditor(QDialog):
         self.x_spinner.setMaximum(9999999)
         self.x_spinner.setDecimals(6)
         self.x_spinner.setValue(X)
+        self.x_spinner.setSuffix(' Ω/Km')
 
         # B
         self.b_spinner = QDoubleSpinBox()
@@ -158,6 +166,7 @@ class LineEditor(QDialog):
         self.b_spinner.setMaximum(9999999)
         self.b_spinner.setDecimals(6)
         self.b_spinner.setValue(B)
+        self.b_spinner.setSuffix(" uS/Km")
 
         # apply to profile
         self.apply_to_profile = QCheckBox()
@@ -177,19 +186,19 @@ class LineEditor(QDialog):
             self.layout.addWidget(self.load_template_btn)
             self.layout.addWidget(QLabel(""))
 
-        self.layout.addWidget(QLabel("L: Line length [Km]"))
+        self.layout.addWidget(QLabel("L: Line length"))
         self.layout.addWidget(self.l_spinner)
 
-        self.layout.addWidget(QLabel("Imax: Max. current [KA] @" + str(int(Vf)) + " [KV]"))
+        self.layout.addWidget(QLabel("Imax: Max. current @" + str(int(Vf)) + " [KV]"))
         self.layout.addWidget(self.i_spinner)
 
-        self.layout.addWidget(QLabel("R: Resistance [Ohm/Km]"))
+        self.layout.addWidget(QLabel("R: Resistance"))
         self.layout.addWidget(self.r_spinner)
 
-        self.layout.addWidget(QLabel("X: Inductance [Ohm/Km]"))
+        self.layout.addWidget(QLabel("X: Inductance"))
         self.layout.addWidget(self.x_spinner)
 
-        self.layout.addWidget(QLabel("B: Susceptance [uS/Km]"))
+        self.layout.addWidget(QLabel("S: Susceptance"))
         self.layout.addWidget(self.b_spinner)
 
         self.layout.addWidget(self.apply_to_profile)
@@ -210,37 +219,27 @@ class LineEditor(QDialog):
             self.line.length = self.l_spinner.value()
             self.line.apply_template(self.selected_template, Sbase=self.Sbase)
         else:
-            length = self.l_spinner.value()
-            I = self.i_spinner.value()
-            R = self.r_spinner.value() * length
-            X = self.x_spinner.value() * length
-            B = self.b_spinner.value() * length
-
-            Vf = self.line.get_max_bus_nominal_voltage()
-
-            Zbase = (Vf * Vf) / self.Sbase
-            Ybase = 1.0 / Zbase
-
-            self.line.R = np.round(R / Zbase, 6)
-            self.line.X = np.round(X / Zbase, 6)
-            self.line.B = np.round(B * 1e-6 / Ybase, 6)
-            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)
+            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=self.l_spinner.value(),  # 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()
 
-    def load_template(self, template):
+    def load_template(self, template: Union[SequenceLineType, OverheadLineType, UndergroundLineType]):
         """
-
-        :param template:
+        Load a template in the editor
+        :param template: line compatible template
         :return:
         """
+
         if isinstance(template, SequenceLineType):
             self.i_spinner.setValue(template.Imax)
             self.r_spinner.setValue(template.R)

{GridCal-5.1.36 → GridCal-5.1.37}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_graphics.py

@@ -245,7 +245,8 @@ class LineGraphicItem(LineGraphicTemplateItem):
                     templates.append(temp)
 
         current_template = self.api_object.template
-        dlg = LineEditor(self.api_object, Sbase, templates, current_template)
+        dlg = LineEditor(line=self.api_object, Sbase=Sbase, frequency=self.editor.circuit.fBase,
+                         templates=templates, current_template=current_template)
         if dlg.exec_():
             pass
 
@@ -256,7 +257,8 @@ class LineGraphicItem(LineGraphicTemplateItem):
         """
         Sbase = self.editor.circuit.Sbase
 
-        dlg = LineEditor(self.api_object, Sbase)
+        dlg = LineEditor(line=self.api_object, Sbase=Sbase, frequency=self.editor.circuit.fBase,
+                         templates=None, current_template=None)
         if dlg.exec_():
             pass
 

{GridCal-5.1.36 → GridCal-5.1.37}/GridCal/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.1.36"
+__GridCal_VERSION__ = "5.1.37"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCal-5.1.36 → GridCal-5.1.37}/PKG-INFO

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