GridCal 5.1.33__tar.gz → 5.1.35__tar.gz

{GridCal-5.1.33 → GridCal-5.1.35}/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.35}/GridCal/Gui/Analysis/object_plot_analysis.py

@@ -100,6 +100,22 @@ class GridErrorLog:
         """
         self.logs.clear()
 
+    def add_normal_logger(self, logger: Logger):
+        """
+        Add normal logger
+        :param logger: Logger
+        """
+        for l in logger.entries:
+            self.add(object_type=l.device_class,
+                     element_name=l.device,
+                     element_index=0,
+                     severity=l.severity,
+                     propty=l.device_property,
+                     message=l.msg,
+                     val=l.value,
+                     lower=l.expected_object_value,
+                     upper=l.expected_value)
+
     def get_model(self) -> "QtGui.QStandardItemModel":
         """
         Get TreeView Model
@@ -1043,7 +1059,7 @@ def analyze_batteries(elements: List[Battery],
 
 def analyze_static_gen(elements: List[StaticGenerator],
                        time_profile,
-                       logger: GridErrorLog,):
+                       logger: GridErrorLog, ):
     """
 
     :param elements:
@@ -1076,7 +1092,7 @@ def analyze_static_gen(elements: List[StaticGenerator],
 
 def analyze_load(elements: List[Load],
                  time_profile,
-                 logger: GridErrorLog,):
+                 logger: GridErrorLog, ):
     """
 
     :param elements:
@@ -1137,6 +1153,12 @@ def grid_analysis(circuit: MultiCircuit,
     :param eps_min: Min epsylon value for comparison
     :return: list of fixable error objects
     """
+
+    # check for duplicated uuid's
+    duplicates_logger = Logger()
+    _, ok_dict = circuit.get_all_elements_dict(logger=duplicates_logger)
+    logger.add_normal_logger(duplicates_logger)
+
     if circuit.time_profile is not None:
         nt = len(circuit.time_profile)
     else:
@@ -1288,6 +1310,8 @@ def grid_analysis(circuit: MultiCircuit,
                        val=Ql_prof[t],
                        upper=str(Qmax))
 
+
+
     return fixable_errors
 
 

{GridCal-5.1.33 → GridCal-5.1.35}/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.35}/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.35}/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.35}/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
@@ -176,7 +176,7 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         if len(selected_items) < 2:
             self.setSelected(True)
         if self.enabled:
-            self.editor.map.view.disableMove = True
+            self.editor.map.view.disable_move = True
             if event.button() == Qt.RightButton:
                 pass
 
@@ -197,7 +197,7 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         """
         Event handler for when the mouse enters the item.
         """
-        self.editor.map.view.inItem = True
+        # self.editor.map.view.in_item = True
         self.hovered = True
         self.setNodeColor(QColor(Qt.red), QColor(Qt.red))
         QApplication.instance().setOverrideCursor(Qt.PointingHandCursor)
@@ -206,7 +206,7 @@ class NodeGraphicItem(QtWidgets.QGraphicsRectItem, NodeTemplate):
         """
         Event handler for when the mouse leaves the item.
         """
-        self.editor.map.view.inItem = False
+        # self.editor.map.view.in_item = False
         self.hovered = False
         self.setDefaultColor()
         QApplication.instance().restoreOverrideCursor()

{GridCal-5.1.33 → GridCal-5.1.35}/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
@@ -190,18 +190,10 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         self.setSelected(True)
 
         event.setAccepted(True)
-        self.editor.map.view.disableMove = True
+        self.editor.map.view.disable_move = 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):
         """
@@ -216,7 +208,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         Event handler for when the mouse enters the item.
         """
-        self.editor.map.view.inItem = True
+        # self.editor.map.view.in_item = True
         self.setNodeColor(QColor(Qt.red), QColor(Qt.red))
         self.hovered = True
         QApplication.instance().setOverrideCursor(Qt.PointingHandCursor)
@@ -225,7 +217,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         Event handler for when the mouse leaves the item.
         """
-        self.editor.map.view.inItem = False
+        # self.editor.map.view.in_item = False
         self.hovered = False
         self.setDefaultColor()
         QApplication.instance().restoreOverrideCursor()

{GridCal-5.1.33 → GridCal-5.1.35}/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.35}/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.35}/GridCal/Gui/Diagrams/MapWidget/map_widget.py

@@ -116,16 +116,20 @@ class MapView(QGraphicsView):
 
         # Create a QLabel
         self.label = QLabel("Bottom Left Label")
-        self.label.setStyleSheet("background-color: rgba(255, 255, 0, 150);")  # Semi-transparent yellow
+        self.label.setStyleSheet("background-color: rgba(0, 0, 0, 0);"
+                                 "color: rgba(150, 150, 150, 180);"
+                                 "font-size:9pt")  # Semi-transparent yellow
 
         # Create a QGraphicsProxyWidget for the QLabel
-        self.proxy_widget = QGraphicsProxyWidget()
-        self.proxy_widget.setWidget(self.label)
+        self.label_proxy_widget = QGraphicsProxyWidget()
+        self.label_proxy_widget.setWidget(self.label)
+
         # Position the QLabel within the scene
-        self.proxy_widget.setPos(0, scene.sceneRect().height() - self.label.height())  # Bottom-left position
+        self.label_proxy_widget.setPos(0, scene.sceneRect().height() - self.label.height())  # Bottom-left position
+        self.label_proxy_widget.setFlag(QGraphicsItem.ItemIgnoresTransformations)
 
         # Add the proxy widget to the scene
-        self._scene.addItem(self.proxy_widget)
+        self._scene.addItem(self.label_proxy_widget)
 
         self.mouse_x = None
         self.mouse_y = None
@@ -133,9 +137,9 @@ class MapView(QGraphicsView):
         self.diagram_w = 25000
         self.diagram_H = 25000
 
-        self.inItem = False
+        # self.in_item = False  # looks that it is written but never used
         self.pressed = False
-        self.disableMove = False
+        self.disable_move = False
 
         # updated later
         self.view_width = self.width()
@@ -147,6 +151,14 @@ class MapView(QGraphicsView):
 
         self.scale(initial_zoom_factor, initial_zoom_factor)
 
+    def set_notice(self, val: str):
+        """
+
+        :param val:
+        :return:
+        """
+        self.label.setText(val)
+
     def selected_items(self) -> List[QGraphicsItem]:
         """
         Get the selected items
@@ -162,7 +174,7 @@ class MapView(QGraphicsView):
         """
         self.map_widget.mousePressEvent(event)
         self.pressed = True
-        self.disableMove = False
+        self.disable_move = False
 
         super().mousePressEvent(event)
 
@@ -174,7 +186,7 @@ class MapView(QGraphicsView):
         """
         self.map_widget.mouseReleaseEvent(event)
         self.pressed = False
-        self.disableMove = True
+        self.disable_move = True
         super().mouseReleaseEvent(event)
 
     def mouseDoubleClickEvent(self, event: QMouseEvent):
@@ -192,11 +204,12 @@ class MapView(QGraphicsView):
         :param event:
         :return:
         """
-        if not self.disableMove:
+        if not self.disable_move:
             self.map_widget.mouseMoveEvent(event)
-            self.centerSchema()
+            self.center_schema()
 
         super().mouseMoveEvent(event)
+        self.update_label_position()
 
     def keyPressEvent(self, event: QKeyEvent):
         """
@@ -247,7 +260,8 @@ class MapView(QGraphicsView):
 
         self.map_widget.wheelEvent(event)
 
-        self.centerSchema()
+        self.center_schema()
+        self.update_label_position()
 
     def dragEnterEvent(self, event: QDragEnterEvent):
         """
@@ -280,21 +294,29 @@ class MapView(QGraphicsView):
         Widget resized, recompute some state.
         """
 
+        super().resizeEvent(event)
         self.map_widget.resizeEvent(event=event)
 
-        self.proxy_widget.setPos(0, self._scene.sceneRect().height() - self.label.height())  # Bottom-left position
+    def update_label_position(self):
+        """
+        Updates the position of the label to the bottom-left corner of the viewport.
+        """
+        view_width = self.viewport().width()
+        view_height = self.viewport().height()
+
+        # Set position relative to the bottom-left corner of the viewport
+        self.label_proxy_widget.setPos(self.mapToScene(0, view_height - self.label.height()))
 
-    def setSizeDiagram(self) -> None:
+    def set_size_diagram(self) -> None:
         """
 
         :return:
         """
         # new widget size
-        # TODO: These vars must be declared in init
         self.view_width = self.width()
         self.view_height = self.height()
 
-    def setSceneRectDiagram(self) -> None:
+    def set_scene_rect_diagram(self) -> None:
         """
 
         :return:
@@ -306,12 +328,9 @@ class MapView(QGraphicsView):
         yToDiagram = -(used_height / 2)
 
         # Adjust the scene rect if needed
-        self.setSceneRect(xToDiagram,
-                          yToDiagram,
-                          used_width,
-                          used_height)
+        self.setSceneRect(xToDiagram, yToDiagram, used_width, used_height)
 
-        self.centerSchema()
+        self.center_schema()
 
     def to_lat_lon(self, x: float, y: float) -> Tuple[float, float]:
         """
@@ -347,7 +366,7 @@ class MapView(QGraphicsView):
 
         return x, y
 
-    def centerSchema(self) -> None:
+    def center_schema(self) -> None:
         """
         This function centers the schema relative to the map according to lat. and long.
         """
@@ -364,142 +383,6 @@ class MapView(QGraphicsView):
         self.map_widget.view.centerOn(point)
 
 
-class NoticeWidget(QWidget):
-    """
-    MapView
-    """
-
-    def __init__(self, map_widget: "MapWidget"):
-        """
-
-        :param map_widget:
-        """
-        QWidget.__init__(self)
-
-        # Enable drop functionality
-        self.setAcceptDrops(True)
-
-        self.map_widget = map_widget
-
-        # add a label to display copyright stuff
-        self.notice_label = QLabel("some notice")
-        self.notice_label.setAlignment(Qt.AlignLeft | Qt.AlignBottom)
-        self.notice_label.setStyleSheet("background-color: rgba(255, 255, 255, 0);"
-                                        "font-size: 8pt;"
-                                        "color: rgba(100, 100, 100, 255);")
-
-        # Create a container for the label and position it at the bottom-left
-        self.label_container = QWidget()
-        self.label_layout = QVBoxLayout(self.label_container)
-        self.label_layout.addWidget(self.notice_label)
-        self.label_layout.setAlignment(Qt.AlignLeft | Qt.AlignBottom)
-        self.label_layout.setContentsMargins(1, 1, 1, 1)  # Optional margin
-
-        self.setLayout(self.label_layout)
-
-    def set_notice(self, val: str) -> None:
-        """
-        Set the notification text
-        :param val: some text
-        """
-        self.notice_label.setText(val)
-
-    def mousePressEvent(self, event: QMouseEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        self.map_widget.view.mousePressEvent(event)
-        super().mousePressEvent(event)
-
-    def mouseReleaseEvent(self, event: QMouseEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        self.map_widget.view.mouseReleaseEvent(event)
-        super().mouseReleaseEvent(event)
-
-    def mouseDoubleClickEvent(self, event: QMouseEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        self.map_widget.view.mouseDoubleClickEvent(event)
-        super().mouseDoubleClickEvent(event)
-
-    def mouseMoveEvent(self, event: QMouseEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        self.map_widget.view.mouseMoveEvent(event)
-        super().mouseMoveEvent(event)
-
-    def keyPressEvent(self, event: QKeyEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        self.map_widget.view.keyPressEvent(event)
-
-    def keyReleaseEvent(self, event: QKeyEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        self.map_widget.view.keyReleaseEvent(event)
-
-    def wheelEvent(self, event: QWheelEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        super().wheelEvent(event)
-        self.map_widget.view.wheelEvent(event)
-
-    def dragEnterEvent(self, event: QDragEnterEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        if event.mimeData().hasFormat('component/name'):
-            event.accept()
-
-    def dragMoveEvent(self, event: QDragMoveEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        super().dragMoveEvent(event)
-        self.map_widget.view.dragMoveEvent(event)
-
-    def dropEvent(self, event: QDropEvent):
-        """
-
-        :param event:
-        :return:
-        """
-        super().dropEvent(event)
-        self.map_widget.view.dropEvent(event)
-
-    def resizeEvent(self, event: QResizeEvent = None):
-        """
-        Widget resized, recompute some state.
-        """
-        super().resizeEvent(event)
-        self.map_widget.view.resizeEvent(event=event)
-
-
 class MapWidget(QWidget):
     """
     Map widget
@@ -541,16 +424,13 @@ class MapWidget(QWidget):
         self.view = MapView(scene=self.diagram_scene, map_widget=self)
         self.view.setBackgroundBrush(Qt.transparent)
 
-        # notification widget
-        self.notice_widget = NoticeWidget(map_widget=self)
-
         # -------------------------------------------------------------------------
         # Internal vars
         # -------------------------------------------------------------------------
         # remember the tile source object
         self._tile_src: Tiles = tile_src
         self._tile_src.setCallback(self.on_tile_available)
-        self.notice_widget.set_notice(val=self._tile_src.attribution_string)
+        self.view.set_notice(val=self._tile_src.attribution_string)
 
         # the tile coordinates
         self.level: int = start_level
@@ -635,11 +515,11 @@ class MapWidget(QWidget):
         if tile_src.TilesetName != self._tile_src.TilesetName:  # avoid changing tilesets to themselves
             self._tile_src: Tiles = tile_src
             self._tile_src.setCallback(self.on_tile_available)
-            self.notice_widget.set_notice(val=self._tile_src.attribution_string)
+            self.view.set_notice(val=self._tile_src.attribution_string)
 
             if self.GotoLevel(level):
                 self.GotoLevelAndPosition(level=level, longitude=longitude, latitude=latitude)
-                self.view.centerSchema()
+                self.view.center_schema()
             else:
                 while abs(self.view.schema_zoom - 0.015625) > 0.00001:
                     self.view.schema_zoom = self.view.schema_zoom / self.view.map_widget.zoom_factor
@@ -928,14 +808,13 @@ class MapWidget(QWidget):
         Widget resized, recompute some state.
         """
         if updateDiagram:
-            self.view.setSizeDiagram()
+            self.view.set_size_diagram()
 
         # recalculate the "key" tile stuff
         self.rectify_key_tile()
 
         if updateDiagram:
-            self.view.setSceneRectDiagram()
-
+            self.view.set_scene_rect_diagram()
 
     def enterEvent(self, event: QEnterEvent):
         """

{GridCal-5.1.33 → GridCal-5.1.35}/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.35}/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.35}/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.35}/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