mg-pso-gui 0.1.243__py3-none-any.whl → 0.2.0__py3-none-any.whl

mgpsogui/gui/SetupTab/OverrideParameterMetrics.py

@@ -9,8 +9,6 @@ import subprocess
 import platform
 import os
 
-global option_manager
-
 class OverrideParameterMetrics(CTkScrollableFrame):
     def __init__(self, *args,
                  option_manager: None,

mgpsogui/gui/SetupTab/SetupTab.py

@@ -4,6 +4,7 @@ from . import StepView as sv
 from . import StaticParameterView as spv
 from . import CalibrationParametersView as cpv
 from . import OptimalParameterView as opv
+from ..General import ParameterView as pv
 
 import customtkinter
 
@@ -43,12 +44,12 @@ def create_tab(self, tab):
     #self.paramtabview.tab(tab3).grid_columnconfigure(0, weight=1)
     #self.paramtabview.tab(tab3).grid_rowconfigure(0, weight=1)
     
-    self.static_param_frame = spv.StaticParameterView(self.paramtabview.tab(tab1), option_manager=self.option_manager)
+    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=(10, 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 = pv.ParameterView(self.paramtabview.tab(tab2), option_manager=self.option_manager, list_name="hyperparameters")
     self.calib_param_frame.grid(row=0, column=0, padx=(10, 10), pady=(10, 0), sticky="nsew")
     self.calib_param_frame.grid_columnconfigure(0, weight=1)
     self.calib_param_frame.grid_rowconfigure(0, weight=1)

mgpsogui/gui/SetupTab/StepView.py

@@ -44,14 +44,16 @@ class StepView(CTkScrollableFrame):
 
         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': [
@@ -79,11 +81,10 @@ class StepView(CTkScrollableFrame):
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
 
         self.steps = self.option_manager.get_steps()
-        self.mode = self.option_manager.get_arguments()['mode'].get()
+        self.mode = self.option_manager.get_mode()
 
         if (self.mode == "Sensitivity Analysis"):
-            info = self.option_manager.get_project_data()
-            folder = os.path.join(info['path'], info['name'], "results")
+            folder = self.option_manager.get_project_folder()
             
             # File all CSV files in folder and put them into list with strings as path
             files = []
@@ -108,23 +109,18 @@ class StepView(CTkScrollableFrame):
 
             row += 1
 
-        if (self.mode == "Sampling"):
+        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_label = CTkLabel(self.file_selector_frame, text="Sampling Method:")
-            self.logo_label.grid(row=0, column=0, padx=(10, 10), pady=header_padding_y)
             
-            self.sampling_method = CTkOptionMenu(self.file_selector_frame, values=["Halton", "Random"], width=50, variable=self.home_page.sampling_method)
-            self.sampling_method.grid(row=0, column=1, padx=(10, 10), pady=header_padding_y)
-
             self.logo_label2 = CTkLabel(self.file_selector_frame, text="Output:")
-            self.logo_label2.grid(row=0, column=2, padx=(20, 10), pady=header_padding_y)
+            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.home_page.sampling_output)
-            self.output_method.grid(row=0, column=3, padx=(10, 10), pady=header_padding_y)
+            self.output_method.grid(row=0, column=2, padx=(10, 10), pady=header_padding_y)
 
             row += 1
 
@@ -161,7 +157,7 @@ class StepView(CTkScrollableFrame):
 
                 row += 1
 
-            if step['open'] or (self.mode == "Sampling" or self.mode == "Sensitivity Analysis"):
+            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),

mgpsogui/gui/VisualizeTab/MatrixEditor.py

@@ -19,7 +19,7 @@ class MatrixEditor(CTkFrame):
         self.option_manager = option_manager
         self.home_page = home_page
         self.columns = columns  
-        self.key_values = option_manager.get_arguments()['figure_parameters']
+        self.key_values = option_manager.get('figure_parameters')
         self.edit_mode = False
         
         self.render()
@@ -51,7 +51,7 @@ class MatrixEditor(CTkFrame):
                 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_figure_parameter(index), self.home_page.update_graph(0), self.render())
+                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)
@@ -64,5 +64,5 @@ class MatrixEditor(CTkFrame):
         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_figure_param("Fig " + str(len(self.key_values)) , self.columns[2]), self.home_page.update_graph(0), self.render())
+        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")

mgpsogui/gui/VisualizeTab/SideBar.py

@@ -59,8 +59,7 @@ class SideBar(CTkScrollableFrame):
             pass
         elif (selected_graph == "Custom CSV"):
             
-            info = self.option_manager.get_project_data()
-            folder = os.path.join(info['path'], info['name'])
+            folder = self.option_manager.get_project_folder()
             if not os.path.exists(folder):
                 os.makedirs(folder)
                 
@@ -124,8 +123,7 @@ class SideBar(CTkScrollableFrame):
                     self.home_page.csv_y2_selector.set(columns[3])
                     
         elif (selected_graph == "Compare CSV"):
-            info = self.option_manager.get_project_data()
-            folder = os.path.join(info['path'], info['name'])
+            folder = self.option_manager.get_project_folder()
             if not os.path.exists(folder):
                 os.makedirs(folder)
                 
@@ -202,8 +200,7 @@ class SideBar(CTkScrollableFrame):
                     
         elif (selected_graph == "Sampling CSV"):
             
-            info = self.option_manager.get_project_data()
-            folder = os.path.join(info['path'], info['name'])
+            folder = self.option_manager.get_project_folder()
             if not os.path.exists(folder):
                 os.makedirs(folder)
                 
@@ -274,8 +271,7 @@ class SideBar(CTkScrollableFrame):
 
         elif (selected_graph == "Matrix Editor"):
             
-            info = self.option_manager.get_project_data()
-            folder = os.path.join(info['path'], info['name'])
+            folder = self.option_manager.get_project_folder()
             if not os.path.exists(folder):
                 os.makedirs(folder)
                 

mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -12,8 +12,7 @@ def create_tab(self, tab):
     
     def open_graph_in_browser():
         # Open the file in the default program
-        info = self.option_manager.get_project_data()
-        folder = os.path.join(info['path'], info['name'])
+        folder = self.option_manager.get_project_folder()
         
         if not os.path.exists(folder):
             os.makedirs(folder)
@@ -29,8 +28,7 @@ def create_tab(self, tab):
 
     def export_graph():
         
-        info = self.option_manager.get_project_data()
-        folder = os.path.join(info['path'], info['name'])
+        folder = self.option_manager.get_project_folder()
         
         if not os.path.exists(folder):
             os.makedirs(folder)

mgpsogui/gui/PlatformTab/ServiceParametersView.py

@@ -1,61 +0,0 @@
-from customtkinter import CTkScrollableFrame
-from customtkinter import CTkFrame
-from customtkinter import CTkLabel
-from customtkinter import CTkButton
-from customtkinter import CTkEntry
-import tkinter as tk
-
-global option_manager
-
-class ServiceParametersView(CTkScrollableFrame):
-    def __init__(self, *args,
-                 option_manager: None,
-                 **kwargs):
-        super().__init__(*args, **kwargs)
-        
-        self.option_manager = option_manager
-        self.key_values = option_manager.get_arguments()['service_parameters']
-        self.edit_mode = False
-        
-        self.render()
-
-    def clear(self):
-        self.containerFrame.destroy()
-        
-    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)
-
-        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="")
-        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_service_parameter(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"])
-            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_service_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")

mgpsogui/gui/SetupTab/CalibrationParametersView.py

@@ -1,61 +0,0 @@
-from customtkinter import CTkScrollableFrame
-from customtkinter import CTkFrame
-from customtkinter import CTkLabel
-from customtkinter import CTkButton
-from customtkinter import CTkEntry
-import tkinter as tk
-
-global option_manager
-
-class CalibrationParametersView(CTkScrollableFrame):
-    def __init__(self, *args,
-                 option_manager: None,
-                 **kwargs):
-        super().__init__(*args, **kwargs)
-        
-        self.option_manager = option_manager
-        self.key_values = option_manager.get_arguments()['calibration_parameters']
-        self.edit_mode = False
-        
-        self.render()
-
-    def clear(self):
-        self.containerFrame.destroy()
-        
-    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)
-        
-        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="")
-        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_calibration_parameter(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"])
-            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_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")

mgpsogui/gui/SetupTab/StaticParameterView.py

@@ -1,61 +0,0 @@
-from customtkinter import CTkScrollableFrame
-from customtkinter import CTkFrame
-from customtkinter import CTkLabel
-from customtkinter import CTkButton
-from customtkinter import CTkEntry
-import tkinter as tk
-
-global option_manager
-
-class StaticParameterView(CTkScrollableFrame):
-    def __init__(self, *args,
-                 option_manager: None,
-                 **kwargs):
-        super().__init__(*args, **kwargs)
-        
-        self.option_manager = option_manager
-        self.key_values = option_manager.get_arguments()['param']
-        self.edit_mode = False
-        
-        self.render()
-
-    def clear(self):
-        self.containerFrame.destroy()
-        
-    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)
-        
-        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="")
-        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())
-                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"])
-            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_argument("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")