mg-pso-gui 0.0.178__py3-none-any.whl → 0.0.179__py3-none-any.whl

{mg_pso_gui-0.0.178.dist-info → mg_pso_gui-0.0.179.dist-info}/METADATA

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

{mg_pso_gui-0.0.178.dist-info → mg_pso_gui-0.0.179.dist-info}/RECORD

@@ -9,11 +9,11 @@ mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 mgpsogui/gui/RunTab/RunTab.py,sha256=OjRteh5-ivHXRBam1M60JrxzkQEeqjstrUR93K25R8Y,2850
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=_6_xEl46PY9MmNvpmoMNdNDbVav6ODwWSDROboy57Cs,2866
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=SC-TcFPEoL_p7xKV4DLoZU92TE3isLvGrDJ3fwe7KiA,12276
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1V5_IH0,12268
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
 mgpsogui/gui/SetupTab/FunctionsList.py,sha256=tUqW43VWpxFpdo9UHaPvFQ0CtCo9mFI3mri52ikntrE,4092
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
-mgpsogui/gui/SetupTab/SetupTab.py,sha256=OVrTA5gFlRaqXvHAJy6GV2fGA0Mwf09IMzc0cWKaJTs,1327
+mgpsogui/gui/SetupTab/SetupTab.py,sha256=fyUUlRhOOgG1AJjMZYjPRJjE8tw8jzRaD5RLpvJLM-o,1661
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=oG5Q-3xpTRP1f_PbNvohKctrbpD63zLAJzHD00bN44k,5531
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,8 +32,8 @@ mgpsogui/util/PSORunner.py,sha256=7iUYRUXgpZ0l0rqoyHQYY1Yg9q0gl9TE0jNaHZMv04c,29
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
-mg_pso_gui-0.0.178.dist-info/METADATA,sha256=LnUwHCUPOLRlPGC-8xGRw2E1Gkv68M6WTuSCkyb73C4,9459
-mg_pso_gui-0.0.178.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.0.178.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.0.178.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.0.178.dist-info/RECORD,,
+mg_pso_gui-0.0.179.dist-info/METADATA,sha256=mNK7eCydAsuf-Mh3HnPJQc1ZA99Hxi_Jqdi45B5RBV8,9459
+mg_pso_gui-0.0.179.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.0.179.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.0.179.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.0.179.dist-info/RECORD,,

mgpsogui/gui/SetupTab/BoundsList.py

@@ -161,9 +161,9 @@ class BoundsList(CTkFrame):
                 CTkButton(self.containerFrame, text="Exit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="new")
             else:
                 CTkButton(self.containerFrame, text="Edit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="new")
-            CTkButton(self.containerFrame, text="Add Parameter", command=add_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="new")
+            CTkButton(self.containerFrame, text="Add Bound", command=add_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="new")
         else:
-            CTkButton(self.containerFrame, text="Add Parameter", command=add_func).grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="new")
+            CTkButton(self.containerFrame, text="Add Bound", command=add_func).grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="new")
             
     def update_type(self, index, option):
         value = option.get()

mgpsogui/gui/SetupTab/SetupTab.py

@@ -4,25 +4,34 @@ from . import StepView as sv
 from . import StaticParameterView as spv
 from . import CalibrationParametersView as cpv
 
+import customtkinter
+
 def create_tab(self, tab):
     
     tab.grid_columnconfigure(0, weight=1)
     tab.grid_columnconfigure(1, weight=8)
-    tab.grid_columnconfigure(2, weight=1)
     tab.grid_rowconfigure(0, weight=1)
     
-    self.static_param_frame = spv.StaticParameterView(tab, label_text="Static Parameters", option_manager=self.option_manager)
-    self.static_param_frame.grid(row=0, column=0, padx=(0, 10), pady=(10, 0), sticky="nsew")
+    self.paramtabview = customtkinter.CTkTabview(self, bg_color="transparent", fg_color="transparent")
+    self.paramtabview.grid(row=0, column=0, padx=(0, 0), pady=(10, 10), sticky="nsew")
+    
+    tab1 = "Static"
+    tab2 = "Calibration"
+    self.paramtabview.add(tab1)
+    self.paramtabview.add(tab2)
+    
+    self.static_param_frame = spv.StaticParameterView(self.paramtabview.tab(tab1), label_text="Static Parameters", option_manager=self.option_manager)
+    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), label_text="Calibration Parameters", 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.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=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
+    self.steps_frame.grid(row=0, column=1, padx=(10, 10), pady=(10, 0), sticky="nsew")
     self.steps_frame.grid_columnconfigure(0, weight=1)
     self.steps_frame.grid_rowconfigure(0, weight=1)
-        
-    self.calib_param_frame = cpv.CalibrationParametersView(tab, label_text="Calibration Parameters", option_manager=self.option_manager)
-    self.calib_param_frame.grid(row=0, column=2, padx=(10, 0), pady=(10, 0), sticky="nsew")
-    self.calib_param_frame.grid_columnconfigure(0, weight=1)
-    self.calib_param_frame.grid_rowconfigure(0, weight=1)