GridCal 5.3.53__tar.gz → 5.4.0b1__tar.gz

{gridcal-5.3.53 → gridcal-5.4.0b1}/GridCal/ExecuteGridCal.py

@@ -31,4 +31,4 @@ if __name__ == "__main__":
     os.environ["QT_QUICK_CONTROLS_STYLE"] = "Basic"
     # os.environ["QT_QPA_PLATFORMTHEME"] = "qt5ct"  # this forces QT-only menus and look and feel
 
-    runGridCal()
+    runGridCal()

{gridcal-5.3.53 → gridcal-5.4.0b1}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -73,14 +73,9 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         self.line_container = None
         self.editor: GridMapWidget = editor  # reassign for the types to be clear
 
-        r2 = size / 2
+        r2 = size / 2.0
         x, y = editor.to_x_y(lat=lat, lon=lon)  # upper left corner
-        self.setRect(
-            x - r2,
-            y - r2,
-            self.size,
-            self.size
-        )
+        self.setRect(x - r2, y - r2, self.size, self.size)
 
         # Enable hover events for the item
         self.setAcceptHoverEvents(True)
@@ -94,17 +89,41 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         self.change_pen_width(0.05 * size)
 
         # Create a pen with reduced line width
-        self.color = QColor(self.api_object.color)
-        self.color.setAlpha(128)
-        self.hoover_color = QColor(self.api_object.color)
-        self.hoover_color.setAlpha(180)
-        self.border_color = QColor(self.api_object.color)  # No Alpha
+        self._color = QColor(self.api_object.color)
+        self._color.setAlpha(128)
+        self._hoover_color = QColor(self.api_object.color)
+        self._hoover_color.setAlpha(180)
+        self._border_color = QColor(self.api_object.color)  # No Alpha
 
         self.set_default_color()
 
         # list of voltage levels graphics
         self.voltage_level_graphics: List[VoltageLevelGraphicItem] = list()
 
+    @property
+    def color(self) -> QColor:
+        return self._color
+
+    @color.setter
+    def color(self, val: QColor):
+        self._color = val
+
+    @property
+    def hover_color(self) -> QColor:
+        return self._hoover_color
+
+    @hover_color.setter
+    def hover_color(self, val: QColor):
+        self._hoover_color = val
+
+    @property
+    def border_color(self) -> QColor:
+        return self._border_color
+
+    @border_color.setter
+    def border_color(self, val: QColor):
+        self._border_color = val
+
     @property
     def api_object(self) -> Substation:
         return self._api_object
@@ -182,8 +201,8 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         self.color = QColor(self.api_object.color)
         self.color.setAlpha(128)
 
-        self.hoover_color = QColor(self.api_object.color)
-        self.hoover_color.setAlpha(180)
+        self.hover_color = QColor(self.api_object.color)
+        self.hover_color.setAlpha(180)
 
         self.border_color = QColor(self.api_object.color)  # No Alpha
 
@@ -315,17 +334,15 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         Event handler for when the mouse enters the item.
         """
         # self.editor.map.view.in_item = True
-        self.set_color(self.hoover_color, self.color)
+        self.color_widget(self.color, self.hover_color)
         self.hovered = True
 
     def hoverLeaveEvent(self, event: QtWidgets.QGraphicsSceneHoverEvent) -> None:
         """
         Event handler for when the mouse leaves the item.
         """
-        # self.editor.map.view.in_item = False
         self.hovered = False
-        self.set_default_color()
-        # QApplication.instance().restoreOverrideCursor()
+        self.color_widget(self.color, self.border_color)
 
     def contextMenuEvent(self, event: QGraphicsSceneContextMenuEvent):
         """
@@ -756,7 +773,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         pen.setWidthF(width)
         self.setPen(pen)
 
-    def set_color(self, inner_color: QColor = None, border_color: QColor = None) -> None:
+    def color_widget(self, inner_color: QColor = None, border_color: QColor = None) -> None:
         """
 
         :param inner_color:
@@ -778,7 +795,7 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
         :return:
         """
         # Example: color assignment
-        self.set_color(self.color, self.border_color)
+        self.color_widget(self.color, self.border_color)
 
     def open_street_view(self):
         """
@@ -810,7 +827,6 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
 
         return self.voltage_level_graphics + associated_lines_graphics
 
-
     def get_associated_devices(self) -> List[ALL_DEV_TYPES]:
         """
         This function returns all the api_object devices associated with the selected graphic object.

{gridcal-5.3.53 → gridcal-5.4.0b1}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -11,7 +11,6 @@ import json
 import numpy as np
 import math
 import pandas as pd
-from GridCalEngine.Devices.Branches.overhead_line_type import OverheadLineType
 from matplotlib import pyplot as plt
 
 from PySide6.QtWidgets import QGraphicsItem, QMessageBox, QDialog, QVBoxLayout, QLabel, QPushButton
@@ -35,12 +34,14 @@ from GridCalEngine.Devices.Substation.substation import Substation
 from GridCalEngine.Devices.Substation.voltage_level import VoltageLevel
 from GridCalEngine.Devices.Branches.line_locations import LineLocation
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-from GridCalEngine.enumerations import DeviceType, ResultTypes
+from GridCalEngine.enumerations import DeviceType, ResultTypes, SubstationTypes
 from GridCalEngine.Devices.types import ALL_DEV_TYPES
 from GridCalEngine.basic_structures import Logger
 from GridCalEngine.Simulations.OPF.opf_ts_results import OptimalPowerFlowTimeSeriesResults
 from GridCalEngine.Simulations.PowerFlow.power_flow_ts_results import PowerFlowTimeSeriesResults
 from GridCalEngine.enumerations import Colormaps
+from GridCalEngine.Topology import substation_wizards as substation_wizards
+import GridCalEngine.Devices.Diagrams.palettes as palettes
 
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_ac_line import MapAcLine
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_dc_line import MapDcLine
@@ -52,7 +53,6 @@ from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import
 from GridCal.Gui.Diagrams.MapWidget.map_widget import MapWidget, MapDiagramScene
 from GridCal.Gui.Diagrams.Editors.new_line_dialogue import NewMapLineDialogue
 import GridCal.Gui.Visualization.visualization as viz
-import GridCalEngine.Devices.Diagrams.palettes as palettes
 from GridCal.Gui.Diagrams.graphics_manager import ALL_MAP_GRAPHICS
 from GridCal.Gui.Diagrams.MapWidget.Tiles.tiles import Tiles
 from GridCal.Gui.Diagrams.base_diagram_widget import BaseDiagramWidget
@@ -101,7 +101,7 @@ class MapLibraryModel(QStandardItemModel):
 
         self.substation_name = "Substation"
 
-        self.add(name=self.substation_name, icon_name="bus_icon")
+        self.add(name=self.substation_name, icon_name="substation")
 
     def add(self, name: str, icon_name: str):
         """
@@ -522,6 +522,21 @@ class GridMapWidget(BaseDiagramWidget):
         """
         return [s for s in self.map.view.selected_items() if isinstance(s, SubstationGraphicItem)]
 
+    def get_substations(self) -> List[Tuple[int, Substation, SubstationGraphicItem]]:
+        """
+        Get all the substations
+        :return: tuple(substation index, substation_api_object, substation_graphic_object)
+        """
+        lst: List[Tuple[int, Substation, Union[SubstationGraphicItem, None]]] = list()
+        substation_graphics_dict = self.graphics_manager.get_device_type_dict(DeviceType.SubstationDevice)
+        substations_dict: Dict[str: Tuple[int, Bus]] = {b.idtag: (i, b) for i, b in enumerate(self.circuit.substations)}
+
+        for bus_idtag, graphic_object in substation_graphics_dict.items():
+            idx, substation = substations_dict[bus_idtag]
+            lst.append((idx, substation, graphic_object))
+
+        return lst
+
     def create_new_line_wizard(self):
         """
         Create a new line in the map with dialogues
@@ -611,6 +626,7 @@ class GridMapWidget(BaseDiagramWidget):
 
             # Delete the substation itself
             self.circuit.delete_substation(obj=api_object)
+
     #
     # def show_devices_to_disconnect_dialog(self,
     #                                       devices: List[ALL_DEV_TYPES],
@@ -945,38 +961,36 @@ class GridMapWidget(BaseDiagramWidget):
         :return:
         """
         kv = self.gui.get_default_voltage()
-        dlg = SubstationDesigner(grid=self.circuit, default_voltage=kv)
+        dlg = SubstationDesigner(grid=self.circuit, default_voltage=kv, lat=lat, lon=lon)
         dlg.exec()
         if dlg.was_ok():
 
-            # create the SE
-            se_object = Substation(name=dlg.get_name(),
-                                   code=dlg.get_code(),
-                                   latitude=lat,
-                                   longitude=lon)
+            se_object, voltage_levels = substation_wizards.create_substation(
+                grid=self.circuit,
+                se_name=dlg.get_name(),
+                se_code=dlg.get_code(),
+                lat=dlg.get_latitude(),
+                lon=dlg.get_longitude(),
+                vl_templates=dlg.get_voltage_levels()
+            )
 
-            self.circuit.add_substation(obj=se_object)
+            # create SE graphic
             substation_graphics = self.add_api_substation(api_object=se_object, lat=lat, lon=lon)
 
-            for vl_template in dlg.get_voltage_levels():
-                # substation_graphics.add_voltage_level()
-                vl = VoltageLevel(name=f"{se_object.name} @{vl_template.voltage} kV VL",
-                                  Vnom=vl_template.voltage,
-                                  substation=se_object)
-                self.circuit.add_voltage_level(vl)
-
-                bus = Bus(name=f"{se_object.name} @{vl_template.voltage} kV bus",
-                          Vnom=vl_template.voltage,
-                          substation=se_object,
-                          voltage_level=vl)
-                self.circuit.add_bus(obj=bus)
-
-                # add the vl graphics
+            # add voltage level graphics
+            for vl in voltage_levels:
                 self.add_api_voltage_level(substation_graphics=substation_graphics, api_object=vl)
 
             # sort voltage levels
             substation_graphics.sort_voltage_levels()
 
+            # ask to create a se diagram
+            ok = yes_no_question(title="create substation diagram",
+                                 text="Do you want to finalize the editing of the substation in the schematic?")
+
+            if ok:
+                self.new_substation_diagram(substation=se_object)
+
     def get_branch_width(self) -> float:
         """
         Get the desired branch width
@@ -1060,7 +1074,7 @@ class GridMapWidget(BaseDiagramWidget):
         # rescale substations (this is super-fast)
         data: Dict[str, SubstationGraphicItem] = self.graphics_manager.get_device_type_dict(DeviceType.SubstationDevice)
         for se_key, elm_graphics in data.items():
-            elm_graphics.set_api_object_color()
+            # elm_graphics.set_api_object_color()
             elm_graphics.set_size(r=se_width)
 
         self.diagram_scene.blockSignals(False)
@@ -1106,7 +1120,7 @@ class GridMapWidget(BaseDiagramWidget):
                        vsc_loading: Vec = None,
                        vsc_active: IntVec = None,
                        ma: Vec = None,
-                       theta: Vec = None,
+                       tau: Vec = None,
                        fluid_node_p2x_flow: Vec = None,
                        fluid_node_current_level: Vec = None,
                        fluid_node_spillage: Vec = None,
@@ -1119,7 +1133,8 @@ class GridMapWidget(BaseDiagramWidget):
                        max_branch_width=5,
                        min_bus_width=20,
                        max_bus_width=20,
-                       cmap: palettes.Colormaps = None):
+                       cmap: palettes.Colormaps = None,
+                       is_three_phase: bool = False):
         """
         Color objects based on the results passed
         :param Sbus: Buses power (MVA)
@@ -1142,9 +1157,9 @@ class GridMapWidget(BaseDiagramWidget):
         :param vsc_losses: VSC branch losses [MW]
         :param vsc_loading: VSC Branch loading [%]
         :param vsc_active: VSC Branch status
-        :param loading_label: String saling whatever the loading label means
+        :param loading_label: String saying whatever the loading label means
         :param ma: branch phase shift angle (rad)
-        :param theta: branch tap module (p.u.)
+        :param tau: branch tap module (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)
@@ -1158,6 +1173,7 @@ class GridMapWidget(BaseDiagramWidget):
         :param min_bus_width: Minimum bus width [px]
         :param max_bus_width: Maximum bus width [px]
         :param cmap: Color map [palettes.Colormaps]
+        :param is_three_phase: the results are three-phase
         """
 
         # voltage_cmap = viz.get_voltage_color_map()
@@ -1517,7 +1533,6 @@ class GridMapWidget(BaseDiagramWidget):
 
         selected_lineloc = self.get_selected_linelocations_tup()
 
-
         if len(selected_lineloc) != 1:
             self.gui.show_error_toast('More than one waypoint selected. Could not determine where '
                                       'the substation should be created.')
@@ -1657,12 +1672,9 @@ class GridMapWidget(BaseDiagramWidget):
                 line2 = Line(name=line.name, code=line.code, bus_from=added_bus, bus_to=line.bus_to,
                              circuit_idx=line.circuit_idx, length=length2)
 
-                template = line.template
-                if isinstance(template, OverheadLineType):
-                    template.compute()
-                line1.apply_template(template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
-
-                line2.apply_template(template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+                if line.template is not None:
+                    line1.apply_template(line.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+                    line2.apply_template(line.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
                 line1.color = line.color
                 line2.color = line.color
@@ -1738,14 +1750,19 @@ class GridMapWidget(BaseDiagramWidget):
 
             if inpt.is_accepted:
                 circ_idx = inpt.value
-                if circ_idx > line1.template.n_circuits:
-                    self.gui.show_error_toast(f'The circuit id introduced is greater than the maximum id that this '
-                                              f'template can use. The template has {line1.template.n_circuits}, the '
-                                              f'maximum possible value for the circuit_idx is '
-                                              f'{line1.template.n_circuits}, try again.')
-                    return
+                if line1.template is not None:
+
+                    if circ_idx > line1.template.n_circuits:
+                        self.gui.show_error_toast(f'The circuit id introduced is greater than the maximum id that this '
+                                                  f'template can use. The template has {line1.template.n_circuits}, the '
+                                                  f'maximum possible value for the circuit_idx is '
+                                                  f'{line1.template.n_circuits}, try again.')
+                        return
+                    else:
+                        pass
                 else:
                     pass
+
             else:
                 self.gui.show_error_toast(f'Dialogue not accepted. Operation not performed.')
                 return
@@ -1808,7 +1825,8 @@ class GridMapWidget(BaseDiagramWidget):
                         length=line1.length + line2.length, circuit_idx=circ_idx)
         new_line.color = line1.color
 
-        new_line.apply_template(obj=line1.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        if line1.template is not None:
+            new_line.apply_template(obj=line1.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         previous_coordinates = [0, 0]
 
@@ -2057,8 +2075,9 @@ class GridMapWidget(BaseDiagramWidget):
                      protection_rating_factor=line_api.protection_rating_factor,
                      circuit_idx=line_api.circuit_idx)
 
-        line1.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
-        line2.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        if line_api.template is not None:
+            line1.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+            line2.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         # Copy other properties from the original line
         if hasattr(line_api, 'color'):
@@ -2483,8 +2502,9 @@ class GridMapWidget(BaseDiagramWidget):
                      protection_rating_factor=line_api.protection_rating_factor,
                      circuit_idx=line_api.circuit_idx)
 
-        line1.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
-        line2.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        if line_api.template is not None:
+            line1.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+            line2.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         # Copy other properties from the original line
         if hasattr(line_api, 'color'):
@@ -2525,7 +2545,8 @@ class GridMapWidget(BaseDiagramWidget):
                                protection_rating_factor=line_api.protection_rating_factor,
                                circuit_idx=line_api.circuit_idx)
 
-        connection_line.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        if line_api.template is not None:
+            connection_line.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         # Copy other properties from the original line
         if hasattr(line_api, 'color'):
@@ -2657,8 +2678,9 @@ class GridMapWidget(BaseDiagramWidget):
         line = self.add_api_line(api_object=line_api)
         line.calculate_total_length()
 
-        self.gui.show_info_toast(f"Line {line_api.name} had its connection to substation {removed_substation} changed to substation "
-                    f"{added_substation}.")
+        self.gui.show_info_toast(
+            f"Line {line_api.name} had its connection to substation {removed_substation} changed to substation "
+            f"{added_substation}.")
 
 
 def generate_map_diagram(

{gridcal-5.3.53 → gridcal-5.4.0b1}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_graphics_template.py

@@ -13,13 +13,10 @@ from PySide6.QtWidgets import (QGraphicsLineItem, QGraphicsRectItem, QGraphicsPo
 from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER, GenericDiagramWidget, TRANSPARENT, WHITE
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCal.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import BusGraphicItem
-from GridCal.Gui.Diagrams.SchematicWidget.Substation.cn_graphics import CnGraphicItem
-from GridCal.Gui.Diagrams.SchematicWidget.Substation.busbar_graphics import BusBarGraphicItem
 from GridCal.Gui.Diagrams.SchematicWidget.Fluid.fluid_node_graphics import FluidNodeGraphicItem
 from GridCal.Gui.messages import yes_no_question
 
 from GridCalEngine.Devices.Substation.bus import Bus
-from GridCalEngine.Devices.Substation.connectivity_node import ConnectivityNode
 from GridCalEngine.Devices.Substation.busbar import BusBar
 from GridCalEngine.Devices.Branches.line import Line
 from GridCalEngine.Devices.Branches.transformer import Transformer2W
@@ -33,12 +30,13 @@ from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine
 from GridCalEngine.Devices.Fluid.fluid_node import FluidNode
 from GridCalEngine.Devices.Fluid.fluid_path import FluidPath
 from GridCalEngine.Devices.types import BRANCH_TYPES
+from GridCalEngine.enumerations import SwitchGraphicType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
     from GridCal.Gui.Diagrams.SchematicWidget.Branches.transformer3w_graphics import Transformer3WGraphicItem
 
-NODE_GRAPHIC = BusGraphicItem | CnGraphicItem | BusBarGraphicItem | FluidNodeGraphicItem
+NODE_GRAPHIC = BusGraphicItem | FluidNodeGraphicItem
 
 
 class TransformerSymbol(QGraphicsRectItem):
@@ -224,7 +222,7 @@ class SeriesReactanceSymbol(VscSymbol):
 
 class SwitchSymbol(VscSymbol):
     """
-    UpfcSymbol
+    SwitchSymbol
     """
 
     def __init__(self, parent, pen_width, h=30, w=30):
@@ -232,6 +230,15 @@ class SwitchSymbol(VscSymbol):
                            icon_route=":/Icons/icons/switch.svg")
 
 
+class DisconnectorSymbol(VscSymbol):
+    """
+    DisconnectorSymbol
+    """
+
+    def __init__(self, parent, pen_width, h=30, w=30):
+        VscSymbol.__init__(self, parent=parent, pen_width=pen_width, h=h, w=w,
+                           icon_route=":/Icons/icons/disconnector.svg")
+
 class HvdcSymbol(QGraphicsRectItem):
     """
     HvdcSymbol
@@ -483,7 +490,12 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         elif isinstance(api_object, SeriesReactance):
             self.symbol = SeriesReactanceSymbol(parent=self, pen_width=width, h=30, w=30)
         elif isinstance(api_object, Switch):
-            self.symbol = SwitchSymbol(parent=self, pen_width=width, h=30, w=30)
+            if api_object.graphic_type == SwitchGraphicType.CircuitBreaker:
+                self.symbol = SwitchSymbol(parent=self, pen_width=width, h=30, w=30)
+            elif api_object.graphic_type == SwitchGraphicType.Disconnector:
+                self.symbol = DisconnectorSymbol(parent=self, pen_width=width, h=30, w=30)
+            else:
+                self.symbol = DisconnectorSymbol(parent=self, pen_width=width, h=30, w=30)
         else:
             self.symbol = None
 
@@ -685,6 +697,11 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         # Set pen for everyone
         self.set_pen(QPen(self.color, self.width, self.style))
 
+        self.arrow_p_from.setVisible(val)
+        self.arrow_q_from.setVisible(val)
+        self.arrow_p_to.setVisible(val)
+        self.arrow_q_to.setVisible(val)
+
     def plot_profiles(self):
         """
         Plot the time series profiles
@@ -816,7 +833,7 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         """
         self._editor.set_active_status_to_profile(self.api_object)
 
-    def set_arrows_with_power(self, Sf: complex, St: complex) -> None:
+    def set_arrows_with_power(self, Sf: complex | None, St: complex | None) -> None:
         """
         Set the arrow directions
         :param Sf: Complex power from
@@ -835,6 +852,12 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
             self.arrow_q_from.set_value(Qf, True, Qf < 0, name="Qf", units="MVAr", draw_label=self.draw_labels)
             self.arrow_p_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
             self.arrow_q_to.set_value(Qt_, True, Qt_ > 0, name="Qt", units="MVAr", draw_label=self.draw_labels)
+        else:
+            if St is None:
+                self.arrow_p_from.setVisible(False)
+                self.arrow_q_from.setVisible(False)
+                self.arrow_p_to.setVisible(False)
+                self.arrow_q_to.setVisible(False)
 
     def set_arrows_with_hvdc_power(self, Pf: float, Pt: float) -> None:
         """
@@ -903,46 +926,6 @@ class LineGraphicTemplateItem(GenericDiagramWidget, 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:
         """
 
@@ -1005,14 +988,14 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         """
         return self.get_to_graphic_object().api_object
 
-    def get_cn_from(self) -> ConnectivityNode:
+    def get_cn_from(self) -> Bus:
         """
 
         :return:
         """
         return self.get_from_graphic_object().api_object
 
-    def get_cn_to(self) -> ConnectivityNode:
+    def get_cn_to(self) -> Bus:
         """
 
         :return:
@@ -1103,61 +1086,6 @@ class LineGraphicTemplateItem(GenericDiagramWidget, 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_cn(self):
-        """
-
-        :return:
-        """
-        return self.is_from_port_a_cn() 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 connected_between_busbar(self):
-        """
-
-        :return:
-        """
-        return self.is_from_port_a_busbar() and self.is_to_port_a_busbar()
-
-    def connected_between_busbar_and_cn(self):
-        """
-
-        :return:
-        """
-        return self.is_from_port_a_busbar() and self.is_to_port_a_cn()
-
-    def connected_between_cn_and_busbar(self):
-        """
-
-        :return:
-        """
-        return self.is_from_port_a_cn() and self.is_to_port_a_busbar()
 
     def should_be_a_converter(self) -> bool:
         """