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

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

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

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

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

{mg-pso-gui-0.1.54 → mg-pso-gui-0.1.57}/mgpsogui/util/GraphGenerator.py

@@ -289,18 +289,23 @@ def custom_csv(homepage, option_manager):
     val = homepage.csv_y1_selector.get()
     val2 = homepage.csv_y2_selector.get()
     
+    data_start_index = 2
+    
     xx = None
     if x == "time":
-        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[data_start_index:]
+    elif x == "date":
+        data_start_index = 5
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index:]
     else:
-        xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
+        xx = pd.to_numeric(data[x], errors="coerce").iloc[data_start_index:]
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[data_start_index:]
     
     #yy_unit = "N/A"
     yy_unit = data[val].iloc[1]
     
-    yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[2:]
+    yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[data_start_index:]
     
     #yy2_unit = "N/A"
     yy2_unit = data[val2].iloc[1]
@@ -358,26 +363,33 @@ def compare_csv(homepage, option_manager):
     val = homepage.csv_y1_selector.get()
     val2 = homepage.csv_y2_selector.get()
     
+    data_start_index = 2
+    data_start_index2 = 2
+    
     xx = None
     if x == "time":
-        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[data_start_index:]
+    elif x == "date":
+        data_start_index = 5
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index:]
     else:
-        xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
+        xx = pd.to_numeric(data[x], errors="coerce").iloc[data_start_index:]
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[data_start_index:]
     
     xx2 = None
     if x == "time":
-        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+        xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce').iloc[data_start_index2:]
+    elif x == "date":
+        data_start_index2 = 5
+        xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce').iloc[data_start_index2:]
     else:
-        xx2 = pd.to_numeric(data2[x], errors="coerce").iloc[2:]
-        
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+        xx2 = pd.to_numeric(data2[x], errors="coerce").iloc[data_start_index2:]
     
     #yy_unit = "N/A"
     yy_unit = data[val].iloc[1]
     
-    yy2 = pd.to_numeric(data2[val2], errors="coerce").iloc[2:]
+    yy2 = pd.to_numeric(data2[val2], errors="coerce").iloc[data_start_index2:]
     
     #yy2_unit = "N/A"
     yy2_unit = data2[val2].iloc[1]

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

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