GridCal 4.7.3__tar.gz → 4.7.4__tar.gz

{GridCal-4.7.3 → GridCal-4.7.4}/GridCal/Engine/Core/multi_circuit.py

@@ -329,6 +329,14 @@ class MultiCircuit:
             m += len(branch_list)
         return m
 
+    def get_branch_names(self):
+
+        names = list()
+        for lst in self.get_branch_lists():
+            for elm in lst:
+                names.append(elm.name)
+        return names
+
     def get_branch_number_wo_hvdc(self):
         """
         return the number of branches (of all types)

{GridCal-4.7.3 → GridCal-4.7.4}/GridCal/Gui/Main/GridCalMain.py

@@ -5190,11 +5190,11 @@ class MainGUI(QMainWindow):
             drv, results = self.session.get_driver_results(sim.SimulationTypes.ShortCircuit_run)
 
             return plot_function(circuit=self.circuit,
-                                 Sbus=results.Sbus,
-                                 Sf=results.Sf,
-                                 voltages=results.voltage,
+                                 Sbus=results.Sbus1,
+                                 Sf=results.Sf1,
+                                 voltages=results.voltage1,
                                  types=results.bus_types,
-                                 loadings=results.loading,
+                                 loadings=results.loading1,
                                  use_flow_based_width=use_flow_based_width,
                                  min_branch_width=min_branch_width,
                                  max_branch_width=max_branch_width,

{GridCal-4.7.3 → GridCal-4.7.4}/GridCal/Gui/Session/export_results_driver.py

@@ -63,11 +63,11 @@ class ExportAllThread(QThread):
 
         self.logger = Logger()
 
-        names_dict = {DeviceType.BusDevice: self.circuit.names,
-                      DeviceType.BranchDevice: self.circuit.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()}
+        # 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:
@@ -79,7 +79,12 @@ class ExportAllThread(QThread):
 
                     self.progress_signal.emit((k + 1) / n * 100.0)
 
-                    for available_result in driver.results.available_results:
+                    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

{GridCal-4.7.3 → GridCal-4.7.4}/GridCal/__version__.py

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

{GridCal-4.7.3 → GridCal-4.7.4}/GridCal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 4.7.3
+Version: 4.7.4
 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.
@@ -15,3 +15,20 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Provides-Extra: gch5 files
+
+# GridCal
+
+This software aims to be a complete platform for power systems research and simulation.
+
+[Watch the video https](https://youtu.be/SY66WgLGo54)
+
+[Check out the documentation](https://gridcal.readthedocs.io)
+
+
+## Installation
+
+pip install GridCal
+
+For more options (including a standalone setup one), follow the
+[installation instructions]( https://gridcal.readthedocs.io/en/latest/getting_started/install.html)
+from the project's [documentation](https://gridcal.readthedocs.io)

{GridCal-4.7.3 → GridCal-4.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 4.7.3
+Version: 4.7.4
 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.
@@ -15,3 +15,20 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Provides-Extra: gch5 files
+
+# GridCal
+
+This software aims to be a complete platform for power systems research and simulation.
+
+[Watch the video https](https://youtu.be/SY66WgLGo54)
+
+[Check out the documentation](https://gridcal.readthedocs.io)
+
+
+## Installation
+
+pip install GridCal
+
+For more options (including a standalone setup one), follow the
+[installation instructions]( https://gridcal.readthedocs.io/en/latest/getting_started/install.html)
+from the project's [documentation](https://gridcal.readthedocs.io)

{GridCal-4.7.3 → GridCal-4.7.4}/setup.py

@@ -147,7 +147,7 @@ setup(
     #
     # This field corresponds to the "Description" metadata field:
     # https://packaging.python.org/specifications/core-metadata/#description-optional
-    # long_description=long_description,  # Optional
+    long_description=long_description,  # Optional
 
     # Denotes that our long_description is in Markdown; valid values are
     # text/plain, text/x-rst, and text/markdown