mg-pso-gui 0.1.31__py3-none-any.whl → 0.1.33__py3-none-any.whl

{mg_pso_gui-0.1.31.dist-info → mg_pso_gui-0.1.33.dist-info}/METADATA

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

{mg_pso_gui-0.1.31.dist-info → mg_pso_gui-0.1.33.dist-info}/RECORD

@@ -17,8 +17,8 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=Doy_6xLq1BjhLTFHRQm7CAbpQzUnNJW4KkBcdfr
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=oG5Q-3xpTRP1f_PbNvohKctrbpD63zLAJzHD00bN44k,5531
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/SideBar.py,sha256=0gC5pmuQz3Ev-FCjH5g5N9oytfFdxLg4tnvzToMCHXo,2061
-mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=oSa4BLTQ2cLsKY8uEsRUNxgY4FZsftQa9FDbcm4BVOw,3526
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=sWDSfFqTm7n8svFKsb1mPhXsp7qi4sRxur6vox3GvnQ,2283
+mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=dqba7BDwwcCB8Rgff7AuHZSTchfyG64k4EIt88qsiNE,3540
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/images/IGOW 4 Logo.png,sha256=JixNXz5gOEj898VF-_PHthAlGU-6W-y9ucb4EVNPtjs,433752
 mgpsogui/gui/images/collapse.png,sha256=yicb16LaY7Nl5q9V8HHlht-Fbg5xU-l4_LJ_Arfmu1c,2989
@@ -45,8 +45,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.31.dist-info/METADATA,sha256=LEKNGRPiHzyoEBADNoeu5DQjwsDnJZvNrotdVcKRtg8,9458
-mg_pso_gui-0.1.31.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.1.31.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.31.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.31.dist-info/RECORD,,
+mg_pso_gui-0.1.33.dist-info/METADATA,sha256=H3J-hvodAN-cP_bLxn-A3qmZhh_w9w8gsIFiiSsgL2Q,9458
+mg_pso_gui-0.1.33.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.1.33.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.33.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.33.dist-info/RECORD,,

mgpsogui/gui/VisualizeTab/SideBar.py

@@ -32,22 +32,25 @@ class SideBar(CTkScrollableFrame):
         self.containerFrame = CTkFrame(self)
         self.containerFrame.grid(row=0, column=0, padx=(
             0, 0), pady=(0, 0), sticky="nsew")
-        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        self.containerFrame.grid_columnconfigure(0, weight=1)
         
-        selected_graph = self.home_page.selected_graph_name
-        if (selected_graph == "best_cost_stacked"):
+        selected_graph = self.home_page.graph_selector_value.get()
+        
+        if (selected_graph == "Best Cost Stacked"):
             self.graph_label = CTkLabel(self.containerFrame, text="Best Cost Stacked")
-            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
             pass
-        elif (selected_graph == "best_cost_by_round"):
+        elif (selected_graph == "Best Cost by Round"):
             self.graph_label = CTkLabel(self.containerFrame, text="Best Cost by Round")
-            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
             pass
-        elif (selected_graph == "table"):
+        elif (selected_graph == "Iteration Table"):
             self.graph_label = CTkLabel(self.containerFrame, text="Iteration Table")
-            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
             pass
-        elif (selected_graph == "calibrated_params_by_round"):
+        elif (selected_graph == "Calibrated Parameters"):
             self.graph_label = CTkLabel(self.containerFrame, text="Calibrated Parameters")
-            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-            pass
+            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+        elif (selected_graph == "Custom CSV"):
+            self.graph_label = CTkLabel(self.containerFrame, text="Custom CSV")
+            self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")

mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -63,7 +63,7 @@ def create_tab(self, tab):
     
     self.graph_selector_value = tk.StringVar()
     self.graph_selector_value.set("Best Cost Stacked")
-    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Calibrated Parameters", "Iteration Table"], variable=self.graph_selector_value, command=self.update_graph)
+    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Calibrated Parameters", "Iteration Table", "Custom CSV"], variable=self.graph_selector_value, command=self.update_graph)
     self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     # Create SideBar