mg-pso-gui 0.1.144__tar.gz → 0.1.146__tar.gz

{mg-pso-gui-0.1.144 → mg-pso-gui-0.1.146}/PKG-INFO

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

{mg-pso-gui-0.1.144 → mg-pso-gui-0.1.146}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.144 → mg-pso-gui-0.1.146}/mgpsogui/gui/HomePage.py

@@ -176,7 +176,7 @@ class App(customtkinter.CTk):
 
 		play_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "play.png")), size=(20, 20))
 		self.run_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=play_image, command=self.run)
-		ctt(self.run_button, delay=0.1, alpha=0.95, message="Start Calibration")
+		ctt(self.run_button, delay=0.1, alpha=0.95, message="Start Job")
 		self.run_button.grid(row=0, column=7, padx=(20, 5), pady=header_padding_y)
 
 		test_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
@@ -226,6 +226,19 @@ class App(customtkinter.CTk):
 			self.after(3000, lambda: self.save_button.configure(text="Save"))
 	
 	def refresh_step_view(self, value):
+		mode = self.option_manager.get_arguments()['mode'].get()
+
+		if mode == "Optimization: MG-PSO":
+			self.test_button.configure(state="normal")
+			self.test_button.configure(fg_color=None)
+			self.download_button.configure(state="normal")
+			self.download_button.configure(fg_color=None)
+		else:
+			self.test_button.configure(state="disabled")
+			self.test_button.configure(fg_color="gray")
+			self.download_button.configure(state="disabled")
+			self.download_button.configure(fg_color="gray")
+
 		self.steps_frame.clear()
 		self.steps_frame.render()
 		self.optimal_param_frame.clear()
@@ -366,11 +379,11 @@ class App(customtkinter.CTk):
 		self.data_x = [0]
 		self.data_y = [0]
 		
-		self.progress_message_middle.configure(text="Calibration starting...")
+		self.progress_message_middle.configure(text="Job starting...")
 		self.footer_progress_label.configure(text="Starting...")
 		
-		self.textbox.insert("0.0", "Starting calibration...\n\n")
-		self.textbox.insert("0.0", "Calibration Parameters:\n")
+		self.textbox.insert("0.0", "Starting job...\n\n")
+		self.textbox.insert("0.0", "Job Parameters:\n")
 		self.textbox.insert("0.0", json.dumps(metrics, indent=4) + "\n\n")
 		try:
 			info = self.option_manager.get_project_data()
@@ -397,9 +410,9 @@ class App(customtkinter.CTk):
 			self.textbox.insert("0.0", "Stack trace:\n")
 			self.textbox.insert("0.0", traceback.format_exc())
 			self.textbox.insert("0.0", "\n\n")
-			self.textbox.insert("0.0", "Calibration failed!")
+			self.textbox.insert("0.0", "Job failed!")
 			self.progress_message_left.configure(text="")
-			self.progress_message_middle.configure(text="Calibration failed! See error log below.")
+			self.progress_message_middle.configure(text="Job failed! See error log below.")
 			self.progress_message_right.configure(text="")
 			self.footer_progress_label.configure(text="Failed")
 			#self.progress_bar.stop()
@@ -426,7 +439,7 @@ class App(customtkinter.CTk):
 		if (os.path.exists(os.path.join(folder, 'error.txt'))):
 			os.remove(os.path.join(folder, 'error.txt'))
 			
-		self.textbox.insert("0.0", "\nCalibration terminated!\n")
+		self.textbox.insert("0.0", "\Job terminated!\n")
 		#self.progress_bar.stop()
 		self.footer_progress_bar.stop()
 		#self.progress_bar.configure(mode="determinate")
@@ -434,7 +447,7 @@ class App(customtkinter.CTk):
 		#self.progress_bar.set(0)
 		self.footer_progress_bar.set(0)
 		self.progress_message_left.configure(text="")
-		self.progress_message_middle.configure(text="Calibration stopped!")
+		self.progress_message_middle.configure(text="Job stopped!")
 		self.footer_progress_label.configure(text="Stopped")
 		self.progress_message_right.configure(text="")
 		
@@ -560,7 +573,7 @@ class App(customtkinter.CTk):
 				self.footer_progress_bar.stop()
 				self.footer_progress_bar.configure(mode="determinate")
 				self.footer_progress_bar.set(data["percent"]/100)
-				self.footer_progress_label.configure(text="Percent: " + str(data["percent"]))
+				self.footer_progress_label.configure(text=str(round(data["percent"])) + "%")
 				
 				
 				
@@ -574,9 +587,9 @@ class App(customtkinter.CTk):
 			#self.progress_bar.start()
 			self.footer_progress_bar.start()
 			self.progress_message_left.configure(text="")
-			self.progress_message_middle.configure(text="Calibration finished!")
+			self.progress_message_middle.configure(text="Job finished!")
 			self.progress_message_right.configure(text="")
-			self.textbox.insert("0.0", "\nCalibration finished!\n")
+			self.textbox.insert("0.0", "\nJob finished!\n")
 
 			# IF "./crash.txt" exists write it to the textbox
 			if (os.path.exists(os.path.join(folder, 'crash.txt'))):

{mg-pso-gui-0.1.144 → mg-pso-gui-0.1.146}/mgpsogui/util/helpers.py

@@ -30,8 +30,6 @@ def parse_sampling_output(file_path):
     # Remove any lines that don't contain "% Done "
     lines = [line for line in lines if '% Done ' in line]
 
-    print(lines)
-
     percents = []
     percent = 0
     for line in lines:

{mg-pso-gui-0.1.144 → mg-pso-gui-0.1.146}/setup.py

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