mg-pso-gui 0.0.176__tar.gz → 0.0.179__tar.gz

{mg-pso-gui-0.0.176 → mg-pso-gui-0.0.179}/PKG-INFO

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

{mg-pso-gui-0.0.176 → mg-pso-gui-0.0.179}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.0.176 → mg-pso-gui-0.0.179}/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()

{mg-pso-gui-0.0.176 → mg-pso-gui-0.0.179}/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=(10, 10), pady=(10, 10), 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=1, padx=(10, 10), pady=(10, 10), sticky="nsew")
-    self.calib_param_frame.grid_columnconfigure(0, weight=1)
-    self.calib_param_frame.grid_rowconfigure(0, weight=1)
     

{mg-pso-gui-0.0.176 → mg-pso-gui-0.0.179}/setup.py

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