mg-pso-gui 0.1.51__py3-none-any.whl → 0.1.53__py3-none-any.whl

{mg_pso_gui-0.1.51.dist-info → mg_pso_gui-0.1.53.dist-info}/METADATA

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

{mg_pso_gui-0.1.51.dist-info → mg_pso_gui-0.1.53.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=SsgCiJLKQT-SInp4YRlqecW7xpZL95uxNy9N6WwXJrE,10776
 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
@@ -31,7 +31,7 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/util/GraphGenerator.py,sha256=4GiHeaoCW6-8GB00x80trZKfSMGYJvadtyzjWi1ByJU,14106
+mgpsogui/util/GraphGenerator.py,sha256=tnpscm2pEE-ZK7fkfTNT-msKZ7AMzZ6ee7ZUVcmVeJI,14379
 mgpsogui/util/PSORunner.py,sha256=wfkrZLysgSS_5BrdFEm8U-0S7DHYpxmHPau_Ec5W8ak,4510
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
@@ -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.51.dist-info/METADATA,sha256=Y9xmLBynARzndB92H-WhDxtZm3uGFmj0f3XzKhFwYKo,9458
-mg_pso_gui-0.1.51.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.51.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.51.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.51.dist-info/RECORD,,
+mg_pso_gui-0.1.53.dist-info/METADATA,sha256=kk8JFOWHZAK7TzsrlztqfP_nX1iA1wFY3LmlrSkv-gw,9458
+mg_pso_gui-0.1.53.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.53.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.53.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.53.dist-info/RECORD,,

mgpsogui/gui/VisualizeTab/SideBar.py

@@ -165,6 +165,7 @@ class SideBar(CTkScrollableFrame):
             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 +188,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])

mgpsogui/util/GraphGenerator.py

@@ -366,6 +366,14 @@ def compare_csv(homepage, option_manager):
         
     yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
     
+    xx2 = None
+    if x == "time":
+        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+    else:
+        xx2 = pd.to_numeric(data2[x], errors="coerce").iloc[2:]
+        
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+    
     #yy_unit = "N/A"
     yy_unit = data[val].iloc[1]
     
@@ -375,7 +383,7 @@ def compare_csv(homepage, option_manager):
     yy2_unit = data2[val2].iloc[1]
 
     fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
-    fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
+    fig.add_trace(go.Scatter(x=xx2, y=yy2, name=val2, yaxis='y2'))
 
     fig.update_layout(
         title="",