mg-pso-gui 0.1.44__py3-none-any.whl → 0.1.46__py3-none-any.whl

{mg_pso_gui-0.1.44.dist-info → mg_pso_gui-0.1.46.dist-info}/METADATA

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

{mg_pso_gui-0.1.44.dist-info → mg_pso_gui-0.1.46.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=pVEUEhg6xi7pSprWCX4kpCws26ioHh3j_8j1fjKCtqY,9683
+mgpsogui/util/GraphGenerator.py,sha256=OQrEGz92xzAGdnD2qu9bs2NX1JwGkE4TElK9RaLoprw,11893
 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.44.dist-info/METADATA,sha256=idA0QtoZ9t4DssHp8kW81n886TJLbq0nCOmqZQgrqHs,9458
-mg_pso_gui-0.1.44.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.1.44.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.44.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.44.dist-info/RECORD,,
+mg_pso_gui-0.1.46.dist-info/METADATA,sha256=yCWYgKgHDk2DLy1OBsl2j-wl2JLIUJzJQavDfblTB-k,9458
+mg_pso_gui-0.1.46.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.1.46.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.46.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.46.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -26,6 +26,9 @@ def generate_graphs(HomePage):
         elif (selected_graph == "Calibrated Parameters"):
             HomePage.selected_graph_name = "calibrated_params_by_round"
             calibrated_params_by_round(HomePage.running_config['steps'], HomePage.calibration_data, HomePage.option_manager)
+        elif (selected_graph == "Custom CSV"):
+            HomePage.selected_graph_name = "custom_csv"
+            custom_csv(HomePage, HomePage.option_manager)
             
         image_path = os.path.join(folder, HomePage.selected_graph_name + ".png")
         
@@ -272,4 +275,70 @@ def calibrated_params_by_round(config, list_of_objs, option_manager):
     with open(os.path.join(folder, "calibrated_params_by_round.html"), "w") as f:
         f.write(html)
 
-    return fig
+    return fig
+
+def custom_csv(homepage, option_manager):
+    fig = go.Figure()
+
+    data = homepage.csv_data
+
+    x = homepage.csv_x_selector.get()
+    val = homepage.csv_y1_selector.get()
+    val2 = homepage.csv_y2_selector.get()
+    
+    xx = None
+    if x == "time":
+        xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce').iloc[2:]
+    else:
+        xx = pd.to_numeric(data[x], errors="coerce").iloc[2:]
+        
+    yy = pd.to_numeric(data[val], errors="coerce").iloc[2]
+    
+    yy_unit = pd.to_numeric(data[val], errors="coerce").iloc[2]
+    
+    yy2 = pd.to_numeric(data[val2], errors="coerce").iloc[2:]
+    
+    yy2_unit = pd.to_numeric(data[val2], errors="coerce").iloc[2]
+
+    fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
+    fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
+
+    fig.update_layout(
+        title="",
+        xaxis_title=x,
+        yaxis_title=val,
+        font=dict(color='white'),
+        paper_bgcolor='rgba(42, 42, 42, 0)',
+        plot_bgcolor='rgb(62, 62, 62)',
+        xaxis=dict(
+            gridcolor='rgb(72, 72, 72)',
+            gridwidth=1
+        ),
+        yaxis=dict(
+            title=val + " (" + str(yy_unit) + ")",
+            autorange=True,
+            gridcolor='rgb(72, 72, 72)',
+            gridwidth=0.1
+        ),
+        yaxis2=dict(
+            title=val2 + " (" + str(yy2_unit) + ")",
+            overlaying='y',
+            side='right'
+        )
+    )
+
+    info = option_manager.get_project_data()
+    folder = os.path.join(info['path'], info['name'])
+    
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+
+    fig.write_image(os.path.join(folder, "custom_csv.png"), width=1280, height=720)
+    fig.write_html(os.path.join(folder, "custom_csv.html"), include_plotlyjs='cdn', auto_open=False)
+    with open(os.path.join(folder, "custom_csv.html"), "r") as f:
+        html = f.read()
+        html = html.replace("<body>", "<body bgcolor='#2a2a2a'>")
+    with open(os.path.join(folder, "custom_csv.html"), "w") as f:
+        f.write(html)
+
+    return fig