GridCal 5.1.33__tar.gz → 5.1.34__tar.gz

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Analysis/AnalysisDialogue.py

@@ -20,7 +20,7 @@ from PySide6 import QtWidgets
 from GridCal.Gui.Analysis.gui import Ui_MainWindow
 from GridCal.Gui.Analysis.object_plot_analysis import grid_analysis, GridErrorLog, FixableErrorOutOfRange
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-from GridCal.Gui.GeneralDialogues import LogsDialogue, Logger
+from GridCal.Gui.general_dialogues import LogsDialogue, Logger
 
 
 class GridAnalysisGUI(QtWidgets.QMainWindow):

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/ContingencyPlanner/contingency_planner_dialogue.py

@@ -22,7 +22,7 @@ from GridCal.Gui.ContingencyPlanner.gui import Ui_MainWindow
 import GridCalEngine.Devices as dev
 from GridCalEngine.enumerations import DeviceType
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-import GridCal.Gui.GuiFunctions as gf
+import GridCal.Gui.gui_functions as gf
 from GridCalEngine.Simulations.ContingencyAnalysis.contingency_plan import generate_automatic_contingency_plan
 
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/CoordinatesInput/coordinates_dialogue.py

@@ -5,7 +5,7 @@ from PySide6 import QtGui, QtCore, QtWidgets
 from typing import List, Tuple, Union
 from GridCal.Gui.CoordinatesInput.gui import Ui_Dialog
 from GridCal.Gui.ProfilesInput.excel_dialog import ExcelDialog
-from GridCal.Gui.GeneralDialogues import LogsDialogue
+from GridCal.Gui.general_dialogues import LogsDialogue
 from GridCalEngine.Devices.Substation import Bus
 from GridCalEngine.basic_structures import Logger
 from GridCal.Gui.messages import error_msg

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -21,7 +21,7 @@ from PySide6.QtGui import QPen, QColor, QCursor
 from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent
 from PySide6.QtWidgets import QGraphicsLineItem, QGraphicsSceneMouseEvent
 
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER
 from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_editor import LineEditor
@@ -99,10 +99,6 @@ class MapLineSegment(QGraphicsLineItem):
         pen.setWidthF(w)
 
         self.setPen(pen)
-        # self.arrow_from_1.set_colour(color, w, style)
-        # self.arrow_from_2.set_colour(color, w, style)
-        # self.arrow_to_1.set_colour(color, w, style)
-        # self.arrow_to_2.set_colour(color, w, style)
 
     def set_from_side_coordinates(self, x: float, y: float):
         """
@@ -152,12 +148,7 @@ class MapLineSegment(QGraphicsLineItem):
         :return:
         """
         if self.api_object is not None:
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists={
-                                             DeviceType.BusDevice: self.editor.circuit.get_buses(),
-                                             DeviceType.ConnectivityNodeDevice: self.editor.circuit.get_connectivity_nodes(),
-                                             DeviceType.BranchGroupDevice: self.editor.circuit.get_branch_groups()
-                                         })
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def contextMenuEvent(self, event: QGraphicsSceneContextMenuEvent):
         """

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/MapWidget/Substation/node_graphic_item.py

@@ -17,7 +17,7 @@
 from __future__ import annotations
 from typing import Tuple, TYPE_CHECKING
 from PySide6.QtWidgets import QApplication, QMenu, QGraphicsSceneContextMenuEvent
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor, QCursor

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -22,9 +22,9 @@ from PySide6.QtWidgets import (QApplication, QMenu, QGraphicsSceneContextMenuEve
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor, QCursor
 from GridCal.Gui.Diagrams.MapWidget.Substation.node_template import NodeTemplate
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.GeneralDialogues import InputNumberDialogue
+from GridCal.Gui.general_dialogues import InputNumberDialogue
 
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices import VoltageLevel
@@ -193,15 +193,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         self.editor.map.view.disableMove = True
 
         if self.api_object is not None:
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists={
-                                             DeviceType.CountryDevice: self.editor.circuit.get_countries(),
-                                             DeviceType.CommunityDevice: self.editor.circuit.get_communities(),
-                                             DeviceType.RegionDevice: self.editor.circuit.get_regions(),
-                                             DeviceType.MunicipalityDevice: self.editor.circuit.get_municipalities(),
-                                             DeviceType.AreaDevice: self.editor.circuit.get_areas(),
-                                             DeviceType.ZoneDevice: self.editor.circuit.get_zones(),
-                                         })
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent):
         """

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/MapWidget/Substation/voltage_level_graphic_item.py

@@ -22,7 +22,7 @@ from PySide6.QtGui import QBrush, QColor
 from PySide6.QtWidgets import (QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsEllipseItem)
 
 from GridCal.Gui.Diagrams.generic_graphics import GenericDiagramWidget
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 
 from GridCalEngine.Devices.Substation.voltage_level import VoltageLevel
 from GridCalEngine.Devices.Substation.bus import Bus
@@ -148,10 +148,7 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         self.updateDiagram()  # always update
 
         if self.api_object is not None:
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists={
-                                             DeviceType.SubstationDevice: self.editor.circuit.get_substations(),
-                                         })
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def mouseReleaseEvent(self, event):
         """

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -16,14 +16,15 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import os
 from typing import Union, List, Tuple
+import json
 import numpy as np
 import math
 from PySide6.QtWidgets import QGraphicsItem
 from collections.abc import Callable
 from PySide6.QtSvg import QSvgGenerator
 from PySide6.QtCore import (Qt, QSize, QRect, QMimeData, QIODevice, QByteArray, QDataStream, QModelIndex)
-from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel, QStandardItem, QColor, QDropEvent,
-                           QWheelEvent)
+from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel, QStandardItem, QColor,
+                           QDropEvent, QWheelEvent)
 
 from GridCalEngine.Devices.Diagrams.map_location import MapLocation
 from GridCalEngine.Devices.Substation import Bus
@@ -1169,6 +1170,29 @@ class GridMapWidget(BaseDiagramWidget):
         else:
             print("call_new_substation_diagram_func is None :( ")
 
+    def copy(self) -> "GridMapWidget":
+        """
+        Deep copy of this widget
+        :return: GridMapWidget
+        """
+        d_copy = MapDiagram(name=self.diagram.name + '_copy')
+        j_data = json.dumps(self.diagram.get_data_dict(), indent=4)
+        d_copy.parse_data(data=json.loads(j_data),
+                          obj_dict=self.circuit.get_all_elements_dict_by_type(add_locations=True),
+                          logger=self.logger)
+
+        return GridMapWidget(
+            tile_src=self.map.tile_src,
+            start_level=self.diagram.start_level,
+            longitude=self.diagram.longitude,
+            latitude=self.diagram.latitude,
+            name=self.diagram.name,
+            circuit=self.circuit,
+            diagram=self.diagram,
+            call_new_substation_diagram_func=self.call_new_substation_diagram_func,
+            call_delete_db_element_func=self.call_delete_db_element_func
+        )
+
 
 def generate_map_diagram(substations: List[Substation],
                          voltage_levels: List[VoltageLevel],

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/dc_line_graphics.py

@@ -20,7 +20,7 @@ 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, add_menu_entry
+from GridCal.Gui.gui_functions import get_list_model, add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCalEngine.Devices.Branches.line import SequenceLineType, OverheadLineType, UndergroundLineType
 from GridCalEngine.Devices.Branches.dc_line import DcLine

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/hvdc_graphics.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_editor.py

@@ -19,7 +19,7 @@ import numpy as np
 from typing import Union, List
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QDoubleSpinBox, QComboBox, QCheckBox
-from GridCal.Gui.GuiFunctions import get_list_model
+from GridCal.Gui.gui_functions import get_list_model
 from GridCal.Gui.messages import error_msg
 from GridCalEngine.Devices.Branches.line import Line, SequenceLineType, OverheadLineType, UndergroundLineType
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_graphics.py

@@ -19,7 +19,7 @@ from typing import TYPE_CHECKING, Union
 from PySide6.QtCore import Qt, QRectF
 from PySide6.QtGui import QPen, QBrush
 from PySide6.QtWidgets import QMenu, QGraphicsRectItem, QGraphicsSceneContextMenuEvent
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_editor import LineEditor
 from GridCal.Gui.messages import yes_no_question, warning_msg

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/line_graphics_template.py

@@ -44,7 +44,6 @@ from GridCalEngine.Devices.Branches.series_reactance import SeriesReactance
 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.enumerations import DeviceType
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
@@ -106,7 +105,7 @@ class ArrowHead(QGraphicsPolygonItem):
         self.label.setDefaultTextColor(color)
 
     def set_value(self, value: float, redraw=True, backwards=False, name="", units="", format_str="{:10.2f}",
-                  draw_label: bool = True):
+                  draw_label: bool = True, visibility_filter_value=1e-4):
         """
         Set the sign with a value
         :param value: any real value
@@ -115,9 +114,10 @@ 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 visibility_filter_value: threshold to determine if to show this widget
         :param draw_label: Draw label
         """
-        # self.backwards = value < 0
+        self.setVisible(abs(value) > visibility_filter_value)
         self.backwards = backwards
 
         self.label.setVisible(draw_label)
@@ -146,9 +146,13 @@ class ArrowHead(QGraphicsPolygonItem):
         arrow_p2 = base_pt - QTransform().rotate(angle).map(QPointF(p1, p2))
         arrow_polygon = QPolygonF([base_pt, arrow_p1, arrow_p2])
 
-        self.setPolygon(arrow_polygon)
+        # base_pt = line.p1() + (line.p2() - line.p1()) * self.position
+        #
+        # arrow_polygon = QPolygonF([base_pt, arrow_p1, arrow_p2])
 
+        self.setPolygon(arrow_polygon)
         if self.show_text:
+            # angle = - line.angle()
             a = angle + 180 if 90 < line.angle() <= 270 else angle  # this keep the labels upside
             label_p = base_pt - QTransform().rotate(a).map(QPointF(0, -10 if self.under else 35))
             self.label.setPos(label_p)
@@ -488,10 +492,10 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
 
         # arrows
         self.view_arrows = True
-        self.arrow_from_1 = ArrowHead(parent=self, arrow_size=arrow_size, position=0.2, under=False)
-        self.arrow_from_2 = ArrowHead(parent=self, arrow_size=arrow_size, position=0.2, under=True)
-        self.arrow_to_1 = ArrowHead(parent=self, arrow_size=arrow_size, position=0.8, under=False)
-        self.arrow_to_2 = ArrowHead(parent=self, arrow_size=arrow_size, position=0.8, under=True)
+        self.arrow_p_from = ArrowHead(parent=self, arrow_size=arrow_size, position=0.2, under=False)
+        self.arrow_q_from = ArrowHead(parent=self, arrow_size=arrow_size, position=0.2, under=True)
+        self.arrow_p_to = ArrowHead(parent=self, arrow_size=arrow_size, position=0.8, under=False)
+        self.arrow_q_to = ArrowHead(parent=self, arrow_size=arrow_size, position=0.8, under=True)
 
         if from_port and to_port:
             self.redraw()
@@ -560,10 +564,10 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         pen = QPen(color, w, style, Qt.RoundCap, Qt.RoundJoin)
 
         self.setPen(pen)
-        self.arrow_from_1.set_colour(color, w, style)
-        self.arrow_from_2.set_colour(color, w, style)
-        self.arrow_to_1.set_colour(color, w, style)
-        self.arrow_to_2.set_colour(color, w, style)
+        self.arrow_p_from.set_colour(color, w, style)
+        self.arrow_q_from.set_colour(color, w, style)
+        self.arrow_p_to.set_colour(color, w, style)
+        self.arrow_q_to.set_colour(color, w, style)
 
         if self.symbol is not None:
             self.symbol.set_colour(color, w, style)
@@ -587,11 +591,7 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
         """
         if self.api_object is not None:           
             
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists={
-                                             DeviceType.BusDevice: self.editor.circuit.get_buses(),
-                                             DeviceType.ConnectivityNodeDevice: self.editor.circuit.get_connectivity_nodes(),
-                                         })
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def remove_widget(self):
         """
@@ -754,10 +754,10 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
 
                 # arrows
                 if self.view_arrows:
-                    self.arrow_from_1.redraw()
-                    self.arrow_from_2.redraw()
-                    self.arrow_to_1.redraw()
-                    self.arrow_to_2.redraw()
+                    self.arrow_p_from.redraw()
+                    self.arrow_q_from.redraw()
+                    self.arrow_p_to.redraw()
+                    self.arrow_q_to.redraw()
 
                 if self.symbol is not None:
                     self.symbol.redraw()
@@ -809,10 +809,10 @@ class LineGraphicTemplateItem(GenericDiagramWidget, QGraphicsLineItem):
             Qf = Sf.imag
             Pt = St.real
             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)
+            self.arrow_p_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+            self.arrow_q_from.set_value(Qf, True, Qf < 0, name="Qf", units="MVAr", draw_label=self.draw_labels)
+            self.arrow_p_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+            self.arrow_q_to.set_value(Qt_, True, Qt_ > 0, name="Qt", units="MVAr", draw_label=self.draw_labels)
 
     def set_arrows_with_hvdc_power(self, Pf: float, Pt: float) -> None:
         """
@@ -820,10 +820,10 @@ class LineGraphicTemplateItem(GenericDiagramWidget, 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", 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)
+        self.arrow_p_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_q_from.set_value(Pf, True, Pf < 0, name="Pf", units="MW", draw_label=self.draw_labels)
+        self.arrow_p_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
+        self.arrow_q_to.set_value(Pt, True, Pt > 0, name="Pt", units="MW", draw_label=self.draw_labels)
 
     def change_bus(self):
         """

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/switch_graphics.py

@@ -19,7 +19,7 @@ from typing import TYPE_CHECKING, Union
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCalEngine.Devices.Branches.switch import Switch
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/transformer2w_graphics.py

@@ -17,7 +17,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_graphics_template import LineGraphicTemplateItem
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCal.Gui.messages import yes_no_question

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/transformer_editor.py

@@ -18,7 +18,7 @@
 from typing import List
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QComboBox
-from GridCal.Gui.GuiFunctions import get_list_model, create_spinbox
+from GridCal.Gui.gui_functions import get_list_model, create_spinbox
 from GridCalEngine.Devices.Branches.transformer import Transformer2W
 from GridCalEngine.Devices.Branches.transformer_type import TransformerType, reverse_transformer_short_circuit_study
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/transformer_taps_editor.py

@@ -16,7 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from PySide6.QtWidgets import QPushButton, QVBoxLayout, QDialog, QLabel, QComboBox
 
-from GridCal.Gui.GuiFunctions import create_spinbox, create_int_spinbox, get_list_model
+from GridCal.Gui.gui_functions import create_spinbox, create_int_spinbox, get_list_model
 from GridCalEngine.Devices.Branches.tap_changer import TapChanger, TapChangerTypes
 
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/upfc_graphics.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem
 from GridCalEngine.Devices.Branches.upfc import UPFC
 from GridCalEngine.enumerations import TapModuleControl

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/vsc_graphics.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCalEngine.Devices.Branches.vsc import VSC
 from GridCalEngine.enumerations import TapModuleControl

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Branches/winding_graphics.py

@@ -20,7 +20,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Union
 from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import QMenu
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCal.Gui.messages import yes_no_question
 from GridCalEngine.Devices.Branches.winding import Winding

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Fluid/fluid_path_graphics.py

@@ -81,10 +81,10 @@ class FluidPathGraphicItem(LineGraphicTemplateItem):
         # pen.setDashPattern([5, 3, 2, 3])
 
         self.setPen(pen)
-        self.arrow_from_1.set_colour(color, w, style)
-        self.arrow_from_2.set_colour(color, w, style)
-        self.arrow_to_1.set_colour(color, w, style)
-        self.arrow_to_2.set_colour(color, w, style)
+        self.arrow_p_from.set_colour(color, w, style)
+        self.arrow_q_from.set_colour(color, w, style)
+        self.arrow_p_to.set_colour(color, w, style)
+        self.arrow_q_to.set_colour(color, w, style)
 
         if self.symbol is not None:
             self.symbol.set_colour(color, w, style)

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Injections/controllable_shunt_editor.py

@@ -18,7 +18,7 @@ import numpy as np
 from typing import List
 from PySide6.QtCore import Qt, QModelIndex
 from PySide6.QtWidgets import QTableView, QVBoxLayout, QPushButton, QHBoxLayout, QDialog, QSpacerItem, QSizePolicy
-from GridCal.Gui.GeneralDialogues import ArrayTableModel
+from GridCal.Gui.general_dialogues import ArrayTableModel
 from GridCal.Gui.messages import error_msg
 from GridCalEngine.Devices.Injections.controllable_shunt import ControllableShunt
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Injections/controllable_shunt_graphics.py

@@ -22,7 +22,7 @@ from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER, Sq
 from GridCal.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphics import InjectionTemplateGraphicItem
 from GridCal.Gui.Diagrams.SchematicWidget.Injections.controllable_shunt_editor import ControllableShuntEditor
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
@@ -184,5 +184,4 @@ class ControllableShuntGraphicItem(InjectionTemplateGraphicItem):
         :param QGraphicsSceneMouseEvent:
         :return:
         """
-        dictionary_of_lists = {DeviceType.Technology: self.editor.circuit.technologies}
-        self.editor.set_editor_model(api_object=self.api_object, dictionary_of_lists=dictionary_of_lists)
+        self.editor.set_editor_model(api_object=self.api_object)

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Injections/current_injection_graphics.py

@@ -168,6 +168,5 @@ class CurrentInjectionGraphicItem(InjectionTemplateGraphicItem):
         :param QGraphicsSceneMouseEvent:
         :return:
         """
-        dictionary_of_lists = {DeviceType.Technology: self.editor.circuit.technologies}
-        self.editor.set_editor_model(api_object=self.api_object, dictionary_of_lists=dictionary_of_lists)
+        self.editor.set_editor_model(api_object=self.api_object)
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Injections/external_grid_graphics.py

@@ -168,6 +168,5 @@ class ExternalGridGraphicItem(InjectionTemplateGraphicItem):
         :param QGraphicsSceneMouseEvent:
         :return:
         """
-        dictionary_of_lists = {DeviceType.Technology: self.editor.circuit.technologies}
-        self.editor.set_editor_model(api_object=self.api_object, dictionary_of_lists=dictionary_of_lists)
+        self.editor.set_editor_model(api_object=self.api_object)
 

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Injections/generator_graphics.py

@@ -26,7 +26,7 @@ from GridCal.Gui.Diagrams.SchematicWidget.Injections.injections_template_graphic
 from GridCal.Gui.Diagrams.SchematicWidget.Injections.generator_editor import GeneratorQCurveEditor
 from GridCal.Gui.SolarPowerWizard.solar_power_wizzard import SolarPvWizard
 from GridCal.Gui.WindPowerWizard.wind_power_wizzard import WindFarmWizard
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 
 if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Injections/injections_template_graphics.py

@@ -119,12 +119,7 @@ class InjectionTemplateGraphicItem(GenericDiagramWidget, QGraphicsItemGroup):
         :param QGraphicsSceneMouseEvent:
         :return:
         """
-        self.editor.set_editor_model(api_object=self.api_object,
-                                     dictionary_of_lists={
-                                         DeviceType.GeneratorDevice: self.editor.circuit.get_generators(),
-                                         DeviceType.BusDevice: self.editor.circuit.get_buses(),
-                                         DeviceType.ConnectivityNodeDevice: self.editor.circuit.get_connectivity_nodes(),
-                                     })
+        self.editor.set_editor_model(api_object=self.api_object)
 
     def change_bus(self):
         """

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Injections/static_generator_graphics.py

@@ -166,7 +166,4 @@ class StaticGeneratorGraphicItem(InjectionTemplateGraphicItem):
         :param QGraphicsSceneMouseEvent:
         :return:
         """
-        self.editor.set_editor_model(api_object=self.api_object,
-                                     dictionary_of_lists={
-                                         DeviceType.Technology: self.editor.circuit.technologies,
-                                     })
+        self.editor.set_editor_model(api_object=self.api_object)

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -23,7 +23,7 @@ from PySide6.QtGui import QPen, QCursor, QIcon, QPixmap, QBrush, QColor
 from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent
 
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.generic_graphics import (GenericDiagramWidget, ACTIVE, DEACTIVATED,
                                                    FONT_SCALE, EMERGENCY)
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, HandleItem
@@ -730,14 +730,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
 
         if self.api_object.device_type == DeviceType.BusDevice:
-            dictionary_of_lists = {DeviceType.AreaDevice: self.editor.circuit.get_areas(),
-                                   DeviceType.ZoneDevice: self.editor.circuit.get_zones(),
-                                   DeviceType.SubstationDevice: self.editor.circuit.get_substations(),
-                                   DeviceType.VoltageLevelDevice: self.editor.circuit.get_voltage_levels(),
-                                   DeviceType.CountryDevice: self.editor.circuit.get_countries()}
-
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists=dictionary_of_lists)
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def mouseDoubleClickEvent(self, event: QtWidgets.QGraphicsSceneMouseEvent):
         """

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Substation/busbar_graphics.py

@@ -607,14 +607,7 @@ class BusBarGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
 
         if self.api_object.device_type == DeviceType.BusBarDevice:
-            dictionary_of_lists = {DeviceType.AreaDevice: self.editor.circuit.get_areas(),
-                                   DeviceType.ZoneDevice: self.editor.circuit.get_zones(),
-                                   DeviceType.SubstationDevice: self.editor.circuit.get_substations(),
-                                   DeviceType.VoltageLevelDevice: self.editor.circuit.get_voltage_levels(),
-                                   DeviceType.CountryDevice: self.editor.circuit.get_countries()}
-
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists=dictionary_of_lists)
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def mouseDoubleClickEvent(self, event: QtWidgets.QGraphicsSceneMouseEvent):
         """

{GridCal-5.1.33 → GridCal-5.1.34}/GridCal/Gui/Diagrams/SchematicWidget/Substation/cn_graphics.py

@@ -388,12 +388,7 @@ class CnGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
 
         if self.api_object.device_type == DeviceType.ConnectivityNodeDevice:
-
-            dictionary_of_lists = {DeviceType.BusDevice: self.editor.circuit.get_buses(),
-                                   DeviceType.VoltageLevelDevice: self.editor.circuit.get_voltage_levels(), }
-
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists=dictionary_of_lists)
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def mouseDoubleClickEvent(self, event: QtWidgets.QGraphicsSceneMouseEvent):
         """