mg-pso-gui 0.1.181__py3-none-any.whl → 0.1.183__py3-none-any.whl

{mg_pso_gui-0.1.181.dist-info → mg_pso_gui-0.1.183.dist-info}/METADATA

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

{mg_pso_gui-0.1.181.dist-info → mg_pso_gui-0.1.183.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=FQHErph6H4I8TWy2GmhANvgQiVdA7pNFe6Lv4rdUYX4,22794
-mgpsogui/gui/OptionManager.py,sha256=X-A_YCiBilcBuAmy3XbAVMAxuUIaFcsyh2fXaU5kiOM,13272
+mgpsogui/gui/HomePage.py,sha256=S4vm9gtwoWjfbNmFSX5e-_l18ti0YIFulrH9a3v953s,22845
+mgpsogui/gui/OptionManager.py,sha256=x3Q4sQW6KuXkDuGGebEVhfHwtz6BiTYmrs7gTXPMe5A,13264
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,8 +59,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 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.181.dist-info/METADATA,sha256=-tqzdmMgWYlJOvsm9zUsF8mqBs4DPXeOTdZNd9UGN3Q,9456
-mg_pso_gui-0.1.181.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.181.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.181.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.181.dist-info/RECORD,,
+mg_pso_gui-0.1.183.dist-info/METADATA,sha256=AJ_gtaGz36sOLeLjaur55kzHdCMNSk3DrlLIBUlZOCU,9456
+mg_pso_gui-0.1.183.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.183.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.183.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.183.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -131,7 +131,7 @@ class App(customtkinter.CTk):
 		# 4 is service URL
 		self.service_label = customtkinter.CTkLabel(self.sidebar_frame, text="Service:", anchor="w")
 		self.service_label.grid(row=0, column=3, padx=(80, 5), pady=header_padding_y)
-		self.service_url = customtkinter.CTkEntry(self.sidebar_frame, textvariable=self.option_manager.get_arguments()['url'])
+		self.service_url = customtkinter.CTkEntry(self.sidebar_frame, textvariable=self.option_manager.get_arguments()['urls'][self.option_manager.service_modes[0]])
 		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)
@@ -140,7 +140,7 @@ class App(customtkinter.CTk):
 
 		self.algorithm_optionmenu = customtkinter.CTkOptionMenu(self.sidebar_frame, variable=self.option_manager.get_arguments()['mode'], values=self.option_manager.service_modes, width=50, command=self.refresh_step_view)
 		self.algorithm_optionmenu.grid(row=0, column=6, padx=(5, 80), pady=header_padding_y)
-		self.algorithm_optionmenu.set("Optimization: MG-PSO")
+		self.algorithm_optionmenu.set(self.option_manager.service_modes[0])
 		
 		self.scaling_label = customtkinter.CTkLabel(self.sidebar_frame, text="Scale:", anchor="w")
 		self.scaling_label.grid(row=0, column=7, padx=header_padding_x, pady=header_padding_y)
@@ -235,7 +235,7 @@ class App(customtkinter.CTk):
 	
 	def refresh_step_view(self, value):
 		mode = self.option_manager.get_arguments()['mode'].get()
-		self.service_url.configure(textvariable=self.option_manager.get_arguments()['urls']['mode'])
+		self.service_url.configure(textvariable=self.option_manager.get_arguments()['urls'][mode])
 
 		if mode == "Optimization: MG-PSO":
 			self.test_button.configure(state="normal")

mgpsogui/gui/OptionManager.py

@@ -37,12 +37,12 @@ class OptionManager():
         self.service_parameters = {}
     
     def add_arguments(self, arguments):
-        
-        if ("url" in arguments):
-            self.arguments["url"].set(arguments["url"])
             
         if ("mode" in arguments):
             self.arguments["mode"].set(arguments["mode"])
+
+        if ("url" in arguments):
+            self.arguments["url"].set(arguments["url"])
             
         if ("files" in arguments):
             for file in arguments["files"]: