mg-pso-gui 0.1.31__tar.gz → 0.1.33__tar.gz

{mg-pso-gui-0.1.31 → mg-pso-gui-0.1.33}/PKG-INFO

@@ -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 → mg-pso-gui-0.1.33}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg-pso-gui-0.1.33}/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")

{mg-pso-gui-0.1.31 → mg-pso-gui-0.1.33}/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

{mg-pso-gui-0.1.31 → mg-pso-gui-0.1.33}/setup.py

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