mg-pso-gui 0.1.51__tar.gz → 0.1.53__tar.gz

{mg-pso-gui-0.1.51 → mg-pso-gui-0.1.53}/PKG-INFO

@@ -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 → mg-pso-gui-0.1.53}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg-pso-gui-0.1.53}/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])

{mg-pso-gui-0.1.51 → mg-pso-gui-0.1.53}/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="",

{mg-pso-gui-0.1.51 → mg-pso-gui-0.1.53}/setup.py

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