GridCal 5.1.41__tar.gz → 5.1.42__tar.gz

{GridCal-5.1.41 → GridCal-5.1.42}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -14,8 +14,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
 import os
-from typing import Union, List, Tuple, Dict
+from typing import Union, List, Tuple, Dict, TYPE_CHECKING
 import json
 import numpy as np
 import math
@@ -59,6 +60,9 @@ 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
 
+if TYPE_CHECKING:
+    from GridCal.Gui.Main.GridCalMain import MainGUI
+
 MAP_BRANCH_GRAPHIC_TYPES = Union[
     MapAcLine, MapDcLine, MapHvdcLine, MapFluidPathLine
 ]
@@ -203,6 +207,7 @@ class GridMapWidget(BaseDiagramWidget):
     """
 
     def __init__(self,
+                 gui: MainGUI,
                  tile_src: Tiles,
                  start_level: int,
                  longitude: float,
@@ -226,6 +231,7 @@ class GridMapWidget(BaseDiagramWidget):
         """
 
         BaseDiagramWidget.__init__(self,
+                                   gui=gui,
                                    circuit=circuit,
                                    diagram=MapDiagram(name=name,
                                                       tile_source=tile_src.TilesetName,

{GridCal-5.1.41 → GridCal-5.1.42}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -14,12 +14,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
 import sys
 import os
 import json
 import numpy as np
 import pandas as pd
-from typing import List, Dict, Union, Tuple
+from typing import List, Dict, Union, Tuple, TYPE_CHECKING
 from collections.abc import Callable
 from warnings import warn
 import networkx as nx
@@ -53,7 +54,8 @@ from GridCalEngine.Devices.Injections.generator import Generator
 from GridCalEngine.Devices.Fluid import FluidNode, FluidPath
 from GridCalEngine.Devices.Diagrams.schematic_diagram import SchematicDiagram
 from GridCalEngine.Devices.Diagrams.graphic_location import GraphicLocation
-from GridCalEngine.enumerations import DeviceType, SimulationTypes
+from GridCalEngine.Simulations import PowerFlowTimeSeriesResults
+from GridCalEngine.enumerations import DeviceType, SimulationTypes, ResultTypes
 from GridCalEngine.basic_structures import Vec, CxVec, IntVec, Logger
 
 from GridCal.Gui.Diagrams.SchematicWidget.terminal_item import BarTerminalItem, RoundTerminalItem
@@ -81,6 +83,9 @@ import GridCal.Gui.Visualization.visualization as viz
 import GridCalEngine.Devices.Diagrams.palettes as palettes
 from GridCal.Gui.messages import info_msg, error_msg, warning_msg, yes_no_question
 
+if TYPE_CHECKING:
+    from GridCal.Gui.Main.GridCalMain import MainGUI
+
 BRANCH_GRAPHICS = Union[
     LineGraphicItem,
     WindingGraphicItem,
@@ -335,6 +340,7 @@ class SchematicWidget(BaseDiagramWidget):
     """
 
     def __init__(self,
+                 gui: MainGUI,
                  circuit: MultiCircuit,
                  diagram: Union[SchematicDiagram, None],
                  default_bus_voltage: float = 10.0,
@@ -351,6 +357,7 @@ class SchematicWidget(BaseDiagramWidget):
         """
 
         BaseDiagramWidget.__init__(self,
+                                   gui=gui,
                                    circuit=circuit,
                                    diagram=diagram,
                                    library_model=SchematicLibraryModel(),
@@ -3700,15 +3707,21 @@ class SchematicWidget(BaseDiagramWidget):
 
         return min_x, max_x, min_y, max_y
 
-    def plot_bus(self, i, api_object: Bus):
+    def plot_bus(self, i: int, api_object: Bus):
         """
         Plot branch results
-        :param i: branch index (not counting HVDC lines because those are not real Branches)
+        :param i: bus index
         :param api_object: Bus API object
         :return:
         """
         fig = plt.figure(figsize=(12, 8))
         ax_1 = fig.add_subplot(211)
+        ax_1.set_title('Power', fontsize=14)
+        ax_1.set_ylabel('Injections [MW]', fontsize=11)
+
+        ax_2 = fig.add_subplot(212, sharex=ax_1)
+        ax_2.set_title('Time', fontsize=14)
+        ax_2.set_ylabel('Voltage [p.u]', fontsize=11)
 
         # set time
         x = self.circuit.get_time_array()
@@ -3719,18 +3732,16 @@ class SchematicWidget(BaseDiagramWidget):
                 # Get all devices grouped by bus
                 all_data = self.circuit.get_injection_devices_grouped_by_bus()
 
-                # filter injections by bus
-                bus_devices = all_data.get(api_object, None)
-
-                voltage = dict()
-
-                for key, driver in self.results_dictionary.items():
-                    if hasattr(driver, 'results'):
-                        if driver.results is not None:
-                            if key == SimulationTypes.PowerFlowTimeSeries_run:
-                                voltage[key] = np.abs(driver.results.voltage[:, i])
+                # search drivers for voltage data
+                for driver, results in self.gui.session.drivers_results_iter():
+                    if results is not None:
+                        if isinstance(results, PowerFlowTimeSeriesResults):
+                            table = results.mdl(result_type=ResultTypes.BusVoltageModule)
+                            table.plot(ax=ax_2, selected_col_idx=[i])
 
                 # Injections
+                # filter injections by bus
+                bus_devices = all_data.get(api_object, None)
                 if bus_devices:
 
                     power_data = dict()
@@ -3752,8 +3763,7 @@ class SchematicWidget(BaseDiagramWidget):
                                 raise Exception("Missing shunt device for plotting")
 
                     df = pd.DataFrame(data=power_data, index=x)
-                    ax_1.set_title('Power', fontsize=14)
-                    ax_1.set_ylabel('Injections [MW]', fontsize=11)
+
                     try:
                         # yt area plots
                         df.plot.area(ax=ax_1)
@@ -3761,14 +3771,6 @@ class SchematicWidget(BaseDiagramWidget):
                         # use regular plots
                         df.plot(ax=ax_1)
 
-                # voltage
-                if len(voltage.keys()):
-                    ax_2 = fig.add_subplot(212, sharex=ax_1)
-                    df = pd.DataFrame(data=voltage, index=x)
-                    ax_2.set_title('Time', fontsize=14)
-                    ax_2.set_ylabel('Voltage [p.u]', fontsize=11)
-                    df.plot(ax=ax_2)
-
                 plt.legend()
                 fig.suptitle(api_object.name, fontsize=20)
 
@@ -4115,6 +4117,7 @@ class SchematicWidget(BaseDiagramWidget):
                           logger=self.logger)
 
         return SchematicWidget(
+            gui=self.gui,
             circuit=self.circuit,
             diagram=self.diagram,
             default_bus_voltage=self.default_bus_voltage,

{GridCal-5.1.41 → GridCal-5.1.42}/GridCal/Gui/Diagrams/base_diagram_widget.py

@@ -35,21 +35,25 @@ from GridCalEngine.Devices.Branches.transformer import Transformer2W
 from GridCalEngine.Devices.Branches.vsc import VSC
 from GridCalEngine.Devices.Branches.upfc import UPFC
 from GridCalEngine.Devices.types import BRANCH_TYPES
+from GridCalEngine.Simulations import (PowerFlowTimeSeriesResults, LinearAnalysisTimeSeriesResults,
+                                       ContingencyAnalysisTimeSeriesResults, OptimalPowerFlowTimeSeriesResults,
+                                       StochasticPowerFlowResults)
 from GridCalEngine.basic_structures import Vec, CxVec, IntVec
 from GridCalEngine.Devices.Diagrams.schematic_diagram import SchematicDiagram
 from GridCalEngine.Devices.Diagrams.map_diagram import MapDiagram
 from GridCalEngine.Simulations.types import DRIVER_OBJECTS
 from GridCalEngine.basic_structures import Logger
-from GridCalEngine.enumerations import SimulationTypes
+from GridCalEngine.enumerations import SimulationTypes, ResultTypes
 
 from GridCal.Gui.Diagrams.graphics_manager import GraphicsManager
 import GridCalEngine.Devices.Diagrams.palettes as palettes
-from GridCal.Gui.messages import yes_no_question
+from GridCal.Gui.messages import yes_no_question, info_msg
 from GridCal.Gui.object_model import ObjectsModel
 
 if TYPE_CHECKING:
     from GridCal.Gui.Diagrams.MapWidget.grid_map_widget import MapLibraryModel, GridMapWidget
     from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicLibraryModel, SchematicWidget
+    from GridCal.Gui.Main.GridCalMain import MainGUI
 
 
 def change_font_size(obj, font_size: int):
@@ -71,6 +75,7 @@ class BaseDiagramWidget(QSplitter):
     """
 
     def __init__(self,
+                 gui: MainGUI,
                  circuit: MultiCircuit,
                  diagram: Union[SchematicDiagram, MapDiagram],
                  library_model: Union[MapLibraryModel, SchematicLibraryModel],
@@ -86,6 +91,8 @@ class BaseDiagramWidget(QSplitter):
         """
         QSplitter.__init__(self)
 
+        self.gui = gui
+
         # --------------------------------------------------------------------------------------------------------------
         # Widget creation
         # --------------------------------------------------------------------------------------------------------------
@@ -120,7 +127,7 @@ class BaseDiagramWidget(QSplitter):
         splitter2 = QSplitter(self)
         splitter2.addWidget(self.frame1)
         splitter2.addWidget(self.object_editor_table)
-        splitter2.setOrientation(Qt.Vertical)
+        splitter2.setOrientation(Qt.Orientation.Vertical)
         self.addWidget(splitter2)
         # self.addWidget(self.editor_graphics_view)
 
@@ -222,87 +229,74 @@ class BaseDiagramWidget(QSplitter):
         :param api_object: API object
         """
         fig = plt.figure(figsize=(12, 8))
+        fig.suptitle(api_object.name, fontsize=20)
+
         ax_1 = fig.add_subplot(211)
+        ax_1.set_title('Probability x < value', fontsize=14)
+        ax_1.set_ylabel('Loading [%]', fontsize=11)
+
         ax_2 = fig.add_subplot(212)
+        ax_2.set_title('Power', fontsize=14)
+        ax_2.set_ylabel('Power [MW]', fontsize=11)
+
+        any_plot = False
+
+        for driver, results in self.gui.session.drivers_results_iter():
+
+            if results is not None:
+
+                if isinstance(results, PowerFlowTimeSeriesResults):
+
+                    Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
+                    Sf_table.plot(ax=ax_1, selected_col_idx=[i])
+
+                    loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
+                    loading_table.convert_to_cdf()
+                    loading_table.plot(ax=ax_2, selected_col_idx=[i])
+                    any_plot = True
+
+                elif isinstance(results, LinearAnalysisTimeSeriesResults):
+
+                    Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
+                    Sf_table.plot(ax=ax_1, selected_col_idx=[i])
+
+                    loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
+                    loading_table.convert_to_cdf()
+                    loading_table.plot(ax=ax_2, selected_col_idx=[i])
+                    any_plot = True
+
+                elif isinstance(results, ContingencyAnalysisTimeSeriesResults):
+
+                    Sf_table = results.mdl(result_type=ResultTypes.MaxContingencyFlows)
+                    Sf_table.plot(ax=ax_1, selected_col_idx=[i])
+
+                    loading_table = results.mdl(result_type=ResultTypes.MaxContingencyLoading)
+                    loading_table.convert_to_cdf()
+                    loading_table.plot(ax=ax_2, selected_col_idx=[i])
+                    any_plot = True
 
-        # set time
-        x = self.circuit.get_time_array()
-        x_cl = x
-
-        if x is not None:
-            if len(x) > 0:
-
-                p = np.arange(len(x)).astype(float) / len(x)
-
-                # search available results
-                power_data = dict()
-                loading_data = dict()
-                loading_st_data = None
-                loading_clustering_data = None
-                power_clustering_data = None
-
-                for key, driver in self.results_dictionary.items():
-                    if hasattr(driver, 'results'):
-                        if driver.results is not None:
-                            if key == SimulationTypes.PowerFlowTimeSeries_run:
-                                power_data[key.value] = driver.results.Sf.real[:, i]
-                                loading_data[key.value] = np.sort(np.abs(driver.results.loading.real[:, i] * 100.0))
-
-                            elif key == SimulationTypes.LinearAnalysis_TS_run:
-                                power_data[key.value] = driver.results.Sf.real[:, i]
-                                loading_data[key.value] = np.sort(np.abs(driver.results.loading.real[:, i] * 100.0))
-
-                            # elif key == SimulationTypes.NetTransferCapacityTS_run:
-                            #     power_data[key.value] = driver.results.atc[:, i]
-                            #     atc_perc = driver.results.atc[:, i] / (api_object.rate_prof + 1e-9)
-                            #     loading_data[key.value] = np.sort(np.abs(atc_perc * 100.0))
-
-                            elif key == SimulationTypes.ContingencyAnalysisTS_run:
-                                power_data[key.value] = driver.results.max_flows.real[:, i]
-                                loading_data[key.value] = np.sort(
-                                    np.abs(driver.results.max_loading.real[:, i] * 100.0))
-
-                            elif key == SimulationTypes.OPFTimeSeries_run:
-                                power_data[key.value] = driver.results.Sf.real[:, i]
-                                loading_data[key.value] = np.sort(np.abs(driver.results.loading.real[:, i] * 100.0))
-
-                            elif key == SimulationTypes.StochasticPowerFlow:
-                                loading_st_data = np.sort(np.abs(driver.results.loading_points.real[:, i] * 100.0))
-
-                # add the rating
-                # power_data['Rates+'] = api_object.rate_prof
-                # power_data['Rates-'] = -api_object.rate_prof
-
-                # loading
-                if len(loading_data.keys()):
-                    df = pd.DataFrame(data=loading_data, index=p)
-                    ax_1.set_title('Probability x < value', fontsize=14)
-                    ax_1.set_ylabel('Loading [%]', fontsize=11)
-                    df.plot(ax=ax_1)
-
-                if loading_st_data is not None:
-                    p_st = np.arange(len(loading_st_data)).astype(float) / len(loading_st_data)
-                    df = pd.DataFrame(data=loading_st_data,
-                                      index=p_st,
-                                      columns=[SimulationTypes.StochasticPowerFlow.value])
-                    ax_1.set_title('Probability x < value', fontsize=14)
-                    ax_1.set_ylabel('Loading [%]', fontsize=11)
-                    df.plot(ax=ax_1)
-
-                # power
-                if len(power_data.keys()):
-                    df = pd.DataFrame(data=power_data, index=x)
-                    ax_2.set_title('Power', fontsize=14)
-                    ax_2.set_ylabel('Power [MW]', fontsize=11)
-                    df.plot(ax=ax_2)
-                    ax_2.plot(x, api_object.rate_prof.toarray(), c='gray', linestyle='dashed', linewidth=1)
-                    ax_2.plot(x, -api_object.rate_prof.toarray(), c='gray', linestyle='dashed', linewidth=1)
-
-                plt.legend()
-                fig.suptitle(api_object.name, fontsize=20)
-
-                # plot the profiles
-                plt.show()
+                elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
+
+                    Sf_table = results.mdl(result_type=ResultTypes.BranchActivePowerFrom)
+                    Sf_table.plot(ax=ax_1, selected_col_idx=[i])
+
+                    loading_table = results.mdl(result_type=ResultTypes.BranchLoading)
+                    loading_table.convert_to_cdf()
+                    loading_table.plot(ax=ax_2, selected_col_idx=[i])
+                    any_plot = True
+
+                elif isinstance(results, StochasticPowerFlowResults):
+                    loading_table = results.mdl(result_type=ResultTypes.BranchLoadingAverage)
+                    loading_table.convert_to_cdf()
+                    loading_table.plot(ax=ax_2, selected_col_idx=[i])
+                    any_plot = True
+
+        if any_plot:
+            plt.legend()
+            plt.show()
+        else:
+            info_msg("No time series results to plot, run some time series results. Even partial results are fine",
+                     f"{api_object.name} results plot")
 
     def plot_hvdc_branch(self, i: int, api_object: HvdcLine):
         """
@@ -311,63 +305,48 @@ class BaseDiagramWidget(QSplitter):
         :param api_object: HvdcGraphicItem
         """
         fig = plt.figure(figsize=(12, 8))
+        fig.suptitle(api_object.name, fontsize=20)
+
         ax_1 = fig.add_subplot(211)
-        # ax_2 = fig.add_subplot(212, sharex=ax_1)
+        ax_1.set_title('Probability x < value', fontsize=14)
+        ax_1.set_ylabel('Loading [%]', fontsize=11)
+
         ax_2 = fig.add_subplot(212)
+        ax_2.set_title('Power', fontsize=14)
+        ax_2.set_ylabel('Power [MW]', fontsize=11)
+
+        any_plot = False
+
+        for driver, results in self.gui.session.drivers_results_iter():
+
+            if results is not None:
+
+                if isinstance(results, PowerFlowTimeSeriesResults):
+
+                    Sf_table = results.mdl(result_type=ResultTypes.HvdcPowerFrom)
+                    Sf_table.plot(ax=ax_1, selected_col_idx=[i])
+
+                    loading_table = results.mdl(result_type=ResultTypes.HvdcLoading)
+                    loading_table.convert_to_cdf()
+                    loading_table.plot(ax=ax_2, selected_col_idx=[i])
+                    any_plot = True
+
+                elif isinstance(results, OptimalPowerFlowTimeSeriesResults):
+
+                    Sf_table = results.mdl(result_type=ResultTypes.HvdcPowerFrom)
+                    Sf_table.plot(ax=ax_1, selected_col_idx=[i])
+
+                    loading_table = results.mdl(result_type=ResultTypes.HvdcLoading)
+                    loading_table.convert_to_cdf()
+                    loading_table.plot(ax=ax_2, selected_col_idx=[i])
+                    any_plot = True
 
-        # set time
-        x = self.circuit.time_profile
-        x_cl = x
-
-        if x is not None:
-            if len(x) > 0:
-
-                p = np.arange(len(x)).astype(float) / len(x)
-
-                # search available results
-                power_data = dict()
-                loading_data = dict()
-
-                for key, driver in self.results_dictionary.items():
-                    if hasattr(driver, 'results'):
-                        if driver.results is not None:
-                            if key == SimulationTypes.PowerFlowTimeSeries_run:
-                                power_data[key.value] = driver.results.hvdc_Pf[:, i]
-                                loading_data[key.value] = np.sort(np.abs(driver.results.hvdc_loading[:, i] * 100.0))
-
-                            elif key == SimulationTypes.LinearAnalysis_TS_run:
-                                power_data[key.value] = driver.results.hvdc_Pf[:, i]
-                                loading_data[key.value] = np.sort(np.abs(driver.results.hvdc_loading[:, i] * 100.0))
-
-                            elif key == SimulationTypes.OPFTimeSeries_run:
-                                power_data[key.value] = driver.results.hvdc_Pf[:, i]
-                                loading_data[key.value] = np.sort(np.abs(driver.results.hvdc_loading[:, i] * 100.0))
-
-                # add the rating
-                # power_data['Rates+'] = api_object.rate_prof
-                # power_data['Rates-'] = -api_object.rate_prof
-
-                # loading
-                if len(loading_data.keys()):
-                    df = pd.DataFrame(data=loading_data, index=p)
-                    ax_1.set_title('Probability x < value', fontsize=14)
-                    ax_1.set_ylabel('Loading [%]', fontsize=11)
-                    df.plot(ax=ax_1)
-
-                # power
-                if len(power_data.keys()):
-                    df = pd.DataFrame(data=power_data, index=x)
-                    ax_2.set_title('Power', fontsize=14)
-                    ax_2.set_ylabel('Power [MW]', fontsize=11)
-                    df.plot(ax=ax_2)
-                    ax_2.plot(x, api_object.rate_prof.toarray(), c='gray', linestyle='dashed', linewidth=1)
-                    ax_2.plot(x, -api_object.rate_prof.toarray(), c='gray', linestyle='dashed', linewidth=1)
-
-                plt.legend()
-                fig.suptitle(api_object.name, fontsize=20)
-
-                # plot the profiles
-                plt.show()
+        if any_plot:
+            plt.legend()
+            plt.show()
+        else:
+            info_msg("No time series results to plot, run some time series results. Even partial results are fine",
+                     f"{api_object.name} results plot")
 
     @staticmethod
     def set_rate_to_profile(api_object: ALL_DEV_TYPES):

{GridCal-5.1.41 → GridCal-5.1.42}/GridCal/Gui/Main/SubClasses/Model/diagrams.py

@@ -896,7 +896,8 @@ class DiagramsMain(CompiledArraysMain):
         """
         diagram = SchematicDiagram(name=name)
 
-        diagram_widget = SchematicWidget(circuit=self.circuit,
+        diagram_widget = SchematicWidget(gui=self,
+                                         circuit=self.circuit,
                                          diagram=diagram,
                                          default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                          time_index=self.get_diagram_slider_index(),
@@ -980,7 +981,8 @@ class DiagramsMain(CompiledArraysMain):
                                              text_func=None,
                                              name=name)
 
-        diagram_widget = SchematicWidget(circuit=self.circuit,
+        diagram_widget = SchematicWidget(gui=self,
+                                         circuit=self.circuit,
                                          diagram=diagram,
                                          default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                          time_index=self.get_diagram_slider_index(),
@@ -1018,7 +1020,8 @@ class DiagramsMain(CompiledArraysMain):
             if isinstance(diagram_widget, SchematicWidget):
                 diagram = diagram_widget.get_selection_diagram()
 
-                diagram_widget = SchematicWidget(self.circuit,
+                diagram_widget = SchematicWidget(gui=self,
+                                                 circuit=self.circuit,
                                                  diagram=diagram,
                                                  default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                                  time_index=self.get_diagram_slider_index(),
@@ -1097,7 +1100,8 @@ class DiagramsMain(CompiledArraysMain):
                                                             root_bus=root_bus,
                                                             max_level=dlg.value)
 
-                            diagram_widget = SchematicWidget(self.circuit,
+                            diagram_widget = SchematicWidget(gui=self,
+                                                             circuit=self.circuit,
                                                              diagram=diagram,
                                                              default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                                              time_index=self.get_diagram_slider_index(),
@@ -1121,7 +1125,8 @@ class DiagramsMain(CompiledArraysMain):
                                             prog_func=None,
                                             text_func=None)
 
-            diagram_widget = SchematicWidget(self.circuit,
+            diagram_widget = SchematicWidget(gui=self,
+                                             circuit=self.circuit,
                                              diagram=diagram,
                                              default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                              time_index=self.get_diagram_slider_index(),
@@ -1144,7 +1149,8 @@ class DiagramsMain(CompiledArraysMain):
         for diagram in self.circuit.diagrams:
 
             if isinstance(diagram, dev.SchematicDiagram):
-                diagram_widget = SchematicWidget(self.circuit,
+                diagram_widget = SchematicWidget(gui=self,
+                                                 circuit=self.circuit,
                                                  diagram=diagram,
                                                  default_bus_voltage=self.ui.defaultBusVoltageSpinBox.value(),
                                                  time_index=self.get_diagram_slider_index(),
@@ -1212,7 +1218,8 @@ class DiagramsMain(CompiledArraysMain):
         tile_source = self.tile_name_dict[self.ui.tile_provider_comboBox.currentText()]
 
         # create the map widget
-        map_widget = GridMapWidget(tile_src=tile_source,
+        map_widget = GridMapWidget(gui=self,
+                                   tile_src=tile_source,
                                    start_level=diagram.start_level,
                                    longitude=diagram.longitude,
                                    latitude=diagram.latitude,

{GridCal-5.1.41 → GridCal-5.1.42}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -111,6 +111,7 @@ class SimulationsMain(TimeEventsMain):
         self.mip_solvers_dict[MIPSolvers.CPLEX.value] = MIPSolvers.CPLEX
         self.mip_solvers_dict[MIPSolvers.GUROBI.value] = MIPSolvers.GUROBI
         self.mip_solvers_dict[MIPSolvers.XPRESS.value] = MIPSolvers.XPRESS
+        self.mip_solvers_dict[MIPSolvers.PDLP.value] = MIPSolvers.PDLP
 
         # opf solvers dictionary
         self.nodal_capacity_methods_dict = OrderedDict()

{GridCal-5.1.41 → GridCal-5.1.42}/GridCal/Session/server_driver.py

@@ -16,6 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import time
 import requests
+import asyncio
 from urllib3 import disable_warnings, exceptions
 from typing import Callable, Dict, Union, List, Any
 from PySide6.QtCore import QThread, Signal
@@ -305,9 +306,11 @@ class ServerDriver(QThread):
         if self.is_running():
             model_data = gather_model_as_jsons_for_communication(circuit=circuit, instruction=instruction)
 
-            response = send_json_data(json_data=model_data,
-                                      endpoint_url=websocket_url,
-                                      certificate=self._certificate_path)
+            response = asyncio.get_event_loop().run_until_complete(
+                send_json_data(json_data=model_data,
+                               endpoint_url=websocket_url,
+                               certificate=self._certificate_path)
+            )
 
             self.get_jobs()
 

{GridCal-5.1.41 → GridCal-5.1.42}/GridCal/Session/session.py

@@ -14,10 +14,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from uuid import uuid4
 import pandas as pd
 from PySide6.QtCore import QThread, Signal
-from typing import Dict, Union, List, Tuple, Any
+from typing import Dict, Union, List, Tuple, Any, Generator
 from collections.abc import Callable
 from warnings import warn
 
@@ -211,6 +213,17 @@ class SimulationSession:
         """
         return [drv for driver_type, drv in self.drivers.items() if drv is not None]
 
+    def drivers_results_iter(self) -> Generator[Tuple[DRIVER_OBJECTS | None, RESULTS_OBJECTS | None]]:
+        """
+        Iterator returning driver and result types
+        :return: driver, result (both can be None)
+        """
+        for driver_type, drv in self.drivers.items():
+            if hasattr(drv, 'results'):
+                yield drv, drv.results
+            else:
+                yield drv, None
+
     def exists(self, driver_type: SimulationTypes):
         """
         Get the results of the driver
@@ -546,7 +559,7 @@ class SimulationSession:
 
     @property
     def net_transfer_capacity_ts(self) -> Tuple[AvailableTransferCapacityTimeSeriesDriver,
-                                                AvailableTransferCapacityTimeSeriesResults]:
+    AvailableTransferCapacityTimeSeriesResults]:
         """
 
         :return:
@@ -555,7 +568,8 @@ class SimulationSession:
         return drv, results
 
     @property
-    def optimal_net_transfer_capacity(self) -> Tuple[OptimalNetTransferCapacityDriver, OptimalNetTransferCapacityResults]:
+    def optimal_net_transfer_capacity(self) -> Tuple[
+        OptimalNetTransferCapacityDriver, OptimalNetTransferCapacityResults]:
         """
 
         :return:
@@ -564,7 +578,8 @@ class SimulationSession:
         return drv, results
 
     @property
-    def optimal_net_transfer_capacity_ts(self) -> Tuple[OptimalNetTransferCapacityDriver, OptimalNetTransferCapacityResults]:
+    def optimal_net_transfer_capacity_ts(self) -> Tuple[
+        OptimalNetTransferCapacityDriver, OptimalNetTransferCapacityResults]:
         """
 
         :return:

{GridCal-5.1.41 → GridCal-5.1.42}/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.41"
+__GridCal_VERSION__ = "5.1.42"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCal-5.1.41 → GridCal-5.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 5.1.41
+Version: 5.1.42
 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.