mg-pso-gui 0.2.42__py3-none-any.whl → 0.2.44__py3-none-any.whl

{mg_pso_gui-0.2.42.dist-info → mg_pso_gui-0.2.44.dist-info}/METADATA

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

{mg_pso_gui-0.2.42.dist-info → mg_pso_gui-0.2.44.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=rNFDCgQ2aoEId7IqhQ43_QC9P5b1fuuypVIaXgTh0DM,21569
+mgpsogui/gui/HomePage.py,sha256=X1CrgrHKPrG48QFQVo5_fqWRZaRMz_7W53jX6-bh3I8,21833
 mgpsogui/gui/OptionManager.py,sha256=HLVib_lHdMijykF78bJ9_PEl-oROuC8lxd1oBS7524U,21898
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/General/ParameterView.py,sha256=ylnzYk9qTN31w_6LW4Iq3536CjfWswEqbE95M_SF8P4,5657
+mgpsogui/gui/General/ParameterView.py,sha256=4jv15f0so1iIllOhU2ZxVRgTft7K3pNiZc-xi998b7A,6227
 mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=XVaXjNoH1MBI-587CWigLIT3LGT00yzEAEnXNkzCLrk,10947
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,14 +19,14 @@ mgpsogui/gui/SetupTab/FunctionsList.py,sha256=ntbIUs8q2Tm3KfBLleT7uL0gynwYuVycwv
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=nin7Pl8z7d_yfKoAxM-yVS34uhj-LnprJ2mNRSB7Z0A,3197
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=mkGaC5cXhEOy5oD0MbTyK9z7VGZp019oK2Y8Ay-n05Q,7460
 mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp_ozzJhyBkL08fJzI,1752
-mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=QFSwLRLHwbqyO8gPOzIQ8nhFUktFipKj_aM9QoP0QT0,3372
+mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=rBfaSitYDOajbHvyi2TfoXAHYlz1cCt028UVpIJ_Dc0,3369
 mgpsogui/gui/SetupTab/OverrideParameterWindow.py,sha256=UpZDxTaFxee0BeviUYXeiIlMNYNy00qz3zlMlM5VcXE,1291
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=uvz604wAgazX9P8naqX9eq-6xwaA8lq-cYTy8lHXkv0,2805
 mgpsogui/gui/SetupTab/StepView.py,sha256=e3QhepeAfDJdhefsJvzyppRuMdVAFKEnbZLtrFIczU4,8936
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=Gzyl2hRgjIfO5n0bCZZoXp_vOFvfsJPaGXDUMeRQg10,3171
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=wPjzA8ZZsCTxBKN0_6-_ABtU5BeHqytNAWfKCWAPoe8,22106
-mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=xeZS1J4RexoFgsKeJDdWi81Hy8xicROGTdawwcGk2O4,6724
+mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=6ybwiVOXw5NAhG9ShnwdpbSfCHjNs-50dvEN7SxGmjU,6696
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/defaults/optimization.json,sha256=bd_XxTKtKN_ErZoxtZmhltWID-sDJAdxzsqt9qBSsh8,3629
@@ -69,8 +69,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.2.42.dist-info/METADATA,sha256=vyskDgVdGRTTxztkfjXpy5ej7LwL5Vrv0LFgXHhplEg,9455
-mg_pso_gui-0.2.42.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.2.42.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.42.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.42.dist-info/RECORD,,
+mg_pso_gui-0.2.44.dist-info/METADATA,sha256=CBRddkCBl5EbQVxtxgS3jTJHuWYqPDjr1USq-NyU-OA,9455
+mg_pso_gui-0.2.44.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.2.44.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.44.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.44.dist-info/RECORD,,

mgpsogui/gui/General/ParameterView.py

@@ -43,9 +43,19 @@ class ParameterView(CTkScrollableFrame):
         row += 1
         
         for key_value_pair in self.key_values:
-            CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            required = False
+            visual_name = "NONE"
+            if "required" in key_value_pair:
+                required = key_value_pair["required"]
+            if required and "visual_name" in key_value_pair:
+                visual_name = key_value_pair["visual_name"]
+
+            if visual_name != "NONE":
+                CTkEntry(self.containerFrame, state="disabled", textvariable=self.key_values[index]["visual_name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
             
-            if self.edit_mode:
+            if self.edit_mode and not required:
                 type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "boolean", "string"], width=20)
                 type_menu.grid(row=row, column=3, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
 
@@ -54,6 +64,7 @@ class ParameterView(CTkScrollableFrame):
 
 
                 return_func = lambda index=index: (self.clear(), self.option_manager.remove_key_value(self.list_name, index), self.render())
+                
                 CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=5, columnspan=1, padx=(5, 5), pady=(5, 5), sticky="ew")
             else:
                 type = self.key_values[index]["type"].get()

mgpsogui/gui/HomePage.py

@@ -64,37 +64,37 @@ class App(customtkinter.CTk):
 		
 		self.option_manager = om.OptionManager()
 		
-		self.graph_selector_value = tk.StringVar()
-		self.graph_selector_value.set("Best Cost Stacked")
+		# self.graph_selector_value = tk.StringVar()
+		# self.graph_selector_value.set("Best Cost Stacked")
 
-		self.graph_theme_value = tk.StringVar()
-		self.graph_theme_value.set("Dark")
+		# self.graph_theme_value = tk.StringVar()
+		# self.graph_theme_value.set("Dark")
 
-		self.selected_csv = tk.StringVar()
-		self.selected_csv.set("No files found...")
-		self.open_file = "None"
-		self.csv_data = None
+		# self.selected_csv = tk.StringVar()
+		# self.selected_csv.set("No files found...")
+		# self.open_file = "None"
+		# self.csv_data = None
 
-		self.selected_csv2 = tk.StringVar()
-		self.selected_csv2.set("No files found...")
-		self.open_file2 = "None"
-		self.csv_data2 = None
+		# self.selected_csv2 = tk.StringVar()
+		# self.selected_csv2.set("No files found...")
+		# self.open_file2 = "None"
+		# self.csv_data2 = None
 
-		self.selected_x = tk.StringVar()
-		self.selected_x.set("time")
+		# self.selected_x = tk.StringVar()
+		# self.selected_x.set("time")
 
-		self.selected_y1 = tk.StringVar()
-		self.selected_y1.set("NONE")
+		# self.selected_y1 = tk.StringVar()
+		# self.selected_y1.set("NONE")
 
-		self.selected_y2 = tk.StringVar()
-		self.selected_y2.set("NONE")
+		# self.selected_y2 = tk.StringVar()
+		# self.selected_y2.set("NONE")
 
-		self.figure_style = tk.StringVar()
-		self.figure_style.set("Scatter")
+		# self.figure_style = tk.StringVar()
+		# self.figure_style.set("Scatter")
 
-		self.matrix_values = []
-		self.matrix_values.append(tk.StringVar())
-		self.matrix_values[0].set("NONE")
+		# self.matrix_values = []
+		# self.matrix_values.append(tk.StringVar())
+		# self.matrix_values[0].set("NONE")
 
 		self.running_config = None
 		self.selected_graph_name = None
@@ -235,6 +235,8 @@ class App(customtkinter.CTk):
 	def refresh_step_view(self, value):
 		mode = self.option_manager.get_mode()
 		self.service_url.configure(textvariable=self.option_manager.get("url"))
+		self.graph_theme.configure(variable=self.option_manager.get("graph_theme"))
+		self.graph_selector.configure(variable=self.option_manager.get("selected_graph"))
 
 		if mode == "Optimization":
 			self.test_button.configure(state="normal")
@@ -247,6 +249,9 @@ class App(customtkinter.CTk):
 			self.download_button.configure(state="disabled")
 			self.download_button.configure(fg_color="gray")
 
+		self.vis_sidebar.clear()
+		self.vis_sidebar.render()
+
 		self.steps_frame.clear()
 		self.steps_frame.render()
 

mgpsogui/gui/SetupTab/OverrideParameterMetrics.py

@@ -32,7 +32,7 @@ class OverrideParameterMetrics(CTkScrollableFrame):
         self.edit_mode = not self.edit_mode
         self.render()
         
-    def add_key(self, key="name", value="value"):
+    def add_key(self, key="iters", value="1"):
         self.option_manager.add_override(self.step_index, key, value)
         
     def remove_key(self, index):

mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -116,7 +116,8 @@ def create_tab(self, tab):
     self.graph_container.grid_columnconfigure(0, weight=1)
     self.graph_container.grid_rowconfigure(0, weight=1)
     
-    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Custom CSV", "Compare CSV", "Sampling CSV", "Matrix Editor"], variable=self.graph_selector_value, command=self.update_graph)
+    graph_types = ["Best Cost Stacked", "Best Cost by Round", "Custom CSV", "Compare CSV", "Sampling CSV", "Matrix Editor"]
+    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=graph_types, variable=self.option_manager.get("selected_graph"), command=self.update_graph)
     self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     # Create SideBar
@@ -124,7 +125,7 @@ def create_tab(self, tab):
     self.vis_sidebar.grid(row=1, column=0, rowspan=6, padx=(0, 0), pady=(0, 0), sticky="nsew")
     
 
-    self.graph_theme = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Dark", "Light", "Publication"], variable=self.graph_theme_value, command=self.update_graph)
+    self.graph_theme = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Dark", "Light", "Publication"], variable=self.option_manager.get("graph_theme"), command=self.update_graph)
     self.graph_theme.grid(row=7, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
 
     self.graph_export = customtkinter.CTkButton(self.graph_sidebar, text="Export", command=export_graph)
@@ -138,5 +139,3 @@ def create_tab(self, tab):
     self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(1280, 720))
     self.graph_label = customtkinter.CTkLabel(self.graph_container, text=None, image=self.graph_image)
     self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-    #window = customtkinter.CTk()
-    #self.graph_label.bind('<Configure>', _resize_image)