GridCal 5.3.16__tar.gz → 5.3.18__tar.gz

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -6,6 +6,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, List, Union
 
+from PySide6.QtWidgets import QGraphicsItemGroup
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QColor
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_line_segment import MapLineSegment
@@ -22,7 +23,7 @@ if TYPE_CHECKING:
     from GridCal.Gui.Diagrams.MapWidget.grid_map_widget import GridMapWidget
 
 
-class MapLineContainer(GenericDiagramWidget):
+class MapLineContainer(GenericDiagramWidget, QGraphicsItemGroup):
     """
     Represents a polyline in the map
     """
@@ -41,6 +42,7 @@ class MapLineContainer(GenericDiagramWidget):
                                       api_object=api_object,
                                       editor=editor,
                                       draw_labels=draw_labels)
+        QGraphicsItemGroup.__init__(self)
 
         self.editor: GridMapWidget = editor  # reassign to make clear the editor type
 
@@ -48,17 +50,18 @@ class MapLineContainer(GenericDiagramWidget):
         self.segments_list: List[MapLineSegment] = list()
         self.enabled = True
 
-    def set_width_scale(self, branch_scale: float, arrow_scale: float):
+    def set_width_scale(self, width: float, arrow_width: float):
         """
         Set the width scale of the line
-        :param branch_scale:
-        :param arrow_scale:
+        :param width:
+        :param arrow_width:
         """
         for segment in self.segments_list:
             # pen = segment.pen()  # get the current pen
             # pen.setWidthF(val * segment.width)  # Set the fractional thickness of the line
-            segment.set_width(branch_scale * segment.width)  # Assign the pen to the line item
-            segment.set_arrow_scale(arrow_scale)
+            segment.set_width(width)  # Assign the pen to the line item
+            segment.set_arrow_sizes(arrow_width)
+        # self.setScale(branch_scale)
 
     def clean_segments(self) -> None:
         """
@@ -105,6 +108,7 @@ class MapLineContainer(GenericDiagramWidget):
         :param segment: Connector
         """
         self.segments_list.append(segment)
+        self.addToGroup(segment)
 
     def set_colour(self, color: QColor, style: Qt.PenStyle, tool_tip: str = '') -> None:
         """
@@ -132,8 +136,8 @@ class MapLineContainer(GenericDiagramWidget):
         :return:
         """
 
-        for conector in self.segments_list:
-            conector.end_update()
+        for segment in self.segments_list:
+            segment.end_update()
 
     def draw_all(self) -> None:
         """
@@ -220,13 +224,14 @@ class MapLineContainer(GenericDiagramWidget):
             # Assuming Connector takes (scene, node1, node2) as arguments
             segment_graphic_object = MapLineSegment(first=elm1,
                                                     second=elm2,
-                                                    container=self)
+                                                    container=self,
+                                                    width=self.editor.diagram.min_branch_width)
 
             elm2.needsUpdate = True
             segment_graphic_object.needsUpdate = True
 
-            segment_graphic_object.set_width(br_scale * segment_graphic_object.width)  # Assign the pen to the line item
-            segment_graphic_object.set_arrow_scale(arrow_scale)
+            # segment_graphic_object.set_width(br_scale * segment_graphic_object.width)  # Assign the pen to the line item
+            # segment_graphic_object.set_arrow_sizes(arrow_scale)
 
             # register the segment in the line
             self.add_segment(segment=segment_graphic_object)

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -28,11 +28,16 @@ class MapLineSegment(QGraphicsLineItem):
     Segment joining two NodeGraphicItem
     """
 
-    def __init__(self, first: LineLocationGraphicItem, second: LineLocationGraphicItem, container: MapLineContainer):
+    def __init__(self,
+                 first: LineLocationGraphicItem,
+                 second: LineLocationGraphicItem,
+                 container: MapLineContainer,
+                 width: float):
         """
         Segment constructor
-        :param first: NodeGraphicItem
-        :param second: NodeGraphicItem
+        :param first: LineLocationGraphicItem
+        :param second: LineLocationGraphicItem
+        :param container: MapLineContainer
         """
         QGraphicsLineItem.__init__(self)
         self.first: LineLocationGraphicItem = first
@@ -48,7 +53,7 @@ class MapLineSegment(QGraphicsLineItem):
         self.hoover_color = QColor(self.api_object.color)
         self.hoover_color.setAlpha(180)
 
-        self.width = 0.1
+        self.width = width
 
         self.pos1: QPointF = self.first.get_center_pos()
         self.pos2: QPointF = self.second.get_center_pos()
@@ -70,6 +75,7 @@ class MapLineSegment(QGraphicsLineItem):
         self.second.add_position_change_callback(self.set_to_side_coordinates)
 
         self._pen = self.set_colour(self.color, self.style)
+        # self._pen.setCosmetic(True)
         self.update_endings()
         self.needsUpdate = True
         self.setZValue(0)
@@ -99,20 +105,24 @@ class MapLineSegment(QGraphicsLineItem):
         :param width:
         :return:
         """
-        if self._pen.widthF() != width:  # Only update if width changes
+
+        # self.setScale(width / self.width)  # Faster since it avoids repainting each QPen
+
+        if self.width != width:  # Only update if width changes
             self._pen.setWidthF(width)
             self.setPen(self._pen)
+            self.width = width
 
-    def set_arrow_scale(self, width: float):
+    def set_arrow_sizes(self, width: float):
         """
 
         :param width:
         :return:
         """
-        self.arrow_p_from.setScale(width)
-        self.arrow_q_from.setScale(width)
-        self.arrow_p_to.setScale(width)
-        self.arrow_q_to.setScale(width)
+        self.arrow_p_from.set_size(width)
+        self.arrow_q_from.set_size(width)
+        self.arrow_p_to.set_size(width)
+        self.arrow_q_to.set_size(width)
 
     def set_colour(self, color: QColor, style: Qt.PenStyle):
         """
@@ -125,10 +135,10 @@ class MapLineSegment(QGraphicsLineItem):
         pen = QPen(color, self.width, style, Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin)
 
         self.setPen(pen)
-        self.arrow_p_from.set_colour(color, self.arrow_p_from.w, style)
-        self.arrow_q_from.set_colour(color, self.arrow_q_from.w, style)
-        self.arrow_p_to.set_colour(color, self.arrow_p_to.w, style)
-        self.arrow_q_to.set_colour(color, self.arrow_q_to.w, style)
+        self.arrow_p_from.set_colour(color)
+        self.arrow_q_from.set_colour(color)
+        self.arrow_p_to.set_colour(color)
+        self.arrow_q_to.set_colour(color)
 
         return pen
 

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -3,6 +3,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
+import webbrowser
 from typing import List, TYPE_CHECKING, Tuple
 from PySide6 import QtWidgets
 from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsRectItem
@@ -23,7 +24,7 @@ if TYPE_CHECKING:  # Only imports the below statements during type checking
     from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
 
 
-class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
+class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
     """
       Represents a block in the diagram
       Has an x and y and width and height
@@ -39,7 +40,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                  api_object: Substation,
                  lat: float,
                  lon: float,
-                 r: float = 0.8,
+                 size: float = 0.8,
                  draw_labels: bool = True):
         """
 
@@ -47,28 +48,33 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         :param api_object:
         :param lat:
         :param lon:
-        :param r:
+        :param size:
         """
+        # Correct way to call multiple inheritance
+        super().__init__()
+
+        # Explicitly call QGraphicsRectItem initialization
         QGraphicsRectItem.__init__(self)
-        NodeTemplate.__init__(self,
-                              api_object=api_object,
+
+        # Explicitly call NodeTemplate initialization
+        NodeTemplate.__init__(self, api_object=api_object,
                               editor=editor,
                               draw_labels=draw_labels,
                               lat=lat,
                               lon=lon)
 
+        self.size = size
         self.line_container = None
         self.editor: GridMapWidget = editor  # reassign for the types to be clear
         self.api_object: Substation = api_object  # reassign for the types to be clear
 
-        self.radius = r
-        r2 = r / 2
-        x, y = self.editor.to_x_y(lat=lat, lon=lon)  # upper left corner
+        r2 = size / 2
+        x, y = editor.to_x_y(lat=lat, lon=lon)  # upper left corner
         self.setRect(
             x - r2,
             y - r2,
-            self.radius,
-            self.radius
+            self.size,
+            self.size
         )
 
         # Enable hover events for the item
@@ -80,7 +86,11 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         self.setCursor(Qt.CursorShape.PointingHandCursor)
 
         # Create a pen with reduced line width
-        self.change_pen_width(0.5)
+        self.change_pen_width(0.05 * size)
+        # self.setPen(Qt.PenStyle.NoPen)
+        # self.setFlag(self.GraphicsItemFlag.ItemIgnoresTransformations, True)
+        # self.setFlag(self.GraphicsItemFlag.ItemIsSelectable, True)
+        # self.setFlag(self.GraphicsItemFlag.ItemIsMovable, True)
 
         # Create a pen with reduced line width
         self.color = QColor(self.api_object.color)
@@ -90,27 +100,28 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         self.border_color = QColor(self.api_object.color)  # No Alpha
 
         self.set_default_color()
+        # self.pen().setCosmetic(True)
 
         # list of voltage levels graphics
         self.voltage_level_graphics: List[VoltageLevelGraphicItem] = list()
 
-    def re_scale(self, r: float):
+    def set_size(self, r: float):
         """
 
         :param r: radius in pixels
         :return:
         """
-        if r != self.radius:
+        if r != self.size:
             rect = self.rect()
             rect.setWidth(r)
             rect.setHeight(r)
 
             # change the width and height while keeping the same center
-            r2 = (self.radius - r) / 2
+            r2 = (self.size - r) / 2
             new_x = rect.x() + r2
             new_y = rect.y() + r2
 
-            self.radius = r
+            self.size = r
 
             # Set the new rectangle with the updated dimensions
             self.setRect(new_x, new_y, r, r)
@@ -124,6 +135,8 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
             for vl_graphics in self.voltage_level_graphics:
                 vl_graphics.center_on_substation()
 
+            self.change_pen_width(0.05 * self.size)
+
             self.update_position_at_the_diagram()
 
             self.resize_voltage_levels()
@@ -140,7 +153,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         for vl_graphics in self.voltage_level_graphics:
             # radius here is the width, therefore we need to send W/2
             scale = vl_graphics.api_object.Vnom / max_vl * 0.5
-            vl_graphics.set_size(r=self.radius * scale)
+            vl_graphics.set_size(r=self.size * scale)
             vl_graphics.center_on_substation()
 
     def set_api_object_color(self) -> None:
@@ -149,9 +162,12 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         self.color = QColor(self.api_object.color)
         self.color.setAlpha(128)
+
         self.hoover_color = QColor(self.api_object.color)
         self.hoover_color.setAlpha(180)
+
         self.border_color = QColor(self.api_object.color)  # No Alpha
+
         self.set_default_color()
 
     def move_to(self, lat: float, lon: float) -> Tuple[float, float]:
@@ -194,7 +210,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
         for vl_graphics in self.voltage_level_graphics:
             scale = vl_graphics.api_object.Vnom / max_vl * 0.8
-            vl_graphics.set_size(r=self.radius * scale)
+            vl_graphics.set_size(r=self.size * scale)
             vl_graphics.center_on_substation()
 
         sorted_objects = sorted(self.voltage_level_graphics, key=lambda x: -x.api_object.Vnom)
@@ -315,7 +331,12 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         add_menu_entry(menu=menu,
                        text="Remove from schematic",
                        icon_path=":/Icons/icons/delete_schematic.svg",
-                       function_ptr=self.remove_function)
+                       function_ptr=self.remove_function_from_schematic)
+
+        add_menu_entry(menu=menu,
+                       text="Remove from schematic and database",
+                       icon_path=":/Icons/icons/delete_db.svg",
+                       function_ptr=self.remove_function_from_schematic_and_db)
 
         add_menu_entry(menu=menu,
                        text="Show diagram",
@@ -327,6 +348,11 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                        icon_path=":/Icons/icons/plot.svg",
                        function_ptr=self.plot)
 
+        add_menu_entry(menu=menu,
+                       text="Open in street view",
+                       icon_path=":/Icons/icons/map.svg",
+                       function_ptr=self.open_street_view)
+
         menu.exec_(event.screenPos())
 
     def create_new_line(self):
@@ -368,7 +394,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
         pass
 
-    def remove_function(self) -> None:
+    def remove_function_from_schematic(self) -> None:
         """
         Function to be called when Action 1 is selected.
         """
@@ -376,7 +402,19 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
                              "Remove substation graphics")
 
         if ok:
-            self.editor.remove_substation(substation=self)
+            self.editor.remove_substation(substation=self, delete_from_db=False)
+
+    def remove_function_from_schematic_and_db(self) -> None:
+        """
+
+        :return:
+        """
+
+        ok = yes_no_question(f"Remove substation {self.api_object.name} from the map and the database?",
+                             "Remove substation graphics and database item")
+
+        if ok:
+            self.editor.remove_substation(substation=self, delete_from_db=True)
 
     def move_to_api_coordinates(self):
         """
@@ -454,7 +492,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         :param width: New pen width.
         """
         pen = self.pen()
-        pen.setWidth(width)
+        pen.setWidthF(width)
         self.setPen(pen)
 
     def set_color(self, inner_color: QColor = None, border_color: QColor = None) -> None:
@@ -480,3 +518,12 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         """
         # Example: color assignment
         self.set_color(self.color, self.border_color)
+
+    def open_street_view(self):
+        """
+        Call open street maps
+        :return:
+        """
+        # https://maps.google.com/?q=<lat>,<lng>
+        url = f"https://www.google.com/maps/?q={self.lat},{self.lon}"
+        webbrowser.open(url)

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Tiles/TileProviders/blue_marble.py

@@ -44,20 +44,19 @@ class BlueMarbleTiles(Tiles):
         :param http_proxy:
         """
 
-        Tiles.__init__(self,
-                       tile_set_name=name,
-                       tile_set_short_name='BM Tiles',
-                       tile_set_version='1.0',
-                       levels=list(range(10)),
-                       tile_width=256,
-                       tile_height=256,
-                       tiles_dir=tiles_dir,
-                       max_lru=10000,
-                       servers=['https://s3.amazonaws.com', ],
-                       url_path='/com.modestmaps.bluemarble/{Z}-r{Y}-c{X}.jpg',
-                       max_server_requests=2,
-                       http_proxy=http_proxy,
-                       attribution="© NASA Blue Marble, © OpenStreetMap contributors")
+        super().__init__(tile_set_name=name,
+                         tile_set_short_name='BM Tiles',
+                         tile_set_version='1.0',
+                         levels=list(range(10)),
+                         tile_width=256,
+                         tile_height=256,
+                         tiles_dir=tiles_dir,
+                         max_lru=10000,
+                         servers=['https://s3.amazonaws.com', ],
+                         url_path='/com.modestmaps.bluemarble/{Z}-r{Y}-c{X}.jpg',
+                         max_server_requests=2,
+                         http_proxy=http_proxy,
+                         attribution="© NASA Blue Marble, © OpenStreetMap contributors")
 
     def Geo2Tile(self, longitude: float, latitude: float) -> Tuple[float, float]:
         """Convert geo to tile fractional coordinates for level in use.

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Tiles/TileProviders/cartodb.py

@@ -52,17 +52,12 @@ class CartoDbTiles(Tiles):
                          tile_width=256,
                          tile_height=256,
                          tiles_dir=tiles_dir,
-                         servers=[
-                             "https://basemaps.cartocdn.com/dark_all/"
-                         ] if tile_servers is None else tile_servers,
+                         servers=["https://basemaps.cartocdn.com/dark_all/"] if tile_servers is None else tile_servers,
                          url_path='/{Z}/{X}/{Y}.png',
                          max_server_requests=2,
                          max_lru=10000,
                          http_proxy=http_proxy,
                          attribution="© CARTO, © OpenStreetMap contributors")
-        # TODO: implement map wrap-around
-        #        self.wrap_x = True
-        #        self.wrap_y = False
 
         # get tile information into instance
         self.level = min(self.levels)

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Tiles/base_tiles.py

@@ -36,7 +36,7 @@ from PySide6.QtGui import QPixmap
 from GridCal.Gui.Diagrams.MapWidget.Tiles.tiles_cache import TilesCache
 
 
-class BaseTiles(object):
+class BaseTiles:
     """A base tile object to source local tiles for pySlip."""
 
     def __init__(self,
@@ -92,7 +92,9 @@ class BaseTiles(object):
                 raise Exception(msg) from None
 
             msg = "The tiles directory %s doesn't exist." % tiles_dir
-            raise Exception(msg) from None
+            print(msg)
+            # raise Exception(msg) from None
+            os.makedirs(tiles_dir)
 
     @property
     def max_level(self):

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Tiles/pycacheback.py

@@ -31,17 +31,17 @@ https://github.com/rzzzwilson/pyCacheBack
 class PyCacheBack(dict):
     """An LRU limited in-memory store fronting an unlimited on-disk store."""
 
-    # default maximum number of key/value pairs for pyCacheBack
-    DefaultMaxLRU = 1000
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # default maximum number of key/value pairs for pyCacheBack
+        self.DefaultMaxLRU = 1000
 
-    # default path to tiles directory
-    DefaultTilesDir = 'tiles'
+        # default path to tiles directory
+        self.DefaultTilesDir = 'tiles'
 
-    def __init__(self, *args, **kwargs):
         self._lru_list = []
         self._max_lru = kwargs.pop('max_lru', self.DefaultMaxLRU)
         self._tiles_dir = kwargs.pop('tiles_dir', self.DefaultTilesDir)
-        super().__init__(*args, **kwargs)
 
     def __getitem__(self, key):
         if key in self:
@@ -134,4 +134,3 @@ class PyCacheBack(dict):
         """
 
         raise KeyError
-

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Tiles/tile_worker.py

@@ -70,8 +70,7 @@ class TileWorker(QThread):
         :param error_image: the image to return on some error
         :param refresh_tiles_after_days:
         """
-
-        QThread.__init__(self)
+        super().__init__()
 
         self.id_num = id_num
         self.server = server

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Tiles/tiles.py

@@ -55,11 +55,7 @@ class Tiles(BaseTiles):
     A tile object to source server tiles for the widget.
     """
 
-    # allowed file types and associated values
-    AllowedFileTypes = {'png': 'PNG', 'jpg': 'JPG'}
 
-    # the number of seconds in a day
-    SecondsInADay = 60 * 60 * 24
 
     def __init__(self,
                  tile_set_name: str,
@@ -92,6 +88,15 @@ class Tiles(BaseTiles):
         :param http_proxy: proxy to use if required
         :param re_fetch_days: fetch new server tile if older than this in days (0 means don't ever update tiles)
         """
+        # perform the base class initialization
+        super().__init__(levels, tile_width, tile_height, tiles_dir, max_lru)
+
+        # allowed file types and associated values
+        self.AllowedFileTypes = {'png': 'PNG', 'jpg': 'JPG'}
+
+        # the number of seconds in a day
+        self.SecondsInADay = 60 * 60 * 24
+
         self.tile_set_name = tile_set_name
         self.tile_set_short_name = tile_set_short_name
         self.tile_set_version = tile_set_version
@@ -105,8 +110,7 @@ class Tiles(BaseTiles):
             if not os.path.isdir(level_dir):
                 os.makedirs(level_dir)
 
-        # perform the base class initialization
-        super().__init__(levels, tile_width, tile_height, tiles_dir, max_lru)
+
 
         # save params not saved in super()
         self.servers = servers

{gridcal-5.3.16 → gridcal-5.3.18}/GridCal/Gui/Diagrams/MapWidget/Tiles/tiles_cache.py

@@ -41,8 +41,11 @@ class TilesCache(pycacheback.PyCacheBack):
         self._tiles_dir  path to the on-disk cache directory
     """
 
-    PicExtension = 'png'
-    TilePath = '{Z}/{X}/{Y}.%s' % PicExtension
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.PicExtension = 'png'
+        self.TilePath = '{Z}/{X}/{Y}.%s' % self.PicExtension
 
     def tile_date(self, key: Tuple[int, float, float]):
         """Return the creation date of a tile given its key."""
@@ -94,10 +97,10 @@ class TilesCache(pycacheback.PyCacheBack):
         try:
             os.makedirs(dir_path)
         except OSError:
-            # we assume it's a "directory exists' error, which we ignore
+            # we assume it's a 'directory exists' error, which we ignore
             pass
 
-        image.save(tile_path, TilesCache.PicExtension)
+        image.save(tile_path, self.PicExtension)
 
     def add(self, key: Tuple[int, float, float], image: QPixmap):
         """