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

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

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

{mg-pso-gui-0.1.53 → mg-pso-gui-0.1.55}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.53 → mg-pso-gui-0.1.55}/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,11 +158,15 @@ 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):

{mg-pso-gui-0.1.53 → mg-pso-gui-0.1.55}/mgpsogui/util/GraphGenerator.py

@@ -292,6 +292,8 @@ def custom_csv(homepage, option_manager):
     xx = None
     if x == "time":
         xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+    elif x == "date":
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[2:]
     else:
         xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
         
@@ -361,6 +363,8 @@ def compare_csv(homepage, option_manager):
     xx = None
     if x == "time":
         xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+    elif x == "date":
+        xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce').iloc[2:]
     else:
         xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
         
@@ -369,6 +373,8 @@ def compare_csv(homepage, option_manager):
     xx2 = None
     if x == "time":
         xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+    elif x == "date":
+        xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce').iloc[2:]
     else:
         xx2 = pd.to_numeric(data2[x], errors="coerce").iloc[2:]
         

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

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