mg-pso-gui 0.1.13__py3-none-any.whl → 0.2.75__py3-none-any.whl

mgpsogui/gui/SetupTab/FunctionsList.py

@@ -4,6 +4,11 @@ from customtkinter import CTkLabel
 from customtkinter import CTkButton
 from customtkinter import CTkEntry
 from customtkinter import CTkOptionMenu
+from customtkinter import CTkImage
+from .CustomFunctionEditorWindow import CustomFunctionEditorWindow as CFEW
+import os
+import PIL
+from PIL import Image
 import tkinter as tk
 
 class FunctionsList(CTkFrame):
@@ -20,6 +25,10 @@ class FunctionsList(CTkFrame):
         self.edit_mode = False
         self.render()
     
+    def refresh(self, op=None):
+        self.clear()
+        self.render()
+
     def clear(self):
         self.containerFrame.destroy()
         
@@ -36,7 +45,7 @@ class FunctionsList(CTkFrame):
         
         row = 1
         
-        funcs = self.option_manager.get_steps()[self.step_index]["objfunc"]
+        funcs = self.option_manager.get_steps()[self.step_index]["objective_functions"]
         
         index = 0
         for func in funcs:
@@ -47,19 +56,64 @@ class FunctionsList(CTkFrame):
             
             row += 1
             
+            columns = ["absdiff",
+                       "absdifflog",
+                       "ave",
+                       "bias",
+                       "fhf",
+                       "ioa",
+                       "ioa2",
+                       "kge",
+                       "kge09",
+                       "mns",
+                       "mse",
+                       "ns",
+                       "ns2log",
+                       "nslog1p",
+                       "nslog2",
+                       "pbias",
+                       "pmcc",
+                       "rmse",
+                       "trmse",
+                       "custom"]
+            
             CTkEntry(self.containerFrame, textvariable=func["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
-            CTkEntry(self.containerFrame, textvariable=func["of"]).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+            CTkOptionMenu(self.containerFrame, values=columns, variable=func["objective_function"], command=self.refresh).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
             CTkEntry(self.containerFrame, textvariable=func["weight"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             
             row += 1
+
+            if func["objective_function"].get() == "custom":
+
+                CTkLabel(self.containerFrame, text="Custom Function:").grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+                #CTkLabel(self.containerFrame, text="Target:").grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="nsew")
+
+                row += 1
+
+                CTkEntry(self.containerFrame, textvariable=func["custom_function"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+                #CTkOptionMenu(self.containerFrame, values=["Positive Best", "Zero Best"], variable=func["custom_function_goal"]).grid(row=row, column=2, padx=(5, 5), pady=(5, 5), sticky="ew")
+
+                def button_click_event(function_index):
+                    dialog = CFEW(title="Edit Custom Function", step_index=self.step_index, function_index=function_index, option_manager=self.option_manager)
+
+
+                open_window = lambda event=None, function_index=index: (button_click_event(function_index))
+                expand_image = CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
+                button = CTkButton(self.containerFrame, width=30, text=None, image=expand_image, command=open_window)
+                button.grid(row=row, column=3, padx=(5, 5), pady=(5, 5), sticky="new")
+
+
+                row += 1
             
-            CTkLabel(self.containerFrame, text="Data:").grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            CTkLabel(self.containerFrame, text="Observed and Simulated Data:").grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
             
             row += 1
-            for obj in func["data"]:
-                CTkEntry(self.containerFrame, textvariable=obj).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
-                row += 1
             
+            CTkEntry(self.containerFrame, textvariable=func["data_observed"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            row += 1
+            CTkEntry(self.containerFrame, textvariable=func["data_simulated"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="nsew")
+            row += 1
+
             if self.edit_mode:
                 remove_func = lambda index=index: (self.clear(), self.option_manager.remove_function(self.step_index, index), self.render())
                 dupe_func = lambda index=index: (self.clear(), self.option_manager.dupe_function(self.step_index, index), self.render())

mgpsogui/gui/SetupTab/{StaticParameterView.py → ListEditor.py}

@@ -3,24 +3,36 @@ 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 StaticParameterView(CTkScrollableFrame):
+class ListEditor(CTkFrame):
     def __init__(self, *args,
                  option_manager: None,
+                 columns: None,
+                 parameter_name: None,
+                 parameter_remove_func: None,
+                 parameter_add_func: None,
+                 title: None,
                  **kwargs):
         super().__init__(*args, **kwargs)
         
         self.option_manager = option_manager
-        self.key_values = option_manager.get_arguments()['param']
+        self.columns = columns  
+        self.parameter_name = parameter_name
+        self.parameter_remove_func = parameter_remove_func
+        self.parameter_add_func = parameter_add_func
+        self.key_values = option_manager.get(self.parameter_name)
         self.edit_mode = False
+        self.title = title
         
         self.render()
 
     def clear(self):
         self.containerFrame.destroy()
+
+    def set_columns(self, columns):
+        self.columns = columns
         
     def toggle_edit_mode(self):
         self.clear()
@@ -31,24 +43,23 @@ class StaticParameterView(CTkScrollableFrame):
         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 = CTkFrame(self, fg_color="transparent")
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="new")
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
-        CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
-        CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
+        CTkLabel(self.containerFrame, text=self.title).grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="ew")
         row += 1
-        
+
         for key_value_pair in self.key_values:
-            CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
-            
             if self.edit_mode:
-                return_func = lambda index=index: (self.clear(), self.option_manager.remove_argument(index), self.render())
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"])
+                bb.grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+                
+                return_func = lambda index=index: (self.clear(), self.parameter_remove_func(index), 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 = CTkEntry(self.containerFrame)
-                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
-                bb.configure(textvariable=self.key_values[index]["value"])
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"])
+                bb.grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             row += 1
             index += 1
             
@@ -57,5 +68,5 @@ class StaticParameterView(CTkScrollableFrame):
         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_argument("name", "value"), self.render())
+        add_key_func = lambda: (self.clear(), self.parameter_add_func("Param " + str(len(self.key_values)) , self.columns[2]), self.render())
         CTkButton(self.containerFrame, text="Add Parameter", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")

mgpsogui/gui/SetupTab/ListParametersView.py

@@ -26,8 +26,8 @@ class ListParametersView(CTkScrollableFrame):
         self.visual_name.set("name")
         
         
-        self.name = self.option_manager.get_steps()[self.step_index]["param"][bound_index]["name"].get()
-        self.default = self.option_manager.get_steps()[self.step_index]["param"][bound_index]["default_value"].get()
+        self.name = self.option_manager.get_steps()[self.step_index]["parameter_objects"][bound_index]["name"].get()
+        self.default = self.option_manager.get_steps()[self.step_index]["parameter_objects"][bound_index]["default_value"].get()
         try:
             if self.name != "" and self.default != "":
                 
@@ -75,8 +75,9 @@ class ListParametersView(CTkScrollableFrame):
         
     def open_csv(self):
         # Shell out to the terminal and run "open ./example.html"
-        info = self.option_manager.get_project_data()
-        folder = os.path.join(info['path'], info['name'])
+        #info = self.option_manager.get_project_data()
+        #folder = os.path.join(info['path'], info['name'])
+        folder = self.option_manager.get_project_folder()
         
         
         path = self.visual_name.get()
@@ -182,5 +183,5 @@ class ListParametersView(CTkScrollableFrame):
             
         default_values = default_values[:-1] + "]"
             
-        self.option_manager.get_steps()[self.step_index]["param"][self.bounds_index]["name"].set(visual_name)
-        self.option_manager.get_steps()[self.step_index]["param"][self.bounds_index]["default_value"].set(default_values)
+        self.option_manager.get_steps()[self.step_index]["parameter_objects"][self.bounds_index]["name"].set(visual_name)
+        self.option_manager.get_steps()[self.step_index]["parameter_objects"][self.bounds_index]["default_value"].set(default_values)

mgpsogui/gui/SetupTab/{CalibrationParametersView.py → OverrideParameterMetrics.py}

@@ -3,20 +3,25 @@ from customtkinter import CTkFrame
 from customtkinter import CTkLabel
 from customtkinter import CTkButton
 from customtkinter import CTkEntry
+from customtkinter import CTkOptionMenu
 import tkinter as tk
+import subprocess
+import platform
+import os
 
-global option_manager
-
-class CalibrationParametersView(CTkScrollableFrame):
+class OverrideParameterMetrics(CTkScrollableFrame):
     def __init__(self, *args,
                  option_manager: None,
+                 step_index: 0,
                  **kwargs):
         super().__init__(*args, **kwargs)
         
         self.option_manager = option_manager
-        self.key_values = option_manager.get_arguments()['calibration_parameters']
-        self.edit_mode = False
+        self.step_index = step_index
+        self.key_values = option_manager.get_override(step_index)
         
+        self.edit_mode = False
+
         self.render()
 
     def clear(self):
@@ -27,6 +32,12 @@ class CalibrationParametersView(CTkScrollableFrame):
         self.edit_mode = not self.edit_mode
         self.render()
         
+    def add_key(self, key="iters", value="1"):
+        self.option_manager.add_override(self.step_index, key, value)
+        
+    def remove_key(self, index):
+        self.option_manager.remove_override(self.step_index, index)
+        
     def render(self):
         row = 0
         index = 0
@@ -40,10 +51,23 @@ class CalibrationParametersView(CTkScrollableFrame):
         row += 1
         
         for key_value_pair in self.key_values:
-            CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            overwrite_values = [
+                'iters',
+                'ftol',
+                'ftol_iter',
+                'rtol',
+                'rtol_iter',
+                'n_threads',
+                'n_particles',
+                'cost_target'
+            ]
             
+
+            CTkOptionMenu(self.containerFrame, values=overwrite_values, variable=self.key_values[index]["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+
+
             if self.edit_mode:
-                return_func = lambda index=index: (self.clear(), self.option_manager.remove_calibration_parameter(index), self.render())
+                return_func = lambda index=index: (self.clear(), self.remove_key(index), 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 = CTkEntry(self.containerFrame)
@@ -57,5 +81,7 @@ class CalibrationParametersView(CTkScrollableFrame):
         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_calibration_param("name", "value"), self.render())
-        CTkButton(self.containerFrame, text="Add Parameter", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+        add_key_func = lambda: (self.clear(), self.add_key(), self.render())
+        CTkButton(self.containerFrame, text="Add", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+        
+        row += 1

mgpsogui/gui/SetupTab/OverrideParameterWindow.py

@@ -0,0 +1,40 @@
+from typing import Union, Tuple, Optional
+
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkInputDialog
+from .OverrideParameterMetrics import OverrideParameterMetrics as ListView
+
+class OverrideParameterWindow(CTkInputDialog):
+    """
+    Dialog with extra window, message, entry widget, cancel and ok button.
+    For detailed information check out the documentation.
+    """
+
+    def __init__(self, *args,
+                 step_index: 0,
+                 option_manager: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.geometry("400x800")
+        
+        self.step_index = step_index
+        self.option_manager = option_manager
+        self.bounds = None
+
+    def _create_widgets(self):
+
+        self.grid_columnconfigure((0, 1), weight=1)
+        self.rowconfigure(0, weight=1)
+
+        self.bounds = ListView(
+                self, step_index=self.step_index, option_manager=self.option_manager)
+        self.bounds.grid(row=0, column=0, columnspan=2, padx=(10, 10),
+                    pady=(10, 10), sticky="nsew")
+        self.bounds.grid_columnconfigure(0, weight=1)
+
+    def _on_closing(self):
+        self.grab_release()
+        self.destroy()

mgpsogui/gui/SetupTab/SetupTab.py

@@ -1,11 +1,21 @@
 
 
 from . import StepView as sv
-from . import StaticParameterView as spv
-from . import CalibrationParametersView as cpv
+from ..General import ParameterView as pv
 
 import customtkinter
 
+def setup_refresh(self):
+    self.static_param_frame.clear()
+    self.static_param_frame.destroy()
+    self.calib_param_frame.clear()
+    self.calib_param_frame.destroy()
+    #self.optimal_param_frame.clear()
+    #self.optimal_param_frame.destroy()
+    self.steps_frame.clear()
+    self.steps_frame.destroy()
+    self.paramtabview.destroy()
+
 def create_tab(self, tab):
     
     tab.grid_columnconfigure(0, weight=8)
@@ -13,12 +23,14 @@ def create_tab(self, tab):
     tab.grid_rowconfigure(0, weight=1)
     
     self.paramtabview = customtkinter.CTkTabview(tab, bg_color="transparent", fg_color="transparent")
-    self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(10, 10), sticky="nsew")
+    self.paramtabview.grid(row=0, column=1, padx=(0, 0), pady=(0, 0), sticky="nsew")
     
-    tab1 = "Static Parameters"
-    tab2 = "Calibration Parameters"
+    tab1 = "Model Parameters"
+    tab2 = "Hyperparameters"
+    #tab3 = "Optimal"
     self.paramtabview.add(tab1)
     self.paramtabview.add(tab2)
+    #self.paramtabview.add(tab3)
     
     self.paramtabview.tab(tab1).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab1).grid_rowconfigure(0, weight=1)
@@ -26,18 +38,26 @@ def create_tab(self, tab):
     self.paramtabview.tab(tab2).grid_columnconfigure(0, weight=1)
     self.paramtabview.tab(tab2).grid_rowconfigure(0, weight=1)
     
-    self.static_param_frame = spv.StaticParameterView(self.paramtabview.tab(tab1), option_manager=self.option_manager)
-    self.static_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    #self.paramtabview.tab(tab3).grid_columnconfigure(0, weight=1)
+    #self.paramtabview.tab(tab3).grid_rowconfigure(0, weight=1)
+    
+    self.static_param_frame = pv.ParameterView(self.paramtabview.tab(tab1), option_manager=self.option_manager, list_name="model_parameters")
+    self.static_param_frame.grid(row=0, column=0, padx=(5, 10), pady=(10, 0), sticky="nsew")
     self.static_param_frame.grid_columnconfigure(0, weight=1)
     self.static_param_frame.grid_rowconfigure(0, weight=1)
     
-    self.calib_param_frame = cpv.CalibrationParametersView(self.paramtabview.tab(tab2), option_manager=self.option_manager)
-    self.calib_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    self.calib_param_frame = pv.ParameterView(self.paramtabview.tab(tab2), option_manager=self.option_manager, list_name="hyperparameters")
+    self.calib_param_frame.grid(row=0, column=0, padx=(5, 10), pady=(10, 0), sticky="nsew")
     self.calib_param_frame.grid_columnconfigure(0, weight=1)
     self.calib_param_frame.grid_rowconfigure(0, weight=1)
     
-    self.steps_frame = sv.StepView(tab, label_text="Group Editor", option_manager=self.option_manager)
-    self.steps_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    #self.optimal_param_frame = opv.OptimalParameterView(self.paramtabview.tab(tab3), option_manager=self.option_manager)
+    #self.optimal_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
+    #self.optimal_param_frame.grid_columnconfigure(0, weight=1)
+    #self.optimal_param_frame.grid_rowconfigure(0, weight=1)
+    
+    self.steps_frame = sv.StepView(tab, label_text="Group Editor", option_manager=self.option_manager, home_page=self)
+    self.steps_frame.grid(row=0, column=0, padx=(10, 5), pady=(10, 0), sticky="nsew")
     self.steps_frame.grid_columnconfigure(0, weight=1)
     self.steps_frame.grid_rowconfigure(0, weight=1)
     

mgpsogui/gui/SetupTab/StepView.py

@@ -5,38 +5,55 @@ from customtkinter import CTkButton
 from customtkinter import CTkEntry
 from customtkinter import CTkTextbox
 from customtkinter import CTkImage
+from customtkinter import CTkOptionMenu
+from .OverrideParameterWindow import OverrideParameterWindow as OPW
 from PIL import Image
 import os
 
 from . import BoundsList
 from . import FunctionsList
+from . import ListEditor
 
 
 class StepView(CTkScrollableFrame):
     def __init__(self, *args,
                  option_manager: None,
+                 home_page: None,
                  **kwargs):
         super().__init__(*args, **kwargs)
 
         self.option_manager = option_manager
-        
+        self.analysisFrame = None
+        self.containerFrame = None
+        self.home_page = home_page
+
+        self.render()
+
+    def refresh(self, *args):
+        self.clear()
         self.render()
 
     def clear(self):
-        self.containerFrame.destroy()
+        if self.containerFrame != None:
+            self.containerFrame.destroy()
+
+        if self.analysisFrame != None:
+            self.analysisFrame.destroy()
 
     def create_new_step(self):
 
         self.clear()
         example_step = [{    # step 1
-            'param': [
+            'parameter_objects': [
                 {
                     'name': 'soilOutLPS',
-                    'bounds': (0.0, 2.0)
+                    'min_bound': 0.0,
+                    'max_bound': 2.0
                 },
                 {
                     'name': 'lagInterflow',
-                    'bounds': (10.0, 80.0)
+                    'min_bound': 10.0,
+                    'max_bound': 80.0
                 }
             ],
             'objfunc': [
@@ -64,6 +81,52 @@ class StepView(CTkScrollableFrame):
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
 
         self.steps = self.option_manager.get_steps()
+        self.mode = self.option_manager.get_mode()
+
+        if (self.mode == "Sensitivity Analysis"):
+            folder = self.option_manager.get_project_folder()
+            folder = os.path.join(folder, "results")
+            
+            # File all CSV files in folder and put them into list with strings as path
+            files = []
+            if os.path.exists(folder):
+                files = [f for f in os.listdir(folder) if f.endswith('.csv')]
+
+            if len(files) == 0:
+                files = ["      No CSV files found! Run sampling first!       "]
+            elif self.option_manager.get("sensitivity_analysis_path").get() not in files:
+                self.option_manager.get("sensitivity_analysis_path").set(files[0])
+
+            header_padding_x = (5, 5)
+            header_padding_y = (10, 10)
+
+            self.file_selector_frame = CTkFrame(self.containerFrame)
+            self.file_selector_frame.grid(row=0, column=0, sticky="nsew", columnspan=2)
+            self.logo_label = CTkLabel(self.file_selector_frame, text="Select File:")
+            self.logo_label.grid(row=0, column=0, padx=(10, 10), pady=header_padding_y)
+            
+            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50, variable=self.option_manager.get("sensitivity_analysis_path"), command=self.refresh)
+            self.file_selector.grid(row=0, column=1, padx=(10, 10), pady=header_padding_y)
+
+            row += 1
+
+        elif (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random"):
+            header_padding_x = (5, 5)
+            header_padding_y = (10, 10)
+
+            self.file_selector_frame = CTkFrame(self.containerFrame)
+            self.file_selector_frame.grid(row=0, column=0, sticky="nsew", columnspan=2)
+            
+            self.logo_label2 = CTkLabel(self.file_selector_frame, text="Output:")
+            self.logo_label2.grid(row=0, column=1, padx=(20, 10), pady=header_padding_y)
+
+            self.output_method = CTkOptionMenu(self.file_selector_frame, values=["Replace", "Append"], width=50, variable=self.option_manager.get("sampling_output_mode"))
+            if self.option_manager.get("sampling_output_mode").get() == "":
+                self.option_manager.get("sampling_output_mode").set("Replace")
+            self.output_method.grid(row=0, column=2, padx=(10, 10), pady=header_padding_y)
+
+            row += 1
+
 
         for step in self.steps:
 
@@ -72,30 +135,33 @@ class StepView(CTkScrollableFrame):
             trash_image = CTkImage(Image.open(os.path.join("./images", "trash.png")), size=(20, 20))
             expand_image = CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
             collapse_image = CTkImage(Image.open(os.path.join("./images", "collapse.png")), size=(20, 20))
+            override_image = CTkImage(Image.open(os.path.join("./images", "plus.png")), size=(20, 20))
 
 
             expand_func = lambda index=index: (self.clear(), self.option_manager.toggle_step_open(index), self.render())
             up_func = lambda index=index: (self.clear(), self.option_manager.move_step_up(index), self.render())
             down_func = lambda index=index: (self.clear(), self.option_manager.move_step_down(index), self.render())
             remove_func = lambda index=index: (self.clear(), self.option_manager.remove_step(index), self.render())
+            open_override_window = lambda index=index: (OPW(title="Edit Override Parameters", step_index=index, option_manager=self.option_manager))
+
+            if (self.mode == "Optimization"):
+                button_container = CTkFrame(self.containerFrame, width=200)
+                button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
+                button_container.grid_rowconfigure(0, weight=1)
+                button_container.grid_columnconfigure(0, weight=1)
+                
+                CTkEntry(self.containerFrame, textvariable=step['name'], width=500).grid(row=row, column=0, padx=(20, 20), pady=(20, 20), sticky="nsw")
             
-            #CTkLabel(self.containerFrame, text="Step:").grid(row=row, column=0, padx=10, pady=5, sticky="nsew")
-            
-            button_container = CTkFrame(self.containerFrame, width=200)
-            button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
-            button_container.grid_rowconfigure(0, weight=1)
-            button_container.grid_columnconfigure(0, weight=1)
-            
-            CTkEntry(self.containerFrame, textvariable=step['name'], width=500).grid(row=row, column=0, padx=(20, 20), pady=(20, 20), sticky="nsw")
-            #CTkLabel(self.containerFrame, textvariable=step['message']).grid(row=row, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=expand_image if not step['open'] else collapse_image, command=expand_func).grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=up_image, state="disabled" if index==0 else "normal", fg_color="gray" if index==0 else None, command=up_func).grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
-            CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
+    
+                CTkButton(button_container, width=30, text=None, image=expand_image if not step['open'] else collapse_image, command=expand_func).grid(row=0, column=0, padx=(20, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=override_image, command=open_override_window).grid(row=0, column=1, padx=(5, 5), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=up_image, state="disabled" if index==0 else "normal", fg_color="gray" if index==0 else None, command=up_func).grid(row=0, column=2, padx=(5, 5), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=3, padx=(5, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=4, padx=(5, 20), pady=(10, 10), sticky="nsew")
 
-            row += 1
+                row += 1
 
-            if step['open']:
+            if step['open'] or (self.mode == "Sampling: Halton" or self.mode == "Sampling: Random" or self.mode == "Sensitivity Analysis"):
                 bounds = BoundsList.BoundsList(
                     self.containerFrame, option_manager=self.option_manager, step_index=index)
                 bounds.grid(row=row, column=0, padx=(10, 10),
@@ -112,7 +178,12 @@ class StepView(CTkScrollableFrame):
                 
             row += 1
             index += 1
+            
+            if (self.mode != "Optimization"):
+                break
 
         # Create an "Add step button that is centered
-        CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
-            row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")
+        if (self.mode == "Optimization" or len(self.steps) == 0):
+            CTkButton(self.containerFrame, text="Add Group", command=self.create_new_step).grid(
+                row=row, columnspan=2, column=0, padx=(10, 10), pady=(10, 10), sticky="ew")
+            

mgpsogui/gui/VisualizeTab/MatrixEditor.py

@@ -0,0 +1,68 @@
+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(CTkFrame):
+    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('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=(0, 0), pady=(0, 0), sticky="new")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        CTkLabel(self.containerFrame, text="X Axes:").grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="ew")
+        row += 1
+
+        for key_value_pair in self.key_values:
+            if self.edit_mode:
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"], command=self.home_page.update_graph)
+                bb.grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+                
+                return_func = lambda index=index: (self.clear(), self.option_manager.remove_key_value('figure_parameters', index), self.home_page.update_graph(0), 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=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="ew")
+            row += 1
+            index += 1
+            
+        if self.edit_mode:
+            CTkButton(self.containerFrame, text="Exit", width=100, command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+        else:
+            CTkButton(self.containerFrame, text="Edit", width=100, 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_key_value('figure_parameters', "Fig " + str(len(self.key_values)), self.columns[2], destination="NONE"), self.home_page.update_graph(0), self.render())
+        CTkButton(self.containerFrame, text="Add Figure", width=100, command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")