mg-pso-gui 0.2.51__py3-none-any.whl → 0.2.52__py3-none-any.whl

{mg_pso_gui-0.2.51.dist-info → mg_pso_gui-0.2.52.dist-info}/METADATA

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

{mg_pso_gui-0.2.51.dist-info → mg_pso_gui-0.2.52.dist-info}/RECORD

@@ -1,15 +1,15 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=WdbmNOcQ7qD-WmuL98T4v6j5vtQpS4MNwH6EjKHVYoE,21825
-mgpsogui/gui/OptionManager.py,sha256=HLVib_lHdMijykF78bJ9_PEl-oROuC8lxd1oBS7524U,21898
+mgpsogui/gui/HomePage.py,sha256=oSlJAwpmX2vpu5TB8RlnCVP8GezNZV9LTTWN0_qXZaU,21828
+mgpsogui/gui/OptionManager.py,sha256=_TT-RSUYdRTzoBr8STx_XDdPt--31byQsL8zmxM7quA,22003
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/General/ParameterView.py,sha256=gTpsXQomHgWxdHhiMxjOk171PeefXqdpVQefH88PE_c,6384
 mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=XVaXjNoH1MBI-587CWigLIT3LGT00yzEAEnXNkzCLrk,10947
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/RunTab/RunTab.py,sha256=8FT7mdxNRQrftDuU0v4LoK1eyH8_RHwLOyM4dz8O_4A,1850
+mgpsogui/gui/RunTab/RunTab.py,sha256=ggqPDEtTEWv9Li1JHutHgIZrsFF4SVE3mgU6haK6M-U,4904
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQtrRHDdTYQ9ux1s,2870
 mgpsogui/gui/SetupTab/BoundsList.py,sha256=1pjSiIadZs2BX-EvBCCjMCTBh-g7Y9oZE6VPI-3bEP0,12383
@@ -21,7 +21,7 @@ mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp0
 mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_ozzJhyBkL08fJzI,1752
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
 mgpsogui/gui/SetupTab/OverrideParameterWindow.py,sha256=UpZDxTaFxee0BeviUYXeiIlMNYNy00qz3zlMlM5VcXE,1291
-mgpsogui/gui/SetupTab/SetupTab.py,sha256=7XUJW4r2n0-J4Mv6qk4B5yYqUaxaO5UB4ryYnOHQX4c,2800
+mgpsogui/gui/SetupTab/SetupTab.py,sha256=3V8LYvg5ulTll1hhguB_XpSoOR-w72vHh_Z3gw3nCxc,2758
 mgpsogui/gui/SetupTab/StepView.py,sha256=e3QhepeAfDJdhefsJvzyppRuMdVAFKEnbZLtrFIczU4,8936
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=Gzyl2hRgjIfO5n0bCZZoXp_vOFvfsJPaGXDUMeRQg10,3171
@@ -69,8 +69,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
 mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
-mg_pso_gui-0.2.51.dist-info/METADATA,sha256=w1u0-SQxOl1v36QEizVbG9UgYPTIR3yAFVFn_eKouGw,9455
-mg_pso_gui-0.2.51.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.2.51.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.51.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.51.dist-info/RECORD,,
+mg_pso_gui-0.2.52.dist-info/METADATA,sha256=OrpbWVuc3rHgbsL5iNI7zPAmPAlPhOQ_c3CC79rBux0,9455
+mg_pso_gui-0.2.52.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.2.52.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.52.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.52.dist-info/RECORD,,

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)

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()]

mgpsogui/gui/RunTab/RunTab.py

@@ -8,15 +8,23 @@ 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)
 
@@ -36,7 +44,65 @@ def create_tab(self, tab):
     #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=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.")
-        
+    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")

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