mg-pso-gui 0.1.28__tar.gz → 0.1.30__tar.gz

{mg-pso-gui-0.1.28 → mg-pso-gui-0.1.30}/PKG-INFO

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

{mg-pso-gui-0.1.28 → mg-pso-gui-0.1.30}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.28 → mg-pso-gui-0.1.30}/mg_pso_gui.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ mgpsogui/gui/SetupTab/SetupTab.py
 mgpsogui/gui/SetupTab/StaticParameterView.py
 mgpsogui/gui/SetupTab/StepView.py
 mgpsogui/gui/SetupTab/__init__.py
+mgpsogui/gui/VisualizeTab/SideBar.py
 mgpsogui/gui/VisualizeTab/VisualizeTab.py
 mgpsogui/gui/VisualizeTab/__init__.py
 mgpsogui/gui/images/IGOW 4 Logo.png

{mg-pso-gui-0.1.28 → mg-pso-gui-0.1.30}/mgpsogui/gui/HomePage.py

@@ -179,6 +179,7 @@ class App(customtkinter.CTk):
 
 	def update_graph(self, value):
 		GraphGenerator.generate_graphs(self)
+		self.vis_sidebar.refresh()
 
 	'''def _resize_image(self, event):
 		self.graph_label.update_idletasks()

mg-pso-gui-0.1.30/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -0,0 +1,53 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkTextbox
+from customtkinter import CTkImage
+from PIL import Image
+import os
+
+class SideBar(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 home_page: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.option_manager = option_manager
+        self.home_page = home_page
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+
+    def refresh(self):
+        self.clear()
+        self.render()
+
+    def render(self):
+
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(
+            0, 0), pady=(0, 0), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        selected_graph = self.home_page.selected_graph_name
+        if (selected_graph == "best_cost_stacked"):
+            self.graph_label = CTkLabel(self.containerFrame, text="Best Cost Stacked")
+            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
+        elif (selected_graph == "best_cost_by_round"):
+            self.graph_label = CTkLabel(self.containerFrame, text="Best Cost by Round")
+            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
+        elif (selected_graph == "table"):
+            self.graph_label = CTkLabel(self.containerFrame, text="Iteration Table")
+            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass
+        elif (selected_graph == "calibrated_params_by_round"):
+            self.graph_label = CTkLabel(self.containerFrame, text="Calibrated Parameters")
+            self.graph_label.grid(row=1, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+            pass

{mg-pso-gui-0.1.28 → mg-pso-gui-0.1.30}/mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -5,6 +5,8 @@ import os
 import platform
 import subprocess
 
+from . import SideBar
+
 def create_tab(self, tab):
     
     def open_graph_in_browser():
@@ -45,7 +47,7 @@ def create_tab(self, tab):
         self.graph_label.update_idletasks()
     
     
-    tab.grid_columnconfigure(0, weight=1)
+    tab.grid_columnconfigure(0, weight=2)
     tab.grid_columnconfigure(1, weight=8)
     tab.grid_rowconfigure(0, weight=1)
     
@@ -64,6 +66,10 @@ def create_tab(self, tab):
     self.graph_selector = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Best Cost Stacked", "Best Cost by Round", "Calibrated Parameters", "Iteration Table"], variable=self.graph_selector_value, command=self.update_graph)
     self.graph_selector.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
+    # Create SideBar
+    self.vis_sidebar = SideBar.SideBar(self.graph_sidebar, option_manager=self.option_manager, home_page=self)
+    self.vis_sidebar.grid(row=1, column=0, rowspan=8, padx=(0, 0), pady=(0, 0), sticky="nsew")
+    
     # Add a button to call open_graph_in_browser
     self.graph_button = customtkinter.CTkButton(self.graph_sidebar, text="Open in Browser", command=open_graph_in_browser)
     self.graph_button.grid(row=9, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")

{mg-pso-gui-0.1.28 → mg-pso-gui-0.1.30}/setup.py

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