GridCal 5.1.34__tar.gz → 5.1.35__tar.gz

{GridCal-5.1.34 → 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.34 → GridCal-5.1.35}/GridCal/Gui/Diagrams/MapWidget/Substation/node_graphic_item.py

@@ -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.34 → GridCal-5.1.35}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -190,7 +190,7 @@ 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)
@@ -208,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)
@@ -217,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.34 → 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.34 → GridCal-5.1.35}/GridCal/Gui/Main/SubClasses/io.py

@@ -23,7 +23,7 @@ from PySide6 import QtWidgets
 import GridCal.Gui.gui_functions as gf
 import GridCal.Session.export_results_driver as exprtdrv
 import GridCal.Session.file_handler as filedrv
-from GridCalEngine.Devices.multi_circuit import MultiCircuit
+
 from GridCal.Gui.CoordinatesInput.coordinates_dialogue import CoordinatesInputGUI
 from GridCal.Gui.general_dialogues import LogsDialogue, CustomQuestionDialogue
 from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
@@ -32,10 +32,12 @@ from GridCal.Gui.GridGenerator.grid_generator_dialogue import GridGeneratorGUI
 from GridCal.Gui.RosetaExplorer.RosetaExplorer import RosetaExplorerGUI
 from GridCal.Gui.Main.SubClasses.Settings.configuration import ConfigurationMain
 
+from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.Compilers.circuit_to_newton_pa import NEWTON_PA_AVAILABLE
 from GridCalEngine.Compilers.circuit_to_pgm import PGM_AVAILABLE
 from GridCalEngine.DataStructures.numerical_circuit import compile_numerical_circuit_at
 from GridCalEngine.enumerations import CGMESVersions, SimulationTypes
+from GridCalEngine.basic_structures import Logger
 from GridCalEngine.IO.gridcal.contingency_parser import import_contingencies_from_json, export_contingencies_json_file
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile
 from GridCalEngine.IO.gridcal.remote import RemoteInstruction
@@ -521,9 +523,17 @@ class IoMain(ConfigurationMain):
         """
         Prompt to add another circuit
         """
-        self.open_file_threaded(post_function=self.post_create_circuit_differential,
-                                allow_diff_file_format=True,
-                                title="Load base grid to compare...")
+        # check that this circuit is ok
+        logger = Logger()
+        _, ok = self.circuit.get_all_elements_dict(logger=logger)
+
+        if ok:
+            self.open_file_threaded(post_function=self.post_create_circuit_differential,
+                                    allow_diff_file_format=True,
+                                    title="Load base grid to compare...")
+        else:
+            dlg = LogsDialogue('This circuit has duplicated idtags :(', logger)
+            dlg.exec_()
 
     def post_create_circuit_differential(self):
         """
@@ -548,30 +558,37 @@ class IoMain(ConfigurationMain):
                     # diff the circuit
                     new_circuit = self.open_file_thread_object.circuit
 
-                    # create the differential
-                    ok, diff_logger, dgrid = self.circuit.differentiate_circuits(new_circuit)
+                    dict_logger = Logger()
+                    _, dict_ok = new_circuit.get_all_elements_dict(logger=dict_logger)
 
-                    if diff_logger.has_logs():
-                        dlg = LogsDialogue('Grid differences', diff_logger)
-                        dlg.exec_()
+                    if dict_ok:
+                        # create the differential
+                        ok, diff_logger, dgrid = self.circuit.differentiate_circuits(new_circuit)
 
-                    # select the file to save
-                    filename, type_selected = QtWidgets.QFileDialog.getSaveFileName(self, 'Save file',
-                                                                                    dgrid.name,
-                                                                                    "GridCal diff (*.dgridcal)")
+                        if diff_logger.has_logs():
+                            dlg = LogsDialogue('Grid differences', diff_logger)
+                            dlg.exec_()
 
-                    if filename != '':
+                        # select the file to save
+                        filename, type_selected = QtWidgets.QFileDialog.getSaveFileName(self, 'Save file',
+                                                                                        dgrid.name,
+                                                                                        "GridCal diff (*.dgridcal)")
 
-                        # if the user did not enter the extension, add it automatically
-                        name, file_extension = os.path.splitext(filename)
+                        if filename != '':
 
-                        if file_extension == '':
-                            filename = name + ".dgridcal"
+                            # if the user did not enter the extension, add it automatically
+                            name, file_extension = os.path.splitext(filename)
 
-                        # we were able to compose the file correctly, now save it
-                        self.save_file_now(filename=filename,
-                                           type_selected=type_selected,
-                                           grid=dgrid)
+                            if file_extension == '':
+                                filename = name + ".dgridcal"
+
+                            # we were able to compose the file correctly, now save it
+                            self.save_file_now(filename=filename,
+                                               type_selected=type_selected,
+                                               grid=dgrid)
+                    else:
+                        dlg = LogsDialogue('The base circuit has duplicated idtags :(', dict_logger)
+                        dlg.exec()
 
     def save_file_as(self):
         """

{GridCal-5.1.34 → GridCal-5.1.35}/GridCal/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.1.34"
+__GridCal_VERSION__ = "5.1.35"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCal-5.1.34 → GridCal-5.1.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 5.1.34
+Version: 5.1.35
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.