GridCal 5.1.0__tar.gz → 5.1.2__tar.gz

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

@@ -15,20 +15,20 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 import numpy as np
 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.GuiFunctions import get_list_model, add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 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.DiagramEditorWidget.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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class DcLineEditor(QDialog):
@@ -230,9 +230,9 @@ class DcLineEditor(QDialog):
 class DcLineGraphicItem(LineGraphicTemplateItem):
 
     def __init__(self,
-                 from_port: TerminalItem,
-                 to_port: TerminalItem,
-                 editor: BusBranchEditorWidget,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem],
+                 editor: DiagramEditorWidget,
                  width=5, api_object: DcLine = None):
         """
 
@@ -264,6 +264,13 @@ class DcLineGraphicItem(LineGraphicTemplateItem):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           icon_path="",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             ra3 = menu.addAction('Editor')
             edit_icon = QIcon()
             edit_icon.addPixmap(QPixmap(":/Icons/icons/edit.svg"))

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

@@ -15,23 +15,24 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import TYPE_CHECKING
+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.GuiFunctions import add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine
-from GridCal.Gui.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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class HvdcGraphicItem(LineGraphicTemplateItem):
 
     def __init__(self,
-                 from_port: TerminalItem,
-                 to_port: TerminalItem,
-                 editor: BusBranchEditorWidget,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem],
+                 editor: DiagramEditorWidget,
                  width=5,
                  api_object: HvdcLine = None):
         """
@@ -64,6 +65,13 @@ class HvdcGraphicItem(LineGraphicTemplateItem):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           icon_path="",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             # pe2 = menu.addAction('Convert to Multi-terminal')
             # pe2.triggered.connect(self.convert_to_multi_terminal)
 

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

@@ -19,15 +19,16 @@ 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.GuiFunctions import add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.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.DiagramEditorWidget.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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class LineGraphicItem(LineGraphicTemplateItem):
@@ -36,9 +37,9 @@ class LineGraphicItem(LineGraphicTemplateItem):
     """
 
     def __init__(self,
-                 from_port: TerminalItem,
-                 to_port: Union[TerminalItem, None],
-                 editor: BusBranchEditorWidget,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem, None],
+                 editor: DiagramEditorWidget,
                  width=5,
                  api_object: Line = None):
         """
@@ -123,6 +124,12 @@ class LineGraphicItem(LineGraphicTemplateItem):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             ra3 = menu.addAction('Editor')
             edit_icon = QIcon()
             edit_icon.addPixmap(QPixmap(":/Icons/icons/edit.svg"))

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

@@ -22,12 +22,14 @@ 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.DiagramEditorWidget.generic_graphics import ACTIVE, DEACTIVATED, OTHER, GenericDBWidget
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Substation.bus_graphics import BusGraphicItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Substation.cn_graphics import CnGraphicItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Substation.busbar_graphics import BusBarGraphicItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.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 +43,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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
+    from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.transformer3w_graphics import Transformer3WGraphicItem
 
 
 class ArrowHead(QGraphicsPolygonItem):
@@ -99,7 +101,8 @@ class ArrowHead(QGraphicsPolygonItem):
         self.setBrush(color)
         self.label.setDefaultTextColor(color)
 
-    def set_value(self, value: float, redraw=True, backwards=False, name="", units="", format_str="{:10.2f}"):
+    def set_value(self, value: float, redraw=True, backwards=False, name="", units="", format_str="{:10.2f}",
+                  draw_label: bool = True):
         """
         Set the sign with a value
         :param value: any real value
@@ -108,13 +111,17 @@ class ArrowHead(QGraphicsPolygonItem):
         :param name: name of the displayed magnitude (i.e. Pf)
         :param units: the units of the displayed magnitude (i.e MW)
         :param format_str: the formatting string of the displayed magnitude
+        :param draw_label: Draw label
         """
         # self.backwards = value < 0
         self.backwards = backwards
-        x = format_str.format(value)
-        msg = f'{name}:{x} {units}'
-        self.label.setPlainText(msg)
-        self.setToolTip(msg)
+
+        self.label.setVisible(draw_label)
+        if draw_label:
+            x = format_str.format(value)
+            msg = f'{name}:{x} {units}'
+            self.label.setPlainText(msg)
+            self.setToolTip(msg)
 
         if redraw:
             self.redraw()
@@ -216,6 +223,10 @@ class TransformerSymbol(QGraphicsRectItem):
         self.c2.setToolTip(toolTip)
 
     def redraw(self):
+        """
+
+        :return:
+        """
         h = self.parent.pos2.y() - self.parent.pos1.y()
         b = self.parent.pos2.x() - self.parent.pos1.x()
         ang = np.arctan2(h, b)
@@ -282,6 +293,10 @@ class VscSymbol(QGraphicsRectItem):
         self.setToolTip(toolTip)
 
     def redraw(self):
+        """
+
+        :return:
+        """
         h = self.parent.pos2.y() - self.parent.pos1.y()
         b = self.parent.pos2.x() - self.parent.pos1.x()
         ang = np.arctan2(h, b)
@@ -398,15 +413,15 @@ class HvdcSymbol(QGraphicsRectItem):
         self.setTransform(transform)
 
 
-class LineGraphicTemplateItem(QGraphicsLineItem):
+class LineGraphicTemplateItem(GenericDBWidget, QGraphicsLineItem):
     """
     LineGraphicItem
     """
 
     def __init__(self,
-                 from_port: TerminalItem,
-                 to_port: Union[TerminalItem, None],
-                 editor: BusBranchEditorWidget,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem, None],
+                 editor: DiagramEditorWidget,
                  width=5,
                  api_object: Union[Line, Transformer2W, VSC, UPFC, HvdcLine, DcLine, FluidPath, None] = None,
                  arrow_size=10):
@@ -419,10 +434,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,27 +459,14 @@ 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)
 
-        self._from_port: Union[TerminalItem, None] = None
-        self._to_port: Union[TerminalItem, None] = None
+        self._from_port: Union[BarTerminalItem, RoundTerminalItem, None] = None
+        self._to_port: Union[BarTerminalItem, RoundTerminalItem, None] = None
 
         # arrows
         self.view_arrows = True
@@ -485,14 +486,14 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
 
         self.set_colour(self.color, self.width, self.style)
 
-    def get_terminal_from(self) -> Union[None, TerminalItem]:
+    def get_terminal_from(self) -> Union[None, BarTerminalItem, RoundTerminalItem]:
         """
         Get the terminal from
         :return: TerminalItem 
         """
         return self._from_port
 
-    def get_terminal_to(self) -> Union[None, TerminalItem]:
+    def get_terminal_to(self) -> Union[None, BarTerminalItem, RoundTerminalItem]:
         """
         Get the terminal to
         :return: TerminalItem
@@ -525,16 +526,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)
 
@@ -657,7 +649,7 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         i = self.editor.circuit.get_branches().index(self.api_object)
         self.editor.plot_branch(i, self.api_object)
 
-    def set_from_port(self, from_port: TerminalItem):
+    def set_from_port(self, from_port: BarTerminalItem):
         """
         Set the From terminal in a connection
         @param from_port: TerminalItem
@@ -673,7 +665,7 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         self._from_port.update()
         self._from_port.get_parent().setZValue(0)
 
-    def set_to_port(self, to_port: TerminalItem):
+    def set_to_port(self, to_port: BarTerminalItem):
         """
         Set the To terminal in a connection
         @param to_port: TerminalItem
@@ -793,11 +785,11 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
             Pf = Sf.real
             Qf = Sf.imag
             Pt = St.real
-            Qt = St.imag
-            self.arrow_from_1.set_value(Pf, True, Pf < 0, name="Pf", units="MW")
-            self.arrow_from_2.set_value(Qf, True, Qf < 0, name="Qf", units="MVAr")
-            self.arrow_to_1.set_value(Pt, True, Pt > 0, name="Pt", units="MW")
-            self.arrow_to_2.set_value(Qt, True, Qt > 0, name="Qt", units="MVAr")
+            Qt_ = St.imag
+            self.arrow_from_1.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+            self.arrow_from_2.set_value(Qf, True, Qf < 0, name="Qf", units="MVAr", draw_label=self.draw_labels)
+            self.arrow_to_1.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+            self.arrow_to_2.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:
         """
@@ -805,10 +797,10 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         :param Pf: Complex power from
         :param Pt: Complex power to
         """
-        self.arrow_from_1.set_value(Pf, True, Pf < 0, name="Pf", units="MW")
-        self.arrow_from_2.set_value(Pf, True, Pf < 0, name="Pf", units="MW")
-        self.arrow_to_1.set_value(Pt, True, Pt > 0, name="Pt", units="MW")
-        self.arrow_to_2.set_value(Pt, True, Pt > 0, name="Pt", units="MW")
+        self.arrow_from_1.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_from_2.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_to_1.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+        self.arrow_to_2.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
 
     def change_bus(self):
         """
@@ -856,6 +848,46 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         else:
             return False
 
+    def is_from_port_a_cn(self) -> bool:
+        """
+
+        :return:
+        """
+        if self._from_port:
+            return isinstance(self.get_terminal_from_parent(), CnGraphicItem)
+        else:
+            return False
+
+    def is_to_port_a_cn(self) -> bool:
+        """
+
+        :return:
+        """
+        if self._to_port:
+            return isinstance(self.get_terminal_to_parent(), CnGraphicItem)
+        else:
+            return False
+
+    def is_from_port_a_busbar(self) -> bool:
+        """
+
+        :return:
+        """
+        if self._from_port:
+            return isinstance(self.get_terminal_from_parent(), BusBarGraphicItem)
+        else:
+            return False
+
+    def is_to_port_a_busbar(self) -> bool:
+        """
+
+        :return:
+        """
+        if self._to_port:
+            return isinstance(self.get_terminal_to_parent(), BusBarGraphicItem)
+        else:
+            return False
+
     def is_from_port_a_tr3(self) -> bool:
         """
 
@@ -863,7 +895,8 @@ 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.DiagramEditorWidget.Branches.transformer3w_graphics import \
+                    Transformer3WGraphicItem
             return isinstance(self.get_terminal_from_parent(), Transformer3WGraphicItem)
         else:
             return False
@@ -875,7 +908,8 @@ 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.DiagramEditorWidget.Branches.transformer3w_graphics import \
+                    Transformer3WGraphicItem
             return isinstance(self.get_terminal_to_parent(), Transformer3WGraphicItem)
         else:
             return False
@@ -984,6 +1018,34 @@ class LineGraphicTemplateItem(QGraphicsLineItem):
         """
         return self.is_from_port_a_bus() and self.is_to_port_a_fluid_node()
 
+    def connected_between_cn_and_bus(self):
+        """
+
+        :return:
+        """
+        return self.is_from_port_a_cn() and self.is_to_port_a_bus()
+
+    def connected_between_bus_and_cn(self):
+        """
+
+        :return:
+        """
+        return self.is_from_port_a_bus() and self.is_to_port_a_cn()
+
+    def connected_between_busbar_and_bus(self):
+        """
+
+        :return:
+        """
+        return self.is_from_port_a_busbar() and self.is_to_port_a_bus()
+
+    def connected_between_bus_and_busbar(self):
+        """
+
+        :return:
+        """
+        return self.is_from_port_a_bus() and self.is_to_port_a_busbar()
+
     def should_be_a_converter(self) -> bool:
         """
 

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

@@ -15,21 +15,23 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import TYPE_CHECKING
+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.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCalEngine.Devices.Branches.series_reactance import SeriesReactance
-from GridCal.Gui.BusBranchEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class SeriesReactanceGraphicItem(LineGraphicTemplateItem):
 
-    def __init__(self, from_port: TerminalItem, to_port: TerminalItem,
-                 editor: BusBranchEditorWidget, width=5,
+    def __init__(self,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem],
+                 editor: DiagramEditorWidget, width=5,
                  api_object: SeriesReactance = None):
         """
 

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

@@ -17,20 +17,21 @@
 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 PySide6.QtWidgets import QMenu
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
+from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Branches.switch import Switch
-from GridCal.Gui.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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class SwitchGraphicItem(LineGraphicTemplateItem):
 
-    def __init__(self, from_port: TerminalItem,
-                 to_port: Union[TerminalItem, None],
-                 editor: BusBranchEditorWidget,
+    def __init__(self, from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem, None],
+                 editor: DiagramEditorWidget,
                  width=5,
                  api_object: Switch = None):
         """
@@ -63,6 +64,12 @@ class SwitchGraphicItem(LineGraphicTemplateItem):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             rabf = menu.addAction('Change bus')
             move_bus_icon = QIcon()
             move_bus_icon.addPixmap(QPixmap(":/Icons/icons/move_bus.svg"))

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

@@ -15,19 +15,20 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 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.GuiFunctions import add_menu_entry
+from GridCal.Gui.Diagrams.DiagramEditorWidget.Branches.line_graphics_template import LineGraphicTemplateItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 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.DiagramEditorWidget.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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class TransformerGraphicItem(LineGraphicTemplateItem):
@@ -35,8 +36,10 @@ class TransformerGraphicItem(LineGraphicTemplateItem):
     TransformerGraphicItem
     """
 
-    def __init__(self, from_port: TerminalItem, to_port: TerminalItem,
-                 editor: BusBranchEditorWidget, width=5,
+    def __init__(self,
+                 from_port: Union[BarTerminalItem, RoundTerminalItem],
+                 to_port: Union[BarTerminalItem, RoundTerminalItem],
+                 editor: DiagramEditorWidget, width=5,
                  api_object: Transformer2W = None):
         """
 
@@ -68,6 +71,12 @@ class TransformerGraphicItem(LineGraphicTemplateItem):
             pe.setChecked(self.api_object.active)
             pe.triggered.connect(self.enable_disable_toggle)
 
+            add_menu_entry(menu=menu,
+                           text="Draw labels",
+                           function_ptr=self.enable_disable_label_drawing,
+                           checkeable=True,
+                           checked_value=self.draw_labels)
+
             ra2 = menu.addAction('Delete')
             del_icon = QIcon()
             del_icon.addPixmap(QPixmap(":/Icons/icons/delete3.svg"))

{GridCal-5.1.0/GridCal/Gui/BusBranchEditorWidget → GridCal-5.1.2/GridCal/Gui/Diagrams/DiagramEditorWidget}/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.DiagramEditorWidget.generic_graphics import ACTIVE, DEACTIVATED
+from GridCal.Gui.Diagrams.DiagramEditorWidget.terminal_item import RoundTerminalItem
+from GridCal.Gui.Diagrams.DiagramEditorWidget.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.DiagramEditorWidget.diagram_editor_widget import DiagramEditorWidget
 
 
 class Transformer3WGraphicItem(QGraphicsRectItem):
@@ -42,7 +42,7 @@ class Transformer3WGraphicItem(QGraphicsRectItem):
       - description
     """
 
-    def __init__(self, editor: BusBranchEditorWidget,
+    def __init__(self, editor: DiagramEditorWidget,
                  elm: Transformer3W,
                  pos: QPoint = None,
                  parent=None,
@@ -105,7 +105,7 @@ class Transformer3WGraphicItem(QGraphicsRectItem):
         yt = diameter * np.sin(angles) + diameter
 
         self.winding_circles: List[QGraphicsEllipseItem] = list()
-        self.terminals: List[TerminalItem] = list()
+        self.terminals: List[RoundTerminalItem] = list()
         self.connection_lines: List[WindingGraphicItem | None] = list()
 
         pen = QPen(self.color, self.pen_width, self.style)
@@ -116,7 +116,7 @@ class Transformer3WGraphicItem(QGraphicsRectItem):
             winding_circle.setRect(0.0, 0.0, diameter, diameter)
             winding_circle.setPos(x[i], y[i])
 
-            terminal = TerminalItem("t", parent=self, editor=self.editor)
+            terminal = RoundTerminalItem("t", parent=self, editor=self.editor)
             terminal.setPos(xt[i], yt[i])
             terminal.setRotation(angles_deg[i])
 
@@ -277,15 +277,11 @@ class Transformer3WGraphicItem(QGraphicsRectItem):
         """
         Update the object
         """
-
         # Arrange line positions
         for terminal in self.terminals:
-            x = int(2 * terminal.w / 3)
-            y = int(2 * terminal.h / 3)
-            m = QPointF(x, y)
-            terminal.process_callbacks(self.pos() + terminal.pos() - m)
+            terminal.process_callbacks(parent_pos=self.pos())
 
-    def get_connection_winding(self, from_port: TerminalItem, to_port: TerminalItem):
+    def get_connection_winding(self, from_port: RoundTerminalItem, to_port: RoundTerminalItem):
         """
         Find the winding between the terminals
         :param from_port: "from" terminal [TerminalItem]