mg-pso-gui 0.1.45__py3-none-any.whl → 0.1.47__py3-none-any.whl

{mg_pso_gui-0.1.45.dist-info → mg_pso_gui-0.1.47.dist-info}/METADATA

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

{mg_pso_gui-0.1.45.dist-info → mg_pso_gui-0.1.47.dist-info}/RECORD

@@ -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=X-u8v29JQLCPbDlXgnXhfDVg5kdULfDC2mNpW3fKshM,11692
+mgpsogui/util/GraphGenerator.py,sha256=assVQO_LeiMZWX5U8ma5aYMwl4NvAKiaCCKaa4UrchE,11829
 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.45.dist-info/METADATA,sha256=qbnnSKata-KCj7CpheBCFQWviSyG2BaXjS2LlCqMHZU,9458
-mg_pso_gui-0.1.45.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.1.45.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.45.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.45.dist-info/RECORD,,
+mg_pso_gui-0.1.47.dist-info/METADATA,sha256=wIq33fQEgQXtIx_mYkP6m9HXd90S6q6wnGMRTC8nVM8,9458
+mg_pso_gui-0.1.47.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.1.47.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.47.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.47.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -292,8 +292,13 @@ def custom_csv(homepage, option_manager):
     else:
         xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
         
-    yy = pd.to_numeric(data[val], errors="coerce").iloc[2:]
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[2]
+    
+    yy_unit = data[val].iloc[1]
+    
     yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[2:]
+    
+    yy2_unit = data[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'))
@@ -310,13 +315,13 @@ def custom_csv(homepage, option_manager):
             gridwidth=1
         ),
         yaxis=dict(
-            title=val,
+            title=val + " (" + str(yy_unit) + ")",
             autorange=True,
             gridcolor='rgb(72, 72, 72)',
             gridwidth=0.1
         ),
         yaxis2=dict(
-            title=val2,
+            title=val2 + " (" + str(yy2_unit) + ")",
             overlaying='y',
             side='right'
         )