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

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

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

{mg_pso_gui-0.1.43.dist-info → mg_pso_gui-0.1.45.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=g4GZchYianaTrG4_vJR-AXk30oAW1wjixxR6PZXgF2M,6037
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=OhKGjlGzwGr4QX8ig5-D_QbcLbK3dOL9fy0md14Y-j8,6025
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=zYu5NDEYkNa76fx_JU8iZ8hMTzdDNcP77cVZwR7Qhkw,3462
 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=pVEUEhg6xi7pSprWCX4kpCws26ioHh3j_8j1fjKCtqY,9683
+mgpsogui/util/GraphGenerator.py,sha256=X-u8v29JQLCPbDlXgnXhfDVg5kdULfDC2mNpW3fKshM,11692
 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.43.dist-info/METADATA,sha256=otk2vVdgdFHMsE4ukYODZiZF10JV-KgGvl1wX2EWOLk,9458
-mg_pso_gui-0.1.43.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.1.43.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.43.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.43.dist-info/RECORD,,
+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,,

mgpsogui/gui/VisualizeTab/SideBar.py

@@ -78,10 +78,10 @@ class SideBar(CTkScrollableFrame):
                     self.home_page.selected_csv.set(name_list[0])
             
             file_label = CTkLabel(self.containerFrame, text="CSV File:")
-            file_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+            file_label.grid(row=0, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
             
             self.home_page.csv_file_selector = CTkOptionMenu(self.containerFrame, values=name_list, variable=self.home_page.selected_csv, command=self.home_page.update_graph)
-            self.home_page.csv_file_selector.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
+            self.home_page.csv_file_selector.grid(row=1, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
             
             selected_file = self.home_page.selected_csv.get()
             if (selected_file in path_map and selected_file != self.home_page.open_file):
@@ -93,28 +93,28 @@ class SideBar(CTkScrollableFrame):
                 columns = self.home_page.csv_data.columns
                 
                 x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
-                x_axis_label.grid(row=2, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+                x_axis_label.grid(row=2, column=0, padx=(20, 20), pady=(40, 5), sticky="w")
                 
                 self.home_page.csv_x_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_x, command=self.home_page.update_graph)
-                self.home_page.csv_x_selector.grid(row=3, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
+                self.home_page.csv_x_selector.grid(row=3, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
                 
                 if (self.home_page.csv_x_selector.get() not in columns):
                     self.home_page.csv_x_selector.set(columns[1])
                 
                 y1_axis_label = CTkLabel(self.containerFrame, text="Y Axis:")
-                y1_axis_label.grid(row=4, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+                y1_axis_label.grid(row=4, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
                 
                 self.home_page.csv_y1_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_y1, command=self.home_page.update_graph)
-                self.home_page.csv_y1_selector.grid(row=5, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
+                self.home_page.csv_y1_selector.grid(row=5, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
                 
                 if (self.home_page.csv_y1_selector.get() not in columns):
                     self.home_page.csv_y1_selector.set(columns[2])
                 
                 y2_axis_label = CTkLabel(self.containerFrame, text="Secondary Y Axis:")
-                y2_axis_label.grid(row=6, column=0, padx=(20, 20), pady=(20, 20), sticky="w")
+                y2_axis_label.grid(row=6, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
                 
                 self.home_page.csv_y2_selector = CTkOptionMenu(self.containerFrame, values=columns, variable=self.home_page.selected_y2, command=self.home_page.update_graph)
-                self.home_page.csv_y2_selector.grid(row=7, column=0, padx=(20, 20), pady=(20, 20), sticky="ew")
+                self.home_page.csv_y2_selector.grid(row=7, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
                 
                 if (self.home_page.csv_y2_selector.get() not in columns):
                     self.home_page.csv_y2_selector.set(columns[3])

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,65 @@ 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:]
+    yy2 = 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,
+            autorange=True,
+            gridcolor='rgb(72, 72, 72)',
+            gridwidth=0.1
+        ),
+        yaxis2=dict(
+            title=val2,
+            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