GridCal 5.3.13__tar.gz → 5.3.15__tar.gz

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/AboutDialogue/about_dialogue.py

@@ -12,6 +12,9 @@ from GridCal.Gui.AboutDialogue.gui import Ui_AboutDialog
 from GridCal.__version__ import __GridCal_VERSION__
 from GridCal.update import check_version, get_upgrade_command
 from GridCalEngine.__version__ import __GridCalEngine_VERSION__, copyright_msg, contributors_msg
+from GridCalEngine.Compilers.circuit_to_gslv import (GSLV_AVAILABLE,
+                                                     GSLV_RECOMMENDED_VERSION,
+                                                     GSLV_VERSION)
 from GridCalEngine.Compilers.circuit_to_newton_pa import (NEWTON_PA_AVAILABLE,
                                                           NEWTON_PA_RECOMMENDED_VERSION,
                                                           NEWTON_PA_VERSION)
@@ -27,6 +30,7 @@ class AboutDialogueGuiGUI(QtWidgets.QDialog):
     """
     AboutDialogueGuiGUI
     """
+
     def __init__(self, parent=None):
         """
 
@@ -39,7 +43,7 @@ class AboutDialogueGuiGUI(QtWidgets.QDialog):
         self.setAcceptDrops(True)
 
         self.ui.librariesTableWidget.setColumnCount(4)
-        self.ui.librariesTableWidget.setRowCount(4)
+        self.ui.librariesTableWidget.setRowCount(5)
         self.ui.librariesTableWidget.setHorizontalHeaderLabels(["Name", "version", "supported version", "licensed"])
 
         self.ui.librariesTableWidget.setItem(0, 0, QtWidgets.QTableWidgetItem("GridCal"))
@@ -47,26 +51,39 @@ class AboutDialogueGuiGUI(QtWidgets.QDialog):
         self.ui.librariesTableWidget.setItem(0, 2, QtWidgets.QTableWidgetItem(__GridCalEngine_VERSION__))
         self.ui.librariesTableWidget.setItem(0, 3, QtWidgets.QTableWidgetItem("True"))
 
-        self.ui.librariesTableWidget.setItem(1, 0, QtWidgets.QTableWidgetItem("NewtonPa"))
-        self.ui.librariesTableWidget.setItem(1, 1, QtWidgets.QTableWidgetItem(NEWTON_PA_VERSION
+        # GSLV
+        self.ui.librariesTableWidget.setItem(1, 0, QtWidgets.QTableWidgetItem("GSLV"))
+        self.ui.librariesTableWidget.setItem(1, 1, QtWidgets.QTableWidgetItem(GSLV_VERSION
+                                                                              if GSLV_AVAILABLE else
+                                                                              "Not installed"))
+
+        self.ui.librariesTableWidget.setItem(1, 2, QtWidgets.QTableWidgetItem(GSLV_RECOMMENDED_VERSION))
+        self.ui.librariesTableWidget.setItem(1, 3, QtWidgets.QTableWidgetItem(str(GSLV_AVAILABLE)))
+
+        # Newton
+        self.ui.librariesTableWidget.setItem(2, 0, QtWidgets.QTableWidgetItem("NewtonPa"))
+        self.ui.librariesTableWidget.setItem(2, 1, QtWidgets.QTableWidgetItem(NEWTON_PA_VERSION
                                                                               if NEWTON_PA_AVAILABLE else
                                                                               "Not installed"))
-        self.ui.librariesTableWidget.setItem(1, 2, QtWidgets.QTableWidgetItem(NEWTON_PA_RECOMMENDED_VERSION))
-        self.ui.librariesTableWidget.setItem(1, 3, QtWidgets.QTableWidgetItem(str(NEWTON_PA_AVAILABLE)))
 
-        self.ui.librariesTableWidget.setItem(2, 0, QtWidgets.QTableWidgetItem("Bentayga"))
-        self.ui.librariesTableWidget.setItem(2, 1, QtWidgets.QTableWidgetItem(BENTAYGA_VERSION
+        self.ui.librariesTableWidget.setItem(2, 2, QtWidgets.QTableWidgetItem(NEWTON_PA_RECOMMENDED_VERSION))
+        self.ui.librariesTableWidget.setItem(2, 3, QtWidgets.QTableWidgetItem(str(NEWTON_PA_AVAILABLE)))
+
+        # Bentayga
+        self.ui.librariesTableWidget.setItem(3, 0, QtWidgets.QTableWidgetItem("Bentayga"))
+        self.ui.librariesTableWidget.setItem(3, 1, QtWidgets.QTableWidgetItem(BENTAYGA_VERSION
                                                                               if BENTAYGA_AVAILABLE else
                                                                               "Not installed"))
-        self.ui.librariesTableWidget.setItem(2, 2, QtWidgets.QTableWidgetItem(BENTAYGA_RECOMMENDED_VERSION))
-        self.ui.librariesTableWidget.setItem(2, 3, QtWidgets.QTableWidgetItem(str(BENTAYGA_AVAILABLE)))
+        self.ui.librariesTableWidget.setItem(3, 2, QtWidgets.QTableWidgetItem(BENTAYGA_RECOMMENDED_VERSION))
+        self.ui.librariesTableWidget.setItem(3, 3, QtWidgets.QTableWidgetItem(str(BENTAYGA_AVAILABLE)))
 
-        self.ui.librariesTableWidget.setItem(3, 0, QtWidgets.QTableWidgetItem("power-grid-model"))
-        self.ui.librariesTableWidget.setItem(3, 1, QtWidgets.QTableWidgetItem(PGM_VERSION
+        # PGM
+        self.ui.librariesTableWidget.setItem(4, 0, QtWidgets.QTableWidgetItem("power-grid-model"))
+        self.ui.librariesTableWidget.setItem(4, 1, QtWidgets.QTableWidgetItem(PGM_VERSION
                                                                               if PGM_AVAILABLE else
                                                                               "Not installed"))
-        self.ui.librariesTableWidget.setItem(3, 2, QtWidgets.QTableWidgetItem(PGM_RECOMMENDED_VERSION))
-        self.ui.librariesTableWidget.setItem(3, 3, QtWidgets.QTableWidgetItem(str(PGM_AVAILABLE)))
+        self.ui.librariesTableWidget.setItem(4, 2, QtWidgets.QTableWidgetItem(PGM_RECOMMENDED_VERSION))
+        self.ui.librariesTableWidget.setItem(4, 3, QtWidgets.QTableWidgetItem(str(PGM_AVAILABLE)))
 
         # check the version in pypi
         version_code, latest_version = check_version()

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_container.py

@@ -234,7 +234,6 @@ class MapLineContainer(GenericDiagramWidget):
             # draw the segment in the scene
             self.editor.add_to_scene(graphic_object=segment_graphic_object)
 
-
         self.update_connectors()
 
         # self.editor.update_device_sizes()

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -41,7 +41,13 @@ class MapLineSegment(QGraphicsLineItem):
         self.draw_labels = True
 
         self.style = Qt.PenStyle.SolidLine
-        self.color = QColor(115, 115, 115, 200)  # translucent gray
+        # self.color = QColor(115, 115, 115, 200)  # translucent gray
+
+        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.width = 0.1
 
         self.pos1: QPointF = self.first.get_center_pos()

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -14,10 +14,8 @@ from matplotlib import pyplot as plt
 
 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,
-                            QRunnable, QThreadPool)
-from PySide6.QtGui import (QIcon, QPixmap, QImage, QPainter, QStandardItemModel, QStandardItem, QColor, QDropEvent)
+from PySide6.QtCore import (Qt, QMimeData, QIODevice, QByteArray, QDataStream, QModelIndex, QRunnable, QThreadPool)
+from PySide6.QtGui import (QIcon, QPixmap, QImage, QStandardItemModel, QStandardItem, QColor, QDropEvent)
 
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_line_container import MapLineContainer
 from GridCal.Gui.SubstationDesigner.substation_designer import SubstationDesigner
@@ -38,6 +36,7 @@ from GridCalEngine.Devices.types import ALL_DEV_TYPES
 from GridCalEngine.basic_structures import Logger
 from GridCalEngine.Simulations.OPF.opf_ts_results import OptimalPowerFlowTimeSeriesResults
 from GridCalEngine.Simulations.PowerFlow.power_flow_ts_results import PowerFlowTimeSeriesResults
+from GridCalEngine.enumerations import Colormaps
 
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_ac_line import MapAcLine
 from GridCal.Gui.Diagrams.MapWidget.Branches.map_dc_line import MapDcLine
@@ -144,7 +143,7 @@ class MapLibraryModel(QStandardItemModel):
         @param idxs:
         @return:
         """
-        mimedata = QMimeData()
+        mime_data = QMimeData()
         for idx in idxs:
             if idx.isValid():
                 txt = self.data(idx, Qt.ItemDataRole.DisplayRole)
@@ -153,8 +152,8 @@ class MapLibraryModel(QStandardItemModel):
                 stream = QDataStream(data, QIODevice.WriteOnly)
                 stream.writeQString(txt)
 
-                mimedata.setData('component/name', data)
-        return mimedata
+                mime_data.setData('component/name', data)
+        return mime_data
 
     def flags(self, index: QModelIndex) -> Qt.ItemFlag:
         """
@@ -323,7 +322,6 @@ class GridMapWidget(BaseDiagramWidget):
         if self.map.level - 1 >= self.map.min_level:
             self.map.zoom_level(level=self.map.level - 1)
 
-
     def to_lat_lon(self, x: float, y: float) -> Tuple[float, float]:
         """
         Convert x, y position in the map to latitude and longitude
@@ -550,9 +548,15 @@ class GridMapWidget(BaseDiagramWidget):
         :param lon:
         :return:
         """
-        graphic_object = SubstationGraphicItem(editor=self, api_object=api_object, lat=lat, lon=lon,
+        graphic_object = SubstationGraphicItem(editor=self,
+                                               api_object=api_object,
+                                               lat=lat,
+                                               lon=lon,
                                                r=self.diagram.min_bus_width)
-        self.graphics_manager.add_device(elm=api_object, graphic=graphic_object)
+
+        self.graphics_manager.add_device(elm=api_object,
+                                         graphic=graphic_object)
+
         self.add_to_scene(graphic_object=graphic_object)
 
         return graphic_object
@@ -1232,16 +1236,26 @@ class GridMapWidget(BaseDiagramWidget):
             info_msg("There are no time series, so nothing to plot :/")
 
 
-def generate_map_diagram(substations: List[Substation],
-                         voltage_levels: List[VoltageLevel],
-                         lines: List[Line],
-                         dc_lines: List[DcLine],
-                         hvdc_lines: List[HvdcLine],
-                         fluid_nodes: List[FluidNode],
-                         fluid_paths: List[FluidPath],
-                         prog_func: Union[Callable, None] = None,
-                         text_func: Union[Callable, None] = None,
-                         name='Map diagram') -> MapDiagram:
+def generate_map_diagram(
+        substations: List[Substation],
+        voltage_levels: List[VoltageLevel],
+        lines: List[Line],
+        dc_lines: List[DcLine],
+        hvdc_lines: List[HvdcLine],
+        fluid_nodes: List[FluidNode],
+        fluid_paths: List[FluidPath],
+        prog_func: Union[Callable, None] = None,
+        text_func: Union[Callable, None] = None,
+        name='Map diagram',
+        use_flow_based_width: bool = False,
+        min_branch_width: int = 1.0,
+        max_branch_width=5,
+        min_bus_width=1.0,
+        max_bus_width=20,
+        arrow_size=20,
+        palette: Colormaps = Colormaps.GridCal,
+        default_bus_voltage: float = 10
+) -> MapDiagram:
     """
     Add a elements to the schematic scene
     :param substations: list of Substation objects
@@ -1254,9 +1268,27 @@ def generate_map_diagram(substations: List[Substation],
     :param prog_func: progress report function
     :param text_func: Text report function
     :param name: name of the diagram
+    :param use_flow_based_width: use flow based width
+    :param min_branch_width: minimum branch width
+    :param max_branch_width: maximum branch width
+    :param min_bus_width:
+    :param max_bus_width: maximum bus width
+    :param arrow_size: arrow size
+    :param palette: Colormaps
+    :param default_bus_voltage: default bus voltage
     """
 
-    diagram = MapDiagram(name=name)
+    diagram = MapDiagram(
+        name=name,
+        use_flow_based_width=use_flow_based_width,
+        min_branch_width=min_branch_width,
+        max_branch_width=max_branch_width,
+        min_bus_width=min_bus_width,
+        max_bus_width=max_bus_width,
+        arrow_size=arrow_size,
+        palette=palette,
+        default_bus_voltage=default_bus_voltage
+    )
 
     # first create the buses
     if text_func is not None:
@@ -1311,21 +1343,11 @@ def generate_map_diagram(substations: List[Substation],
         diagram.set_point(device=branch, location=MapLocation())
 
         # register all the line locations
-        # if branch.bus_from is not None:
-        #     diagram.set_point(device=branch.bus_from, location=MapLocation(latitude=branch.bus_from.latitude,
-        #                                                                    longitude=branch.bus_from.longitude,
-        #                                                                    altitude=0))
-
         for loc in branch.locations.get_locations():
             diagram.set_point(device=loc, location=MapLocation(latitude=loc.lat,
                                                                longitude=loc.long,
                                                                altitude=loc.alt))
 
-        # if branch.bus_to is not None:
-        #     diagram.set_point(device=branch.bus_to, location=MapLocation(latitude=branch.bus_to.latitude,
-        #                                                                  longitude=branch.bus_to.longitude,
-        #                                                                  altitude=0))
-
     # --------------------------------------------------------------------------------------------------------------
     if text_func is not None:
         text_func('Creating schematic line devices')
@@ -1374,7 +1396,6 @@ def generate_map_diagram(substations: List[Substation],
         if prog_func is not None:
             prog_func((i + 1) / nn * 100.0)
 
-        # branch.graphic_obj = self.add_api_upfc(branch)
         diagram.set_point(device=elm, location=MapLocation())
 
         # register all the line locations
@@ -1383,7 +1404,7 @@ def generate_map_diagram(substations: List[Substation],
                                                                longitude=loc.long,
                                                                altitude=loc.alt))
 
-    # find the diagram cented and set it internally
+    # find the diagram centre and set it internally
     diagram.set_center()
 
     return diagram

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/Diagrams/SchematicWidget/Injections/generator_graphics.py

@@ -134,10 +134,18 @@ class GeneratorGraphicItem(InjectionTemplateGraphicItem):
 
         menu.addSeparator()
 
-        add_menu_entry(menu=menu,
-                       text="Delete",
-                       icon_path=":/Icons/icons/delete3.svg",
-                       function_ptr=self.remove)
+        # add_menu_entry(menu=menu,
+        #                text="Delete",
+        #                icon_path=":/Icons/icons/delete3.svg",
+        #                function_ptr=self.remove)
+
+        add_menu_entry(menu, text='Remove from schematic and DB',
+                       icon_path=":/Icons/icons/delete_db.svg",
+                       function_ptr=lambda: self.remove_from_widget_and_db(ask=True, delete_from_db=True))
+
+        add_menu_entry(menu, text='Remove from schematic',
+                       icon_path=":/Icons/icons/delete_schematic.svg",
+                       function_ptr=lambda: self.remove_from_widget_and_db(ask=True, delete_from_db=False))
 
         add_menu_entry(menu=menu,
                        text="Convert to battery",

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/Diagrams/SchematicWidget/Injections/injections_template_graphics.py

@@ -100,6 +100,27 @@ class InjectionTemplateGraphicItem(GenericDiagramWidget, QGraphicsItemGroup):
             self.editor.remove_from_scene(self.nexus)
             self.editor.remove_element(device=self.api_object, graphic_object=self)
             self.editor.remove_from_scene(self)
+            self.editor.delete_diagram_element(device=self.api_object)
+
+    def remove_from_widget_and_db(self, ask: bool = True, delete_from_db: bool = True) -> None:
+        """
+        Remove this element
+        @return:
+        """
+        if ask:
+            ok = yes_no_question('Are you sure that you want to remove this device',
+                                 'Remove bus from schematic and DB' if delete_from_db else "Remove bus from schematic")
+        else:
+            ok = True
+
+        if ok:
+            self.editor.remove_element(device=self.api_object,
+                                       graphic_object=self,
+                                       delete_from_db=delete_from_db)
+
+            self.editor.remove_from_scene(self.nexus)
+            self.editor.remove_from_scene(self)
+            # self.editor.delete_diagram_element(device=self.api_object)
 
     def mousePressEvent(self, QGraphicsSceneMouseEvent):
         """

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -532,7 +532,7 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
         if ask:
             ok = yes_no_question('Are you sure that you want to remove this bus',
-                                 'Remove bus from schamatic and DB' if delete_from_db else "Remove bus from schamatic")
+                                 'Remove bus from schematic and DB' if delete_from_db else "Remove bus from schematic")
         else:
             ok = True
 

{gridcal-5.3.13 → gridcal-5.3.15}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -1116,6 +1116,9 @@ class SchematicWidget(BaseDiagramWidget):
                 # remove the buses (from the schematic and the circuit)
                 for bus, graphic_obj in selected:
                     self.remove_element(device=bus, graphic_object=graphic_obj, delete_from_db=False)
+                    self.remove_from_scene(graphic_obj)
+                    if hasattr(graphic_obj, 'nexus'):
+                        self.remove_from_scene(graphic_obj.nexus)
             else:
                 pass
         else:
@@ -1916,7 +1919,7 @@ class SchematicWidget(BaseDiagramWidget):
 
         transformer = pyproj.Transformer.from_crs(4326, 25830, always_xy=True)
 
-        # the longitude is more reated to x, the latitude is more related to y
+        # the longitude is more related to x, the latitude is more related to y
         y, x = transformer.transform(xx=lon, yy=lat)
         x *= - factor
         y *= - factor
@@ -1937,6 +1940,53 @@ class SchematicWidget(BaseDiagramWidget):
                 bus.y = y[i]
             i += 1
 
+    def rotate(self, angle_degrees):
+        """
+        Rotates a list of points around a given pivot by a specified angle.
+
+        Parameters:
+            angle_degrees (float): The rotation angle in degrees.
+
+        Returns:
+            list of tuples: The rotated points.
+        """
+
+        # get the buses info
+        buses_info_list = self.get_buses()
+
+        # gather the coordinates
+        n = len(buses_info_list)
+        X = np.zeros(n)
+        Y = np.zeros(n)
+        for i in range(n):
+            idx, bus, graphic_object = buses_info_list[i]
+            X[i] = graphic_object.pos().x()
+            Y[i] = graphic_object.pos().y()
+
+        # compute the center
+        cx = np.mean(X)
+        cy = np.mean(Y)
+
+        # compute the sin and cos
+        angle_rad = np.deg2rad(angle_degrees)
+        cos_a = np.cos(angle_rad)
+        sin_a = np.sin(angle_rad)
+        for i in range(n):
+            idx, bus, graphic_object = buses_info_list[i]
+
+            # Translate the point to the origin relative to the pivot
+            x_rel = X[i] - cx
+            y_rel = Y[i] - cy
+
+            # Rotate the point
+            x_rot = x_rel * cos_a - y_rel * sin_a
+            y_rot = x_rel * sin_a + y_rel * cos_a
+
+            # Translate back to the original coordinate system
+            x_new = x_rot + cx
+            y_new = y_rot + cy
+            graphic_object.set_position(x_new, y_new)
+
     def get_image(self, transparent: bool = False) -> QImage:
         """
         get the current picture
@@ -3423,7 +3473,7 @@ class SchematicWidget(BaseDiagramWidget):
                                                   Va=vang[i],
                                                   P=Sbus[i].real if Sbus is not None else None,
                                                   Q=Sbus[i].imag if Sbus is not None else None,
-                                                  tpe=bus_types[types[i]] if types is not None else None)
+                                                  tpe=bus_types[int(types[i])] if types is not None else None)
 
                         if use_flow_based_width:
                             graphic_object.change_size(w=graphic_object.w)
@@ -3729,7 +3779,7 @@ class SchematicWidget(BaseDiagramWidget):
                             Va=vang[i],
                             P=Sbus[i].real if Sbus is not None else None,
                             Q=Sbus[i].imag if Sbus is not None else None,
-                            tpe=bus_types[types[i]] if types is not None else None,
+                            tpe=bus_types[int(types[i])] if types is not None else None,
                             fluid_node_p2x_flow=fluid_node_p2x_flow[i] if fluid_node_p2x_flow is not None else None,
                             fluid_node_current_level=fluid_node_current_level[
                                 i] if fluid_node_current_level is not None else None,