mg-pso-gui 0.1.22__tar.gz → 0.1.24__tar.gz

{mg-pso-gui-0.1.22 → mg-pso-gui-0.1.24}/PKG-INFO

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

{mg-pso-gui-0.1.22 → mg-pso-gui-0.1.24}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.22 → mg-pso-gui-0.1.24}/mgpsogui/gui/HomePage.py

@@ -177,6 +177,9 @@ class App(customtkinter.CTk):
 
 		self.after(1000, self.running_loop)
 
+	def update_graph(self):
+		GraphGenerator.generate_graphs(self)
+
 	'''def _resize_image(self, event):
 		self.graph_label.update_idletasks()
 		new_width = self.graph_label.winfo_width()
@@ -195,8 +198,9 @@ class App(customtkinter.CTk):
 		
 		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(new_width, new_height))
 		self.graph_label.configure(image=self.graph_image)
-		self.graph_label.update_idletasks()'''
+		self.graph_label.update_idletasks()
 			
+   
 	def update_graph(self, value):
 		selected_graph = self.graph_selector_value.get()
 		info = self.option_manager.get_project_data()
@@ -219,7 +223,7 @@ class App(customtkinter.CTk):
 			image_path = os.path.join("./images", "up.png")
 		self.graph_image_obj = Image.open(image_path)
 		self.graph_image = customtkinter.CTkImage(self.graph_image_obj, size=(self.image_width * self.image_scale, self.image_height * self.image_scale))
-		self.graph_label.configure(image=self.graph_image)
+		self.graph_label.configure(image=self.graph_image)'''
 			
 	def save_project(self):
 		metrics = self.option_manager.get_metrics()
@@ -439,8 +443,6 @@ class App(customtkinter.CTk):
 			active_tab = self.tabview.get()
 			if (active_tab == "Results"):
 				GraphGenerator.generate_graphs(self)
-			else:
-				print(active_tab)
 		finally:
 			self.after(1000, self.running_loop)
 

{mg-pso-gui-0.1.22 → mg-pso-gui-0.1.24}/mgpsogui/util/GraphGenerator.py

@@ -4,33 +4,39 @@ import pandas as pd
 import numpy as np
 import os
 from PIL import Image, ImageTk
+import customtkinter
 
 def generate_graphs(HomePage):
-    selected_graph = HomePage.graph_selector_value.get()
-    info = HomePage.option_manager.get_project_data()
-    folder = os.path.join(info['path'], info['name'])
-    if not os.path.exists(folder):
-        os.makedirs(folder)
+    try:
+        selected_graph = HomePage.graph_selector_value.get()
+        info = HomePage.option_manager.get_project_data()
+        folder = os.path.join(info['path'], info['name'])
+        if not os.path.exists(folder):
+            os.makedirs(folder)
+            
+        if (selected_graph == "Best Cost Stacked"):
+            HomePage.selected_graph_name = "best_cost_stacked"
+            best_cost_stacked(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+        elif (selected_graph == "Best Cost by Round"):
+            HomePage.selected_graph_name = "best_cost_by_round"
+            best_cost_by_round(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+        elif (selected_graph == "Iteration Table"):
+            HomePage.selected_graph_name = "table"
+            table(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+        elif (selected_graph == "Calibrated Parameters"):
+            HomePage.selected_graph_name = "calibrated_params_by_round"
+            calibrated_params_by_round(HomePage.running_config['steps'], HomePage.calibration_data, HomePage.option_manager)
+            
+        image_path = os.path.join(folder, HomePage.selected_graph_name + ".png")
         
-    if (selected_graph == "Best Cost Stacked"):
-        HomePage.selected_graph_name = "best_cost_stacked"
-        best_cost_stacked(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
-    elif (selected_graph == "Best Cost by Round"):
-        HomePage.selected_graph_name = "best_cost_by_round"
-        best_cost_by_round(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
-    elif (selected_graph == "Iteration Table"):
-        HomePage.selected_graph_name = "table"
-        table(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
-    elif (selected_graph == "Calibrated Parameters"):
-        HomePage.selected_graph_name = "calibrated_params_by_round"
-        calibrated_params_by_round(HomePage.running_config['steps'], HomePage.calibration_data, HomePage.option_manager)
+        if not os.path.exists(image_path):
+            image_path = os.path.join("./images", "up.png")
         
-    image_path = os.path.join(folder, HomePage.selected_graph_name + ".png")
-    
-    if not os.path.exists(image_path):
-        image_path = os.path.join("./images", "up.png")
-  
-    HomePage.graph_image_obj = Image.open(image_path)
+        HomePage.graph_image_obj = Image.open(image_path)
+        HomePage.graph_image = customtkinter.CTkImage(HomePage.graph_image_obj, size=(HomePage.image_width * HomePage.image_scale, HomePage.image_height * HomePage.image_scale))
+        HomePage.graph_label.configure(image=HomePage.graph_image)
+    except Exception as e:
+        pass
 
 def best_cost_stacked(config, dataframe, option_manager):
     fig = go.Figure()

{mg-pso-gui-0.1.22 → mg-pso-gui-0.1.24}/setup.py

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