GridCal 5.1.55__tar.gz → 5.1.56__tar.gz

{GridCal-5.1.55 → GridCal-5.1.56}/GridCal/Gui/Diagrams/MapWidget/Substation/voltage_level_graphic_item.py

@@ -173,6 +173,7 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         Event handler for mouse press events.
         """
         super().mousePressEvent(event)
+        self.parent.mousePressEvent(event)
         self.editor.disableMove = True
         self.update_position_at_the_diagram()  # always update
 
@@ -184,6 +185,7 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         Event handler for mouse release events.
         """
         super().mouseReleaseEvent(event)
+        self.parent.mouseReleaseEvent(event)
         self.editor.disableMove = True
 
     def hoverEnterEvent(self, event: QtWidgets.QGraphicsSceneHoverEvent) -> None:

{GridCal-5.1.55 → GridCal-5.1.56}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -38,7 +38,6 @@ from GridCalEngine.Devices.Branches.line import Line
 from GridCalEngine.Devices.Branches.dc_line import DcLine
 from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine
 from GridCalEngine.Devices.Diagrams.map_diagram import MapDiagram
-from GridCalEngine.Devices.types import BRANCH_TYPES
 from GridCalEngine.Devices.Fluid import FluidNode, FluidPath
 from GridCalEngine.basic_structures import Vec, CxVec, IntVec
 from GridCalEngine.Devices.Substation.substation import Substation
@@ -983,9 +982,6 @@ class GridMapWidget(BaseDiagramWidget):
             graphic_object.change_pen_width(pen_width)
 
     def colour_results(self,
-                       buses: List[Bus],
-                       branches: List[BRANCH_TYPES],
-                       hvdc_lines: List[HvdcLine],
                        Sbus: CxVec,
                        bus_active: IntVec,
                        Sf: CxVec,
@@ -1004,6 +1000,13 @@ class GridMapWidget(BaseDiagramWidget):
                        ma: Vec = None,
                        theta: Vec = None,
                        Beq: Vec = None,
+                       fluid_node_p2x_flow: Vec = None,
+                       fluid_node_current_level: Vec = None,
+                       fluid_node_spillage: Vec = None,
+                       fluid_node_flow_in: Vec = None,
+                       fluid_node_flow_out: Vec = None,
+                       fluid_path_flow: Vec = None,
+                       fluid_injection_flow: Vec = None,
                        use_flow_based_width: bool = False,
                        min_branch_width: int = 5,
                        max_branch_width=5,
@@ -1012,9 +1015,6 @@ class GridMapWidget(BaseDiagramWidget):
                        cmap: palettes.Colormaps = None):
         """
         Color objects based on the results passed
-        :param buses: list of matching bus objects
-        :param branches: list of Branches without HVDC
-        :param hvdc_lines: list of HVDC lines
         :param Sbus: Buses power (MVA)
         :param bus_active: Bus active status
         :param Sf: Branches power from the "from" bus (MVA)
@@ -1033,6 +1033,13 @@ class GridMapWidget(BaseDiagramWidget):
         :param ma: branch phase shift angle (rad)
         :param theta: branch tap module (p.u.)
         :param Beq: Branch equivanet susceptance (p.u.)
+        :param fluid_node_p2x_flow: P2X flow rate (m3)
+        :param fluid_node_current_level: Current level (m3)
+        :param fluid_node_spillage: Spillage (m3)
+        :param fluid_node_flow_in: Flow rate (m3)
+        :param fluid_node_flow_out: Flow rate (m3)
+        :param fluid_injection_flow: Injection rate (m3)
+        :param fluid_path_flow: fluid flow (m3)
         :param use_flow_based_width: use branch width based on the actual flow?
         :param min_branch_width: Minimum branch width [px]
         :param max_branch_width: Maximum branch width [px]
@@ -1050,12 +1057,12 @@ class GridMapWidget(BaseDiagramWidget):
         # vabs = np.abs(voltages)
         # vang = np.angle(voltages, deg=True)
         # vnorm = (vabs - vmin) / vrng
+        nbus = self.circuit.get_bus_number()
 
-        n = len(buses)
-        longitudes = np.zeros(n)
-        latitudes = np.zeros(n)
+        longitudes = np.zeros(nbus)
+        latitudes = np.zeros(nbus)
         nodes_dict = dict()
-        for i, bus in enumerate(buses):
+        for i, bus in enumerate(self.circuit.buses):
 
             # try to find the diagram object of the DB object
             graphic_object = self.graphics_manager.query(bus)
@@ -1099,13 +1106,13 @@ class GridMapWidget(BaseDiagramWidget):
         arrow_scale = self.get_arrow_scale()
 
         # Try colouring the branches
-        if len(branches):
+        if self.circuit.get_branch_number_wo_hvdc():
 
             lnorm = np.abs(loadings)
             lnorm[lnorm == np.inf] = 0
             Sfabs = np.abs(Sf)
             Sfnorm = Sfabs / np.max(Sfabs + 1e-20)
-            for i, branch in enumerate(branches):
+            for i, branch in enumerate(self.circuit.get_branches_wo_hvdc_iter()):
 
                 # try to find the diagram object of the DB object
                 graphic_object: Union[MapAcLine, MapDcLine] = self.graphics_manager.query(branch)
@@ -1159,14 +1166,14 @@ class GridMapWidget(BaseDiagramWidget):
                     pass
 
         # try colouring the HVDC lines
-        if len(hvdc_lines) > 0:
+        if self.circuit.get_hvdc_number() > 0:
 
             lnorm = np.abs(hvdc_loading)
             lnorm[lnorm == np.inf] = 0
             Sfabs = np.abs(hvdc_Pf)
             Sfnorm = Sfabs / np.max(Sfabs + 1e-9)
 
-            for i, branch in enumerate(hvdc_lines):
+            for i, branch in enumerate(self.circuit.hvdc_lines):
 
                 # try to find the diagram object of the DB object
                 graphic_object: MapHvdcLine = self.graphics_manager.query(branch)
@@ -1203,7 +1210,8 @@ class GridMapWidget(BaseDiagramWidget):
                     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))
+                            np.floor(min_branch_width + Sfnorm[i] * (max_branch_width - min_branch_width) * 0.1)
+                        )
                     else:
                         weight = self.get_branch_width()
 
@@ -1223,6 +1231,17 @@ class GridMapWidget(BaseDiagramWidget):
                     graphic_object.set_colour(color=color, style=style, tool_tip=tooltip)
                     graphic_object.set_width_scale(branch_scale=weight, arrow_scale=arrow_scale)
 
+        if fluid_path_flow is not None:
+
+            if self.circuit.get_fluid_paths_number() == len(fluid_path_flow):
+                for i, elm in enumerate(self.circuit.fluid_paths):
+
+                    # try to find the diagram object of the DB object
+                    graphic_object = self.graphics_manager.query(elm)
+
+                    if graphic_object:
+                        pass
+
     def get_image(self, transparent: bool = False) -> QImage:
         """
         get the current picture

{GridCal-5.1.55 → GridCal-5.1.56}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_graphics_template.py

@@ -462,7 +462,9 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
                  width=5,
                  api_object: Union[Line, Transformer2W, VSC, UPFC, HvdcLine, DcLine, FluidPath, None] = None,
                  arrow_size=10,
-                 draw_labels: bool = True):
+                 draw_labels: bool = True,
+                 arrow_f_pos=0.2,
+                 arrow_t_pos=0.8, ):
         """
 
         :param from_port:
@@ -511,10 +513,10 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
 
         # arrows
         self.view_arrows = True
-        self.arrow_p_from = ArrowHead(parent=self, arrow_size=arrow_size, position=0.2, under=False)
-        self.arrow_q_from = ArrowHead(parent=self, arrow_size=arrow_size, position=0.2, under=True)
-        self.arrow_p_to = ArrowHead(parent=self, arrow_size=arrow_size, position=0.8, under=False)
-        self.arrow_q_to = ArrowHead(parent=self, arrow_size=arrow_size, position=0.8, under=True)
+        self.arrow_p_from = ArrowHead(parent=self, arrow_size=arrow_size, position=arrow_f_pos, under=False)
+        self.arrow_q_from = ArrowHead(parent=self, arrow_size=arrow_size, position=arrow_f_pos, under=True)
+        self.arrow_p_to = ArrowHead(parent=self, arrow_size=arrow_size, position=arrow_t_pos, under=False)
+        self.arrow_q_to = ArrowHead(parent=self, arrow_size=arrow_size, position=arrow_t_pos, under=True)
 
         if from_port and to_port:
             self.redraw()
@@ -843,6 +845,16 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         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)
 
+    def set_arrows_with_fluid_flow(self, flow: float) -> None:
+        """
+        Set the arrow directions
+        :param flow: branch_flow (m3/s)
+        """
+        self.arrow_p_from.set_value(flow, True, flow < 0, name="flow", units="m3/s", draw_label=self.draw_labels)
+        self.arrow_q_from.set_value(flow, True, flow < 0, name="flow", units="m3/s", draw_label=False)
+        self.arrow_p_to.setVisible(False)
+        self.arrow_q_to.setVisible(False)
+
     def change_bus(self):
         """
         change the from or to bus of the nbranch with another selected bus
@@ -936,6 +948,7 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         """
         if self._from_port:
             if 'Transformer3WGraphicItem' not in sys.modules:
+                # keep this here, we need an actual instance
                 from GridCal.Gui.Diagrams.SchematicWidget.Branches.transformer3w_graphics import \
                     Transformer3WGraphicItem
             return isinstance(self.get_terminal_from_parent(), Transformer3WGraphicItem)
@@ -949,6 +962,7 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         """
         if self._to_port:
             if 'Transformer3WGraphicItem' not in sys.modules:
+                # keep this here, we need an actual instance
                 from GridCal.Gui.Diagrams.SchematicWidget.Branches.transformer3w_graphics import \
                     Transformer3WGraphicItem
             return isinstance(self.get_terminal_to_parent(), Transformer3WGraphicItem)

{GridCal-5.1.55 → GridCal-5.1.56}/GridCal/Gui/Diagrams/SchematicWidget/Fluid/fluid_node_graphics.py

@@ -18,9 +18,9 @@ from __future__ import annotations
 import numpy as np
 from typing import Union, TYPE_CHECKING, List, Dict
 from PySide6 import QtWidgets
-from PySide6.QtCore import Qt, QPoint
-from PySide6.QtGui import QPen, QCursor, QIcon, QPixmap, QBrush, QPainterPath, QFont
-from PySide6.QtWidgets import QMenu, QGraphicsRectItem, QGraphicsSceneMouseEvent, QGraphicsTextItem
+from PySide6.QtCore import Qt, QPoint, QPointF
+from PySide6.QtGui import QPen, QCursor, QIcon, QPixmap, QBrush, QColor
+from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent
 
 from GridCalEngine.Devices.Fluid import FluidNode, FluidTurbine, FluidPump, FluidP2x
 from GridCalEngine.Devices.Substation.bus import Bus
@@ -33,54 +33,13 @@ from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem,
 from GridCal.Gui.Diagrams.SchematicWidget.Fluid.fluid_turbine_graphics import FluidTurbineGraphicItem
 from GridCal.Gui.Diagrams.SchematicWidget.Fluid.fluid_pump_graphics import FluidPumpGraphicItem
 from GridCal.Gui.Diagrams.SchematicWidget.Fluid.fluid_p2x_graphics import FluidP2xGraphicItem
-from GridCal.Gui.messages import yes_no_question
+from GridCal.Gui.messages import yes_no_question, error_msg
+from GridCal.Gui.gui_functions import add_menu_entry
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
 
 
-class RoundedRect(QtWidgets.QGraphicsRectItem):
-    """
-    Rounded rectangle
-    """
-    def __init__(self, x, y, width, height, radius, parent):
-        super().__init__(x, y, width, height, parent=parent)
-        self.radius = radius
-
-    def paint(self, painter, option, widget):
-        path = QPainterPath()
-        path.addRoundedRect(self.rect(), self.radius, self.radius)
-        painter.setClipPath(path)
-        painter.setBrush(self.brush())
-        painter.setPen(self.pen())
-        painter.drawRoundedRect(self.rect(), self.radius, self.radius)
-
-
-class VerticalWaterIndicator(QGraphicsRectItem):
-    def __init__(self, x, y, width, height, outer_radius, inner_radius, parent=None):
-        super().__init__(x, y, width, height, parent=parent)
-        self.outer_radius = outer_radius
-        self.inner_radius = inner_radius
-        self.setBrush(Qt.lightGray)  # Set the outer rectangle color
-
-        self.inner_rect = QGraphicsRectItem(self.rect(), self)
-        self.inner_rect.setBrush(Qt.blue)  # Set the inner rectangle color
-
-        self.label = QGraphicsTextItem('', self)
-        self.label.setDefaultTextColor(Qt.black)
-        self.label.setFont(QFont('Arial', 10))
-
-    def set_percentage(self, percentage):
-        # Update the inner rectangle size based on the percentage
-        inner_height = self.rect().height() * percentage / 100
-        self.inner_rect.setRect(self.rect().x(), self.rect().y() + self.rect().height() - inner_height,
-                                self.rect().width(), inner_height)
-        self.inner_rect.setPos(self.rect().x(), self.rect().y())
-
-        # Update the label text
-        self.label.setPlainText(f'{percentage}%')
-
-
 class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
     """
       Represents a block in the diagram
@@ -96,7 +55,8 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                  parent=None, index=0, h: int = 20, w: int = 80, x: float = 0, y: float = 0,
                  draw_labels: bool = True):
 
-        GenericDiagramWidget.__init__(self, parent=parent, api_object=fluid_node, editor=editor, draw_labels=draw_labels)
+        GenericDiagramWidget.__init__(self, parent=parent, api_object=fluid_node, editor=editor,
+                                      draw_labels=draw_labels)
         QtWidgets.QGraphicsRectItem.__init__(self, parent)
 
         self.min_w = 180.0
@@ -105,6 +65,8 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         self.h = h if h >= self.min_h else self.min_h
         self.w = w if w >= self.min_w else self.min_w
 
+        self.api_object: FluidNode = fluid_node  # reassign for type to be clear
+
         # loads, shunts, generators, etc...
         self.shunt_children = list()
 
@@ -116,7 +78,7 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         # index
         self.index = index
 
-        self.color = ACTIVE['fluid']
+        self.color = QColor(fluid_node.color) if fluid_node is not None else ACTIVE['fluid']
         self.style = ACTIVE['style']
 
         # Label:
@@ -130,7 +92,8 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
         # connection terminals the block
         self._terminal = BarTerminalItem('s', parent=self, editor=self.editor)  # , h=self.h))
-        self._terminal.setPen(QPen(Qt.transparent, self.pen_width, self.style, Qt.RoundCap, Qt.RoundJoin))
+        self._terminal.setPen(QPen(Qt.GlobalColor.transparent, self.pen_width, self.style,
+                                   Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin))
 
         # Create corner for resize:
         self.sizer = HandleItem(self._terminal, callback=self.change_size)
@@ -141,16 +104,24 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
 
         self.set_tile_color(self.color)
 
-        self.setPen(QPen(Qt.transparent, self.pen_width, self.style))
-        self.setBrush(Qt.transparent)
+        self.setPen(QPen(Qt.GlobalColor.transparent, self.pen_width, self.style))
+        self.setBrush(Qt.GlobalColor.transparent)
         self.setFlags(self.GraphicsItemFlag.ItemIsSelectable | self.GraphicsItemFlag.ItemIsMovable)
-        self.setCursor(QCursor(Qt.PointingHandCursor))
+        self.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
         # Update size:
         self.change_size(self.w, self.h)
 
         self.set_position(x, y)
 
+    def set_api_object_color(self):
+        """
+        Gether the color from the api object and apply
+        :return:
+        """
+        self.color = QColor(self.api_object.color) if self.api_object is not None else ACTIVE['fluid']
+        self.set_tile_color(self.color)
+
     def set_label(self, val: str):
         """
         Set the label content
@@ -210,6 +181,14 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
             if e is not None:
                 e.recolour_mode()
 
+    def get_nexus_point(self) -> QPointF:
+        """
+        Get the connection point for the chldren nexus line
+        :return: QPointF
+        """
+        return QPointF(self.x() + self.rect().width() / 2.0,
+                       self.y() + self.rect().height() + self._terminal.h / 2.0)
+
     def set_tile_color(self, brush):
         """
         Set the color of the title
@@ -320,49 +299,47 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         menu = QMenu()
         menu.addSection("Fluid node")
 
-        pl = menu.addAction('Plot profiles')
-        plot_icon = QIcon()
-        plot_icon.addPixmap(QPixmap(":/Icons/icons/plot.svg"))
-        pl.setIcon(plot_icon)
-        pl.triggered.connect(self.plot_profiles)
-
-        arr = menu.addAction('Arrange')
-        arr_icon = QIcon()
-        arr_icon.addPixmap(QPixmap(":/Icons/icons/automatic_layout.svg"))
-        arr.setIcon(arr_icon)
-        arr.triggered.connect(self.arrange_children)
-
-        ra3 = menu.addAction('Delete all the connections')
-        del2_icon = QIcon()
-        del2_icon.addPixmap(QPixmap(":/Icons/icons/delete_conn.svg"))
-        ra3.setIcon(del2_icon)
-        ra3.triggered.connect(self.delete_all_connections)
-
-        da = menu.addAction('Delete')
-        del_icon = QIcon()
-        del_icon.addPixmap(QPixmap(":/Icons/icons/delete3.svg"))
-        da.setIcon(del_icon)
-        da.triggered.connect(self.remove)
+        add_menu_entry(menu=menu,
+                       text="Plot electrical profiles",
+                       icon_path=":/Icons/icons/plot.svg",
+                       function_ptr=self.plot_electrical_profiles)
+
+        add_menu_entry(menu=menu,
+                       text="Plot fluid profiles",
+                       icon_path=":/Icons/icons/plot.svg",
+                       function_ptr=self.plot_fluid_profiles)
+
+        add_menu_entry(menu=menu,
+                       text="Arrange",
+                       icon_path=":/Icons/icons/automatic_layout.svg",
+                       function_ptr=self.arrange_children)
+
+        add_menu_entry(menu=menu,
+                       text="Delete all the connections",
+                       icon_path=":/Icons/icons/delete_conn.svg",
+                       function_ptr=self.delete_all_connections)
+
+        add_menu_entry(menu=menu,
+                       text="Delete",
+                       icon_path=":/Icons/icons/delete3.svg",
+                       function_ptr=self.remove)
 
         menu.addSection("Add")
 
-        al = menu.addAction('Turbine')
-        al_icon = QIcon()
-        al_icon.addPixmap(QPixmap(":/Icons/icons/add_gen.svg"))
-        al.setIcon(al_icon)
-        al.triggered.connect(self.add_turbine)
+        add_menu_entry(menu=menu,
+                       text="Turbine",
+                       icon_path=":/Icons/icons/add_gen.svg",
+                       function_ptr=self.add_turbine)
 
-        ash = menu.addAction('Pump')
-        ash_icon = QIcon()
-        ash_icon.addPixmap(QPixmap(":/Icons/icons/add_gen.svg"))
-        ash.setIcon(ash_icon)
-        ash.triggered.connect(self.add_pump)
+        add_menu_entry(menu=menu,
+                       text="Pump",
+                       icon_path=":/Icons/icons/add_gen.svg",
+                       function_ptr=self.add_pump)
 
-        acg = menu.addAction('P2X')
-        acg_icon = QIcon()
-        acg_icon.addPixmap(QPixmap(":/Icons/icons/add_gen.svg"))
-        acg.setIcon(acg_icon)
-        acg.triggered.connect(self.add_p2x)
+        add_menu_entry(menu=menu,
+                       text="P2X",
+                       icon_path=":/Icons/icons/add_gen.svg",
+                       function_ptr=self.add_p2x)
 
         menu.exec_(event.screenPos())
 
@@ -485,11 +462,147 @@ class FluidNodeGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
         self.set_tile_color(QBrush(ACTIVE['color']))
 
-    def plot_profiles(self):
+    def plot_electrical_profiles(self):
         """
 
         @return:
         """
         # get the index of this object
-        i = self.editor.circuit.fluid_nodes.index(self.api_object)
-        # self.editor.diagramScene.plot_bus(i, self.api_object)
+        if self.api_object is not None:
+            if self.api_object.bus is not None:
+                i = self.editor.circuit.fluid_nodes.index(self.api_object)
+                self.editor.plot_bus(i, self.api_object.bus)
+            else:
+                error_msg("No electrical bus attached :/")
+        else:
+            error_msg("No DB object attached :/")
+
+    def plot_fluid_profiles(self):
+        """
+
+        @return:
+        """
+        # get the index of this object
+        if self.api_object is not None:
+            i = self.editor.circuit.fluid_nodes.index(self.api_object)
+            self.editor.plot_fluid_node(i, self.api_object)
+        else:
+            error_msg("No DB object attached :/")
+
+    def set_values(self, i: int, Vm: float, Va: float, P: float, Q: float,
+                   tpe: str, format_str="{:10.2f}"):
+        """
+
+        :param i:
+        :param Vm:
+        :param Va:
+        :param P:
+        :param Q:
+        :param tpe:
+        :param format_str:
+        :return:
+        """
+        if self.draw_labels:
+            vm = format_str.format(Vm)
+
+            if self.api_object is not None:
+                if self.api_object.bus is not None:
+                    vm_kv = format_str.format(Vm * self.api_object.bus.Vnom)
+                else:
+                    vm_kv = "No electrical bus"
+            else:
+                vm_kv = ""
+            va = format_str.format(Va)
+            msg = f"Bus {i}"
+            if tpe is not None:
+                msg += f" [{tpe}]"
+            msg += "<br>"
+            msg += f"v={vm}&lt;{va}º pu<br>"
+            msg += f"V={vm_kv} KV<br>"
+            if P is not None:
+                p = format_str.format(P)
+                q = format_str.format(Q)
+                msg += f"P={p} MW<br>Q={q} MVAr"
+        else:
+            msg = ""
+
+        title = self.api_object.name if self.api_object is not None else ""
+        self.label.setHtml(f'<html><head/><body><p><span style=" font-size:10pt;">{title}<br/></span>'
+                           f'<span style=" font-size:6pt;">{msg}</span></p></body></html>')
+
+        self.setToolTip(msg)
+
+    def set_fluid_values(self, i: int, Vm: float, Va: float, P: float, Q: float,
+                         tpe: str,
+                         fluid_node_p2x_flow: float,
+                         fluid_node_current_level: float,
+                         fluid_node_spillage: float,
+                         fluid_node_flow_in: float,
+                         fluid_node_flow_out: float,
+                         format_str="{:10.2f}"):
+        """
+
+        :param i:
+        :param Vm:
+        :param Va:
+        :param P:
+        :param Q:
+        :param tpe:
+        :param fluid_node_p2x_flow:
+        :param fluid_node_current_level:
+        :param fluid_node_spillage:
+        :param fluid_node_flow_in:
+        :param fluid_node_flow_out:
+        :param format_str:
+        :return:
+        """
+        if self.draw_labels:
+            vm = format_str.format(Vm)
+
+            if self.api_object is not None:
+                if self.api_object.bus is not None:
+                    vm_kv = format_str.format(Vm * self.api_object.bus.Vnom)
+                else:
+                    vm_kv = "No electrical bus"
+            else:
+                vm_kv = ""
+            va = format_str.format(Va)
+            msg = f"Bus {i}"
+            if tpe is not None:
+                msg += f" [{tpe}]"
+            msg += "<br>"
+            msg += f"v={vm}&lt;{va}º pu<br>"
+            msg += f"V={vm_kv} KV<br>"
+            if P is not None:
+                p = format_str.format(P)
+                q = format_str.format(Q)
+                msg += f"P={p} MW<br>Q={q} MVAr<br>"
+
+            if fluid_node_flow_in is not None:
+                f_in = format_str.format(fluid_node_flow_in)
+                msg += f"In={f_in} m3/s<br>"
+
+            if fluid_node_flow_out is not None:
+                f_out = format_str.format(fluid_node_flow_out)
+                msg += f"Out={f_out} m3/s<br>"
+
+            if fluid_node_spillage is not None:
+                f_spill = format_str.format(fluid_node_spillage)
+                msg += f"Spill={f_spill} m3/s<br>"
+
+            if fluid_node_current_level is not None:
+                f_lvl = format_str.format(fluid_node_current_level)
+                msg += f"Lvl={f_lvl} m3<br>"
+
+            if fluid_node_p2x_flow is not None:
+                f_p2x = format_str.format(fluid_node_p2x_flow)
+                msg += f"P2X={f_p2x} m3/s<br>"
+
+        else:
+            msg = ""
+
+        title = self.api_object.name if self.api_object is not None else ""
+        self.label.setHtml(f'<html><head/><body><p><span style=" font-size:10pt;">{title}<br/></span>'
+                           f'<span style=" font-size:6pt;">{msg}</span></p></body></html>')
+
+        self.setToolTip(msg)

{GridCal-5.1.55 → GridCal-5.1.56}/GridCal/Gui/Diagrams/SchematicWidget/Fluid/fluid_p2x_graphics.py

@@ -16,11 +16,12 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
 from typing import TYPE_CHECKING
-from PySide6.QtGui import QPen, QIcon, QPixmap
+from PySide6.QtGui import QPen
 from PySide6.QtWidgets import (QMenu, QGraphicsTextItem)
 from GridCalEngine.Devices.Fluid.fluid_p2x import FluidP2x
 from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
 from GridCal.Gui.messages import yes_no_question
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
@@ -89,30 +90,22 @@ class FluidP2xGraphicItem(InjectionTemplateGraphicItem):
         menu = QMenu()
         menu.addSection("Power2X")
 
-        # pc = menu.addAction('Voltage control')
-        # pc.setCheckable(True)
-        # pc.setChecked(self.api_object.is_controlled)
-        # pc.triggered.connect(self.enable_disable_control_toggle)
-
-        pa = menu.addAction('Plot profiles')
-        plot_icon = QIcon()
-        plot_icon.addPixmap(QPixmap(":/Icons/icons/plot.svg"))
-        pa.setIcon(plot_icon)
-        pa.triggered.connect(self.plot)
+        add_menu_entry(menu=menu,
+                       text="Plot fluid profiles",
+                       icon_path=":/Icons/icons/plot.svg",
+                       function_ptr=self.plot)
 
         menu.addSeparator()
 
-        da = menu.addAction('Delete')
-        del_icon = QIcon()
-        del_icon.addPixmap(QPixmap(":/Icons/icons/delete3.svg"))
-        da.setIcon(del_icon)
-        da.triggered.connect(self.remove)
-
-        rabf = menu.addAction('Change bus')
-        move_bus_icon = QIcon()
-        move_bus_icon.addPixmap(QPixmap(":/Icons/icons/move_bus.svg"))
-        rabf.setIcon(move_bus_icon)
-        rabf.triggered.connect(self.change_bus)
+        add_menu_entry(menu=menu,
+                       text="Delete",
+                       icon_path=":/Icons/icons/delete3.svg",
+                       function_ptr=self.remove)
+
+        add_menu_entry(menu=menu,
+                       text="Change bus",
+                       icon_path=":/Icons/icons/move_bus.svg",
+                       function_ptr=self.change_bus)
 
         menu.exec_(event.screenPos())