mg-pso-gui 0.1.14__py3-none-any.whl → 0.1.17__py3-none-any.whl

{mg_pso_gui-0.1.14.dist-info → mg_pso_gui-0.1.17.dist-info}/METADATA

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

{mg_pso_gui-0.1.14.dist-info → mg_pso_gui-0.1.17.dist-info}/RECORD

@@ -2,7 +2,7 @@ mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
 mgpsogui/trace.json,sha256=BeXTnMzXKeyaZwBHYC6KMipOnF4zH0kgZXl1CWVblJA,9615
-mgpsogui/gui/HomePage.py,sha256=KiqGVP03G1C3L-YrHxDlAkeVDme4NqzWSRs02RE5De4,22643
+mgpsogui/gui/HomePage.py,sha256=9Xi1B-lKfw3uquZi8kTTcJkuQFd8cwB59ugP-wjUc-s,24016
 mgpsogui/gui/OptionManager.py,sha256=bFN2jWJbx1Din3waOFLmbWGt0BXD_KthGJ8Mgue_FEE,11712
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -28,6 +28,7 @@ mgpsogui/gui/images/play.png,sha256=zbWtyZqvqCMT81bo6D3KhDPulWZH5lh1oCEs-X_X5Sk,
 mgpsogui/gui/images/refresh.png,sha256=B1nbOlky6nVhgSjDWT35FLZKW2LWxmliWWP_qZjZ7k8,4657
 mgpsogui/gui/images/refresh_hd.png,sha256=lprZtCNZ9JUm20SPwfaslr-VV4yzzmCPEB6oFfJm1tI,31242
 mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,2153
+mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
 mgpsogui/util/GraphGenerator.py,sha256=hEPhka0ZKQJ9DSSywDfwoXFQMsk3RHyG8QyTLOQnN4M,7851
@@ -37,15 +38,15 @@ mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-a
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
 mgpsogui/util/recosu/__init__.py,sha256=T7_iigIlowGbPOHLO3hwihjw2kbwIg6olOMhFhNiL38,236
 mgpsogui/util/recosu/pso/__init__.py,sha256=PQ548aEKVOk6MMzxxDg7yMO_1hHfoEoYLLkGLeij73Y,247
-mgpsogui/util/recosu/pso/csip_access.py,sha256=mKpK2LjJeI2bojaNSw2U-S2yCUfJoMGZvHcXEsT3zis,2767
+mgpsogui/util/recosu/pso/csip_access.py,sha256=jBli1MSShUUwQCMKOUvMaGuNwBViCrjXJi_FmSEJsZA,2721
 mgpsogui/util/recosu/pso/pso.py,sha256=6jGIcIzVHe80C-uU31gLoSAAu3rbh-a7aqYeqaloaro,12474
 mgpsogui/util/recosu/utils/__init__.py,sha256=TXz_TpNif2GeGu22pzTnkUQvaP-PmLQ9Sz4BgMIS6ig,196
 mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvarrMRXJMbDBWqI8,3023
 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.14.dist-info/METADATA,sha256=XyV2Vv2JO2c-JpZ07eIkFXqMwknY21_atLCsAI6x-rc,9458
-mg_pso_gui-0.1.14.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.1.14.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.14.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.14.dist-info/RECORD,,
+mg_pso_gui-0.1.17.dist-info/METADATA,sha256=OM6uZMQABaJNGu7zVIe9zYqq4PJWlbqbnk_KmkWATSs,9458
+mg_pso_gui-0.1.17.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.1.17.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.17.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.17.dist-info/RECORD,,

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()

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