mg-pso-gui 0.1.183__tar.gz → 0.1.184__tar.gz

{mg-pso-gui-0.1.183 → mg_pso_gui-0.1.184}/PKG-INFO

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

{mg-pso-gui-0.1.183 → mg_pso_gui-0.1.184}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.183 → mg_pso_gui-0.1.184}/mgpsogui/gui/OptionManager.py

@@ -42,7 +42,7 @@ class OptionManager():
             self.arguments["mode"].set(arguments["mode"])
 
         if ("url" in arguments):
-            self.arguments["url"].set(arguments["url"])
+            self.arguments["urls"][self.arguments["mode"].get()].set(arguments["url"])
             
         if ("files" in arguments):
             for file in arguments["files"]:
@@ -258,6 +258,9 @@ class OptionManager():
         return self.service_parameters
 
     def get_metrics(self):
+
+        self.arguments["url"].set(self.arguments["urls"][self.arguments["mode"].get()].get())
+
         result = {}
         result['arguments'] = {}
         result['calibration_parameters'] = []

{mg-pso-gui-0.1.183 → mg_pso_gui-0.1.184}/mgpsogui/gui/SetupTab/StepView.py

@@ -19,7 +19,9 @@ class StepView(CTkScrollableFrame):
         super().__init__(*args, **kwargs)
 
         self.option_manager = option_manager
-        
+        self.analysisFrame = None
+        self.containerFrame = None
+
         self.render()
 
     def refresh(self):
@@ -27,7 +29,11 @@ class StepView(CTkScrollableFrame):
         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):
 
@@ -91,7 +97,6 @@ class StepView(CTkScrollableFrame):
                 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")
@@ -122,7 +127,15 @@ class StepView(CTkScrollableFrame):
                 break
 
         # Create an "Add step button that is centered
-        
         if (self.mode == "Optimization: MG-PSO" 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")
+            
+        if (self.mode == "Sensitivity Analysis"):
+            self.analysisFrame = CTkFrame(self)
+            self.analysisFrame.grid(row=0, column=0, padx=(
+                10, 10), pady=(10, 10), sticky="nsew")
+            self.analysisFrame.grid_columnconfigure((0, 1, 2), weight=1)
+            CTkLabel(self.analysisFrame, text="Col 1").grid(row=0, column=0, padx=(10, 10), pady=(10, 10), sticky="nsew")
+            CTkLabel(self.analysisFrame, text="Col 2").grid(row=0, column=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
+            CTkLabel(self.analysisFrame, text="Col 3").grid(row=0, column=2, padx=(10, 10), pady=(10, 10), sticky="nsew")

{mg-pso-gui-0.1.183 → mg_pso_gui-0.1.184}/setup.py

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