mg-pso-gui 0.1.41__tar.gz → 0.1.43__tar.gz

{mg-pso-gui-0.1.41 → mg-pso-gui-0.1.43}/PKG-INFO

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

{mg-pso-gui-0.1.41 → mg-pso-gui-0.1.43}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.41 → mg-pso-gui-0.1.43}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -77,8 +77,11 @@ class SideBar(CTkScrollableFrame):
                 if (self.home_page.selected_csv.get() not in name_list):
                     self.home_page.selected_csv.set(name_list[0])
             
+            file_label = CTkLabel(self.containerFrame, text="CSV File:")
+            file_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+            
             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=1, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
             
             selected_file = self.home_page.selected_csv.get()
             if (selected_file in path_map and selected_file != self.home_page.open_file):
@@ -89,20 +92,29 @@ class SideBar(CTkScrollableFrame):
                 # Get all column names of CSV
                 columns = self.home_page.csv_data.columns
                 
+                x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
+                x_axis_label.grid(row=2, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+                
                 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")
+                self.home_page.csv_x_selector.grid(row=3, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
                 
                 if (self.home_page.csv_x_selector.get() not in columns):
                     self.home_page.csv_x_selector.set(columns[1])
                 
+                y1_axis_label = CTkLabel(self.containerFrame, text="Y Axis:")
+                y1_axis_label.grid(row=4, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+                
                 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")
+                self.home_page.csv_y1_selector.grid(row=5, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
                 
                 if (self.home_page.csv_y1_selector.get() not in columns):
                     self.home_page.csv_y1_selector.set(columns[2])
                 
+                y2_axis_label = CTkLabel(self.containerFrame, text="Secondary Y Axis:")
+                y2_axis_label.grid(row=6, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+                
                 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")
+                self.home_page.csv_y2_selector.grid(row=7, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
                 
                 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.41 → mg-pso-gui-0.1.43}/setup.py

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