GridCal 5.1.31__tar.gz → 5.1.34__tar.gz

{GridCal-5.1.31 → GridCal-5.1.34}/GridCal/Gui/Analysis/AnalysisDialogue.py

@@ -20,7 +20,7 @@ from PySide6 import QtWidgets
 from GridCal.Gui.Analysis.gui import Ui_MainWindow
 from GridCal.Gui.Analysis.object_plot_analysis import grid_analysis, GridErrorLog, FixableErrorOutOfRange
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-from GridCal.Gui.GeneralDialogues import LogsDialogue, Logger
+from GridCal.Gui.general_dialogues import LogsDialogue, Logger
 
 
 class GridAnalysisGUI(QtWidgets.QMainWindow):

{GridCal-5.1.31 → GridCal-5.1.34}/GridCal/Gui/ContingencyPlanner/contingency_planner_dialogue.py

@@ -22,7 +22,7 @@ from GridCal.Gui.ContingencyPlanner.gui import Ui_MainWindow
 import GridCalEngine.Devices as dev
 from GridCalEngine.enumerations import DeviceType
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-import GridCal.Gui.GuiFunctions as gf
+import GridCal.Gui.gui_functions as gf
 from GridCalEngine.Simulations.ContingencyAnalysis.contingency_plan import generate_automatic_contingency_plan
 
 

{GridCal-5.1.31 → GridCal-5.1.34}/GridCal/Gui/CoordinatesInput/coordinates_dialogue.py

@@ -5,7 +5,7 @@ from PySide6 import QtGui, QtCore, QtWidgets
 from typing import List, Tuple, Union
 from GridCal.Gui.CoordinatesInput.gui import Ui_Dialog
 from GridCal.Gui.ProfilesInput.excel_dialog import ExcelDialog
-from GridCal.Gui.GeneralDialogues import LogsDialogue
+from GridCal.Gui.general_dialogues import LogsDialogue
 from GridCalEngine.Devices.Substation import Bus
 from GridCalEngine.basic_structures import Logger
 from GridCal.Gui.messages import error_msg

{GridCal-5.1.31 → GridCal-5.1.34}/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-5.1.34}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -21,7 +21,7 @@ from PySide6.QtGui import QPen, QColor, QCursor
 from PySide6.QtWidgets import QMenu, QGraphicsSceneContextMenuEvent
 from PySide6.QtWidgets import QGraphicsLineItem, QGraphicsSceneMouseEvent
 
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.messages import yes_no_question
 from GridCal.Gui.Diagrams.generic_graphics import ACTIVE, DEACTIVATED, OTHER
 from GridCal.Gui.Diagrams.SchematicWidget.Branches.line_editor import LineEditor
@@ -99,10 +99,6 @@ class MapLineSegment(QGraphicsLineItem):
         pen.setWidthF(w)
 
         self.setPen(pen)
-        # self.arrow_from_1.set_colour(color, w, style)
-        # self.arrow_from_2.set_colour(color, w, style)
-        # self.arrow_to_1.set_colour(color, w, style)
-        # self.arrow_to_2.set_colour(color, w, style)
 
     def set_from_side_coordinates(self, x: float, y: float):
         """
@@ -152,12 +148,7 @@ class MapLineSegment(QGraphicsLineItem):
         :return:
         """
         if self.api_object is not None:
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists={
-                                             DeviceType.BusDevice: self.editor.circuit.get_buses(),
-                                             DeviceType.ConnectivityNodeDevice: self.editor.circuit.get_connectivity_nodes(),
-                                             DeviceType.BranchGroupDevice: self.editor.circuit.get_branch_groups()
-                                         })
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def contextMenuEvent(self, event: QGraphicsSceneContextMenuEvent):
         """

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

@@ -17,7 +17,7 @@
 from __future__ import annotations
 from typing import Tuple, TYPE_CHECKING
 from PySide6.QtWidgets import QApplication, QMenu, QGraphicsSceneContextMenuEvent
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor, QCursor

{GridCal-5.1.31 → GridCal-5.1.34}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -22,9 +22,9 @@ from PySide6.QtWidgets import (QApplication, QMenu, QGraphicsSceneContextMenuEve
 from PySide6.QtCore import Qt, QPointF
 from PySide6.QtGui import QBrush, QColor, QCursor
 from GridCal.Gui.Diagrams.MapWidget.Substation.node_template import NodeTemplate
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.messages import yes_no_question
-from GridCal.Gui.GeneralDialogues import InputNumberDialogue
+from GridCal.Gui.general_dialogues import InputNumberDialogue
 
 from GridCalEngine.Devices.Substation.bus import Bus
 from GridCalEngine.Devices import VoltageLevel
@@ -193,15 +193,7 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
         self.editor.map.view.disableMove = True
 
         if self.api_object is not None:
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists={
-                                             DeviceType.CountryDevice: self.editor.circuit.get_countries(),
-                                             DeviceType.CommunityDevice: self.editor.circuit.get_communities(),
-                                             DeviceType.RegionDevice: self.editor.circuit.get_regions(),
-                                             DeviceType.MunicipalityDevice: self.editor.circuit.get_municipalities(),
-                                             DeviceType.AreaDevice: self.editor.circuit.get_areas(),
-                                             DeviceType.ZoneDevice: self.editor.circuit.get_zones(),
-                                         })
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def mouseReleaseEvent(self, event: QGraphicsSceneMouseEvent):
         """

{GridCal-5.1.31 → GridCal-5.1.34}/GridCal/Gui/Diagrams/MapWidget/Substation/voltage_level_graphic_item.py

@@ -22,7 +22,7 @@ from PySide6.QtGui import QBrush, QColor
 from PySide6.QtWidgets import (QMenu, QGraphicsSceneContextMenuEvent, QGraphicsSceneMouseEvent, QGraphicsEllipseItem)
 
 from GridCal.Gui.Diagrams.generic_graphics import GenericDiagramWidget
-from GridCal.Gui.GuiFunctions import add_menu_entry
+from GridCal.Gui.gui_functions import add_menu_entry
 
 from GridCalEngine.Devices.Substation.voltage_level import VoltageLevel
 from GridCalEngine.Devices.Substation.bus import Bus
@@ -148,10 +148,7 @@ class VoltageLevelGraphicItem(GenericDiagramWidget, QGraphicsEllipseItem):
         self.updateDiagram()  # always update
 
         if self.api_object is not None:
-            self.editor.set_editor_model(api_object=self.api_object,
-                                         dictionary_of_lists={
-                                             DeviceType.SubstationDevice: self.editor.circuit.get_substations(),
-                                         })
+            self.editor.set_editor_model(api_object=self.api_object)
 
     def mouseReleaseEvent(self, event):
         """

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

@@ -15,15 +15,16 @@
 # 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 json
 import numpy as np
 import math
 from PySide6.QtWidgets import QGraphicsItem
 from collections.abc import Callable
 from PySide6.QtSvg import QSvgGenerator
 from PySide6.QtCore import (Qt, QSize, QRect, QMimeData, QIODevice, QByteArray, QDataStream, QModelIndex)
-from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel, QStandardItem, QColor, QDropEvent,
-                           QWheelEvent)
+from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel, QStandardItem, QColor,
+                           QDropEvent, QWheelEvent)
 
 from GridCalEngine.Devices.Diagrams.map_location import MapLocation
 from GridCalEngine.Devices.Substation import Bus
@@ -39,7 +40,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 +51,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 +213,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 +240,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 +459,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 +959,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
@@ -1168,6 +1170,29 @@ class GridMapWidget(BaseDiagramWidget):
         else:
             print("call_new_substation_diagram_func is None :( ")
 
+    def copy(self) -> "GridMapWidget":
+        """
+        Deep copy of this widget
+        :return: GridMapWidget
+        """
+        d_copy = MapDiagram(name=self.diagram.name + '_copy')
+        j_data = json.dumps(self.diagram.get_data_dict(), indent=4)
+        d_copy.parse_data(data=json.loads(j_data),
+                          obj_dict=self.circuit.get_all_elements_dict_by_type(add_locations=True),
+                          logger=self.logger)
+
+        return GridMapWidget(
+            tile_src=self.map.tile_src,
+            start_level=self.diagram.start_level,
+            longitude=self.diagram.longitude,
+            latitude=self.diagram.latitude,
+            name=self.diagram.name,
+            circuit=self.circuit,
+            diagram=self.diagram,
+            call_new_substation_diagram_func=self.call_new_substation_diagram_func,
+            call_delete_db_element_func=self.call_delete_db_element_func
+        )
+
 
 def generate_map_diagram(substations: List[Substation],
                          voltage_levels: List[VoltageLevel],