GridCal 5.1.0__tar.gz → 5.1.1__tar.gz

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/dc_line_graphics.py

@@ -21,14 +21,14 @@ from PySide6.QtCore import Qt
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu, QLabel, QDoubleSpinBox, QPushButton, QVBoxLayout, QComboBox, QDialog, QGraphicsScene
 from GridCal.Gui.GuiFunctions import get_list_model
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCalEngine.Devices.Branches.line import SequenceLineType, OverheadLineType, UndergroundLineType
 from GridCalEngine.Devices.Branches.dc_line import DcLine
 from GridCalEngine.enumerations import DeviceType
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
 
 
 class DcLineEditor(QDialog):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/hvdc_graphics.py

@@ -18,12 +18,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
 
 
 class HvdcGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/line_graphics.py

@@ -19,15 +19,15 @@ 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, QGraphicsSceneContextMenuEvent
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_editor import LineEditor
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_editor import LineEditor
 from GridCal.Gui.messages import yes_no_question, warning_msg
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Branches.line import Line, SequenceLineType
 from GridCalEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
 
 
 class LineGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/line_graphics_template.py

@@ -22,12 +22,12 @@ from PySide6.QtCore import Qt, QLineF, QPointF, QRectF
 from PySide6.QtGui import QPen, QCursor, QPixmap, QBrush, QColor, QTransform, QPolygonF
 from PySide6.QtWidgets import (QGraphicsLineItem, QGraphicsRectItem, QGraphicsPolygonItem,
                                QGraphicsEllipseItem, QGraphicsSceneMouseEvent, QGraphicsTextItem)
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import BusGraphicItem
-from GridCal.Gui.BusBranchEditorWidget.Fluid.fluid_node_graphics import FluidNodeGraphicItem
-
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, GenericDBWidget
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Substation.bus_graphics import BusGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Fluid.fluid_node_graphics import FluidNodeGraphicItem
 from GridCal.Gui.messages import yes_no_question
+
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices.Branches.line import Line
 from GridCalEngine.Devices.Branches.transformer import Transformer2W
@@ -41,8 +41,8 @@ from GridCalEngine.Devices.Fluid.fluid_node import FluidNode
 from GridCalEngine.Devices.Fluid.fluid_path import FluidPath
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
-    from GridCal.Gui.BusBranchEditorWidget.Branches.transformer3w_graphics import Transformer3WGraphicItem
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import Transformer3WGraphicItem
 
 
 class ArrowHead(QGraphicsPolygonItem):
@@ -398,7 +398,7 @@ class HvdcSymbol(QGraphicsRectItem):
         self.setTransform(transform)
 
 
-class LineGraphicTemplateItem(QGraphicsLineItem):
+class LineGraphicTemplateItem(GenericDBWidget, QGraphicsLineItem):
     """
     LineGraphicItem
     """
@@ -419,10 +419,9 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         :param api_object:
         :param arrow_size:
         """
+        GenericDBWidget.__init__(self, parent=None, api_object=api_object, editor=editor, draw_labels=True)
         QGraphicsLineItem.__init__(self)
 
-        self.api_object = api_object
-
         if isinstance(api_object, Transformer2W):
             if isinstance(api_object, Winding):  # Winding is a sublass of Transformer
                 self.symbol = None
@@ -445,22 +444,9 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         self.pen_width = width
         self.width = width
 
-        if self.api_object is not None:
-            if self.api_object.active:
-                self.color = ACTIVE['color']
-                self.style = ACTIVE['style']
-            else:
-                self.color = DEACTIVATED['color']
-                self.style = DEACTIVATED['style']
-        else:
-            self.color = ACTIVE['color']
-            self.style = ACTIVE['style']
-
         self.setFlag(self.GraphicsItemFlag.ItemIsSelectable, True)
         self.setCursor(QCursor(Qt.PointingHandCursor))
 
-        self.editor: BusBranchEditorWidget = editor
-
         self.pos1: QPointF = QPointF(0.0, 0.0)
         self.pos2: QPointF = QPointF(0.0, 0.0)
 
@@ -525,16 +511,7 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         """
         Change the colour according to the system theme
         """
-        if self.api_object is not None:
-            if self.api_object.active:
-                self.color = ACTIVE['color']
-                self.style = ACTIVE['style']
-            else:
-                self.color = DEACTIVATED['color']
-                self.style = DEACTIVATED['style']
-        else:
-            self.color = ACTIVE['color']
-            self.style = ACTIVE['style']
+        super().recolour_mode()
 
         self.set_colour(self.color, self.width, self.style)
 
@@ -863,7 +840,7 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         """
         if self._from_port:
             if 'Transformer3WGraphicItem' not in sys.modules:
-                from GridCal.Gui.BusBranchEditorWidget.Branches.transformer3w_graphics import Transformer3WGraphicItem
+                from GridCal.Gui.Diagrams.BusBranchEditorWidget import Transformer3WGraphicItem
             return isinstance(self.get_terminal_from_parent(), Transformer3WGraphicItem)
         else:
             return False
@@ -875,7 +852,7 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         """
         if self._to_port:
             if 'Transformer3WGraphicItem' not in sys.modules:
-                from GridCal.Gui.BusBranchEditorWidget.Branches.transformer3w_graphics import Transformer3WGraphicItem
+                from GridCal.Gui.Diagrams.BusBranchEditorWidget import Transformer3WGraphicItem
             return isinstance(self.get_terminal_to_parent(), Transformer3WGraphicItem)
         else:
             return False

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/series_reactance_graphics.py

@@ -18,12 +18,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCalEngine.Devices.Branches.series_reactance import SeriesReactance
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class SeriesReactanceGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/switch_graphics.py

@@ -18,12 +18,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu, QGraphicsScene
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCalEngine.Devices.Branches.switch import Switch
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class SwitchGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/transformer2w_graphics.py

@@ -18,16 +18,16 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.BusBranchEditorWidget.Branches.transformer_editor import (TransformerEditor,
-                                                                           reverse_transformer_short_circuit_study)
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.transformer_editor import (TransformerEditor,
+                                                                                    reverse_transformer_short_circuit_study)
 from GridCalEngine.Devices.Branches.transformer import Transformer2W, TransformerType
 from GridCalEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class TransformerGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/transformer3w_graphics.py

@@ -22,13 +22,13 @@ from PySide6.QtGui import QPen, QCursor, QColor, QIcon, QPixmap
 from PySide6.QtWidgets import QGraphicsItem, QGraphicsEllipseItem, QGraphicsRectItem, QMenu, QGraphicsSceneMouseEvent
 
 from GridCalEngine.Devices.Branches.transformer3w import Transformer3W
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED
-from GridCal.Gui.BusBranchEditorWidget.terminal_item import TerminalItem
-from GridCal.Gui.BusBranchEditorWidget.Branches.winding_graphics import WindingGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.winding_graphics import WindingGraphicItem
 from GridCal.Gui.messages import yes_no_question
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class Transformer3WGraphicItem(QGraphicsRectItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/upfc_graphics.py

@@ -18,12 +18,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCalEngine.Devices.Branches.upfc import UPFC
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class UpfcGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/vsc_graphics.py

@@ -18,12 +18,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCalEngine.Devices.Branches.vsc import VSC
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class VscGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Branches/winding_graphics.py

@@ -20,13 +20,13 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
 from GridCal.Gui.messages import yes_no_question
 from GridCalEngine.Devices.Branches.winding import Winding
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
 
 
 class WindingGraphicItem(LineGraphicTemplateItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Fluid/fluid_node_graphics.py

@@ -22,22 +22,27 @@ 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 GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, FONT_SCALE
 from GridCalEngine.Devices.Fluid import FluidNode, FluidTurbine, FluidPump, FluidP2x
 from GridCalEngine.Devices.Substation.bus import Bus
-from GridCal.Gui.BusBranchEditorWidget.terminal_item import TerminalItem, HandleItem
-from GridCal.Gui.BusBranchEditorWidget.Fluid.fluid_turbine_graphics import FluidTurbineGraphicItem
-from GridCal.Gui.BusBranchEditorWidget.Fluid.fluid_pump_graphics import FluidPumpGraphicItem
-from GridCal.Gui.BusBranchEditorWidget.Fluid.fluid_p2x_graphics import FluidP2xGraphicItem
-from GridCal.Gui.messages import yes_no_question
 from GridCalEngine.enumerations import DeviceType, FaultType
 from GridCalEngine.Devices.Parents.editable_device import EditableDevice
+from GridCalEngine.Devices.types import FLUID_TYPES
+
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, FONT_SCALE, GenericDBWidget
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem, HandleItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Fluid.fluid_turbine_graphics import FluidTurbineGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Fluid.fluid_pump_graphics import FluidPumpGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Fluid.fluid_p2x_graphics import FluidP2xGraphicItem
+from GridCal.Gui.messages import yes_no_question
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
 
 
 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
@@ -76,7 +81,7 @@ class VerticalWaterIndicator(QGraphicsRectItem):
         self.label.setPlainText(f'{percentage}%')
 
 
-class FluidNodeGraphicItem(QtWidgets.QGraphicsRectItem):
+class FluidNodeGraphicItem(GenericDBWidget, QtWidgets.QGraphicsRectItem):
     """
       Represents a block in the diagram
       Has an x and y and width and height
@@ -90,7 +95,8 @@ class FluidNodeGraphicItem(QtWidgets.QGraphicsRectItem):
     def __init__(self, editor: BusBranchEditorWidget, fluid_node: FluidNode,
                  parent=None, index=0, h: int = 20, w: int = 80, x: int = 0, y: int = 0):
 
-        super(FluidNodeGraphicItem, self).__init__(parent)
+        GenericDBWidget.__init__(self, parent=parent, api_object=fluid_node, editor=editor, draw_labels=True)
+        QtWidgets.QGraphicsRectItem.__init__(self, parent)
 
         self.min_w = 180.0
         self.min_h = 20.0
@@ -98,10 +104,6 @@ class FluidNodeGraphicItem(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 = fluid_node
-
-        self.editor: BusBranchEditorWidget = editor
-
         # loads, shunts, generators, etc...
         self.shunt_children = list()
 
@@ -304,7 +306,7 @@ class FluidNodeGraphicItem(QtWidgets.QGraphicsRectItem):
         # Arrange line positions
         self._terminal.process_callbacks(self.pos() + self._terminal.pos())
 
-    def create_children_widgets(self, injections_by_tpe: Dict[DeviceType, List[EditableDevice]]):
+    def create_children_widgets(self, injections_by_tpe: Dict[DeviceType, List[FLUID_TYPES]]):
         """
         Create the icons of the elements that are attached to the API bus object
         Returns:

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Fluid/fluid_p2x_graphics.py

@@ -20,12 +20,12 @@ from PySide6.QtCore import QPointF
 from PySide6.QtGui import QPen, QIcon, QPixmap
 from PySide6.QtWidgets import (QMenu, QGraphicsTextItem)
 from GridCalEngine.Devices.Fluid.fluid_p2x import FluidP2x
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class FluidP2xGraphicItem(InjectionTemplateGraphicItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Fluid/fluid_path_graphics.py

@@ -19,17 +19,15 @@ from typing import Union, TYPE_CHECKING
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QPen, QIcon, QPixmap, QColor
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.GeneralDialogues import InputNumberDialogue
-from GridCal.Gui.BusBranchEditorWidget.Substation.bus_graphics import TerminalItem
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_editor import LineEditor
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.terminal_item import TerminalItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import GenericDBWidget, ACTIVE
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Fluid.fluid_path import FluidPath
 from GridCalEngine.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
 
 
 class FluidPathGraphicItem(LineGraphicTemplateItem):
@@ -53,6 +51,7 @@ class FluidPathGraphicItem(LineGraphicTemplateItem):
         :param api_object:
         :param arrow_size:
         """
+        GenericDBWidget.__init__(self, parent=None, api_object=api_object, editor=editor, draw_labels=True)
         LineGraphicTemplateItem.__init__(self,
                                          from_port=from_port,
                                          to_port=to_port,
@@ -93,6 +92,7 @@ class FluidPathGraphicItem(LineGraphicTemplateItem):
         """
         Change the colour according to the system theme
         """
+        # super().recolour_mode()
         self.set_colour(self.color, self.width, self.style)
 
     def mouseDoubleClickEvent(self, event):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Fluid/fluid_pump_graphics.py

@@ -20,12 +20,12 @@ from PySide6.QtCore import QPointF
 from PySide6.QtGui import QPen, QIcon, QPixmap
 from PySide6.QtWidgets import (QMenu, QGraphicsTextItem)
 from GridCalEngine.Devices.Fluid.fluid_pump import FluidPump
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class FluidPumpGraphicItem(InjectionTemplateGraphicItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Fluid/fluid_turbine_graphics.py

@@ -16,18 +16,15 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
 from typing import TYPE_CHECKING
-from PySide6.QtCore import QPointF
 from PySide6.QtGui import QPen, QIcon, QPixmap
 from PySide6.QtWidgets import (QMenu, QGraphicsTextItem, QGraphicsSceneMouseEvent)
-from GridCalEngine.enumerations import DeviceType
 from GridCalEngine.Devices.Fluid.fluid_turbine import FluidTurbine
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
-from GridCal.Gui.GuiFunctions import ObjectsModel
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class FluidTurbineGraphicItem(InjectionTemplateGraphicItem):
@@ -35,7 +32,7 @@ class FluidTurbineGraphicItem(InjectionTemplateGraphicItem):
     FluidTurbineGraphicItem
     """
 
-    def __init__(self, parent, api_obj: FluidTurbine, editor: "BusBranchEditorWidget"):
+    def __init__(self, parent, api_obj: FluidTurbine, editor: BusBranchEditorWidget):
         """
 
         :param parent:

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Injections/battery_graphics.py

@@ -18,13 +18,13 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6 import QtWidgets, QtGui
 from GridCalEngine.Devices.Injections.battery import Battery, DeviceType
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from GridCal.Gui.GuiFunctions import ObjectsModel
 from GridCal.Gui.messages import yes_no_question
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class BatteryGraphicItem(InjectionTemplateGraphicItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Injections/controllable_shunt_graphics.py

@@ -18,12 +18,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6 import QtWidgets, QtGui
 from GridCalEngine.Devices.Injections.controllable_shunt import ControllableShunt, DeviceType
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from GridCal.Gui.messages import yes_no_question
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class ControllableShuntGraphicItem(InjectionTemplateGraphicItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Injections/current_injection_graphics.py

@@ -18,12 +18,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6 import QtWidgets, QtGui, QtCore
 from GridCalEngine.Devices.Injections.current_injection import CurrentInjection, DeviceType
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from GridCal.Gui.messages import yes_no_question
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class CurrentInjectionGraphicItem(InjectionTemplateGraphicItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Injections/external_grid_graphics.py

@@ -18,13 +18,13 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6 import QtWidgets, QtGui, QtCore
 from GridCalEngine.Devices.Injections.external_grid import ExternalGrid, DeviceType
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Square
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from GridCal.Gui.GuiFunctions import ObjectsModel
 from GridCal.Gui.messages import yes_no_question
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget import BusBranchEditorWidget
 
 
 class ExternalGridGraphicItem(InjectionTemplateGraphicItem):

{GridCal-5.1.0/GridCal/Gui → GridCal-5.1.1/GridCal/Gui/Diagrams}/BusBranchEditorWidget/Injections/generator_graphics.py

@@ -24,15 +24,15 @@ from PySide6.QtWidgets import (QMenu, QGraphicsTextItem, QDialog, QTableView, QV
 from GridCalEngine.Devices.Injections.generator import Generator
 from GridCalEngine.Devices.Injections.generator_q_curve import GeneratorQCurve
 from GridCalEngine.basic_structures import Mat, Vec
-from GridCal.Gui.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
-from GridCal.Gui.BusBranchEditorWidget.matplotlibwidget import MatplotlibWidget
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Circle
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.matplotlibwidget import MatplotlibWidget
 from GridCal.Gui.messages import yes_no_question, info_msg
-from GridCal.Gui.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
+from GridCal.Gui.Diagrams.BusBranchEditorWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from GridCal.Gui.SolarPowerWizard.solar_power_wizzard import SolarPvWizard
 from GridCal.Gui.WindPowerWizard.wind_power_wizzard import WindFarmWizard
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
-    from GridCal.Gui.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
+    from GridCal.Gui.Diagrams.BusBranchEditorWidget.bus_branch_editor_widget import BusBranchEditorWidget
 
 
 class GeneratorQCurveEditorTableModel(QAbstractTableModel):