mg-pso-gui 0.1.150__tar.gz → 0.1.152__tar.gz

{mg-pso-gui-0.1.150 → mg-pso-gui-0.1.152}/PKG-INFO

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

{mg-pso-gui-0.1.150 → mg-pso-gui-0.1.152}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.150 → mg-pso-gui-0.1.152}/mgpsogui/gui/HomePage.py

@@ -13,6 +13,7 @@ import requests
 import tkinter as tk
 import tkinter.messagebox
 import customtkinter
+from customtkinter import ThemeManager
 import json
 import os
 from PIL import Image, ImageTk
@@ -100,7 +101,7 @@ class App(customtkinter.CTk):
 		self.testing = False
 
 		# configure window
-		self.title("CSIP PSO")
+		self.title("COSU Manager")
 		self.geometry(f"{1920}x{1080}")
 
 		# configure grid layout (4x4)
@@ -230,14 +231,14 @@ class App(customtkinter.CTk):
 
 		if mode == "Optimization: MG-PSO":
 			self.test_button.configure(state="normal")
-			self.test_button.configure(fg_color="default")
+			self.test_button.configure(fg_color=get_color("CTkButton"))
 			self.download_button.configure(state="normal")
-			self.download_button.configure(fg_color="default")
+			self.download_button.configure(fg_color=get_color("CTkButton"))
 		else:
 			self.test_button.configure(state="disabled")
-			self.test_button.configure(fg_color="gray")
+			self.test_button.configure(fg_color="red")
 			self.download_button.configure(state="disabled")
-			self.download_button.configure(fg_color="gray")
+			self.download_button.configure(fg_color="red")
 
 		self.steps_frame.clear()
 		self.steps_frame.render()
@@ -334,24 +335,22 @@ class App(customtkinter.CTk):
 			self.service_description.insert(text=str(response_json["metainfo"]["description"]), index='0.0')
 			self.service_details.delete('0.0', tk.END)
 			self.service_details.insert(text=json.dumps(response_json, indent=4), index='0.0')
-			
-			self.refresh_step_view(0)
 
 			self.refresh_button.configure(fg_color="green")
 		except Exception as e:
 			self.refresh_button.configure(fg_color="red")
-			self.after(1000, lambda: self.refresh_button.configure(fg_color=self.default_button_color))
+			self.after(1000, lambda: self.refresh_button.configure(fg_color=get_color("CTkButton")))
+
+		self.refresh_step_view(0)
 		
 	
 	def load(self):
 		# Make HTTP request to service_url and save the result to bounds.json
 		
-		self.default_button_color = self.refresh_button.cget("fg_color")
-		
 		self.refresh_button.configure(fg_color="gray")
 		
 		self.after(10, self.make_request)
-		self.after(3000, lambda: self.refresh_button.configure(fg_color=self.default_button_color))
+		self.after(3000, lambda: self.refresh_button.configure(fg_color=get_color("CTkButton")))
 		
 	def run_test(self):
 		self.testing = True
@@ -603,6 +602,9 @@ class App(customtkinter.CTk):
 				# Delete the file
 				os.remove(os.path.join(folder, 'crash.txt'))
 
+def get_color(class_name, property = "fg_color"):
+    return ThemeManager.theme[class_name][property]
+
 def start():
 	app = App()
 	app.mainloop()

{mg-pso-gui-0.1.150 → mg-pso-gui-0.1.152}/mgpsogui/gui/SetupTab/OptimalParameterView.py

@@ -45,5 +45,5 @@ class OptimalParameterView(CTkScrollableFrame):
                 bb.configure(textvariable=param['optimal_value'])
                 row += 1
                 
-            if self.mode == "Sampling: Halton":
+            if self.mode == "Sampling: Halton" or self.mode == "Sampling: Random":
                 break

{mg-pso-gui-0.1.150 → mg-pso-gui-0.1.152}/mgpsogui/gui/SetupTab/StepView.py

@@ -84,8 +84,6 @@ class StepView(CTkScrollableFrame):
             down_func = lambda index=index: (self.clear(), self.option_manager.move_step_down(index), self.render())
             remove_func = lambda index=index: (self.clear(), self.option_manager.remove_step(index), self.render())
             
-            #CTkLabel(self.containerFrame, text="Step:").grid(row=row, column=0, padx=10, pady=5, sticky="nsew")
-            
             if (self.mode == "Optimization: MG-PSO"):
                 button_container = CTkFrame(self.containerFrame, width=200)
                 button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
@@ -102,7 +100,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or self.mode == "Sampling: Halton":
+            if step['open'] or (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random"):
                 bounds = BoundsList.BoundsList(
                     self.containerFrame, option_manager=self.option_manager, step_index=index)
                 bounds.grid(row=row, column=0, padx=(10, 10),

{mg-pso-gui-0.1.150 → mg-pso-gui-0.1.152}/setup.py

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