mg-pso-gui 0.1.239__py3-none-any.whl → 0.1.240__py3-none-any.whl

{mg_pso_gui-0.1.239.dist-info → mg_pso_gui-0.1.240.dist-info}/METADATA

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

{mg_pso_gui-0.1.239.dist-info → mg_pso_gui-0.1.240.dist-info}/RECORD

@@ -1,16 +1,16 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=F0QIzkkM4cDvaFZq_Uy5cDFL6wb1-HV8AB44K-QqB4o,23227
-mgpsogui/gui/OptionManager.py,sha256=2Fckux8P8xrkPWmQtqi8pCOO1mvRc8IjfPjxmyoLLTM,17362
+mgpsogui/gui/HomePage.py,sha256=6Tt1dnSsuYk888Da0RLbJpxEgtgxk-dg72Qphi85Cns,23231
+mgpsogui/gui/OptionManager.py,sha256=vLVwIvKMt08-Yr3BNYsWFxfrZcuiay_yZv6_o8_Qmmg,18111
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=Uug0hUzwF7mpmnMOs6lXZMAN8AGoeV5VWtPBqYwUV0c,10897
-mgpsogui/gui/PlatformTab/ServiceParametersView.py,sha256=0oWkRCUjqVNj4jhAqtczz_REef5MWZymWA-8JWBRl3E,2916
+mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=-YdSvNFr-ybTuvsB9WNTEy0rRmDuCTiVf9jBHu_8CNk,10939
+mgpsogui/gui/PlatformTab/ServiceParametersView.py,sha256=jzv-kPNVo-aAflpi-xPz1yltv2P87wR0iOUf6b_fwMg,2760
 mgpsogui/gui/PlatformTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/RunTab/RunTab.py,sha256=8FT7mdxNRQrftDuU0v4LoK1eyH8_RHwLOyM4dz8O_4A,1850
 mgpsogui/gui/RunTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/SetupTab/BoundsEditorWindow.py,sha256=U64oaiDIOaimjbqKMz5rQNq2o1SrQtrRHDdTYQ9ux1s,2870
-mgpsogui/gui/SetupTab/BoundsList.py,sha256=L77UEaUJNiUE-ZsYIl44tWRb1zBfxaEQ-bAG1V5_IH0,12268
+mgpsogui/gui/SetupTab/BoundsList.py,sha256=yen8lUc5iVzUyNwRg1qAENJz-gzN9-UhTHx3jyc946c,12260
 mgpsogui/gui/SetupTab/CalibrationParametersView.py,sha256=ppVBHG3nphku9-P6Z8az-HTpgk8vHxnj-A5m80BZTgA,2784
 mgpsogui/gui/SetupTab/CustomFunctionEditorWindow.py,sha256=yx0dHSNa7fGy99Q6qFcI6j9r8p0DlV3iOBgyPMGd8pM,2884
 mgpsogui/gui/SetupTab/CustomFunctionMetrics.py,sha256=hAVZSJMgHEQYrFsgUUnil17pWMFDA26Scio5DAlfdzE,5899
@@ -18,15 +18,16 @@ mgpsogui/gui/SetupTab/FunctionsList.py,sha256=cMBv87GeRACiJ1DPxFrPvZJOZ3fK6FUVAe
 mgpsogui/gui/SetupTab/ListEditor.py,sha256=vlP0KDPu8J1_6KXuUTlE7OClgfF0Qk6cISsFm_SglUw,3232
 mgpsogui/gui/SetupTab/ListParametersView.py,sha256=wYcDcaooYkw-y7XW6dJUwhTWxLuUUOK5tGUFVHBf3ck,7352
 mgpsogui/gui/SetupTab/OptimalParameterView.py,sha256=H92S6ioJI2iTjFBspEzyDxluagCEgfFSW5AkqQFO-l8,1738
-mgpsogui/gui/SetupTab/SetupTab.py,sha256=RuAn6inLUX12i6-4RmXkteIiGtxh27nYY34mFmbb3xs,2810
+mgpsogui/gui/SetupTab/OverrideParameterMetrics.py,sha256=Wf8zTLTm2XnKKp7O0l60HOle0cJK5YEiR98DtJyfhIo,3078
+mgpsogui/gui/SetupTab/OverrideParameterWindow.py,sha256=qt3bHKBu-YYedvxx_BfQqZBiFvkSM85n_J1Qke-bq4w,1374
+mgpsogui/gui/SetupTab/SetupTab.py,sha256=hbEUU1QYjEyLsLEOFTMLLiTK_7X6NFsXhmdYwnx2q5g,2812
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
-mgpsogui/gui/SetupTab/StepView.py,sha256=UQNLRxCEQQPvdW5UIT703TnmEfnjgchGIBFnCg4K3Zs,8557
+mgpsogui/gui/SetupTab/StepView.py,sha256=wBWKOjGoc_CRqBjC_bXN2aq7gMg-tY0a-W5vldQWYmA,9049
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=JPQmfljdddIwHtTKpFqUdk7hRzVdX-IKl4neOk3DsjM,3132
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=MtZfDScNFN0fQ8DyPm6bZGJSrFRgT14fZeUq-qc61O8,21936
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=JCm4qOe_l2vVTabBjGUHAK6fl21UQ4RhRLll_PIUFWI,6832
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/images/IGOW 4 Logo.png,sha256=JixNXz5gOEj898VF-_PHthAlGU-6W-y9ucb4EVNPtjs,433752
 mgpsogui/gui/images/collapse.png,sha256=yicb16LaY7Nl5q9V8HHlht-Fbg5xU-l4_LJ_Arfmu1c,2989
 mgpsogui/gui/images/down.png,sha256=pspJkvUitD648C_2y8JLLD4Eagpk4MDEKQJGOO_yIaY,2654
 mgpsogui/gui/images/expand.png,sha256=YQyxXipCiNiZpTok5Y4juNU5davxoK7MTlRQI4Id27w,2922
@@ -63,8 +64,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.1.239.dist-info/METADATA,sha256=6QhLxssfrs7PPVwYKXoyIyYyHGAsITbKdQ7kHgGkZdA,9456
-mg_pso_gui-0.1.239.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-mg_pso_gui-0.1.239.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.239.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.239.dist-info/RECORD,,
+mg_pso_gui-0.1.240.dist-info/METADATA,sha256=F7xHFn6Tbj4ryic8_F6Wk_Ig0bElTIYNCniQM-M26gk,9456
+mg_pso_gui-0.1.240.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+mg_pso_gui-0.1.240.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.240.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.240.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -262,8 +262,8 @@ class App(customtkinter.CTk):
 
 		self.steps_frame.clear()
 		self.steps_frame.render()
-		self.optimal_param_frame.clear()
-		self.optimal_param_frame.render()
+		#self.optimal_param_frame.clear()
+		#self.optimal_param_frame.render()
 
 	def open_new_window(self):
 		# Shell out and run ./main.py
@@ -313,8 +313,8 @@ class App(customtkinter.CTk):
 			self.calib_param_frame.clear()
 			self.calib_param_frame.render()
 
-			self.optimal_param_frame.clear()
-			self.optimal_param_frame.render()
+			#self.optimal_param_frame.clear()
+			#self.optimal_param_frame.render()
 			
 			self.load_button.configure(text="Loaded!")
 			self.after(3000, lambda: self.load_button.configure(text="Load"))

mgpsogui/gui/OptionManager.py

@@ -87,9 +87,12 @@ class OptionManager():
             
     def add_steps(self, steps):
         for step in steps:
-            obj = {"param": [], "objfunc": [], "name": sv(), "message": sv(), "open": False}
+            obj = {"param": [], 
+                    "overrideparam": [],
+                    "objfunc": [], 
+                    "name": sv(), 
+                    "open": False}
             obj["name"].set("Group " + str(len(self.steps) + 1))
-            obj["message"].set("Wow")
             
             for param in step["param"]:
                 param_obj = {
@@ -130,6 +133,12 @@ class OptionManager():
                     
                 obj["param"].append(param_obj)
             
+            for override in step["overrideparam"]:
+                override_obj = {"name": sv(), "value": sv()}
+                override_obj['name'].set(override['name'])
+                override_obj['value'].set(override['value'])
+                obj['overrideparam'].append(override_obj)
+
             for objfunc in step["objfunc"]:
                 objfunc_obj = {"name": sv(), 
                                 "of": sv(), 
@@ -231,6 +240,18 @@ class OptionManager():
     def remove_bound(self, step_index, index):
         self.steps[step_index]["param"].pop(index)
         
+    def add_override(self, step_index, name, value):
+        obj = {"name": sv(), "value": sv()}
+        obj["name"].set(name)
+        obj["value"].set(value)
+        self.steps[step_index]["overrideparam"].append(obj)
+
+    def remove_override(self, step_index, index):
+        self.steps[step_index]["overrideparam"].pop(index)
+
+    def get_override(self, step_index):
+        return self.steps[step_index]["overrideparam"]
+
     def add_argument(self, key, value):
         obj = {"name": sv(), "value": sv()}
         obj["name"].set(key)
@@ -330,8 +351,7 @@ class OptionManager():
     
     def get_steps(self):
         return self.steps
-            
-            
+        
     def get_all_as_json(self):
         obj = {"arguments": self.arguments, "steps": self.steps}
         return obj

mgpsogui/gui/PlatformTab/PlatformTab.py

@@ -135,13 +135,13 @@ def create_tab(self, tab):
     
     """
 
-    self.service_param_frame = spv.ServiceParametersView(tab, option_manager=self.option_manager)
+    self.service_param_frame = spv.ServiceParametersView(tab, option_manager=self.option_manager, label_text="Service Parameters")
     self.service_param_frame.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     self.service_param_frame.grid_columnconfigure(0, weight=1)
     self.service_param_frame.grid_rowconfigure(0, weight=1)
 
             
-    self.service_editor = customtkinter.CTkScrollableFrame(tab, label_text="Service Editor")
+    self.service_editor = customtkinter.CTkScrollableFrame(tab, label_text="Service Status")
     self.service_editor.grid(row=0, column=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
     self.service_editor.grid_columnconfigure(0, weight=1)
     self.service_editor.grid_rowconfigure(0, weight=1)
@@ -170,7 +170,7 @@ def create_tab(self, tab):
     self.service_details = customtkinter.CTkTextbox(self.service_editor, height=480)
     self.service_details.grid(row=8, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
     
-    self.environment_editor = customtkinter.CTkScrollableFrame(tab, label_text="Environment Editor")
+    self.environment_editor = customtkinter.CTkScrollableFrame(tab, label_text="Minikube Environment Editor")
     self.environment_editor.grid(row=0, column=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
     self.environment_editor.grid_columnconfigure(0, weight=1)
     self.environment_editor.grid_rowconfigure(0, weight=1)

mgpsogui/gui/PlatformTab/ServiceParametersView.py

@@ -34,9 +34,6 @@ class ServiceParametersView(CTkScrollableFrame):
         self.containerFrame = CTkFrame(self)
         self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
-        
-        CTkLabel(self.containerFrame, text="Service Parameters").grid(row=row, column=0, columnspan=2, padx=5, pady=5, sticky="")
-        row += 1
 
         CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
         CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")

mgpsogui/gui/SetupTab/BoundsList.py

@@ -132,8 +132,8 @@ class BoundsList(CTkFrame):
                 
                 if (bound_type == "list"):
                     def button_click_event(bound_index):
-                        dialog = BEW(title="Edit List Bound", step_index=self.step_index, bound_index=bound_index, option_manager=self.option_manager)
-                        print("Number:", dialog.get_input())
+                        BEW(title="Edit List Bound", step_index=self.step_index, bound_index=bound_index, option_manager=self.option_manager)
+                        #print("Number:", dialog.get_input())
 
                     open_window = lambda event=None, bound_index=index: (button_click_event(bound_index))
                     expand_image = CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))

mgpsogui/gui/SetupTab/OverrideParameterMetrics.py

@@ -0,0 +1,77 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkOptionMenu
+import tkinter as tk
+import subprocess
+import platform
+import os
+
+global option_manager
+
+class OverrideParameterMetrics(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 step_index: 0,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        self.step_index = step_index
+        self.key_values = option_manager.get_override(step_index)
+        
+        self.edit_mode = False
+
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+        
+    def toggle_edit_mode(self):
+        self.clear()
+        self.edit_mode = not self.edit_mode
+        self.render()
+        
+    def add_key(self, key="", value=""):
+        self.option_manager.add_override(self.step_index, key, value)
+        
+    def remove_key(self, index):
+        self.option_manager.remove_override(self.step_index, index)
+        
+    def render(self):
+        row = 0
+        index = 0
+        
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        CTkLabel(self.containerFrame, text="Name:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+        CTkLabel(self.containerFrame, text="Value:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
+        row += 1
+        
+        for key_value_pair in self.key_values:
+            CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+
+
+            if self.edit_mode:
+                return_func = lambda index=index: (self.clear(), self.remove_key(index), self.render())
+                CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                bb = CTkEntry(self.containerFrame)
+                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+                bb.configure(textvariable=self.key_values[index]["value"])
+            row += 1
+            index += 1
+            
+        if self.edit_mode:
+            CTkButton(self.containerFrame, text="Exit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+        else:
+            CTkButton(self.containerFrame, text="Edit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+        add_key_func = lambda: (self.clear(), self.add_key(), self.render())
+        CTkButton(self.containerFrame, text="Add", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+        
+        row += 1

mgpsogui/gui/SetupTab/OverrideParameterWindow.py

@@ -0,0 +1,42 @@
+from typing import Union, Tuple, Optional
+
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkInputDialog
+from .OverrideParameterMetrics import OverrideParameterMetrics as ListView
+
+class OverrideParameterWindow(CTkInputDialog):
+    """
+    Dialog with extra window, message, entry widget, cancel and ok button.
+    For detailed information check out the documentation.
+    """
+
+    def __init__(self, *args,
+                 step_index: 0,
+                 function_index: 0,
+                 option_manager: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.geometry("400x800")
+        
+        self.step_index = step_index
+        self.function_index = function_index  
+        self.option_manager = option_manager
+        self.bounds = None
+
+    def _create_widgets(self):
+
+        self.grid_columnconfigure((0, 1), weight=1)
+        self.rowconfigure(0, weight=1)
+
+        self.bounds = ListView(
+                self, step_index=self.step_index, option_manager=self.option_manager)
+        self.bounds.grid(row=0, column=0, columnspan=2, padx=(10, 10),
+                    pady=(10, 10), sticky="nsew")
+        self.bounds.grid_columnconfigure(0, weight=1)
+
+    def _on_closing(self):
+        self.grab_release()
+        self.destroy()

mgpsogui/gui/SetupTab/SetupTab.py

@@ -12,8 +12,8 @@ def setup_refresh(self):
     self.static_param_frame.destroy()
     self.calib_param_frame.clear()
     self.calib_param_frame.destroy()
-    self.optimal_param_frame.clear()
-    self.optimal_param_frame.destroy()
+    #self.optimal_param_frame.clear()
+    #self.optimal_param_frame.destroy()
     self.steps_frame.clear()
     self.steps_frame.destroy()
     self.paramtabview.destroy()

mgpsogui/gui/SetupTab/StepView.py

@@ -6,6 +6,7 @@ from customtkinter import CTkEntry
 from customtkinter import CTkTextbox
 from customtkinter import CTkImage
 from customtkinter import CTkOptionMenu
+from .OverrideParameterWindow import OverrideParameterWindow as OPW
 from PIL import Image
 import os
 
@@ -135,13 +136,15 @@ 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))
 
 
             expand_func = lambda index=index: (self.clear(), self.option_manager.toggle_step_open(index), self.render())
             up_func = lambda index=index: (self.clear(), self.option_manager.move_step_up(index), self.render())
             down_func = lambda index=index: (self.clear(), self.option_manager.move_step_down(index), self.render())
             remove_func = lambda index=index: (self.clear(), self.option_manager.remove_step(index), self.render())
-            
+            open_override_window = lambda index=index: (OPW(title="Edit Override Parameters", step_index=index, option_manager=self.option_manager))
+
             if (self.mode == "Optimization"):
                 button_container = CTkFrame(self.containerFrame, width=200)
                 button_container.grid(row=row, column=1, sticky="nse", padx=(10, 10), pady=(10, 10))
@@ -150,10 +153,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=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")
-                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=2, padx=(10, 10), pady=(10, 10), sticky="nsew")
-                CTkButton(button_container, width=30, text=None, image=trash_image, command=remove_func).grid(row=0, column=3, padx=(10, 10), pady=(10, 10), sticky="nsew")
+                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=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=trash_image, command=remove_func).grid(row=0, column=4, padx=(10, 10), pady=(10, 10), sticky="nsew")
 
                 row += 1