mg-pso-gui 0.1.172__py3-none-any.whl → 0.1.175__py3-none-any.whl

{mg_pso_gui-0.1.172.dist-info → mg_pso_gui-0.1.175.dist-info}/METADATA

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

{mg_pso_gui-0.1.172.dist-info → mg_pso_gui-0.1.175.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=dm8u18zpNi9wVze_F2BVI1x9DCLyZvjhR2dX30csjcE,22550
-mgpsogui/gui/OptionManager.py,sha256=36_MlFd6nLt6xd6HHE2sHtL8oW7VBOZbCvJ8er-wWJ4,12544
+mgpsogui/gui/HomePage.py,sha256=cnqM5NspTVaujmJd3dg7qidUeWctEzp-9mzR-RM52k8,22730
+mgpsogui/gui/OptionManager.py,sha256=gGRwwzBMN7Bu9ATugWiM9OG7BRpa-mvhNQatjqUU1Ig,12946
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,8 +18,9 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=8f_xqmMaD8grmSKFFUHm8zIGEDrSUzU_sNW6CdR
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=_gdfiYr_GqqbQfSYLvdllIYCHdGsy1339cALfYLDAEQ,5909
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/SideBar.py,sha256=_3fEMB3MStWIoprfTfHVi4cZEsnP1H5MpFMWTCztSao,17209
-mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=PBIlpGWlr2TVkMoXww7iYMRBcCBuGvJ5Nt4_S-EqbhU,3449
+mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=a7_j7I5yGqtr-HYso4FUzCGEhi0WR2HjwCEky2T0fic,2849
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=4m3LtrnsLgJ9SthlQGmFbysyhept5bTK6ilGaVCBurU,21925
+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
 mgpsogui/gui/images/collapse.png,sha256=yicb16LaY7Nl5q9V8HHlht-Fbg5xU-l4_LJ_Arfmu1c,2989
@@ -32,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=nKviGGhN2FZhW28hzkhv8qGmtCBtlUMZOCifH2vY5SA,17222
+mgpsogui/util/GraphGenerator.py,sha256=mqbFEy5BcpXButIUFtI62cJ1gUHQhN6J3R2ttORiuK4,18058
 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
@@ -58,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.172.dist-info/METADATA,sha256=3_3X9SYzBM-cLdMteSMSFFyyPUKYJEulFoXys9PHS0g,9456
-mg_pso_gui-0.1.172.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.172.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.172.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.172.dist-info/RECORD,,
+mg_pso_gui-0.1.175.dist-info/METADATA,sha256=gdqL-2HHJyI9G3ziO4mYvrYo-3s7m-OUg7UEVAA4GPU,9456
+mg_pso_gui-0.1.175.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.175.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.175.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.175.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -85,6 +85,13 @@ class App(customtkinter.CTk):
 		self.selected_y2 = tk.StringVar()
 		self.selected_y2.set("NONE")
 
+		self.figure_style = tk.StringVar()
+		self.figure_style.set("Scatter")
+
+		self.matrix_values = []
+		self.matrix_values.append(tk.StringVar())
+		self.matrix_values[0].set("NONE")
+
 		self.running_config = None
 		self.selected_graph_name = None
 

mgpsogui/gui/OptionManager.py

@@ -13,7 +13,8 @@ class OptionManager():
                  "url": sv(),
                  "mode": sv(),
                  "files": {},
-                 "calibration_parameters": []}
+                 "calibration_parameters": [],
+                 "figure_parameters": []}
         self.steps = []
         self.service_parameters = {}
             
@@ -23,6 +24,7 @@ class OptionManager():
         self.arguments['mode'].set("Optimization: MG-PSO")
         self.arguments['files'] = {}
         self.arguments['calibration_parameters'].clear()
+        self.arguments['figure_parameters'].clear()
         self.steps = []
         self.service_parameters = {}
     
@@ -183,6 +185,12 @@ class OptionManager():
         obj["name"].set(key)
         obj["value"].set(value)
         self.arguments["calibration_parameters"].append(obj)
+
+    def add_figure_param(self, key, value):
+        obj = {"name": sv(), "value": sv()}
+        obj["name"].set(key)
+        obj["value"].set(value)
+        self.arguments["figure_parameters"].append(obj)
     
     def move_argument_up(self, index):
         if index > 0:
@@ -208,6 +216,9 @@ class OptionManager():
         
     def remove_calibration_parameter(self, index):
         self.arguments["calibration_parameters"].pop(index)
+
+    def remove_figure_parameter(self, index):
+        self.arguments["figure_parameters"].pop(index)
         
     def remove_step(self, index):
         self.steps.pop(index)

mgpsogui/gui/VisualizeTab/MatrixEditor.py

@@ -0,0 +1,64 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkOptionMenu
+import tkinter as tk
+
+global option_manager
+
+class MatrixEditor(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 home_page: None,
+                 columns: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        self.home_page = home_page
+        self.columns = columns  
+        self.key_values = option_manager.get_arguments()['figure_parameters']
+        self.edit_mode = False
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+
+    def set_columns(self, columns):
+        self.columns = columns
+        
+    def toggle_edit_mode(self):
+        self.clear()
+        self.edit_mode = not self.edit_mode
+        self.render()
+        
+    def render(self):
+        row = 0
+        index = 0
+        
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        for key_value_pair in self.key_values:
+            CTkLabel(self.containerFrame, text=self.key_values[index]["name"].get()).grid(row=row, column=0, padx=5, pady=5, sticky="")
+            
+            if self.edit_mode:
+                return_func = lambda index=index: (self.clear(), self.option_manager.remove_figure_parameter(index), self.home_page.update_graph(), self.render())
+                CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"], command=self.home_page.update_graph)
+                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+            row += 1
+            index += 1
+            
+        if self.edit_mode:
+            CTkButton(self.containerFrame, text="Exit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+        else:
+            CTkButton(self.containerFrame, text="Edit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+        add_key_func = lambda: (self.clear(), self.option_manager.add_figure_param("Fig " + str(len(self.key_values)) , self.columns[2]), self.home_page.update_graph(), self.render())
+        CTkButton(self.containerFrame, text="Add Figure", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")

mgpsogui/gui/VisualizeTab/SideBar.py

@@ -9,6 +9,8 @@ from customtkinter import CTkOptionMenu
 from PIL import Image
 import os
 
+from . import MatrixEditor as me
+
 import pandas as pd
 
 class SideBar(CTkScrollableFrame):
@@ -264,6 +266,81 @@ class SideBar(CTkScrollableFrame):
                 if (self.home_page.csv_y2_selector.get() not in columns):
                     self.home_page.csv_y2_selector.set(columns[3])
 
+                style_label = CTkLabel(self.containerFrame, text="Figure Style:")
+                style_label.grid(row=8, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
+                
+                self.home_page.figure_style_selector = CTkOptionMenu(self.containerFrame, values=["Scatter", "Bars", "Lines", "Area", "Box"], variable=self.home_page.figure_style, command=self.home_page.update_graph)
+                self.home_page.figure_style_selector.grid(row=9, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+
+        elif (selected_graph == "Matrix Editor"):
+            
+            info = self.option_manager.get_project_data()
+            folder = os.path.join(info['path'], info['name'])
+            if not os.path.exists(folder):
+                os.makedirs(folder)
+                
+            # Get all CSV files in the folder and add their paths to a list
+            path_map = {}
+            name_list = []
+            for root, dirs, files in os.walk(folder):
+                for file in files:
+                    if file.endswith(".csv"):
+                        name = file.replace(".csv", "")
+                        name_list.append(name)
+                        path_map[name] = os.path.join(root, file)
+            
+            if (len(name_list) == 0):
+                name_list.append("No files found...")
+            else:
+                if (self.home_page.selected_csv.get() not in name_list):
+                    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, 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=(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):
+                self.home_page.csv_data = pd.read_csv(path_map[selected_file])
+                print(self.home_page.csv_data)
+                self.home_page.open_file = selected_file
+                
+            if (self.home_page.csv_data is not None):
+                # Get all column names of CSV
+                columns = self.home_page.csv_data.columns
+                
+                style_label = CTkLabel(self.containerFrame, text="Figure Style:")
+                style_label.grid(row=2, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
+                
+                self.home_page.figure_style_selector = CTkOptionMenu(self.containerFrame, values=["Scatter", "Bars", "Lines", "Area", "Box"], variable=self.home_page.figure_style, command=self.home_page.update_graph)
+                self.home_page.figure_style_selector.grid(row=3, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+
+                x_axis_label = CTkLabel(self.containerFrame, text="X Axis:")
+                x_axis_label.grid(row=4, 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=5, 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])
+                
+                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_columnconfigure(0, weight=1)
+                self.matrix_editor.grid_rowconfigure(0, weight=1)
+
+
+                #y1_axis_label = CTkLabel(self.containerFrame, text="Y Axis:")
+                #y1_axis_label.grid(row=6, 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=7, 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])
+
     def load_special_csv(self, file_path):
         file_metadata = {}
         data_metadata = {}

mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -61,7 +61,7 @@ def create_tab(self, tab):
     self.graph_container.grid_columnconfigure(0, weight=1)
     self.graph_container.grid_rowconfigure(0, weight=1)
     
-    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Custom CSV", "Compare CSV", "Sampling CSV"], variable=self.graph_selector_value, command=self.update_graph)
+    self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Custom CSV", "Compare CSV", "Sampling CSV", "Matrix Editor"], variable=self.graph_selector_value, command=self.update_graph)
     self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     # Create SideBar

mgpsogui/util/GraphGenerator.py

@@ -36,6 +36,9 @@ def generate_graphs(HomePage):
         elif (selected_graph == "Sampling CSV"):
             HomePage.selected_graph_name = "sampling_csv"
             sampling_csv(HomePage, HomePage.option_manager)
+        elif (selected_graph == "Matrix Editor"):
+            HomePage.selected_graph_name = "matrix_editor"
+            pass
             
         image_path = os.path.join(folder, HomePage.selected_graph_name + ".png")
         
@@ -444,6 +447,8 @@ def compare_csv(homepage, option_manager):
 def sampling_csv(homepage, option_manager):
     fig = go.Figure()
 
+    style = homepage.figure_style.get()
+
     data = homepage.csv_data
 
     x = homepage.csv_x_selector.get()
@@ -466,8 +471,21 @@ def sampling_csv(homepage, option_manager):
     
     yy2_unit = ""
 
-    fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers'))
-    fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', mode='markers'))
+    if (style == "Scatter"):
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers'))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', mode='markers'))
+    elif (style == "Bars"):
+        fig.add_trace(go.Bar(x=xx, y=yy, name=val))
+        fig.add_trace(go.Bar(x=xx, y=yy2, name=val2, yaxis='y2'))
+    elif (style == "Lines"):
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
+    elif (style == "Area"):
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, fill='tozeroy'))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', fill='tozeroy'))
+    elif (style == "Box"):
+        fig.add_trace(go.Box(x=xx, y=yy, name=val))
+        fig.add_trace(go.Box(x=xx, y=yy2, name=val2, yaxis='y2'))
 
     fig.update_layout(
         title="",