GridCal 5.2.8__tar.gz → 5.2.9__tar.gz

{gridcal-5.2.8 → gridcal-5.2.9}/GridCal/Gui/Main/GridCalMain.py

@@ -148,7 +148,7 @@ def runGridCal() -> None:
     h_ = 780
     window_.resize(int(1.7 * h_), h_)  # almost the golden ratio :)
     window_.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec())
 
 
 if __name__ == "__main__":

{gridcal-5.2.8 → gridcal-5.2.9}/GridCal/Gui/Main/SubClasses/Settings/configuration.py

@@ -12,7 +12,7 @@ from GridCalEngine.IO.file_system import get_create_gridcal_folder
 from GridCal.Gui.Main.SubClasses.Results.results import ResultsMain
 from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
 from GridCal.Gui.Diagrams.generic_graphics import set_dark_mode, set_light_mode
-from GridCal.plugins import PluginsInfo
+from GridCal.plugins import PluginsInfo, PluginFunction
 import GridCal.Gui.gui_functions as gf
 from GridCal.Gui.gui_functions import add_menu_entry
 
@@ -436,7 +436,6 @@ class ConfigurationMain(ResultsMain):
 
             # maybe add the main function
             if plugin_info.main_fcn.function_ptr is not None:
-
                 """
                 Really hard core magic to avoid lambdas shadow each other due to late binding
                 
@@ -456,7 +455,8 @@ class ConfigurationMain(ResultsMain):
                     text=plugin_info.name,
                     icon_path=":/Icons/icons/plugin.svg",
                     icon_pixmap=plugin_info.icon,
-                    function_ptr=plugin_info.main_fcn.get_pointer_lambda(gui_instance=self)
+                    # function_ptr=plugin_info.main_fcn.get_pointer_lambda(gui_instance=self)
+                    function_ptr=lambda: self.launch_plugin(plugin_info.main_fcn)
                 )
 
             # maybe add the investments function
@@ -468,3 +468,15 @@ class ConfigurationMain(ResultsMain):
         # create combobox model for the plugin investments
         lst = list(self.plugins_investment_evaluation_method_dict.keys())
         self.ui.plugins_investment_evaluation_method_ComboBox.setModel(gf.get_list_model(lst))
+
+    def launch_plugin(self, fcn: PluginFunction):
+        """
+
+        :param fcn:
+        :return:
+        """
+        ret = fcn.get_pointer_lambda(gui_instance=self)()
+
+        if fcn.call_gui and ret is not None:
+            ret.show()
+

{gridcal-5.2.8 → gridcal-5.2.9}/GridCal/__version__.py

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

{gridcal-5.2.8 → gridcal-5.2.9}/GridCal/plugins.py

@@ -5,6 +5,7 @@
 from __future__ import annotations
 
 import os
+import sys
 import importlib
 import importlib.util
 import hashlib
@@ -27,6 +28,7 @@ class PluginFunction:
 
         self.name = ""
         self.alias = ""
+        self.call_gui = False
         self.function_ptr = None
 
     def get_pointer_lambda(self, gui_instance: ConfigurationMain) -> Callable:
@@ -42,7 +44,7 @@ class PluginFunction:
             during the iteration and not after the loop since lambdas in a loop are lazy evaluated
         - func(self) is then what I wanted to lambda in the first place
         """
-        return lambda e=True, func=self.function_ptr: func(gui_instance)  # This is not an error, it is correct
+        return lambda e=True, func=self.function_ptr: func(gui_instance)
 
     def to_dict(self) -> Dict[str, str]:
         """
@@ -52,6 +54,7 @@ class PluginFunction:
         return {
             "name": self.name,
             "alias": self.alias,
+            "call_gui": self.call_gui,
         }
 
     def parse(self, data: Dict[str, str]) -> None:
@@ -61,6 +64,7 @@ class PluginFunction:
         """
         self.name = data.get('name', '').strip()
         self.alias = data.get('alias', '').strip()
+        self.call_gui = data.get('call_gui', False)
 
     def read_plugin(self, plugin_path: str) -> None:
         """
@@ -185,6 +189,9 @@ class PluginsInfo:
         """
 
         """
+        # add the plugins directory to the pythonpath
+        sys.path.insert(0, plugins_path())
+
         self.plugins: Dict[str, PluginInfo] = dict()
         self.read()
 

{gridcal-5.2.8 → gridcal-5.2.9}/PKG-INFO

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