mg-pso-gui 0.1.186__py3-none-any.whl → 0.1.187__py3-none-any.whl

{mg_pso_gui-0.1.186.dist-info → mg_pso_gui-0.1.187.dist-info}/METADATA

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

{mg_pso_gui-0.1.186.dist-info → mg_pso_gui-0.1.187.dist-info}/RECORD

@@ -18,7 +18,7 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=_cehQwQhDbX92da_AwqYQ2mQo7sFDGkN1IsYQmc
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=DqLoH1qKdlE2uQxX0DMYozl9tSx0SF69ULpHwgQP0es,6635
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=-nwVw4FizlbVZdnM7r8-bexowF_qUtoeQ0Mu0mZijFQ,2851
+mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=a2RIiPLggYAPC8gJRub7oyF7a-yHUuRQh9Bwrqajs7c,3248
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=342SridpIqL6LBRE2rDAoUQqbMYCBCiSL3xNo3iPzz8,21936
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=_SiRDUvYJ7VUmMZ_VzylWP2tFygbLzWeUCGW3TU3yZM,3466
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,8 +59,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.186.dist-info/METADATA,sha256=5ORoIj-LS8pfa3hPmyf8wZVJpqsENPeQdOLaDjtswjA,9456
-mg_pso_gui-0.1.186.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.186.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.186.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.186.dist-info/RECORD,,
+mg_pso_gui-0.1.187.dist-info/METADATA,sha256=-g2-dpklOS6ngVyrN_k7ohg2x9_R1ITmzl_qHoljrPw,9456
+mg_pso_gui-0.1.187.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.187.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.187.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.187.dist-info/RECORD,,

mgpsogui/gui/VisualizeTab/MatrixEditor.py

@@ -8,7 +8,7 @@ import tkinter as tk
 
 global option_manager
 
-class MatrixEditor(CTkScrollableFrame):
+class MatrixEditor(CTkFrame):
     def __init__(self, *args,
                  option_manager: None,
                  home_page: None,
@@ -40,18 +40,24 @@ class MatrixEditor(CTkScrollableFrame):
         index = 0
         
         self.containerFrame = CTkFrame(self)
-        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid(row=0, column=0, padx=(0, 0), pady=(0, 0), sticky="nsew")
         self.containerFrame.grid_columnconfigure((0, 1), weight=1)
         
+        CTkLabel(self.containerFrame, text="X Axes:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+        row += 1
+
         for key_value_pair in self.key_values:
-            CTkLabel(self.containerFrame, text=self.key_values[index]["name"].get()).grid(row=row, column=0, padx=5, pady=5, sticky="")
+            #CTkLabel(self.containerFrame, text=self.key_values[index]["name"].get()).grid(row=row, column=0, padx=5, pady=5, sticky="")
             
             if self.edit_mode:
+                bb = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"], command=self.home_page.update_graph)
+                bb.grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+                
                 return_func = lambda index=index: (self.clear(), self.option_manager.remove_figure_parameter(index), self.home_page.update_graph(0), 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 = CTkOptionMenu(self.containerFrame, values=self.columns, variable=self.key_values[index]["value"], command=self.home_page.update_graph)
-                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+                bb.grid(row=row, column=0, columnspan=2, padx=(5, 5), pady=(5, 5), sticky="ew")
             row += 1
             index += 1