mg-pso-gui 0.1.92__tar.gz → 0.1.94__tar.gz

{mg-pso-gui-0.1.92 → mg-pso-gui-0.1.94}/PKG-INFO

@@ -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 → mg-pso-gui-0.1.94}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg-pso-gui-0.1.94}/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

{mg-pso-gui-0.1.92 → mg-pso-gui-0.1.94}/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

{mg-pso-gui-0.1.92 → mg-pso-gui-0.1.94}/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(

{mg-pso-gui-0.1.92 → mg-pso-gui-0.1.94}/setup.py

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