GridCal 5.1.38__tar.gz → 5.1.40__tar.gz

{GridCal-5.1.38 → GridCal-5.1.40}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -72,9 +72,9 @@ class MapLineContainer(GenericDiagramWidget):
         :param val:
         """
         for segment in self.segments_list:
-            pen = segment.pen()  # get the current pen
-            pen.setWidthF(val * segment.width)  # Set the fractional thickness of the line
-            segment.setPen(pen)  # Assign the pen to the line item
+            # pen = segment.pen()  # get the current pen
+            # pen.setWidthF(val * segment.width)  # Set the fractional thickness of the line
+            segment.set_width(val * segment.width)  # Assign the pen to the line item
 
     def clean_segments(self) -> None:
         """
@@ -132,10 +132,8 @@ class MapLineContainer(GenericDiagramWidget):
         :return:
         """
         for segment in self.segments_list:
-            segment.setPen(QPen(color, w, style))
             segment.setToolTip(tool_tip)
-            # segment.setPen(Qt.NoPen)
-            # segment.setBrush(color)
+            segment.set_colour(color=color, w=w, style=style)
 
     def update_connectors(self) -> None:
         """
@@ -463,3 +461,23 @@ class MapLineContainer(GenericDiagramWidget):
 
         for line in self.segments_list:
             line.set_enable(val=False)
+
+    def set_arrows_with_power(self, Sf: complex, St: complex) -> None:
+        """
+
+        :param Sf:
+        :param St:
+        :return:
+        """
+        for segment in self.segments_list:
+            segment.set_arrows_with_power(Sf=Sf, St=St)
+
+    def set_arrows_with_hvdc_power(self, Pf: float, Pt: float) -> None:
+        """
+
+        :param Pf:
+        :param Pt:
+        :return:
+        """
+        for segment in self.segments_list:
+            segment.set_arrows_with_hvdc_power(Pf=Pf, Pt=Pt)

{GridCal-5.1.38 → GridCal-5.1.40}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -21,6 +21,7 @@ from PySide6.QtGui import QPen, QColor, QCursor
 from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent
 from PySide6.QtWidgets import QGraphicsLineItem, QGraphicsSceneMouseEvent
 
+from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_graphics_template import ArrowHead
 from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER
@@ -52,13 +53,26 @@ class MapLineSegment(QGraphicsLineItem):
         self.container: MapLineContainer = container
         self.draw_labels = True
 
-        self.style = Qt.SolidLine
-        self.color = Qt.blue
+        self.style = Qt.PenStyle.SolidLine
+        self.color = QColor(115, 115, 115, 200)  # translucent gray
         self.width = 0.1
 
         self.pos1: QPointF = self.first.get_center_pos()
         self.pos2: QPointF = self.second.get_center_pos()
 
+        # arrows
+        self.view_arrows = True
+        self._arrow_size = self.width * 1.5
+        self.arrow_p_from = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.2, under=False,
+                                      text_scale=0.01, show_text=False)
+        self.arrow_q_from = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.2, under=True,
+                                      text_scale=0.01, show_text=False)
+        self.arrow_p_to = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.8, under=False,
+                                    text_scale=0.01, show_text=False)
+        self.arrow_q_to = ArrowHead(parent=self, arrow_size=self._arrow_size, position=0.8, under=True,
+                                    text_scale=0.01, show_text=False)
+
+        # set callbacks
         self.first.add_position_change_callback(self.set_from_side_coordinates)
         self.second.add_position_change_callback(self.set_to_side_coordinates)
 
@@ -68,7 +82,7 @@ class MapLineSegment(QGraphicsLineItem):
         self.setZValue(0)
 
         self.setFlag(self.GraphicsItemFlag.ItemIsSelectable, True)
-        self.setCursor(QCursor(Qt.PointingHandCursor))
+        self.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
     @property
     def api_object(self) -> BRANCH_TYPES:
@@ -86,6 +100,21 @@ class MapLineSegment(QGraphicsLineItem):
         """
         return self.container.editor
 
+    def set_width(self, width: float):
+        """
+
+        :param width:
+        :return:
+        """
+        pen = self.pen()
+        pen.setWidthF(width)
+        self.setPen(pen)
+
+        self.arrow_p_from.label.setScale(width)
+        self.arrow_q_from.label.setScale(width)
+        self.arrow_p_to.label.setScale(width)
+        self.arrow_q_to.label.setScale(width)
+
     def set_colour(self, color: QColor, w: float, style: Qt.PenStyle):
         """
         Set color and style
@@ -95,10 +124,14 @@ class MapLineSegment(QGraphicsLineItem):
         :return:
         """
 
-        pen = QPen(color, w, style, Qt.RoundCap, Qt.RoundJoin)
+        pen = QPen(color, w, style, Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin)
         pen.setWidthF(w)
 
         self.setPen(pen)
+        self.arrow_p_from.set_colour(color, w, style)
+        self.arrow_q_from.set_colour(color, w, style)
+        self.arrow_p_to.set_colour(color, w, style)
+        self.arrow_q_to.set_colour(color, w, style)
 
     def set_from_side_coordinates(self, x: float, y: float):
         """
@@ -125,13 +158,15 @@ class MapLineSegment(QGraphicsLineItem):
         Update the endings of this segment
         """
         self.setLine(QLineF(self.pos1, self.pos2))
-        # Get the positions of the first and second objects
-        # if self.first.needsUpdate or self.second.needsUpdate or force:
-        #     # Set the line's starting and ending points
-        #     self.setLine(self.first.rect().x(),
-        #                  self.first.rect().y(),
-        #                  self.second.rect().x(),
-        #                  self.second.rect().y())
+
+        if self.api_object is not None:
+
+            # arrows
+            if self.view_arrows:
+                self.arrow_p_from.redraw()
+                self.arrow_q_from.redraw()
+                self.arrow_p_to.redraw()
+                self.arrow_q_to.redraw()
 
     def end_update(self) -> None:
         """
@@ -158,11 +193,6 @@ class MapLineSegment(QGraphicsLineItem):
         """
         menu = QMenu()
 
-        # add_menu_entry(menu=menu,
-        #                text="Remove",
-        #                icon_path="",
-        #                function_ptr=self.RemoveFunction)
-
         menu.addSection("Line")
 
         add_menu_entry(menu=menu,
@@ -360,3 +390,34 @@ class MapLineSegment(QGraphicsLineItem):
         if ok:
             self.editor.circuit.delete_branch(obj=self.api_object)
             self.editor.delete_diagram_element(device=self.api_object)
+
+    def set_arrows_with_power(self, Sf: complex, St: complex) -> None:
+        """
+        Set the arrow directions
+        :param Sf: Complex power from
+        :param St: Complex power to
+        """
+
+        if Sf is not None:
+            if St is None:
+                St = -Sf
+
+            Pf = Sf.real
+            Qf = Sf.imag
+            Pt = St.real
+            Qt_ = St.imag
+            self.arrow_p_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+            self.arrow_q_from.set_value(Qf, True, Qf < 0, name="Qf", units="MVAr", draw_label=self.draw_labels)
+            self.arrow_p_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+            self.arrow_q_to.set_value(Qt_, True, Qt_ > 0, name="Qt", units="MVAr", draw_label=self.draw_labels)
+
+    def set_arrows_with_hvdc_power(self, Pf: float, Pt: float) -> None:
+        """
+        Set the arrow directions
+        :param Pf: Complex power from
+        :param Pt: Complex power to
+        """
+        self.arrow_p_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_q_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_p_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+        self.arrow_q_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)

{GridCal-5.1.38 → GridCal-5.1.40}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -374,14 +374,14 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
             max_value=100000.0,
             default_value=self.editor.diagram.default_bus_voltage,
             title="Add voltage level",
-            text="Voltage (kV)",
+            text="Voltage (KV)",
         )
 
         inpt.exec()
 
         if inpt.is_accepted:
             kv = inpt.value
-            vl = VoltageLevel(name=f'{kv}kV @ {self.api_object.name}',
+            vl = VoltageLevel(name=f'{kv}KV @ {self.api_object.name}',
                               Vnom=kv,
                               substation=self.api_object)
 

{GridCal-5.1.38 → GridCal-5.1.40}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -245,7 +245,7 @@ class GridMapWidget(BaseDiagramWidget):
                              position_callback=self.position_callback)
 
         # Any representation on the map must be done after this Goto Function
-        self.map.GotoLevelAndPosition(level=6, longitude=0, latitude=40)
+        self.map.GotoLevelAndPosition(level=6, longitude=longitude, latitude=latitude)
 
         self.map.startLev = 6
         self.map.startLat = 0
@@ -994,7 +994,7 @@ class GridMapWidget(BaseDiagramWidget):
         #
         #     tooltip = str(i) + ': ' + bus.name + '\n' \
         #               + 'V:' + "{:10.4f}".format(vabs[i]) + " <{:10.4f}".format(vang[i]) + 'º [p.u.]\n' \
-        #               + 'V:' + "{:10.4f}".format(vabs[i] * bus.Vnom) + " <{:10.4f}".format(vang[i]) + 'º [kV]'
+        #               + 'V:' + "{:10.4f}".format(vabs[i] * bus.Vnom) + " <{:10.4f}".format(vang[i]) + 'º [KV]'
         #     if Sbus is not None:
         #         tooltip += '\nS: ' + "{:10.4f}".format(Sbus[i] * Sbase) + ' [MVA]'
         #     if types is not None:
@@ -1059,7 +1059,7 @@ class GridMapWidget(BaseDiagramWidget):
                         a *= 255
 
                     color = QColor(r, g, b, a)
-                    style = Qt.SolidLine
+                    style = Qt.PenStyle.SolidLine
                     if use_flow_based_width:
                         weight = int(
                             np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
@@ -1068,6 +1068,15 @@ class GridMapWidget(BaseDiagramWidget):
 
                     graphic_object.set_colour(color=color, w=weight, style=style, tool_tip=tooltip)
 
+                    if hasattr(graphic_object, 'set_arrows_with_power'):
+                        graphic_object.set_arrows_with_power(
+                            Sf=Sf[i] if Sf is not None else None,
+                            St=St[i] if St is not None else None
+                        )
+                else:
+                    # the graphic object is None
+                    pass
+
         # try colouring the HVDC lines
         if len(hvdc_lines) > 0:
 
@@ -1110,13 +1119,26 @@ class GridMapWidget(BaseDiagramWidget):
                         a *= 255
 
                     color = QColor(r, g, b, a)
-                    style = Qt.SolidLine
+                    style = Qt.PenStyle.SolidLine
                     if use_flow_based_width:
                         weight = int(
                             np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1))
                     else:
                         weight = 0.5
 
+                    tooltip = str(i) + ': ' + graphic_object.api_object.name
+                    tooltip += '\n' + loading_label + ': ' + "{:10.4f}".format(
+                        abs(hvdc_loading[i]) * 100) + ' [%]'
+
+                    tooltip += '\nPower (from):\t' + "{:10.4f}".format(hvdc_Pf[i]) + ' [MW]'
+
+                    if hvdc_losses is not None:
+                        tooltip += '\nPower (to):\t' + "{:10.4f}".format(hvdc_Pt[i]) + ' [MW]'
+                        tooltip += '\nLosses: \t\t' + "{:10.4f}".format(hvdc_losses[i]) + ' [MW]'
+                        graphic_object.set_arrows_with_hvdc_power(Pf=hvdc_Pf[i], Pt=hvdc_Pt[i])
+                    else:
+                        graphic_object.set_arrows_with_hvdc_power(Pf=hvdc_Pf[i], Pt=-hvdc_Pf[i])
+
                     graphic_object.set_colour(color=color, w=weight, style=style, tool_tip=tooltip)
 
     def get_image(self, transparent: bool = False) -> Tuple[QImage, int, int]:

{GridCal-5.1.38 → GridCal-5.1.40}/GridCal/Gui/Diagrams/SchematicWidget/Branches/dc_line_graphics.py

@@ -73,7 +73,7 @@ class DcLineEditor(QDialog):
         # X = self.branch.X * Zbase
         # B = self.branch.B * Ybase
 
-        I = self.branch.rate / Vf  # current in kA
+        I = self.branch.rate / Vf  # current in KA
 
         # ------------------------------------------------------------------------------------------
 
@@ -177,7 +177,7 @@ class DcLineEditor(QDialog):
         Vf = self.branch.bus_from.Vnom
         Vt = self.branch.bus_to.Vnom
 
-        Sn = np.round(I * Vf, 2)  # nominal power in MVA = kA * kV
+        Sn = np.round(I * Vf, 2)  # nominal power in MVA = KA * KV
 
         Zbase = self.Sbase / (Vf * Vf)
         Ybase = 1.0 / Zbase

{GridCal-5.1.38 → GridCal-5.1.40}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_editor.py

@@ -87,7 +87,7 @@ class LineEditor(QDialog):
         R = self.line.R * Zbase / length
         X = self.line.X * Zbase / length
         B = self.line.B * Ybase / length
-        I = np.round(self.line.rate / (Vf * 1.73205080757), 6)  # current in kA
+        I = np.round(self.line.rate / (Vf * 1.73205080757), 6)  # current in KA
 
         # ------------------------------------------------------------------------------------------
 
@@ -225,7 +225,7 @@ class LineEditor(QDialog):
                 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
+                Imax=self.i_spinner.value(),  # KA
                 freq=self.frequency,  # Hz
                 Sbase=self.Sbase,  # MVA
                 apply_to_profile=self.apply_to_profile.isChecked()

{GridCal-5.1.38 → GridCal-5.1.40}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_graphics.py

@@ -271,7 +271,7 @@ class LineGraphicItem(LineGraphicTemplateItem):
 
         if ok:
             # rate = I
-            rated_current = self.api_object.rate / (self.api_object.Vf * 1.73205080757)  # MVA = kA * kV * sqrt(3)
+            rated_current = self.api_object.rate / (self.api_object.Vf * 1.73205080757)  # MVA = KA * KV * sqrt(3)
 
             tpe = SequenceLineType(name='SequenceLine from ' + self.api_object.name,
                                    idtag=None,