mg-pso-gui 0.1.14__tar.gz → 0.1.16__tar.gz

{mg-pso-gui-0.1.14 → mg-pso-gui-0.1.16}/PKG-INFO

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

{mg-pso-gui-0.1.14 → mg-pso-gui-0.1.16}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.14 → mg-pso-gui-0.1.16}/mg_pso_gui.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ mgpsogui/gui/images/play.png
 mgpsogui/gui/images/refresh.png
 mgpsogui/gui/images/refresh_hd.png
 mgpsogui/gui/images/stop.png
+mgpsogui/gui/images/test.png
 mgpsogui/gui/images/trash.png
 mgpsogui/gui/images/up.png
 mgpsogui/util/GraphGenerator.py

{mg-pso-gui-0.1.14 → mg-pso-gui-0.1.16}/mgpsogui/gui/HomePage.py

@@ -30,6 +30,7 @@ from queue import Empty
 
 from ..util import PSORunner
 from ..util import GraphGenerator
+from ..util.CTkToolTip import CTkToolTip as ctt
 
 import subprocess
 import plotly.express as px
@@ -100,6 +101,7 @@ class App(customtkinter.CTk):
 		self.service_url.grid(row=0, column=4, columnspan=1, padx=header_padding_x, pady=header_padding_y, sticky="nsew")
 		refresh_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "refresh.png")), size=(20, 20))
 		self.refresh_button = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=refresh_image, command=self.load)
+		ctt(self.refresh_button, delay=0.1, alpha=0.95, message="Connect to Service")
 		self.refresh_button.grid(row=0, column=5, padx=(5, 80), pady=header_padding_y)
 		
 		self.scaling_label = customtkinter.CTkLabel(self.sidebar_frame, text="Scale:", anchor="w")
@@ -111,6 +113,7 @@ class App(customtkinter.CTk):
 		
 		expand_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
 		self.new_window = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=expand_image, command=self.new_window)
+  		ctt(self.refresh_button, delay=0.1, alpha=0.95, message="Open New Window")
 		self.new_window.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
 		
 		self.tabview = customtkinter.CTkTabview(self, bg_color="transparent", fg_color="transparent")
@@ -145,13 +148,29 @@ class App(customtkinter.CTk):
 		self.footer_progress_bar.grid(row=0, column=4, padx=(50, 100), pady=header_padding_y, sticky="ew")
 		self.footer_progress_bar.set(0)
 		
+		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.sidebar_frame, values=["PSO", "Halton"], width=50)
+		self.algorithm_optionmenu.grid(row=0, column=6, padx=header_padding_x, pady=header_padding_y)
+		self.algorithm_optionmenu.set("PSO")
+  
 		play_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "play.png")), size=(20, 20))
-		self.new_window = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=play_image, command=self.run)
-		self.new_window.grid(row=0, column=7, padx=(5, 5), pady=header_padding_y)
+		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")
+		self.run_button.grid(row=0, column=7, padx=(5, 5), pady=header_padding_y)
+
+		test_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
+		self.test_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=test_image, command=self.run)
+		ctt(self.test_button, delay=0.1, alpha=0.95, message="Start Testing")
+		self.test_button.grid(row=0, column=8, padx=(5, 5), pady=header_padding_y)
 		
 		stop_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "stop.png")), size=(20, 20))
-		self.new_window = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=stop_image, command=self.stop)
-		self.new_window.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
+		self.stop_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=stop_image, command=self.stop)
+		ctt(self.stop_button, delay=0.1, alpha=0.95, message="Stop")
+		self.stop_button.grid(row=0, column=9, padx=(5, 20), pady=header_padding_y)
+
+		download_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "down.png")), size=(20, 20))
+		self.download_button = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=stop_image, command=self.stop)
+		ctt(self.download_button, delay=0.1, alpha=0.95, message="Download Results")
+		self.download_button.grid(row=0, column=10, padx=(5, 20), pady=header_padding_y)
 
 	def _resize_image(self, event):
 		self.graph_label.update_idletasks()
@@ -563,6 +582,7 @@ class App(customtkinter.CTk):
 			self.progress_message_right.configure(text="")
 			self.textbox.insert("0.0", "\nCalibration finished!\n")
 
+'''
 	def get_results(self):
 		request: Client = Client()
 		for name, value in parameters.items():
@@ -601,6 +621,7 @@ class App(customtkinter.CTk):
 			print(result)
 		else:
 			print(result)
+'''
 
 def start():
 	app = App()

{mg-pso-gui-0.1.14 → mg-pso-gui-0.1.16}/mgpsogui/util/recosu/pso/csip_access.py

@@ -69,8 +69,7 @@ def csip_worker(reqq: queue.Queue, thread_no: int, stop, full_trace,
             except Exception as e:
                 print(res)
                 print(e)
-                
-            print("client17")
+
             reqq.task_done()
         except queue.Empty:
             continue

{mg-pso-gui-0.1.14 → mg-pso-gui-0.1.16}/setup.py

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