mg-pso-gui 0.1.52__tar.gz → 0.1.54__tar.gz

{mg-pso-gui-0.1.52 → mg-pso-gui-0.1.54}/PKG-INFO

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

{mg-pso-gui-0.1.52 → mg-pso-gui-0.1.54}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.52 → mg-pso-gui-0.1.54}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -86,6 +86,9 @@ class SideBar(CTkScrollableFrame):
             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)
+                if (self.home_page.csv_data.columns[0] != "@H"):
+                    self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=9)
+                
                 self.home_page.open_file = selected_file
                 
             if (self.home_page.csv_data is not None):
@@ -155,16 +158,21 @@ class SideBar(CTkScrollableFrame):
             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)
+                if (self.home_page.csv_data.columns[0] != "@H"):
+                    self.home_page.csv_data = pd.read_csv(path_map[selected_file], skiprows=9)
                 self.home_page.open_file = selected_file
                 
             selected_file2 = self.home_page.selected_csv2.get()
             if (selected_file2 in path_map and selected_file2 != self.home_page.open_file2):
                 self.home_page.csv_data2 = pd.read_csv(path_map[selected_file2], skiprows=3)
+                if (self.home_page.csv_data2.columns[0] != "@H"):
+                    self.home_page.csv_data2 = pd.read_csv(path_map[selected_file2], skiprows=9)
                 self.home_page.open_file2 = selected_file2
                 
             if (self.home_page.csv_data is not None and self.home_page.csv_data2 is not None):
                 # Get all column names of CSV
                 columns = self.home_page.csv_data.columns
+                columns2 = self.home_page.csv_data2.columns
                 
                 x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
                 x_axis_label.grid(row=3, column=0, padx=(20, 20), pady=(40, 5), sticky="w")
@@ -187,8 +195,8 @@ class SideBar(CTkScrollableFrame):
                 y2_axis_label = CTkLabel(self.containerFrame, text="Secondary Y Axis:")
                 y2_axis_label.grid(row=7, column=0, padx=(20, 20), pady=(20, 5), 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 = CTkOptionMenu(self.containerFrame, values=columns2, variable=self.home_page.selected_y2, command=self.home_page.update_graph)
                 self.home_page.csv_y2_selector.grid(row=8, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
                 
-                if (self.home_page.csv_y2_selector.get() not in columns):
-                    self.home_page.csv_y2_selector.set(columns[3])
+                if (self.home_page.csv_y2_selector.get() not in columns2):
+                    self.home_page.csv_y2_selector.set(columns2[2])

{mg-pso-gui-0.1.52 → mg-pso-gui-0.1.54}/setup.py

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