mg-pso-gui 0.1.32__tar.gz → 0.1.34__tar.gz

{mg-pso-gui-0.1.32 → mg-pso-gui-0.1.34}/PKG-INFO

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

{mg-pso-gui-0.1.32 → mg-pso-gui-0.1.34}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.32 → mg-pso-gui-0.1.34}/mgpsogui/gui/HomePage.py

@@ -178,8 +178,8 @@ class App(customtkinter.CTk):
 		self.after(1000, self.running_loop)
 
 	def update_graph(self, value):
-		GraphGenerator.generate_graphs(self)
 		self.vis_sidebar.refresh()
+		GraphGenerator.generate_graphs(self)
 
 	'''def _resize_image(self, event):
 		self.graph_label.update_idletasks()

{mg-pso-gui-0.1.32 → mg-pso-gui-0.1.34}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -5,6 +5,7 @@ from customtkinter import CTkButton
 from customtkinter import CTkEntry
 from customtkinter import CTkTextbox
 from customtkinter import CTkImage
+from customtkinter import CTkOptionMenu
 from PIL import Image
 import os
 
@@ -32,12 +33,10 @@ 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.graph_selector_value.get()
         
-        print("Current Graph: " + selected_graph)
-        
         if (selected_graph == "Best Cost Stacked"):
             self.graph_label = CTkLabel(self.containerFrame, text="Best Cost Stacked")
             self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
@@ -53,4 +52,26 @@ class SideBar(CTkScrollableFrame):
         elif (selected_graph == "Calibrated Parameters"):
             self.graph_label = CTkLabel(self.containerFrame, text="Calibrated Parameters")
             self.graph_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
-            pass
+        elif (selected_graph == "Custom CSV"):
+            
+            info = self.option_manager.get_project_data()
+            folder = os.path.join(info['path'], info['name'])
+            if not os.path.exists(folder):
+                os.makedirs(folder)
+                
+            # Get all CSV files in the folder and add their paths to a list
+            path_list = []
+            name_list = []
+            for root, dirs, files in os.walk(folder):
+                for file in files:
+                    if file.endswith(".csv"):
+                        path_list.append(os.path.join(root, file))
+                        name_list.append(file.replace(".csv", ""))
+                        
+            print("PATH LIST")
+            print(path_list)
+            print("NAME LIST")
+            print(name_list)
+            
+            self.home_page.csv_file_selector = 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.home_page.csv_file_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")

{mg-pso-gui-0.1.32 → mg-pso-gui-0.1.34}/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.32 → mg-pso-gui-0.1.34}/setup.py

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