GridCal 5.1.35__tar.gz → 5.1.36__tar.gz

{GridCal-5.1.35 → 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.35 → 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.35 → 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.35 → 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.35 → 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,20 +113,19 @@ 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(0, 0, 0, 0);"
-                                 "color: rgba(150, 150, 150, 180);"
-                                 "font-size:9pt")  # 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.label_proxy_widget = QGraphicsProxyWidget()
-        self.label_proxy_widget.setWidget(self.label)
-
-        # Position the QLabel within the scene
-        self.label_proxy_widget.setPos(0, scene.sceneRect().height() - self.label.height())  # Bottom-left position
+        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.label_proxy_widget)
@@ -157,7 +156,7 @@ class MapView(QGraphicsView):
         :param val:
         :return:
         """
-        self.label.setText(val)
+        self.attribution_label.setText(val)
 
     def selected_items(self) -> List[QGraphicsItem]:
         """
@@ -305,7 +304,7 @@ class MapView(QGraphicsView):
         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()))
+        self.label_proxy_widget.setPos(self.mapToScene(0, view_height - self.attribution_label.height()))
 
     def set_size_diagram(self) -> None:
         """
@@ -1879,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.35 → 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