GridCal 5.1.34__tar.gz → 5.1.36__tar.gz

{GridCal-5.1.34 → GridCal-5.1.36}/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.36}/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.36}/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.36}/GridCal/Gui/Diagrams/MapWidget/Tiles/TileProviders/open_street_map.py

@@ -10,14 +10,21 @@ from GridCal.Gui.Diagrams.MapWidget.Tiles.tiles import Tiles
 class OsmTiles(Tiles):
     """An object to source server tiles for pySlipQt."""
 
-    def __init__(self, tiles_dir='open_street_map_tiles', http_proxy=None):
+    def __init__(self, name: str = 'OpenStreetMap Tiles', tiles_dir='open_street_map_tiles', http_proxy=None, tile_servers=None):
+        """
+
+        :param name:
+        :param tiles_dir:
+        :param http_proxy:
+        :param tile_servers:
+        """
         """Override the base class for these tiles.
 
         Basically, just fill in the BaseTiles class with values from above
         and provide the Geo2Tile() and Tile2Geo() methods.
         """
 
-        super().__init__(TilesetName='OpenStreetMap Tiles',
+        super().__init__(TilesetName=name,
                          TilesetShortName='OSM Tiles',
                          TilesetVersion='1.0',
                          levels=list(range(17)),
@@ -30,7 +37,7 @@ class OsmTiles(Tiles):
                              # 'https://a.tile.openstreetmap.org',
                              # 'https://b.tile.openstreetmap.org',
                              # 'https://c.tile.openstreetmap.org',
-                         ],
+                         ] if tile_servers is None else tile_servers,
                          url_path='/{Z}/{X}/{Y}.png',
                          max_server_requests=2,
                          max_lru=10000,

{GridCal-5.1.34 → GridCal-5.1.36}/GridCal/Gui/Diagrams/MapWidget/Tiles/tile_worker.py

@@ -6,7 +6,8 @@ For example, see osm_tiles.py.
 """
 import queue
 import ssl
-from urllib import request
+# from urllib import request
+from urllib.request import Request, urlopen
 from collections.abc import Callable
 from PySide6.QtGui import QPixmap
 from PySide6.QtCore import QThread
@@ -27,7 +28,7 @@ class TileWorker(QThread):
                  id_num: int,
                  server: str,
                  tilepath: str,
-                 requests: queue.Queue,
+                 requests_cue: queue.Queue,
                  callback: Callable[[int, float, float, QPixmap, bool], None],  # level, x, y, pixmap, error
                  error_tile: QPixmap,
                  content_type: str,
@@ -40,7 +41,7 @@ class TileWorker(QThread):
         :param id_num: a unique numer identifying the worker instance
         :param server: server URL
         :param tilepath: path to tile on server
-        :param requests: the request queue
+        :param requests_cue: the request queue
         :param callback: function to call after tile available
         :param error_tile: image of error tile
         :param content_type: expected Content-Type string
@@ -54,7 +55,7 @@ class TileWorker(QThread):
         self.id_num = id_num
         self.server = server
         self.tilepath = tilepath
-        self.requests = requests
+        self.requests_cue = requests_cue
         self.callback: Callable[[int, float, float, QPixmap, bool], None] = callback
         self.error_tile_image = error_tile
         self.content_type = content_type
@@ -70,15 +71,19 @@ class TileWorker(QThread):
         """
         while True:
             # get zoom level and tile coordinates to retrieve
-            (level, x, y) = self.requests.get()
+            (level, x, y) = self.requests_cue.get()
 
             # try to retrieve the image
             error = False
             pixmap = self.error_image
             try:
                 tile_url = self.server + self.tilepath.format(Z=level, X=x, Y=y)
-                response = request.urlopen(tile_url)
+
+                # Create a Request object with the desired headers
+                response = urlopen(Request(tile_url, headers={'User-Agent': 'GridCal 5'}))
+
                 content_type = response.info().get_content_type()
+
                 if content_type == self.content_type:
                     data = response.read()
                     pixmap = QPixmap()
@@ -88,11 +93,11 @@ class TileWorker(QThread):
                     error = True
             except Exception as e:
                 error = True
-                log('%s exception getting tile (%d,%d,%d)' % (type(e).__name__, level, x, y))
+                log(f"{e} exception getting tile ({level},{x},{y}) with {tile_url}")
 
             # call the callback function passing level, x, y and pixmap data
             # error is False if we want to cache this tile on-disk
             self.callback(level, x, y, pixmap, error)
 
             # finally, removes request from queue
-            self.requests.task_done()
+            self.requests_cue.task_done()

{GridCal-5.1.34 → GridCal-5.1.36}/GridCal/Gui/Diagrams/MapWidget/Tiles/tiles.py

@@ -147,9 +147,9 @@ class Tiles(BaseTiles):
         # test for firewall - use proxy (if supplied)
         test_url = self.servers[0] + self.url_path.format(Z=0, X=0, Y=0)
         try:
-            # r = request.Request(test_url, headers={'User-Agent': 'Nokia (PyQt) Graphics Dojo 1.0'})
-            # response = request.urlopen(r).read()
-            request.urlopen(test_url)
+            r = request.Request(test_url, headers={'User-Agent': 'GridCal 5'})
+            response = request.urlopen(r).read()
+            # request.urlopen(test_url)
         except HTTPError as e:
             # if it's fatal, log it and die, otherwise try a proxy
             status_code = e.code
@@ -188,7 +188,7 @@ class Tiles(BaseTiles):
                 worker = TileWorker(id_num=num_thread,
                                     server=server,
                                     tilepath=self.url_path,
-                                    requests=self.request_queue,
+                                    requests_cue=self.request_queue,
                                     callback=self.tile_is_available,
                                     error_tile=self.error_tile,
                                     content_type=self.content_type,

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

@@ -1126,10 +1126,10 @@ class GridMapWidget(BaseDiagramWidget):
         #
         # painter = QPainter(image)
         # painter.setRenderHint(QPainter.Antialiasing)
-        # # self.view.render(painter)  # self.view stores the grid widgets
-        # self.render(painter)
+        # self.map.view.render(painter)  # self.view stores the grid widgets
+        # # self.render(painter)
         # painter.end()
-        image = self.grab().toImage()
+        image = self.map.grab().toImage()
 
         return image, w, h
 

{GridCal-5.1.34 → GridCal-5.1.36}/GridCal/Gui/Diagrams/MapWidget/map_widget.py

@@ -34,7 +34,7 @@ from PySide6.QtCore import Qt, QTimer, QEvent, QPointF
 from PySide6.QtGui import (QPainter, QColor, QPixmap, QCursor,
                            QMouseEvent, QKeyEvent, QWheelEvent,
                            QResizeEvent, QEnterEvent, QPaintEvent, QDragEnterEvent, QDragMoveEvent, QDropEvent)
-from PySide6.QtWidgets import (QSizePolicy, QWidget, QGraphicsScene, QGraphicsView, QStackedLayout, QVBoxLayout,
+from PySide6.QtWidgets import (QSizePolicy, QWidget, QGraphicsScene, QGraphicsView, QStackedLayout,
                                QGraphicsSceneMouseEvent, QGraphicsItem, QLabel, QGraphicsProxyWidget)
 
 from GridCal.Gui.Diagrams.MapWidget.Tiles.tiles import Tiles
@@ -77,7 +77,7 @@ class MapScene(QGraphicsScene):
         # print(f"Scene pressed at {event.scenePos()}")
         super().mousePressEvent(event)
 
-    def mouseReleaseEvent(self, event):
+    def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent) -> None:
         """
 
         :param event:
@@ -113,19 +113,22 @@ class MapView(QGraphicsView):
         self._scene = scene
 
         self.map_widget = map_widget
+        self.setStyleSheet("QGraphicsView { border: none; }")
 
         # Create a QLabel
-        self.label = QLabel("Bottom Left Label")
-        self.label.setStyleSheet("background-color: rgba(255, 255, 0, 150);")  # Semi-transparent yellow
+        self.attribution_label = QLabel("Bottom Left Label")
+        self.attribution_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)
-        # Position the QLabel within the scene
-        self.proxy_widget.setPos(0, scene.sceneRect().height() - self.label.height())  # Bottom-left position
+        self.label_proxy_widget = QGraphicsProxyWidget()
+        self.label_proxy_widget.setWidget(self.attribution_label)
+        self.label_proxy_widget.setFlag(QGraphicsItem.ItemIgnoresTransformations)
+        self.update_label_position()
 
         # 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 +136,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 +150,14 @@ class MapView(QGraphicsView):
 
         self.scale(initial_zoom_factor, initial_zoom_factor)
 
+    def set_notice(self, val: str):
+        """
+
+        :param val:
+        :return:
+        """
+        self.attribution_label.setText(val)
+
     def selected_items(self) -> List[QGraphicsItem]:
         """
         Get the selected items
@@ -162,7 +173,7 @@ class MapView(QGraphicsView):
         """
         self.map_widget.mousePressEvent(event)
         self.pressed = True
-        self.disableMove = False
+        self.disable_move = False
 
         super().mousePressEvent(event)
 
@@ -174,7 +185,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 +203,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 +259,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 +293,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()
 
-    def setSizeDiagram(self) -> None:
+        # Set position relative to the bottom-left corner of the viewport
+        self.label_proxy_widget.setPos(self.mapToScene(0, view_height - self.attribution_label.height()))
+
+    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 +327,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 +365,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 +382,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 +423,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 +514,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 +807,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):
         """
@@ -2000,15 +1878,6 @@ class MapWidget(QWidget):
         # self.tile_size_y = tile_src.tile_size_y
         self.level = level
 
-        result = self.tile_src.GetInfo(level)
-        (num_tiles_x, num_tiles_y, ppd_x, ppd_y) = result
-        # self.map_width = self.tile_size_x * num_tiles_x
-        # self.map_height = self.tile_size_y * num_tiles_y
-
-        # set tile levels stuff - allowed levels, etc
-        # self.tiles_max_level = max(tile_src.levels)
-        # self.tiles_min_level = min(tile_src.levels)
-
         # set callback from Tile source object when tile(s) available
         self.tile_src.setCallback(self.on_tile_available)
 

{GridCal-5.1.34 → GridCal-5.1.36}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -40,7 +40,7 @@ from GridCalEngine.Devices.Diagrams.schematic_diagram import SchematicDiagram
 from GridCalEngine.Devices.Diagrams.map_diagram import MapDiagram
 from GridCalEngine.Simulations.types import DRIVER_OBJECTS
 from GridCalEngine.basic_structures import Logger
-from GridCalEngine.enumerations import DeviceType, SimulationTypes
+from GridCalEngine.enumerations import SimulationTypes
 
 from GridCal.Gui.Diagrams.graphics_manager import GraphicsManager
 import GridCalEngine.Devices.Diagrams.palettes as palettes