mg-pso-gui 0.1.71__py3-none-any.whl → 0.1.73__py3-none-any.whl

{mg_pso_gui-0.1.71.dist-info → mg_pso_gui-0.1.73.dist-info}/METADATA

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

{mg_pso_gui-0.1.71.dist-info → mg_pso_gui-0.1.73.dist-info}/RECORD

@@ -32,7 +32,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=IRG_8DM79kN243pkw889b0bPX_N-dGWWAQ6Bcns2BM8,14813
+mgpsogui/util/GraphGenerator.py,sha256=HhUsFUFhCv3wTYV8CTqU0wo56Ph9c1DocPj25AVIAdI,15076
 mgpsogui/util/PSORunner.py,sha256=4T-L4t0I6ogMeT5v7YUaURS-g_WaN0VS2sQLpgMLMs0,4502
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
@@ -46,8 +46,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.71.dist-info/METADATA,sha256=mI41IgccftM8AbcprwP3js0dkBPlM2Q5htXhIoH4ffo,9458
-mg_pso_gui-0.1.71.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.71.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.71.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.71.dist-info/RECORD,,
+mg_pso_gui-0.1.73.dist-info/METADATA,sha256=ax47rzWEwt68wh_do1MD2Fmxu3ZVaFcELzOwLyR7MYg,9458
+mg_pso_gui-0.1.73.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.73.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.73.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.73.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -303,12 +303,15 @@ def custom_csv(homepage, option_manager):
         
     yy = pd.to_numeric(data[val], errors="coerce")
     
-    yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
+    yy_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
     
     yy2 = pd.to_numeric(data[val2], errors="coerce")
     
     yy2_unit = "-"
-    yy2_unit = homepage.csv_data2["data_attributes"]["Unit"][val2]
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
 
     fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
     fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
@@ -377,15 +380,19 @@ def compare_csv(homepage, option_manager):
     if x == "time":
         xx2 = pd.to_datetime(data2["time"], format='%Y-%m-%d', errors='coerce')
     elif x == "date":
-        data_start_index2 = 5
         xx2 = pd.to_datetime(data2["date"], format='%d-%m-%Y', errors='coerce')
     else:
         xx2 = pd.to_numeric(data2[x], errors="coerce")
     
-    yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
+    yy_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy_unit = homepage.csv_data["data_attributes"]["Unit"][val]
     
-    yy2 = pd.to_numeric(data2[val2], errors="coerce")
-    yy2_unit = homepage.csv_data2["data_attributes"]["Unit"][val2]
+    yy2 = pd.to_numeric(data[val2], errors="coerce")
+    
+    yy2_unit = "-"
+    if "Unit" in homepage.csv_data["data_attributes"]:
+        yy2_unit = homepage.csv_data["data_attributes"]["Unit"][val2]
 
     fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
     fig.add_trace(go.Scatter(x=xx2, y=yy2, name=val2, yaxis='y2'))