GridCal 5.1.46__tar.gz → 5.1.48__tar.gz

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -131,6 +131,8 @@ class SubstationGraphicItem(QGraphicsRectItem, NodeTemplate):
 
             self.update_diagram()
 
+            self.resize_voltage_levels()
+
     def resize_voltage_levels(self):
         """
 

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -63,7 +63,7 @@ import GridCalEngine.Devices.Diagrams.palettes as palettes
 from GridCal.Gui.Diagrams.graphics_manager import ALL_MAP_GRAPHICS
 from GridCal.Gui.Diagrams.MapWidget.Tiles.tiles import Tiles
 from GridCal.Gui.Diagrams.base_diagram_widget import BaseDiagramWidget
-from GridCal.Gui.messages import error_msg
+from GridCal.Gui.messages import error_msg, info_msg
 
 if TYPE_CHECKING:
     from GridCal.Gui.Main.SubClasses.Model.diagrams import DiagramsMain
@@ -1278,10 +1278,10 @@ class GridMapWidget(BaseDiagramWidget):
                     if results is not None:
                         if isinstance(results, PowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Power flow")
                         elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Optimal power flow")
 
                 # Injections
                 # filter injections by bus
@@ -1320,6 +1320,8 @@ class GridMapWidget(BaseDiagramWidget):
 
                 # plot the profiles
                 plt.show()
+        else:
+            info_msg("There are no time series, so nothing to plot :/")
 
 
 def generate_map_diagram(substations: List[Substation],

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/Gui/Diagrams/SchematicWidget/Substation/bus_graphics.py

@@ -22,7 +22,7 @@ from PySide6.QtCore import Qt, QRectF, QRect, QPointF
 from PySide6.QtGui import QPen, QCursor, QIcon, QPixmap, QBrush, QColor
 from PySide6.QtWidgets import QMenu, QGraphicsSceneMouseEvent
 
-from GridCal.Gui.messages import yes_no_question
+from GridCal.Gui.messages import yes_no_question, warning_msg
 from GridCal.Gui.gui_functions import add_menu_entry
 from GridCal.Gui.Diagrams.generic_graphics import (GenericDiagramWidget, ACTIVE, DEACTIVATED,
                                                    FONT_SCALE, EMERGENCY, TRANSPARENT)
@@ -478,6 +478,10 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
                        icon_path=":/Icons/icons/grid_icon.svg",
                        function_ptr=self.expand_diagram_from_bus)
 
+        add_menu_entry(menu, text='Vecinity diagram from here',
+                       icon_path=":/Icons/icons/grid_icon.svg",
+                       function_ptr=self.new_vecinity_diagram_from_here)
+
         menu.addSection("Add")
 
         # Actions under the "Add" section
@@ -565,6 +569,16 @@ class BusGraphicItem(GenericDiagramWidget, QtWidgets.QGraphicsRectItem):
         """
         self.editor.expand_diagram_from_bus(root_bus=self.api_object)
 
+    def new_vecinity_diagram_from_here(self):
+        """
+        Create new vecinity diagram
+        :return:
+        """
+        if self.api_object is not None:
+            self.editor.gui.new_bus_branch_diagram_from_bus(root_bus=self.api_object)
+        else:
+            warning_msg("The api object is none :(")
+
     def enable_disable_toggle(self):
         """
         Toggle bus element state

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -3737,10 +3737,10 @@ class SchematicWidget(BaseDiagramWidget):
                     if results is not None:
                         if isinstance(results, PowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Power flow")
                         elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
                             table = results.mdl(result_type=ResultTypes.BusVoltageModule)
-                            table.plot_device(ax=ax_2, device_idx=i)
+                            table.plot_device(ax=ax_2, device_idx=i, title="Optimal power flow")
 
                 # Injections
                 # filter injections by bus
@@ -3779,6 +3779,8 @@ class SchematicWidget(BaseDiagramWidget):
 
                 # plot the profiles
                 plt.show()
+        else:
+            info_msg("There are no time series, so nothing to plot :/")
 
     def split_line_now(self, line_graphics: LineGraphicItem, position: float, extra_km: float):
         """

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -18,6 +18,7 @@ from __future__ import annotations
 from typing import List, Dict, Union, Tuple, Callable, TYPE_CHECKING
 import numpy as np
 import cv2
+from docutils.nodes import title
 from matplotlib import pyplot as plt
 
 from PySide6.QtCore import Qt
@@ -325,47 +326,47 @@ class BaseDiagramWidget(QSplitter):
                 if isinstance(results, PowerFlowTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Power flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Power loading")
                     any_plot = True
 
                 elif isinstance(results, LinearAnalysisTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Linear flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Linear loading")
                     any_plot = True
 
                 elif isinstance(results, ContingencyAnalysisTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.MaxContingencyFlows)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Contingency flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.MaxContingencyLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Contingency loading")
                     any_plot = True
 
                 elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
 
                     Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
-                    Sf_table.plot_device(ax=ax_1, device_idx=i)
+                    Sf_table.plot_device(ax=ax_1, device_idx=i, title="Optimal power flow")
 
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Optimal loading")
                     any_plot = True
 
                 elif isinstance(results, StochasticPowerFlowResults):
                     loading_table = results.mdl(result_type=ResultTypes.BranchLoadingAverage)
                     loading_table.convert_to_cdf()
-                    loading_table.plot_device(ax=ax_2, device_idx=i)
+                    loading_table.plot_device(ax=ax_2, device_idx=i, title="Stochastic loading")
                     any_plot = True
 
         if any_plot:

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/Gui/Main/SubClasses/Model/diagrams.py

@@ -1181,6 +1181,30 @@ class DiagramsMain(CompiledArraysMain):
                                                                 diagram=diagram)
                             self.set_diagrams_list_view()
 
+    def new_bus_branch_diagram_from_bus(self, root_bus: dev.Bus):
+        """
+        Add a bus-branch diagram of a particular selection of objects
+        """
+        dlg = InputNumberDialogue(min_value=1, max_value=99,
+                                  default_value=1, is_int=True,
+                                  title='Vecinity diagram',
+                                  text='Select the expansion level')
+
+        if dlg.exec():
+            diagram = make_vecinity_diagram(circuit=self.circuit,
+                                            root_bus=root_bus,
+                                            max_level=dlg.value)
+
+            diagram_widget = SchematicWidget(gui=self,
+                                             circuit=self.circuit,
+                                             diagram=diagram,
+                                             default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
+                                             time_index=self.get_diagram_slider_index(),
+                                             call_delete_db_element_func=self.call_delete_db_element)
+
+            self.add_diagram_widget_and_diagram(diagram_widget=diagram_widget, diagram=diagram)
+            self.set_diagrams_list_view()
+
     def new_bus_branch_diagram_from_substation(self, substation: dev.Substation):
         """
         Add a bus-branch diagram of a particular selection of objects

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/Session/file_handler.py

@@ -116,7 +116,6 @@ class FileOpenThread(QThread):
             self.circuit = file_handler.open(text_func=self.progress_text.emit,
                                              progress_func=self.progress_signal.emit)
         except ValueError as e:
-            # error_msg(text=str(e), title='File open')
             self.valid = False
             self.logger.add_error(msg=str(e))
             self.progress_text.emit('Error loading')

{GridCal-5.1.46 → GridCal-5.1.48}/GridCal/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCal_VERSION__ = "5.1.46"
+__GridCal_VERSION__ = "5.1.48"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCal-5.1.46 → GridCal-5.1.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 5.1.46
+Version: 5.1.48
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.