mg-pso-gui 0.1.176__py3-none-any.whl → 0.1.178__py3-none-any.whl

{mg_pso_gui-0.1.176.dist-info → mg_pso_gui-0.1.178.dist-info}/METADATA

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

{mg_pso_gui-0.1.176.dist-info → mg_pso_gui-0.1.178.dist-info}/RECORD

@@ -19,7 +19,7 @@ mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROj
 mgpsogui/gui/SetupTab/StepView.py,sha256=_gdfiYr_GqqbQfSYLvdllIYCHdGsy1339cALfYLDAEQ,5909
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=-nwVw4FizlbVZdnM7r8-bexowF_qUtoeQ0Mu0mZijFQ,2851
-mgpsogui/gui/VisualizeTab/SideBar.py,sha256=4m3LtrnsLgJ9SthlQGmFbysyhept5bTK6ilGaVCBurU,21925
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=342SridpIqL6LBRE2rDAoUQqbMYCBCiSL3xNo3iPzz8,21936
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=_SiRDUvYJ7VUmMZ_VzylWP2tFygbLzWeUCGW3TU3yZM,3466
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/images/IGOW 4 Logo.png,sha256=JixNXz5gOEj898VF-_PHthAlGU-6W-y9ucb4EVNPtjs,433752
@@ -33,7 +33,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=mqbFEy5BcpXButIUFtI62cJ1gUHQhN6J3R2ttORiuK4,18058
+mgpsogui/util/GraphGenerator.py,sha256=OyCPwIDkbRzNZiJQII3F76yTKj_EdeMiE8vaih-n5lE,22811
 mgpsogui/util/PSORunner.py,sha256=sWgickFGl97p3ybWz97LR5qeYhnNqryKx5nWAa-NhwA,6306
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
@@ -59,8 +59,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.176.dist-info/METADATA,sha256=sjUjjskNruo5o2pKMYsgrXAxLfLw12Cg_YmbK0X0jUk,9456
-mg_pso_gui-0.1.176.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.176.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.176.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.176.dist-info/RECORD,,
+mg_pso_gui-0.1.178.dist-info/METADATA,sha256=HSLGeRWZJgFvQtiZkncX4wzYtlUOE7gv9q9pjzO1NaU,9456
+mg_pso_gui-0.1.178.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.178.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.178.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.178.dist-info/RECORD,,

mgpsogui/gui/VisualizeTab/SideBar.py

@@ -327,7 +327,7 @@ class SideBar(CTkScrollableFrame):
                     self.home_page.csv_x_selector.set(columns[1])
                 
                 self.matrix_editor = me.MatrixEditor(self.containerFrame, option_manager=self.option_manager, home_page=self.home_page, columns=columns)
-                self.matrix_editor.grid(row=6, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+                self.matrix_editor.grid(row=6, rowspan=3, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
                 self.matrix_editor.grid_columnconfigure(0, weight=1)
                 self.matrix_editor.grid_rowconfigure(0, weight=1)
 

mgpsogui/util/GraphGenerator.py

@@ -1,5 +1,6 @@
 import plotly.express as px
 import plotly.graph_objs as go
+from plotly.subplots import make_subplots
 import pandas as pd
 import numpy as np
 import os
@@ -38,6 +39,7 @@ def generate_graphs(HomePage):
             sampling_csv(HomePage, HomePage.option_manager)
         elif (selected_graph == "Matrix Editor"):
             HomePage.selected_graph_name = "matrix_editor"
+            matrix_editor(HomePage, HomePage.option_manager)
             pass
             
         image_path = os.path.join(folder, HomePage.selected_graph_name + ".png")
@@ -525,4 +527,143 @@ def sampling_csv(homepage, option_manager):
     with open(os.path.join(folder, "sampling_csv.html"), "w") as f:
         f.write(html)
 
+    return fig
+
+def matrix_editor(homepage, option_manager):
+    style = homepage.figure_style.get()
+    data = homepage.csv_data
+    x = homepage.csv_x_selector.get()
+
+    all_figures = []
+    figure_parameters = option_manager.get_arguments()['figure_parameters']
+
+    color_list = ['#636EFA', '#EF553B', '#00CC96', '#AB63FA', '#FFA15A', '#19D3F3', '#FF6692', '#B6E880', '#FF97FF', '#FECB52']
+    color_index = 0
+    color_dict = {}
+
+    total_figures = 0
+    for parameter in figure_parameters:
+        name = parameter['name'].get()
+        if ("Fig" not in name):
+            continue
+        total_figures += 1
+
+    figures_per_row = 1
+    if (total_figures == 1):
+        figures_per_row = 1
+    elif (total_figures == 2):
+        figures_per_row = 2
+    elif (total_figures == 3 or total_figures == 4):
+        figures_per_row = 2
+    elif (total_figures == 5 or total_figures == 6):
+        figures_per_row = 3
+    elif (total_figures == 7 or total_figures == 8):
+        figures_per_row = 4
+    elif (total_figures == 9 or total_figures == 10):
+        figures_per_row = 5
+
+    fig_combined = make_subplots(rows=(total_figures // figures_per_row) + 1, cols=figures_per_row, shared_xaxes=False, shared_yaxes=False)
+
+    for parameter in figure_parameters:
+        name = parameter['name'].get()
+
+        if ("Fig" not in name):
+            continue
+
+        fig = go.Figure()
+        val = parameter['value'].get()
+        
+        xx = None
+        if x == "time":
+            xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce')
+        elif x == "date":
+            xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce')
+        else:
+            xx = pd.to_numeric(data[x], errors="coerce")
+            
+        yy = pd.to_numeric(data[val], errors="coerce")
+        
+        yy_unit = ""
+
+        if (style == "Scatter"):
+            fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers'))
+        elif (style == "Bars"):
+            fig.add_trace(go.Bar(x=xx, y=yy, name=val))
+        elif (style == "Lines"):
+            fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
+        elif (style == "Area"):
+            fig.add_trace(go.Scatter(x=xx, y=yy, name=val, fill='tozeroy'))
+        elif (style == "Box"):
+            fig.add_trace(go.Box(x=xx, y=yy, name=val))
+
+        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
+            )
+        )
+        all_figures.append(fig)
+
+    row = 1
+    col = 1
+    for fig in all_figures:
+        for trace in fig.data:
+
+            if trace.name not in color_dict:
+                color_dict[trace.name] = color_list[color_index % len(color_list)]
+                color_index += 1
+
+            trace.marker.color = color_dict[trace.name]
+
+            if fig_combined.data:
+                trace.showlegend = not any(t.name == trace.name for t in fig_combined.data)
+            fig_combined.add_trace(trace, row=row, col=col)
+        
+        # Get the layout titles from the individual figure
+        xaxis_title = fig.layout.xaxis.title.text
+        yaxis_title = fig.layout.yaxis.title.text
+
+        # Update the combined figure's subplot with the titles
+        fig_combined.update_xaxes(title_text=xaxis_title, row=row, col=col)
+        fig_combined.update_yaxes(title_text=yaxis_title, row=row, col=col)
+
+        col += 1
+        if col > figures_per_row:
+            row += 1
+            col = 1
+
+    info = option_manager.get_project_data()
+    folder = os.path.join(info['path'], info['name'])
+    
+    fig = fig_combined
+    fig.update_layout(
+        title="",
+        font=dict(color='white'),
+        paper_bgcolor='rgba(42, 42, 42, 0)',
+        plot_bgcolor='rgb(62, 62, 62)'
+    )
+
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+
+    fig.write_image(os.path.join(folder, "matrix_editor.png"), width=1280, height=720)
+    fig.write_html(os.path.join(folder, "matrix_editor.html"), include_plotlyjs='cdn', auto_open=False)
+    with open(os.path.join(folder, "matrix_editor.html"), "r") as f:
+        html = f.read()
+        html = html.replace("<body>", "<body bgcolor='#2a2a2a'>")
+    with open(os.path.join(folder, "matrix_editor.html"), "w") as f:
+        f.write(html)
+
     return fig