mg-pso-gui 0.2.50__tar.gz → 0.2.52__tar.gz

{mg_pso_gui-0.2.50 → mg_pso_gui-0.2.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.2.50
+Version: 0.2.52
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.2.50 → mg_pso_gui-0.2.52}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.2.50
+Version: 0.2.52
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.2.50 → mg_pso_gui-0.2.52}/mgpsogui/gui/HomePage.py

@@ -161,7 +161,7 @@ class App(customtkinter.CTk):
 		self.tabview.grid(row=1, column=0, padx=(0, 0), pady=(10, 10), sticky="nsew")
 		tab1 = "Platform"
 		tab2 = "Setup"
-		tab3 = "Logs"
+		tab3 = "Project"
 		tab4 = "Results"
 		
 		self.tabview.add(tab1)

{mg_pso_gui-0.2.50 → mg_pso_gui-0.2.52}/mgpsogui/gui/OptionManager.py

@@ -371,6 +371,9 @@ class OptionManager():
         path = filename.replace(file_name + ".json", "")
         self._project_data["path"] = path
         self._project_data["name"] = file_name
+
+    def copy_list(self, source_mode):
+        self._data[self._mode_sv.get()] = self._data[source_mode]
             
     def get_data(self):
         return self._data[self._mode_sv.get()]

mg_pso_gui-0.2.52/mgpsogui/gui/RunTab/RunTab.py

@@ -0,0 +1,108 @@
+
+import customtkinter
+import json
+import os
+from multiprocessing import Process
+import traceback
+import re
+import ast
+import pandas as pd
+import numpy as np
+import os
+import platform
+import subprocess
+
+from ...util import PSORunner
+from ...util import GraphGenerator
+from ...util.CTkToolTip import CTkToolTip as ctt
+import customtkinter
+
+from . import OptimalParameterView as opv
+
+def create_tab(self, tab):
+    
+    # URL
+    tab.grid_columnconfigure(0, weight=1)
+    tab.grid_columnconfigure(1, weight=5)
+    tab.grid_columnconfigure(2, weight=5)
+    tab.grid_rowconfigure(0, weight=1)
+    tab.grid_rowconfigure(1, weight=200)
+
+    #self.progress_container = customtkinter.CTkFrame(tab)
+    #self.progress_container.grid_columnconfigure(0, weight=1)
+    #self.progress_container.grid_columnconfigure(1, weight=1)
+    #self.progress_container.grid_columnconfigure(2, weight=1)
+    #self.progress_container.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+    
+    # Add progress bar to progress container
+    #self.progress_message_left = customtkinter.CTkLabel(self.progress_container, text="")
+    #self.progress_message_left.grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="w")
+    
+    #self.progress_message_middle = customtkinter.CTkLabel(self.progress_container, text="Calibration not running...")
+    #self.progress_message_middle.grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="ew")
+    
+    #self.progress_message_right = customtkinter.CTkLabel(self.progress_container, text="")
+    #self.progress_message_right.grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="e")
+    
+    self.optimal_param_frame = opv.OptimalParameterView(tab, option_manager=self.option_manager)
+    self.optimal_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    self.optimal_param_frame.grid_columnconfigure(0, weight=1)
+    self.optimal_param_frame.grid_rowconfigure(0, weight=1)
+
+    self.textbox = customtkinter.CTkTextbox(tab)
+    self.textbox.grid(row=0, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
+    self.textbox.insert("0.0", "Welcome to the CSIP PSO Calibration Tool!\n\nUse the Setup tab to define steps and calibration parameters. Use this tab to view logs and manage your Project. Once finished, use the Results tab to generate figures and graphs.")
+        
+    self.project_editor = customtkinter.CTkScrollableFrame(tab, label_text="Project Editor")
+    self.project_editor.grid(row=0, column=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
+    self.project_editor.grid_columnconfigure(0, weight=1)
+    self.project_editor.grid_rowconfigure(0, weight=1)
+
+    customtkinter.CTkLabel(self.project_editor, text="Copy Data to Current Mode:").grid(row=0, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    def copy_sense():
+        self.option_manager.copy_list("Sensitivity Analysis")
+        self.refresh_step_view(0)
+
+    def copy_halton():
+        self.option_manager.copy_list("Sampling: Halton")
+        self.refresh_step_view(0)
+    
+    def copy_random():
+        self.option_manager.copy_list("Sampling: Random")
+        self.refresh_step_view(0)
+
+    def copy_optim():
+        self.option_manager.copy_list("Optimization")
+        self.refresh_step_view(0)
+
+    def open_project_folder():
+        # Open the file in the default program
+        folder = self.option_manager.get_project_folder()
+        
+        if not os.path.exists(folder):
+            os.makedirs(folder)
+        
+        if platform.system() == "Windows":
+            os.startfile(folder)
+        elif platform.system() == "Darwin":
+            subprocess.Popen(["open", folder])
+        else:
+            subprocess.Popen(["xdg-open", folder])
+
+    self.analysis_copy = customtkinter.CTkButton(self.project_editor, text="From Sensitivity Analysis", command=copy_sense)
+    self.analysis_copy.grid(row=1, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    self.halton_copy = customtkinter.CTkButton(self.project_editor, text="From Sampling: Halton", command=copy_halton)
+    self.halton_copy.grid(row=2, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    self.random_copy = customtkinter.CTkButton(self.project_editor, text="From Sampling: Random", command=copy_random)
+    self.random_copy.grid(row=3, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    self.optimization_copy = customtkinter.CTkButton(self.project_editor, text="From Optimization", command=copy_optim)
+    self.optimization_copy.grid(row=4, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    customtkinter.CTkLabel(self.project_editor, text="Project Management:").grid(row=5, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")
+
+    self.open_folder = customtkinter.CTkButton(self.project_editor, text="Open Project Folder", command=open_project_folder)
+    self.open_folder.grid(row=4, column=0, padx=(20, 20), pady=(5, 10), sticky="ew")

{mg_pso_gui-0.2.50 → mg_pso_gui-0.2.52}/mgpsogui/gui/SetupTab/SetupTab.py

@@ -1,7 +1,6 @@
 
 
 from . import StepView as sv
-from . import OptimalParameterView as opv
 from ..General import ParameterView as pv
 
 import customtkinter
@@ -24,7 +23,7 @@ def create_tab(self, tab):
     tab.grid_rowconfigure(0, weight=1)
     
     self.paramtabview = customtkinter.CTkTabview(tab, bg_color="transparent", fg_color="transparent")
-    self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(10, 0), sticky="nsew")
+    self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(0, 0), sticky="nsew")
     
     tab1 = "Model Parameters"
     tab2 = "Hyperparameters"
@@ -43,12 +42,12 @@ def create_tab(self, tab):
     #self.paramtabview.tab(tab3).grid_rowconfigure(0, weight=1)
     
     self.static_param_frame = pv.ParameterView(self.paramtabview.tab(tab1), option_manager=self.option_manager, list_name="model_parameters")
-    self.static_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    self.static_param_frame.grid(row=0, column=0, padx=(5, 10), pady=(10, 0), sticky="nsew")
     self.static_param_frame.grid_columnconfigure(0, weight=1)
     self.static_param_frame.grid_rowconfigure(0, weight=1)
     
     self.calib_param_frame = pv.ParameterView(self.paramtabview.tab(tab2), option_manager=self.option_manager, list_name="hyperparameters")
-    self.calib_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    self.calib_param_frame.grid(row=0, column=0, padx=(5, 10), pady=(10, 0), sticky="nsew")
     self.calib_param_frame.grid_columnconfigure(0, weight=1)
     self.calib_param_frame.grid_rowconfigure(0, weight=1)
     
@@ -58,7 +57,7 @@ def create_tab(self, tab):
     #self.optimal_param_frame.grid_rowconfigure(0, weight=1)
     
     self.steps_frame = sv.StepView(tab, label_text="Group Editor", option_manager=self.option_manager, home_page=self)
-    self.steps_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    self.steps_frame.grid(row=0, column=0, padx=(10, 5), pady=(10, 0), sticky="nsew")
     self.steps_frame.grid_columnconfigure(0, weight=1)
     self.steps_frame.grid_rowconfigure(0, weight=1)
     

{mg_pso_gui-0.2.50 → mg_pso_gui-0.2.52}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.2.50'
+VERSION = '0.2.52'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()
 

mg_pso_gui-0.2.50/mgpsogui/gui/RunTab/RunTab.py

@@ -1,42 +0,0 @@
-
-import customtkinter
-import json
-import os
-from multiprocessing import Process
-import traceback
-import re
-import ast
-import pandas as pd
-import numpy as np
-
-from ...util import PSORunner
-from ...util import GraphGenerator
-from ...util.CTkToolTip import CTkToolTip as ctt
-
-def create_tab(self, tab):
-    
-    # URL
-    tab.grid_columnconfigure(0, weight=1)
-    tab.grid_rowconfigure(0, weight=1)
-    tab.grid_rowconfigure(1, weight=200)
-
-    #self.progress_container = customtkinter.CTkFrame(tab)
-    #self.progress_container.grid_columnconfigure(0, weight=1)
-    #self.progress_container.grid_columnconfigure(1, weight=1)
-    #self.progress_container.grid_columnconfigure(2, weight=1)
-    #self.progress_container.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-    
-    # Add progress bar to progress container
-    #self.progress_message_left = customtkinter.CTkLabel(self.progress_container, text="")
-    #self.progress_message_left.grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="w")
-    
-    #self.progress_message_middle = customtkinter.CTkLabel(self.progress_container, text="Calibration not running...")
-    #self.progress_message_middle.grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="ew")
-    
-    #self.progress_message_right = customtkinter.CTkLabel(self.progress_container, text="")
-    #self.progress_message_right.grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="e")
-    
-    self.textbox = customtkinter.CTkTextbox(tab)
-    self.textbox.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-    self.textbox.insert("0.0", "Welcome to the CSIP PSO Calibration Tool!\n\nUse the Setup tab to define steps and calibration parameters. Use this tab to view logs and observe calibration progress. Once finished, use the Results tab to generate figures and graphs.")
-