mg-pso-gui 0.2.18__py3-none-any.whl → 0.2.20__py3-none-any.whl

{mg_pso_gui-0.2.18.dist-info → mg_pso_gui-0.2.20.dist-info}/METADATA

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

{mg_pso_gui-0.2.18.dist-info → mg_pso_gui-0.2.20.dist-info}/RECORD

@@ -5,7 +5,7 @@ mgpsogui/gui/HomePage.py,sha256=RXG6pqPZZMKjJuHP8Nqc2jrD36zpro2yFmt4n09-2T0,2164
 mgpsogui/gui/OptionManager.py,sha256=6OXfCIa4xi-WY33zNOcN9lcdcIQJcDJjdKPbVynKgUI,20239
 mgpsogui/gui/OptionManager_backup.py,sha256=TCWfPnHL2foN5id47jsi267lamRG6yGU6y_M29eOOJk,18530
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/General/ParameterView.py,sha256=U4GapB5NHXq80d_F2K5XyDXbhkDAm-KgzmXVo6J4bNs,5608
+mgpsogui/gui/General/ParameterView.py,sha256=eMX9ECpRAMTBkoYmeW_lXtQVH-YmqgWU_F_LlzdkMtM,5628
 mgpsogui/gui/General/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=XVaXjNoH1MBI-587CWigLIT3LGT00yzEAEnXNkzCLrk,10947
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=nliUEWA840cPBQt7wjiZ-L7uBOp
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=un6lSEQE5SSVhv7xA1Ea-G4JRoaQXCFi052ufDYLBAo,3064
 mgpsogui/gui/SetupTab/OverrideParameterWindow.py,sha256=UpZDxTaFxee0BeviUYXeiIlMNYNy00qz3zlMlM5VcXE,1291
 mgpsogui/gui/SetupTab/SetupTab.py,sha256=uvz604wAgazX9P8naqX9eq-6xwaA8lq-cYTy8lHXkv0,2805
-mgpsogui/gui/SetupTab/StepView.py,sha256=jdDzCMe7luBKj8q5R0FnjbwPP6u52Dbu041l5XIktSU,8702
+mgpsogui/gui/SetupTab/StepView.py,sha256=YYRmQeZHaHNLPomcX4UpzJtEU3e4QL5HnZP9Q9DCSAA,8707
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=Gzyl2hRgjIfO5n0bCZZoXp_vOFvfsJPaGXDUMeRQg10,3171
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=FP77ZVEgF5KRX5mWbwpY2NcjptfdUh_-aNuyJdNzyHY,21704
@@ -36,6 +36,7 @@ mgpsogui/gui/images/collapse.png,sha256=yicb16LaY7Nl5q9V8HHlht-Fbg5xU-l4_LJ_Arfm
 mgpsogui/gui/images/down.png,sha256=pspJkvUitD648C_2y8JLLD4Eagpk4MDEKQJGOO_yIaY,2654
 mgpsogui/gui/images/expand.png,sha256=YQyxXipCiNiZpTok5Y4juNU5davxoK7MTlRQI4Id27w,2922
 mgpsogui/gui/images/play.png,sha256=zbWtyZqvqCMT81bo6D3KhDPulWZH5lh1oCEs-X_X5Sk,2790
+mgpsogui/gui/images/plus.png,sha256=X7QyYxzkgTWpF4ghfTIvYpYgkhyZSr1yQJtJmn1MAzs,2086
 mgpsogui/gui/images/refresh.png,sha256=B1nbOlky6nVhgSjDWT35FLZKW2LWxmliWWP_qZjZ7k8,4657
 mgpsogui/gui/images/refresh_hd.png,sha256=lprZtCNZ9JUm20SPwfaslr-VV4yzzmCPEB6oFfJm1tI,31242
 mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,2153
@@ -68,8 +69,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
 mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
-mg_pso_gui-0.2.18.dist-info/METADATA,sha256=P6CC0tbKvRXcsN5EmIToFx6rGibrNxAFvCDhw_tQ_4o,9455
-mg_pso_gui-0.2.18.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.2.18.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.2.18.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.2.18.dist-info/RECORD,,
+mg_pso_gui-0.2.20.dist-info/METADATA,sha256=BYgrt6iXhuAiTx1iTXmRXP7L5xe8FjxtyNy7LRvAQGg,9455
+mg_pso_gui-0.2.20.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.2.20.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.2.20.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.2.20.dist-info/RECORD,,

mgpsogui/gui/General/ParameterView.py

@@ -46,11 +46,11 @@ class ParameterView(CTkScrollableFrame):
             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:
-                type_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["type"], values=["integer", "float", "date", "boolean", "string"])
-                type_menu.grid(row=row, column=1, columnspan=2, padx=(0, 0), pady=(5, 5), sticky="ew")
+                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")
 
-                dest_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["destination"], values=["calibration_parameters", "param"])
-                dest_menu.grid(row=row, column=3, columnspan=2, padx=(0, 0), pady=(5, 5), sticky="ew")
+                dest_menu = CTkOptionMenu(self.containerFrame, variable=self.key_values[index]["destination"], values=["calibration_parameters", "param"], width=20)
+                dest_menu.grid(row=row, column=4, columnspan=1, padx=(0, 0), pady=(5, 5), sticky="ew")
 
 
                 return_func = lambda index=index: (self.clear(), self.option_manager.remove_key_value(self.list_name, index), self.render())

mgpsogui/gui/SetupTab/StepView.py

@@ -132,7 +132,7 @@ class StepView(CTkScrollableFrame):
             trash_image = CTkImage(Image.open(os.path.join("./images", "trash.png")), size=(20, 20))
             expand_image = CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
             collapse_image = CTkImage(Image.open(os.path.join("./images", "collapse.png")), size=(20, 20))
-            override_image = CTkImage(Image.open(os.path.join("./images", "test.png")), size=(20, 20))
+            override_image = CTkImage(Image.open(os.path.join("./images", "plus.png")), size=(20, 20))
 
 
             expand_func = lambda index=index: (self.clear(), self.option_manager.toggle_step_open(index), self.render())
@@ -149,10 +149,11 @@ class StepView(CTkScrollableFrame):
                 
                 CTkEntry(self.containerFrame, textvariable=step['name'], width=500).grid(row=row, column=0, padx=(20, 20), pady=(20, 20), sticky="nsw")
             
-                CTkButton(button_container, width=30, text=None, image=override_image, command=open_override_window).grid(row=0, column=0, padx=(10, 30), pady=(10, 10), 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=1, padx=(10, 10), pady=(10, 10), 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, 15), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=override_image, command=open_override_window).grid(row=0, column=1, 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=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
-                CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
+                CTkButton(button_container, width=30, text=None, image=down_image, state="disabled" if index==(len(self.steps)-1) else "normal", fg_color="gray" if index==(len(self.steps)-1) else None, command=down_func).grid(row=0, column=3, padx=(10, 15), pady=(10, 10), sticky="nsew")
                 CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=4, padx=(10, 10), pady=(10, 10), sticky="nsew")
 
                 row += 1