mg-pso-gui 0.2.41__tar.gz → 0.2.43__tar.gz

{mg_pso_gui-0.2.41 → mg_pso_gui-0.2.43}/PKG-INFO

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

{mg_pso_gui-0.2.41 → mg_pso_gui-0.2.43}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.41 → mg_pso_gui-0.2.43}/mgpsogui/gui/General/ParameterView.py

@@ -43,9 +43,19 @@ class ParameterView(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, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            required = False
+            visual_name = "NONE"
+            if "required" in key_value_pair:
+                required = key_value_pair["required"]
+            if required and "visual_name" in key_value_pair:
+                visual_name = key_value_pair["visual_name"]
+
+            if visual_name != "NONE":
+                CTkEntry(self.containerFrame, state="disabled", textvariable=self.key_values[index]["visual_name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, columnspan=3, padx=(5, 5), pady=(5, 5), sticky="ew")
             
-            if self.edit_mode:
+            if self.edit_mode and not required:
                 type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "boolean", "string"], width=20)
                 type_menu.grid(row=row, column=3, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
 
@@ -54,6 +64,7 @@ class ParameterView(CTkScrollableFrame):
 
 
                 return_func = lambda index=index: (self.clear(), self.option_manager.remove_key_value(self.list_name, index), self.render())
+                
                 CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=5, columnspan=1, padx=(5, 5), pady=(5, 5), sticky="ew")
             else:
                 type = self.key_values[index]["type"].get()

{mg_pso_gui-0.2.41 → mg_pso_gui-0.2.43}/mgpsogui/gui/HomePage.py

@@ -64,37 +64,37 @@ class App(customtkinter.CTk):
 		
 		self.option_manager = om.OptionManager()
 		
-		self.graph_selector_value = tk.StringVar()
-		self.graph_selector_value.set("Best Cost Stacked")
+		# self.graph_selector_value = tk.StringVar()
+		# self.graph_selector_value.set("Best Cost Stacked")
 
-		self.graph_theme_value = tk.StringVar()
-		self.graph_theme_value.set("Dark")
+		# self.graph_theme_value = tk.StringVar()
+		# self.graph_theme_value.set("Dark")
 
-		self.selected_csv = tk.StringVar()
-		self.selected_csv.set("No files found...")
-		self.open_file = "None"
-		self.csv_data = None
+		# self.selected_csv = tk.StringVar()
+		# self.selected_csv.set("No files found...")
+		# self.open_file = "None"
+		# self.csv_data = None
 
-		self.selected_csv2 = tk.StringVar()
-		self.selected_csv2.set("No files found...")
-		self.open_file2 = "None"
-		self.csv_data2 = None
+		# self.selected_csv2 = tk.StringVar()
+		# self.selected_csv2.set("No files found...")
+		# self.open_file2 = "None"
+		# self.csv_data2 = None
 
-		self.selected_x = tk.StringVar()
-		self.selected_x.set("time")
+		# self.selected_x = tk.StringVar()
+		# self.selected_x.set("time")
 
-		self.selected_y1 = tk.StringVar()
-		self.selected_y1.set("NONE")
+		# self.selected_y1 = tk.StringVar()
+		# self.selected_y1.set("NONE")
 
-		self.selected_y2 = tk.StringVar()
-		self.selected_y2.set("NONE")
+		# self.selected_y2 = tk.StringVar()
+		# self.selected_y2.set("NONE")
 
-		self.figure_style = tk.StringVar()
-		self.figure_style.set("Scatter")
+		# 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.matrix_values = []
+		# self.matrix_values.append(tk.StringVar())
+		# self.matrix_values[0].set("NONE")
 
 		self.running_config = None
 		self.selected_graph_name = None

{mg_pso_gui-0.2.41 → mg_pso_gui-0.2.43}/mgpsogui/gui/SetupTab/OverrideParameterMetrics.py

@@ -32,7 +32,7 @@ class OverrideParameterMetrics(CTkScrollableFrame):
         self.edit_mode = not self.edit_mode
         self.render()
         
-    def add_key(self, key="name", value="value"):
+    def add_key(self, key="iters", value="1"):
         self.option_manager.add_override(self.step_index, key, value)
         
     def remove_key(self, index):

{mg_pso_gui-0.2.41 → mg_pso_gui-0.2.43}/mgpsogui/util/PSORunner.py

@@ -124,7 +124,7 @@ def process_list(data, parameter_map, args, options, oh_strategy, config, metain
             converted_value = True if converted_value == "True" else False
 
         if destination == "args":
-            args['param'].append((name, obj['value']))
+            args['param'].append({"name": name, "value": converted_value})
         elif destination == "kwargs":
             parameter_map[name] = original_value
         elif destination == "conf":    

{mg_pso_gui-0.2.41 → mg_pso_gui-0.2.43}/setup.py

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