GridCal 5.1.31__tar.gz → 5.1.33__tar.gz

{GridCal-5.1.31 → GridCal-5.1.33}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -411,14 +411,16 @@ class MapLineContainer(GenericDiagramWidget):
         :param index:
         :return:
         """
+        # TODO: Review this and possibly link to existing functions
         if 0 < index < len(self.api_object.locations.data) and len(self.api_object.locations.data) > 3:
 
-            ln1 = Line()
-            ln1.set_data_from(self.api_object)
-            # ln1 = self.api_object.copy()
+            # ln1 = Line()
+            # ln1.set_data_from(self.api_object)
+            ln1 = self.api_object.copy()
 
-            ln2 = Line()
-            ln2.set_data_from(self.api_object)
+            # ln2 = Line()
+            # ln2.set_data_from(self.api_object)
+            ln2 = self.api_object.copy()
 
             first_list = self.api_object.locations.data[:index]
             second_list = self.api_object.locations.data[index:]

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Branches}/new_line_dialogue.py

@@ -15,12 +15,15 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from PySide6.QtWidgets import (QApplication, QDialog, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QDialogButtonBox)
+from PySide6.QtWidgets import (QDialog, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QDialogButtonBox)
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.Devices.Substation.substation import Substation
 
 
 class NewMapLineDialogue(QDialog):
+    """
+    NewMapLineDialogue
+    """
     def __init__(self, grid: MultiCircuit, se_from: Substation, se_to: Substation, parent=None):
         """
         Constructor
@@ -89,6 +92,10 @@ class NewMapLineDialogue(QDialog):
         self.setLayout(main_layout)
 
     def is_valid(self):
+        """
+
+        :return: 
+        """
         return self._is_valid
 
     def bus_from(self):
@@ -114,12 +121,14 @@ class NewMapLineDialogue(QDialog):
             return None
 
     def accept(self):
-        selected_option1 = self.combo_box_from.currentText()
-        selected_option2 = self.combo_box_to.currentText()
-        # print(f"Accepted: {selected_option1}, {selected_option2}")
+        """
+        accept
+        """
         super().accept()
 
     def reject(self):
+        """
+        reject
+        """
         self._is_valid = False
-        # print("Canceled")
         super().reject()

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/blue_marble.py

@@ -34,7 +34,8 @@ class BlueMarbleTiles(Tiles):
                        servers=['https://s3.amazonaws.com', ],
                        url_path='/com.modestmaps.bluemarble/{Z}-r{Y}-c{X}.jpg',
                        max_server_requests=2,
-                       http_proxy=http_proxy)
+                       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.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/cartodb.py

@@ -38,7 +38,8 @@ class CartoDbTiles(Tiles):
                          url_path='/{Z}/{X}/{Y}.png',
                          max_server_requests=2,
                          max_lru=10000,
-                         http_proxy=http_proxy)
+                         http_proxy=http_proxy,
+                         attribution="© CARTO, © OpenStreetMap contributors")
         # TODO: implement map wrap-around
         #        self.wrap_x = True
         #        self.wrap_y = False

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/mapbox.py

@@ -29,7 +29,8 @@ class MapboxTiles(Tiles):
                                   ],
                          url_path='/v3/examples.map-szwdot65/{Z}/{X}/{Y}.png',
                          max_server_requests=2,
-                         http_proxy=http_proxy)
+                         http_proxy=http_proxy,
+                         attribution="© Mapbox © OpenStreetMap contributors")
 
     def Geo2Tile(self, longitude: float, latitude: float) -> Tuple[float, float]:
         """Convert geo to tile fractional coordinates for level in use.

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/mapquest.py

@@ -32,7 +32,8 @@ class MapquestTiles(Tiles):
                          max_server_requests=2,
                          max_lru=10000,
                          tiles_dir=tiles_dir,
-                         http_proxy=http_proxy)
+                         http_proxy=http_proxy,
+                         attribution="© MapQuest, © OpenStreetMap contributors")
 
     def Geo2Tile(self, longitude: float, latitude: float) -> Tuple[float, float]:
         """

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/open_street_map.py

@@ -34,7 +34,8 @@ class OsmTiles(Tiles):
                          url_path='/{Z}/{X}/{Y}.png',
                          max_server_requests=2,
                          max_lru=10000,
-                         http_proxy=http_proxy)
+                         http_proxy=http_proxy,
+                         attribution="© OpenStreetMap contributors")
         # TODO: implement map wrap-around
         #        self.wrap_x = True
         #        self.wrap_y = False

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/stamen_toner.py

@@ -31,7 +31,8 @@ class StamenTonerTiles(Tiles):
                          url_path='/toner/{Z}/{X}/{Y}.png',
                          max_server_requests=2,
                          max_lru=10000,
-                         http_proxy=http_proxy)
+                         http_proxy=http_proxy,
+                         attribution="Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.")
 
     def Geo2Tile(self, longitude: float, latitude: float) -> Tuple[float, float]:
         """Convert geo to tile fractional coordinates for level in use.

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/stamen_transport.py

@@ -34,7 +34,8 @@ class StamenTransportTiles(Tiles):
                          max_server_requests=2,
                          max_lru=10000,
                          tiles_dir=tiles_dir,
-                         http_proxy=http_proxy)
+                         http_proxy=http_proxy,
+                         attribution="Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.")
 
     def Geo2Tile(self, longitude: float, latitude: float) -> Tuple[float, float]:
         """Convert geo to tile fractional coordinates for level in use.

{GridCal-5.1.31/GridCal/Gui/Diagrams/MapWidget → GridCal-5.1.33/GridCal/Gui/Diagrams/MapWidget/Tiles}/TileProviders/stamen_watercolor.py

@@ -30,7 +30,8 @@ class StamenWatercolorTiles(Tiles):
                          max_server_requests=2,
                          max_lru=10000,
                          tiles_dir=tiles_dir,
-                         http_proxy=http_proxy)
+                         http_proxy=http_proxy,
+                         attribution="Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.")
 
     def Geo2Tile(self, longitude: float, latitude: float) -> Tuple[float, float]:
         """

{GridCal-5.1.31 → GridCal-5.1.33}/GridCal/Gui/Diagrams/MapWidget/Tiles/tiles.py

@@ -59,7 +59,8 @@ class Tiles(BaseTiles):
                  url_path: str,
                  max_server_requests: int,
                  http_proxy,
-                 refetch_days: int = 60):
+                 refetch_days: int = 60,
+                 attribution: str = ""):
         """
         Initialise a Tiles instance.
         :param levels: a list of level numbers that are to be served
@@ -77,6 +78,8 @@ class Tiles(BaseTiles):
         self.TilesetShortName = TilesetShortName
         self.TilesetVersion = TilesetVersion
 
+        self.attribution_string = attribution
+
         # prepare the tile cache directory, if required
         # we have to do this *before* the base class initialization!
         for level in levels:

{GridCal-5.1.31 → GridCal-5.1.33}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import os
-from typing import Union, List, Tuple, Dict
+from typing import Union, List, Tuple
 import numpy as np
 import math
 from PySide6.QtWidgets import QGraphicsItem
@@ -39,7 +39,7 @@ from GridCalEngine.Devices.Substation.voltage_level import VoltageLevel
 from GridCalEngine.Devices.Branches.line_locations import LineLocation
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.enumerations import DeviceType
-from GridCalEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, FLUID_TYPES
+from GridCalEngine.Devices.types import ALL_DEV_TYPES
 from GridCalEngine.basic_structures import Logger
 
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_ac_line import MapAcLine
@@ -50,7 +50,7 @@ from GridCal.Gui.Diagrams.MapWidget.Substation.node_graphic_item import NodeGrap
 from GridCal.Gui.Diagrams.MapWidget.Substation.substation_graphic_item import SubstationGraphicItem
 from GridCal.Gui.Diagrams.MapWidget.Substation.voltage_level_graphic_item import VoltageLevelGraphicItem
 from GridCal.Gui.Diagrams.MapWidget.map_widget import MapWidget
-from GridCal.Gui.Diagrams.MapWidget.new_line_dialogue import NewMapLineDialogue
+from GridCal.Gui.Diagrams.MapWidget.Branches.new_line_dialogue import NewMapLineDialogue
 import GridCal.Gui.Visualization.visualization as viz
 import GridCalEngine.Devices.Diagrams.palettes as palettes
 from GridCal.Gui.Diagrams.graphics_manager import ALL_MAP_GRAPHICS
@@ -212,14 +212,16 @@ class GridMapWidget(BaseDiagramWidget):
                  call_delete_db_element_func: Callable[["GridMapWidget", ALL_DEV_TYPES], None] = None,
                  call_new_substation_diagram_func: Callable[[Substation], None] = None, ):
         """
-
-        :param tile_src:
-        :param start_level:
-        :param longitude:
-        :param latitude:
-        :param name:
-        :param diagram:
-        :param call_delete_db_element_func:
+        GridMapWidget
+        :param tile_src: Tiles instance
+        :param start_level: starting level
+        :param longitude: Center point Longitude (deg)
+        :param latitude: Center point Latitude (deg)
+        :param name: Name of the diagram
+        :param circuit: MultiCircuit instance
+        :param diagram: Diagram instance (optional)
+        :param call_delete_db_element_func: function pointer to call on delete (optional)
+        :param call_new_substation_diagram_func: function pointer to call on new_substation (optional)
         """
 
         BaseDiagramWidget.__init__(self,
@@ -237,8 +239,6 @@ class GridMapWidget(BaseDiagramWidget):
         self.map = MapWidget(parent=self,
                              tile_src=tile_src,
                              start_level=start_level,
-                             startLat=latitude,
-                             startLon=longitude,
                              editor=self,
                              zoom_callback=self.zoom_callback,
                              position_callback=self.position_callback)
@@ -458,9 +458,11 @@ class GridMapWidget(BaseDiagramWidget):
         if it1 == it2:
             return 0
 
-        new_line = Line()
-        new_line.set_data_from(it1.line_container.api_object)
+        # TODO: Review this and possibly link to existing functions
+        # new_line = Line()
+        # new_line.set_data_from(it1.line_container.api_object)
         # ln1 = self.api_object.copy()
+        new_line = it1.line_container.api_object.copy()
 
         better_first, better_second, bus_from, bus_to = compare_options(it1, it2)
 
@@ -956,7 +958,6 @@ class GridMapWidget(BaseDiagramWidget):
 
         voltage_cmap = viz.get_voltage_color_map()
         loading_cmap = viz.get_loading_color_map()
-        bus_types = ['', 'PQ', 'PV', 'Slack', 'PQV', 'P']
 
         vmin = 0
         vmax = 1.2

{GridCal-5.1.31 → GridCal-5.1.33}/GridCal/Gui/Diagrams/MapWidget/map_widget.py

@@ -34,8 +34,8 @@ 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, QVBoxLayout,
-                               QGraphicsSceneMouseEvent, QGraphicsItem)
+from PySide6.QtWidgets import (QSizePolicy, QWidget, QGraphicsScene, QGraphicsView, QStackedLayout, QVBoxLayout,
+                               QGraphicsSceneMouseEvent, QGraphicsItem, QLabel, QGraphicsProxyWidget)
 
 from GridCal.Gui.Diagrams.MapWidget.Tiles.tiles import Tiles
 
@@ -114,6 +114,19 @@ class MapView(QGraphicsView):
 
         self.map_widget = map_widget
 
+        # Create a QLabel
+        self.label = QLabel("Bottom Left Label")
+        self.label.setStyleSheet("background-color: rgba(255, 255, 0, 150);")  # 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
+
+        # Add the proxy widget to the scene
+        self._scene.addItem(self.proxy_widget)
+
         self.mouse_x = None
         self.mouse_y = None
 
@@ -269,6 +282,8 @@ class MapView(QGraphicsView):
 
         self.map_widget.resizeEvent(event=event)
 
+        self.proxy_widget.setPos(0, self._scene.sceneRect().height() - self.label.height())  # Bottom-left position
+
     def setSizeDiagram(self) -> None:
         """
 
@@ -349,6 +364,142 @@ 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
@@ -358,8 +509,6 @@ class MapWidget(QWidget):
                  parent: Union[None, QWidget],
                  tile_src: Tiles,
                  start_level: int,
-                 startLat: float,
-                 startLon: float,
                  editor: GridMapWidget,
                  zoom_callback: Callable[[int], None],
                  position_callback: Callable[[float, float, int, int], None]):
@@ -368,10 +517,8 @@ class MapWidget(QWidget):
         :param parent: the GUI parent widget
         :param tile_src: a Tiles object, source of tiles
         :param start_level: level to initially display
-        :param startLat:
-        :param startLon:
-        :param zoom_callback:
-        :param position_callback:
+        :param zoom_callback: zoom change callback function
+        :param position_callback: position change change callback function
         """
 
         QWidget.__init__(self, parent)  # inherit all parent object setup
@@ -381,35 +528,29 @@ class MapWidget(QWidget):
         # -------------------------------------------------------------------------
         self.diagram_scene = MapScene(self)
 
+        # pointer to the editor
         self.editor: GridMapWidget = editor
 
-        self.view = MapView(scene=self.diagram_scene, map_widget=self)
-
-        self.view.setBackgroundBrush(Qt.transparent)
-
-        # re-map events, because otherwise the view shadows the base widget events
-        # self.view.mousePressEvent = self.mousePressEvent
-        # self.view.mouseReleaseEvent = self.mouseReleaseEvent
-        # self.view.mouseDoubleClickEvent = self.mouseDoubleClickEvent
-        # self.view.mouseMoveEvent = self.mouseMoveEvent
-        # self.view.wheelEvent = self.wheelEvent
-        # self.view.keyPressEvent = self.keyPressEvent
-        # self.view.keyReleaseEvent = self.keyReleaseEvent
-
         # Create a layout for the view
-        self.layout = QVBoxLayout()
-        self.layout.addWidget(self.view)  # Add the QGraphicsView to the layout
-        self.setLayout(self.layout)  # Set the layout for the MapWidget
+        self.layout = QStackedLayout()
         self.layout.setContentsMargins(0, 0, 0, 0)
         self.layout.setSpacing(0)
         self.setStyleSheet("background-color: transparent;")
 
+        # the view is the transparent layer used to draw stuff
+        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)
 
         # the tile coordinates
         self.level: int = start_level
@@ -468,6 +609,12 @@ class MapWidget(QWidget):
                                   longitude=0,
                                   latitude=40)
 
+        # add the widgets in a leyered manner
+        # self.layout.addWidget(self.notice_widget)
+        self.layout.addWidget(self.view)  # Add the QGraphicsView to the layout
+
+        self.setLayout(self.layout)  # Set the layout for the MapWidget
+
     @property
     def tile_src(self) -> Tiles:
         """
@@ -488,6 +635,7 @@ 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)
 
             if self.GotoLevel(level):
                 self.GotoLevelAndPosition(level=level, longitude=longitude, latitude=latitude)
@@ -788,6 +936,7 @@ class MapWidget(QWidget):
         if updateDiagram:
             self.view.setSceneRectDiagram()
 
+
     def enterEvent(self, event: QEnterEvent):
         """
 

{GridCal-5.1.31 → GridCal-5.1.33}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -33,7 +33,7 @@ from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel,
 from PySide6.QtWidgets import (QGraphicsView, QMessageBox, QGraphicsScene, QGraphicsSceneMouseEvent, QGraphicsItem)
 from PySide6.QtSvg import QSvgGenerator
 
-from GridCalEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, FLUID_TYPES
+from GridCalEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, FLUID_TYPES, BRANCH_TYPES
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices.Substation.busbar import BusBar
@@ -53,7 +53,6 @@ from GridCalEngine.Devices.Diagrams.schematic_diagram import SchematicDiagram
 from GridCalEngine.Devices.Diagrams.graphic_location import GraphicLocation
 from GridCalEngine.enumerations import DeviceType, SimulationTypes
 from GridCalEngine.basic_structures import Vec, CxVec, IntVec, Logger
-from GridCalEngine.Devices.types import BRANCH_TYPES
 
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
 from GridCal.Gui.Diagrams.SchematicWidget.Substation.bus_graphics import BusGraphicItem

{GridCal-5.1.31 → GridCal-5.1.33}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -52,6 +52,18 @@ if TYPE_CHECKING:
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicLibraryModel, SchematicWidget
 
 
+def change_font_size(obj, font_size: int):
+    """
+
+    :param obj:
+    :param font_size:
+    :return:
+    """
+    font1 = obj.font()
+    font1.setPointSize(font_size)
+    obj.setFont(font1)
+
+
 class BaseDiagramWidget(QSplitter):
     """
     Common diagram widget to host common functions
@@ -79,13 +91,18 @@ class BaseDiagramWidget(QSplitter):
         # --------------------------------------------------------------------------------------------------------------
         # Widget layout and child widgets:
         self.horizontal_layout = QHBoxLayout(self)
+
+        # Table to display object's properties
         self.object_editor_table = QTableView(self)
+        change_font_size(self.object_editor_table, 9)
+        change_font_size(self.object_editor_table.verticalHeader(), 9)
+        change_font_size(self.object_editor_table.horizontalHeader(), 9)
 
         # Actual libraryView object
         self.library_view = QListView(self)
-
         self.library_view.setViewMode(self.library_view.ViewMode.ListMode)
         self.library_view.setDragDropMode(QAbstractItemView.DragDropMode.InternalMove)
+        change_font_size(self.library_view, 9)
 
         # library model
         self.library_model = library_model

{GridCal-5.1.31 → GridCal-5.1.33}/GridCal/Gui/Main/GridCalMain.py

@@ -87,6 +87,7 @@ class MainGUI(ScriptingMain):
         self.add_complete_bus_branch_diagram()
         self.add_map_diagram(ask=False)
         self.set_diagram_widget(self.diagram_widgets_list[0])
+        self.update_available_results()
 
     def save_all_config(self) -> None:
         """