mg-pso-gui 0.1.52__py3-none-any.whl → 0.1.54__py3-none-any.whl

{mg_pso_gui-0.1.52.dist-info → mg_pso_gui-0.1.54.dist-info}/METADATA

@@ -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.dist-info → mg_pso_gui-0.1.54.dist-info}/RECORD

@@ -17,7 +17,7 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=Doy_6xLq1BjhLTFHRQm7CAbpQzUnNJW4KkBcdfr
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=oG5Q-3xpTRP1f_PbNvohKctrbpD63zLAJzHD00bN44k,5531
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/SideBar.py,sha256=XV5VnX5UT7OniLSIRFNzxj87zB1i2Rxfnvx0g36SvQc,10713
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=8UU0Y-dCRdcK6wwj7J6XiLJtOvx1hXXN7HWWUVDgMmU,11276
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=y3ZjLR78yXjHTcHMpB637ipBKxb1CCEM3qzG8OUJvpQ,3477
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/images/IGOW 4 Logo.png,sha256=JixNXz5gOEj898VF-_PHthAlGU-6W-y9ucb4EVNPtjs,433752
@@ -45,8 +45,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
 mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
-mg_pso_gui-0.1.52.dist-info/METADATA,sha256=me9NxQPxOb8damEnddxBw1CM3bA14nWtuYS_v3sv530,9458
-mg_pso_gui-0.1.52.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.52.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.52.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.52.dist-info/RECORD,,
+mg_pso_gui-0.1.54.dist-info/METADATA,sha256=Ug1j1UdaEy0rWzjvanoTtpRIsW1JPOE_lsOve3sv8QU,9458
+mg_pso_gui-0.1.54.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.54.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.54.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.54.dist-info/RECORD,,

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])