mg-pso-gui 0.1.43__tar.gz → 0.1.45__tar.gz

{mg-pso-gui-0.1.43 → mg-pso-gui-0.1.45}/PKG-INFO

@@ -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 → mg-pso-gui-0.1.45}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg-pso-gui-0.1.45}/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])

{mg-pso-gui-0.1.43 → mg-pso-gui-0.1.45}/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

{mg-pso-gui-0.1.43 → mg-pso-gui-0.1.45}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.1.43'
+VERSION = '0.1.45'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()