mg-pso-gui 0.1.38__tar.gz → 0.1.40__tar.gz

{mg-pso-gui-0.1.38 → mg-pso-gui-0.1.40}/PKG-INFO

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

{mg-pso-gui-0.1.38 → mg-pso-gui-0.1.40}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.38 → mg-pso-gui-0.1.40}/mgpsogui/gui/HomePage.py

@@ -67,6 +67,17 @@ class App(customtkinter.CTk):
 
 		self.selected_csv = tk.StringVar()
 		self.selected_csv.set("No files found...")
+		self.open_file = "None"
+		self.csv_data = None
+
+		self.selected_x = tk.StringVar()
+		self.selected_x.set("time")
+
+		self.selected_y1 = tk.StringVar()
+		self.selected_y1.set("NONE")
+
+		self.selected_y2 = tk.StringVar()
+		self.selected_y2.set("NONE")
 
 		self.running_config = None
 		self.selected_graph_name = None

{mg-pso-gui-0.1.38 → mg-pso-gui-0.1.40}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -9,6 +9,8 @@ from customtkinter import CTkOptionMenu
 from PIL import Image
 import os
 
+import pandas as pd
+
 class SideBar(CTkScrollableFrame):
     def __init__(self, *args,
                  option_manager: None,
@@ -60,13 +62,14 @@ class SideBar(CTkScrollableFrame):
                 os.makedirs(folder)
                 
             # Get all CSV files in the folder and add their paths to a list
-            path_list = []
+            path_map = {}
             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", ""))
+                        name = file.replace(".csv", "")
+                        name_list.append(name)
+                        path_map[name] = os.path.join(root, file)
             
             if (len(name_list) == 0):
                 name_list.append("No files found...")
@@ -74,10 +77,32 @@ class SideBar(CTkScrollableFrame):
                 if (self.home_page.selected_csv.get() not in name_list):
                     self.home_page.selected_csv.set(name_list[0])
             
-            print("PATH LIST")
-            print(path_list)
-            print("NAME LIST")
-            print(name_list)
-            
             self.home_page.csv_file_selector = CTkOptionMenu(self.containerFrame, values=name_list, variable=self.home_page.selected_csv, command=self.home_page.update_graph)
-            self.home_page.csv_file_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            self.home_page.csv_file_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            
+            selected_file = self.home_page.selected_csv.get()
+            if (selected_file in path_map and selected_file != self.home_page.open_file):
+                self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=3)
+                self.home_page.open_file = selected_file
+                
+            if (self.home_page.csv_data != None):
+                # Get all column names of CSV
+                columns = self.home_page.csv_data.columns
+                
+                self.home_page.csv_x_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_x, command=self.home_page.update_graph)
+                self.home_page.csv_x_selector.grid(row=2, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+                
+                if (self.home_page.csv_x_selector.get() not in columns):
+                    self.home_page.csv_x_selector.set(columns[1])
+                
+                self.home_page.csv_y1_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_y1, command=self.home_page.update_graph)
+                self.home_page.csv_y1_selector.grid(row=2, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+                
+                if (self.home_page.csv_y1_selector.get() not in columns):
+                    self.home_page.csv_y1_selector.set(columns[2])
+                
+                self.home_page.csv_y2_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_y2, command=self.home_page.update_graph)
+                self.home_page.csv_y2_selector.grid(row=2, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+                
+                if (self.home_page.csv_y2_selector.get() not in columns):
+                    self.home_page.csv_y2_selector.set(columns[3])

{mg-pso-gui-0.1.38 → mg-pso-gui-0.1.40}/mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -65,7 +65,7 @@ def create_tab(self, tab):
     self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     # Create SideBar
-    self.vis_sidebar = SideBar.SideBar(self.graph_sidebar, option_manager=self.option_manager, home_page=self)
+    self.vis_sidebar = SideBar.SideBar(self.graph_sidebar, option_manager=self.option_manager, home_page=self, fg_color="transparent")
     self.vis_sidebar.grid(row=1, column=0, rowspan=8, padx=(0, 0), pady=(0, 0), sticky="nsew")
     
     # Add a button to call open_graph_in_browser

{mg-pso-gui-0.1.38 → mg-pso-gui-0.1.40}/setup.py

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