Преглед изворни кода

feat(gui): Optimize gui menu request

runhey пре 3 година
родитељ
комит
4e19b403c0
2 измењених фајлова са 9 додато и 11 уклоњено
  1. 7 10
      module/gui/context/process_manager.py
  2. 2 1
      module/gui/qml/Page/ScriptView.qml

+ 7 - 10
module/gui/context/process_manager.py

@@ -10,10 +10,12 @@ import numpy as np
 import io
 
 from typing import Union, Any
-from PySide6.QtCore import QObject, Slot, Signal, QByteArray, QBuffer
+from cached_property import cached_property
+from PySide6.QtCore import QObject, Slot, Signal, Property
 from PySide6.QtGui import QImage
 
 from module.gui.process.script_process import ScriptProcess
+from module.config.config_menu import ConfigMenu
 from module.gui.context.add import Add
 from module.logger import logger
 
@@ -144,20 +146,15 @@ class ProcessManager(QObject):
             logger.info(f'script {config} is not running')
             return None
 
-    @Slot(str, result="QString")
-    def gui_menu(self, config: str) -> str:
+    @Slot(result="QString")
+    def gui_menu(self) -> str:
         """
         get_gui_menu
         :param config:
         :return:
         """
-        if config in self.clients:
-            logger.info(f'gui get menu of {config}')
-            return self.clients[config].gui_menu()
-        else:
-            logger.info(self.clients)
-            logger.info(f'script {config} is not running')
-            return None
+        menu = ConfigMenu()
+        return menu.gui_menu
 
     @Slot(str, str, result="QString")
     def gui_args(self, config: str, task: str) -> str:

+ 2 - 1
module/gui/qml/Page/ScriptView.qml

@@ -74,7 +74,8 @@ SplitPanel{
             console.info('configname is emtry')
             return
         }
-        const data = JSON.parse(process_manager.gui_menu(configName))
+        console.debug(process_manager.gui_menu)
+        const data = JSON.parse(process_manager.gui_menu())
         create(data)
     }