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

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

@@ -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.dist-info → mg_pso_gui-0.1.55.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=SsgCiJLKQT-SInp4YRlqecW7xpZL95uxNy9N6WwXJrE,10776
+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
@@ -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=tnpscm2pEE-ZK7fkfTNT-msKZ7AMzZ6ee7ZUVcmVeJI,14379
+mgpsogui/util/GraphGenerator.py,sha256=4_l3D8xESegVmKc8O9mS4GIj4KjxJkh0oauBst7CXAg,14708
 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.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,,
+mg_pso_gui-0.1.55.dist-info/METADATA,sha256=rowjRbwyjHeFeePd_7fJHJYBGEviJatWkswPl624JpA,9458
+mg_pso_gui-0.1.55.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.55.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.55.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.55.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,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):

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