mg-pso-gui 0.1.92__py3-none-any.whl → 0.1.94__py3-none-any.whl

{mg_pso_gui-0.1.92.dist-info → mg_pso_gui-0.1.94.dist-info}/METADATA

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

{mg_pso_gui-0.1.92.dist-info → mg_pso_gui-0.1.94.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=zsYG9qwK82gJ-XnEkK0PFR7md9bU2a306JN1D4Ukskw,24173
+mgpsogui/gui/HomePage.py,sha256=SRkYmHwsdmHNomi_lGhBxc1aE3Yr17xr9sdxlAKbiEQ,24244
 mgpsogui/gui/OptionManager.py,sha256=H5ofd7PA5f6dVfSghUhKdPiqLHNE0IVpPPzf93k7JD4,12527
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -13,10 +13,10 @@ mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=tUqW43VWpxFpdo9UHaPvFQ0CtCo9mFI3mri52ikntrE,4092
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
-mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=ItWY0UFQHZ4EGzRXeoyyn4Q_P2GLGy_Ux0THx0ZJSPE,1784
+mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=Z6XuGEVQYa2GlpDe_nxqcXjGoqSaaNkTGKYHzfnsyRg,2003
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=bqb_kgDaTi0oEOjPNBCbdyHaGvCvMRG6LAZ5DXq89vU,2443
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=Ao9NrIjFR2caB3vvhMH9CDEsnmTsZVPoMkGN3mNIRt0,5892
+mgpsogui/gui/SetupTab/StepView.py,sha256=Okmmwpvyu6eu3LO0up8qyUuH8wuQK43kudv1TNNsj8E,5937
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=TpTY4iFG5TzPMIjxfxREgAxLHvxma3Ihtq_EavWhZq8,13322
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=y3ZjLR78yXjHTcHMpB637ipBKxb1CCEM3qzG8OUJvpQ,3477
@@ -46,8 +46,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.1.92.dist-info/METADATA,sha256=IIufQvz_hNdIZO9S9wHWCFUS-MIYIfETXCGrqgHx2KM,9458
-mg_pso_gui-0.1.92.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.92.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.92.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.92.dist-info/RECORD,,
+mg_pso_gui-0.1.94.dist-info/METADATA,sha256=iQ1ZHGHG3RUinmd5_EQFJR-djYhankoWicUUm1v0k9s,9458
+mg_pso_gui-0.1.94.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.94.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.94.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.94.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -277,6 +277,8 @@ class App(customtkinter.CTk):
 	def refresh_step_view(self, value):
 		self.steps_frame.clear()
 		self.steps_frame.render()
+		self.optimal_param_frame.clear()
+		self.optimal_param_frame.render()
  
 	def open_new_window(self):
 		# Shell out and run ./main.py

mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -27,6 +27,8 @@ class OptimalParameterView(CTkScrollableFrame):
         self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
+        self.mode = self.option_manager.get_arguments()['mode'].get()
+        
         #CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
         #CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
         #row += 1
@@ -34,9 +36,11 @@ class OptimalParameterView(CTkScrollableFrame):
         self.steps = self.option_manager.get_steps()
 
         for step in self.steps:
-            name = step['name'].get()
-            CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
-            row += 1
+            
+            if self.mode != "Halton":
+                name = step['name'].get()
+                CTkLabel(self.containerFrame, text=name).grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+                row += 1
             
             for param in step['param']:
                 CTkEntry(self.containerFrame, textvariable=param['name']).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
@@ -44,4 +48,7 @@ class OptimalParameterView(CTkScrollableFrame):
                 bb = CTkEntry(self.containerFrame)
                 bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
                 bb.configure(textvariable=param['optimal_value'])
-                row += 1
+                row += 1
+                
+            if self.mode == "Halton":
+                break

mgpsogui/gui/SetupTab/StepView.py

@@ -86,20 +86,21 @@ class StepView(CTkScrollableFrame):
             
             #CTkLabel(self.containerFrame, text="Step:").grid(row=row, column=0, padx=10, pady=5, sticky="nsew")
             
-            button_container = CTkFrame(self.containerFrame, width=200)
-            button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
-            button_container.grid_rowconfigure(0, weight=1)
-            button_container.grid_columnconfigure(0, weight=1)
-            
-            CTkEntry(self.containerFrame, textvariable=step['name'], width=500).grid(row=row, column=0, padx=(20, 20), pady=(20, 20), sticky="nsw")
-            #CTkLabel(self.containerFrame, textvariable=step['message']).grid(row=row, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
             if (self.mode == "PSO"):
+                button_container = CTkFrame(self.containerFrame, width=200)
+                button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
+                button_container.grid_rowconfigure(0, weight=1)
+                button_container.grid_columnconfigure(0, weight=1)
+                
+                CTkEntry(self.containerFrame, textvariable=step['name'], width=500).grid(row=row, column=0, padx=(20, 20), pady=(20, 20), sticky="nsw")
+                #CTkLabel(self.containerFrame, textvariable=step['message']).grid(row=row, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            
                 CTkButton(button_container, width=30, text=None, image=expand_image if not step['open'] else collapse_image, command=expand_func).grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew")
                 CTkButton(button_container, width=30, text=None, image=up_image, state="disabled" if index==0 else "normal", fg_color="gray" if index==0 else None, command=up_func).grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
                 CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
                 CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
 
-            row += 1
+                row += 1
 
             if step['open'] or self.mode == "Halton":
                 bounds = BoundsList.BoundsList(