GridCal 5.1.26__tar.gz → 5.1.28__tar.gz

{GridCal-5.1.26 → GridCal-5.1.28}/GridCal/Gui/Main/SubClasses/io.py

@@ -837,7 +837,7 @@ class IoMain(ConfigurationMain):
         :return:
         """
 
-        available_results = self.get_available_results()
+        available_results = self.get_available_drivers()
 
         if len(available_results) > 0:
 
@@ -851,7 +851,7 @@ class IoMain(ConfigurationMain):
 
                 self.stuff_running_now.append('export_all')
                 self.export_all_thread_object = exprtdrv.ExportAllThread(circuit=self.circuit,
-                                                                         simulations_list=available_results,
+                                                                         drivers_list=available_results,
                                                                          file_name=filename)
 
                 self.export_all_thread_object.progress_signal.connect(self.ui.progressBar.setValue)

{GridCal-5.1.26 → GridCal-5.1.28}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -256,7 +256,7 @@ class SimulationsMain(TimeEventsMain):
 
         return all_threads
 
-    def get_available_results(self):
+    def get_available_drivers(self) -> List[DRIVER_OBJECTS]:
         """
         Get a list of all the available results' objects
         :return: list[object]
@@ -539,7 +539,7 @@ class SimulationsMain(TimeEventsMain):
         # clear results lists
         self.ui.results_treeView.setModel(None)
 
-        available_results = self.get_available_results()
+        available_results = self.get_available_drivers()
         max_steps = 0
         d = dict()
         lst = list()

{GridCal-5.1.26 → GridCal-5.1.28}/GridCal/Gui/ProfilesInput/profile_dialogue.py

@@ -503,6 +503,9 @@ class ProfileInputGUI(QtWidgets.QDialog):
             cols = [str(x).strip() for x in self.original_data_frame.columns.values]
             self.original_data_frame.columns = cols
 
+            # replace NaN
+            self.original_data_frame.fillna(0, inplace=True)
+
             # set the profile names list
             self.profile_names = np.array([str(e).strip() for e in self.original_data_frame.columns.values],
                                           dtype=object)

{GridCal-5.1.26 → GridCal-5.1.28}/GridCal/Gui/TowerBuilder/LineBuilderDialogue.py

@@ -136,7 +136,7 @@ class TowerBuilderGUI(QtWidgets.QDialog):
         sel_idx = idx.row()
 
         if sel_idx > -1:
-            selected_wire = self.wires_table.wires[sel_idx].copy()
+            selected_wire: Wire = self.wires_table.wires[sel_idx].copy()
             self.tower_driver.add(WireInTower(selected_wire))
         else:
             self.msg('Select a wire in the wires catalogue')

{GridCal-5.1.26 → GridCal-5.1.28}/GridCal/Gui/TowerBuilder/table_models.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.
 
-from typing import Union
+from typing import Union, List
 from PySide6 import QtCore
 from GridCalEngine.Devices.Branches.wire import Wire
 from GridCalEngine.Devices.Branches.overhead_line_type import OverheadLineType, WireInTower
@@ -32,6 +32,9 @@ Typical values of earth
 
 
 class WiresTable(QtCore.QAbstractTableModel):
+    """
+    Wires table for the tower
+    """
 
     def __init__(self, parent=None):
 
@@ -39,13 +42,13 @@ class WiresTable(QtCore.QAbstractTableModel):
 
         self.header = ['Name', 'R (Ohm/km)', 'GMR (m)', 'max current (kA)']
 
-        self.index_prop = {0: 'name', 1: 'r', 2: 'gmr', 3: 'max_current'}
+        # self.index_prop = {0: 'name', 1: 'r', 2: 'GMR', 3: 'max_current'}
 
         self.converter = {0: str, 1: float, 2: float, 3: float}
 
         self.editable = [True, True, True, True]
 
-        self.wires = list()
+        self.wires: List[Wire] = list()
 
     def add(self, wire: Wire):
         """
@@ -102,8 +105,17 @@ class WiresTable(QtCore.QAbstractTableModel):
 
         if index.isValid():
             if role == QtCore.Qt.ItemDataRole.DisplayRole:
-                val = getattr(self.wires[index.row()], self.index_prop[index.column()])
-                return str(val)
+                wire = self.wires[index.row()]
+                if index.column() == 0:
+                    return wire.name
+                elif index.column() == 1:
+                    return str(wire.R)
+                elif index.column() == 2:
+                    return str(wire.GMR)
+                elif index.column() == 3:
+                    return str(wire.max_current)
+
+                return ""
         return None
 
     def headerData(self,
@@ -122,17 +134,28 @@ class WiresTable(QtCore.QAbstractTableModel):
         :param value:
         :param role:
         """
-        if self.editable[index.column()]:
-            wire = self.wires[index.row()]
-            attr = self.index_prop[index.column()]
-
-            if attr == 'tower_name':
-                if self.is_used(value):
-                    pass
-                else:
-                    setattr(wire, attr, self.converter[index.column()](value))
-            else:
-                setattr(wire, attr, self.converter[index.column()](value))
+        # if self.editable[index.column()]:
+        #     wire = self.wires[index.row()]
+        #     # attr = self.index_prop[index.column()]
+        #
+        #     if attr == 'tower_name':
+        #         if self.is_used(value):
+        #             pass
+        #         else:
+        #             wire.
+        #             setattr(wire, attr, self.converter[index.column()](value))
+        #     else:
+        #         setattr(wire, attr, self.converter[index.column()](value))
+        #
+        #     wire = self.wires[index.row()]
+        #     if index.column() == 0:
+        #         return wire.name
+        #     elif index.column() == 1:
+        #         return str(wire.R)
+        #     elif index.column() == 2:
+        #         return str(wire.GMR)
+        #     elif index.column() == 3:
+        #         return str(wire.max_current)
 
         return True
 

{GridCal-5.1.26 → GridCal-5.1.28}/GridCal/Gui/plugins.py

@@ -64,7 +64,7 @@ class PluginFunction:
         - func(self) is then what I wanted to lambda in the first place
         """
         func = self.function_ptr
-        return lambda e, func=func: func(gui_instance)  # This is not an error, it is correct
+        return lambda e=True, func=func: func(gui_instance)  # This is not an error, it is correct
 
     def to_dict(self) -> Dict[str, str]:
         """

GridCal-5.1.28/GridCal/Session/export_results_driver.py

@@ -0,0 +1,80 @@
+# GridCal
+# Copyright (C) 2015 - 2024 Santiago Peñate Vera
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# 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 typing import List
+from PySide6.QtCore import QThread, Signal
+from GridCalEngine.IO.gridcal.results_export import export_drivers
+from GridCalEngine.Devices.multi_circuit import MultiCircuit
+from GridCalEngine.Simulations.types import DRIVER_OBJECTS
+from GridCalEngine.basic_structures import Logger
+
+
+class ExportAllThread(QThread):
+    """
+    ExportAllThread
+    """
+    progress_signal = Signal(float)
+    progress_text = Signal(str)
+    done_signal = Signal()
+
+    def __init__(self, circuit: MultiCircuit, drivers_list: List[DRIVER_OBJECTS], file_name: str):
+        """
+        Constructor
+        :param circuit: Grid circuit
+        :param drivers_list: list of GridCal simulation drivers
+        :param file_name: name of the file where to save (.zip)
+        """
+        QThread.__init__(self)
+
+        self.circuit: MultiCircuit = circuit
+
+        self.drivers_list: List[DRIVER_OBJECTS] = drivers_list
+
+        self.file_name: str = file_name
+
+        self.valid: bool = False
+
+        self.logger = Logger()
+
+        self.error_msg: str = ""
+
+        self.__cancel__ = False
+
+    def run(self) -> None:
+        """
+        run the file save procedure
+        """
+
+        # try:
+        export_drivers(drivers_list=self.drivers_list,
+                       file_name=self.file_name,
+                       text_func=self.progress_text.emit,
+                       progress_func=self.progress_signal.emit,
+                       logger=self.logger)
+
+        self.valid = True
+
+        # post events
+        self.progress_text.emit('Done!')
+
+        self.done_signal.emit()
+
+    def cancel(self):
+        """
+        Cancel progress
+        """
+        self.__cancel__ = True

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

{GridCal-5.1.26 → GridCal-5.1.28}/PKG-INFO

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

GridCal-5.1.26/GridCal/Session/export_results_driver.py

@@ -1,117 +0,0 @@
-# GridCal
-# Copyright (C) 2015 - 2024 Santiago Peñate Vera
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# 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.
-import os
-from io import StringIO
-import zipfile
-from PySide6.QtCore import QThread, Signal
-
-from GridCalEngine.basic_structures import Logger
-
-
-class ExportAllThread(QThread):
-    progress_signal = Signal(float)
-    progress_text = Signal(str)
-    done_signal = Signal()
-
-    def __init__(self, circuit, simulations_list, file_name):
-        """
-        Constructor
-        :param simulations_list: list of GridCal simulation drivers
-        :param file_name: name of the file where to save (.zip)
-        """
-        QThread.__init__(self)
-
-        self.circuit = circuit
-
-        self.simulations_list = simulations_list
-
-        self.file_name = file_name
-
-        self.valid = False
-
-        self.logger = Logger()
-
-        self.error_msg = ''
-
-        self.__cancel__ = False
-
-    def run(self):
-        """
-        run the file save procedure
-        """
-
-        # try:
-        path, fname = os.path.split(self.file_name)
-
-        self.progress_text.emit('Flushing ' + fname + ' into ' + fname + '...')
-
-        self.logger = Logger()
-
-        # names_dict = {DeviceType.BusDevice: self.circuit.get_bus_names(),
-        #               DeviceType.BranchDevice: self.circuit.get_branch_names(),
-        #               DeviceType.BusDevice.LoadDevice: self.circuit.get_load_names(),
-        #               DeviceType.BusDevice.GeneratorDevice: self.circuit.get_controlled_generator_names(),
-        #               DeviceType.BusDevice.BatteryDevice: self.circuit.get_battery_names()}
-
-        # open zip file for writing
-        try:
-            with zipfile.ZipFile(self.file_name, 'w', zipfile.ZIP_DEFLATED) as myzip:
-
-                n = len(self.simulations_list)
-
-                for k, driver in enumerate(self.simulations_list):
-
-                    self.progress_signal.emit((k + 1) / n * 100.0)
-
-                    if isinstance(driver.results.available_results, dict):
-                        available_res = [e for tpe, lst in driver.results.available_results.items() for e in lst]
-                    else:
-                        available_res = driver.results.available_results
-
-                    for available_result in available_res:
-
-                        # ge the result type definition
-                        result_name, device_type = available_result.value
-
-                        self.progress_text.emit('flushing ' + driver.results.name + ' ' + result_name)
-
-                        # save the DataFrame to the buffer
-                        mdl = driver.results.mdl(result_type=available_result)
-
-                        if mdl is not None:
-                            with StringIO() as buffer:
-                                filename = driver.results.name + ' ' + result_name + '.csv'
-                                try:
-                                    mdl.save_to_csv(buffer)
-                                    myzip.writestr(filename, buffer.getvalue())
-                                except ValueError:
-                                    self.logger.add_error('Value error', filename)
-                        else:
-                            self.logger.add_info('No results for ' + driver.results.name + ' - ' + result_name)
-
-        except PermissionError:
-            self.logger.add('Permission error.\nDo you have the file open?')
-
-        self.valid = True
-
-        # post events
-        self.progress_text.emit('Done!')
-
-        self.done_signal.emit()
-
-    def cancel(self):
-        self.__cancel__ = True