mg-pso-gui 0.2.18__tar.gz → 0.2.20__tar.gz

{mg_pso_gui-0.2.18 → mg_pso_gui-0.2.20}/PKG-INFO

@@ -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 → mg_pso_gui-0.2.20}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg_pso_gui-0.2.20}/mg_pso_gui.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ mgpsogui/gui/images/collapse.png
 mgpsogui/gui/images/down.png
 mgpsogui/gui/images/expand.png
 mgpsogui/gui/images/play.png
+mgpsogui/gui/images/plus.png
 mgpsogui/gui/images/refresh.png
 mgpsogui/gui/images/refresh_hd.png
 mgpsogui/gui/images/stop.png

{mg_pso_gui-0.2.18 → mg_pso_gui-0.2.20}/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())

{mg_pso_gui-0.2.18 → mg_pso_gui-0.2.20}/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

{mg_pso_gui-0.2.18 → mg_pso_gui-0.2.20}/setup.py

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