mg-pso-gui 0.1.27__py3-none-any.whl → 0.1.29__py3-none-any.whl

{mg_pso_gui-0.1.27.dist-info → mg_pso_gui-0.1.29.dist-info}/METADATA

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

{mg_pso_gui-0.1.27.dist-info → mg_pso_gui-0.1.29.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=8DyWwDK7uptDUeeWb6xv5LK-of313oEF7hnQpxsDz6M,22791
+mgpsogui/gui/HomePage.py,sha256=y2CSgEzkKGNOjIMqvCud7774GXkqn_05mkJQAM6-xB4,22832
 mgpsogui/gui/OptionManager.py,sha256=bFN2jWJbx1Din3waOFLmbWGt0BXD_KthGJ8Mgue_FEE,11712
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=KyIoHlMKD9nfQqHeGJwRDA4RCoe4UykjB2l6xMTKK_M,10486
@@ -17,7 +17,8 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=Doy_6xLq1BjhLTFHRQm7CAbpQzUnNJW4KkBcdfr
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=oG5Q-3xpTRP1f_PbNvohKctrbpD63zLAJzHD00bN44k,5531
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=x40jLeGNfgeMaJaa8YKkIi1R374kRLONI0rok-_xQfY,3271
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=0gC5pmuQz3Ev-FCjH5g5N9oytfFdxLg4tnvzToMCHXo,2061
+mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=wIz2clWFhOQBiypjDNuhhHMqgq1YLrbYoCV33JzpNeA,3527
 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
@@ -44,8 +45,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.27.dist-info/METADATA,sha256=SrybIlE0eX3hXQt6sMMADcWzHCM2CJRUQ_M_feIzZ0k,9458
-mg_pso_gui-0.1.27.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.1.27.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.27.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.27.dist-info/RECORD,,
+mg_pso_gui-0.1.29.dist-info/METADATA,sha256=CzoYNRm9DzqmTEHsQyEYHVGR3rupMXR0YodPbiCkZlY,9458
+mg_pso_gui-0.1.29.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.1.29.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.29.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.29.dist-info/RECORD,,

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()
@@ -300,7 +301,7 @@ class App(customtkinter.CTk):
    
 			info = self.option_manager.get_project_data()
 			folder = os.path.join(info['path'], info['name'])
-			self.HRU_data = pd.read_csv(os.path.join(folder, "results", "HRU_1.csv"))
+			self.HRU_data = pd.read_csv(os.path.join(folder, "results", "HRU_1.csv"), skiprows=3)
 			print(self.HRU_data)
 			
 			self.load_button.configure(text="Loaded!")

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

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, rowspawn=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")