mg-pso-gui 0.0.147__tar.gz → 0.0.149__tar.gz

{mg-pso-gui-0.0.147 → mg-pso-gui-0.0.149}/PKG-INFO

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

{mg-pso-gui-0.0.147 → mg-pso-gui-0.0.149}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.0.147 → mg-pso-gui-0.0.149}/mgpsogui/gui/HomePage.py

@@ -102,7 +102,7 @@ class App(customtkinter.CTk):
         
         expand_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))
         self.new_window = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=expand_image, command=self.new_window)
-        self.new_window.grid(row=0, column=8, padx=header_padding_x, pady=header_padding_y)
+        self.new_window.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
         
         self.tabview = customtkinter.CTkTabview(self)
         self.tabview.grid(row=1, column=0, padx=(60, 60), pady=(10, 10), sticky="nsew")
@@ -124,6 +124,14 @@ class App(customtkinter.CTk):
         st.create_tab(self, self.tabview.tab(tab2))
         rt.create_tab(self, self.tabview.tab(tab3))
         vt.create_tab(self, self.tabview.tab(tab4))
+        
+        self.footer_frame = customtkinter.CTkFrame(self, corner_radius=0)
+        self.footer_frame.grid(row=2, column=0, sticky="nsew")
+        self.footer_frame.grid_columnconfigure(4, weight=1)
+
+        self.footer_progress_bar = customtkinter.CTkProgressBar(self.footer_frame)
+        self.footer_progress_bar.grid(row=0, column=4, padx=(100, 100), pady=header_padding_y, sticky="ew")
+        self.footer_progress_bar.set(0)
 
     def _resize_image(self, event):
         self.graph_label.update_idletasks()

{mg-pso-gui-0.0.147 → mg-pso-gui-0.0.149}/mgpsogui/gui/RunTab/RunTab.py

@@ -21,6 +21,8 @@ def create_tab(self, tab):
         
         self.progress_bar.configure(mode="indeterminnate")
         self.progress_bar.start()
+        self.footer_progress_bar.configure(mode="indeterminnate")
+        self.footer_progress_bar.start()
         
         self.data_x = [0]
         self.data_y = [0]
@@ -52,8 +54,11 @@ def create_tab(self, tab):
             self.progress_message_middle.configure(text="Calibration failed! See error log below.")
             self.progress_message_right.configure(text="")
             self.progress_bar.stop()
+            self.footer_progress_bar.stop()
             self.progress_bar.configure(mode="determinate")
+            self.footer_progress_bar.configure(mode="determinate")
             self.progress_bar.set(0)
+            self.footer_progress_bar.set(0)
             
     def stop():
         print("Stopping...")
@@ -74,8 +79,11 @@ def create_tab(self, tab):
             
         self.textbox.insert("0.0", "\nCalibration terminated!\n")
         self.progress_bar.stop()
+        self.footer_progress_bar.stop()
         self.progress_bar.configure(mode="determinate")
+        self.footer_progress_bar.configure(mode="determinate")
         self.progress_bar.set(0)
+        self.footer_progress_bar.set(0)
         self.progress_message_left.configure(text="")
         self.progress_message_middle.configure(text="Calibration stopped!")
         self.progress_message_right.configure(text="")
@@ -165,14 +173,19 @@ def create_tab(self, tab):
                     
                     if (percent > 0):
                         self.progress_bar.stop()
+                        self.footer_progress_bar.stop()
                         self.progress_bar.configure(mode="determinate")
+                        self.footer_progress_bar.configure(mode="determinate")
                         self.progress_bar.set(percent/100)
+                        self.footer_progress_bar.set(percent/100)
                         self.progress_message_left.configure(text="Percent Complete: " + str(percent) + "%")
                         self.progress_message_middle.configure(text=str(completed_rounds) + "/" + str(total_rounds))
                         self.progress_message_right.configure(text="Best Cost: " + str(best_cost))
                     else:
                         self.progress_bar.configure(mode="indeterminate")
+                        self.footer_progress_bar.configure(mode="indeterminate")
                         self.progress_bar.start()
+                        self.footer_progress_bar.start()
                         self.progress_message_left.configure(text="")
                         self.progress_message_middle.configure(text="Starting new round...")
                         self.progress_message_right.configure(text="")
@@ -183,8 +196,11 @@ def create_tab(self, tab):
             self.after(1000, watch_loop)
         else:
             self.progress_bar.stop()
+            self.footer_progress_bar.stop()
             self.progress_bar.configure(mode="indeterminate")
+            self.footer_progress_bar.configure(mode="indeterminate")
             self.progress_bar.start()
+            self.footer_progress_bar.start()
             self.progress_message_left.configure(text="")
             self.progress_message_middle.configure(text="Calibration finished!")
             self.progress_message_right.configure(text="")

{mg-pso-gui-0.0.147 → mg-pso-gui-0.0.149}/mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -7,7 +7,7 @@ import subprocess
 
 def create_tab(self, tab):
     
-    def open_graph_in_browser(self):
+    def open_graph_in_browser():
         # Open the file in the default program
         info = self.option_manager.get_project_data()
         folder = os.path.join(info['path'], info['name'])
@@ -24,7 +24,7 @@ def create_tab(self, tab):
         else:
             subprocess.Popen(["xdg-open", file_path])
     
-    def _resize_image(self, event):
+    def _resize_image(event):
         self.graph_label.update_idletasks()
         new_width = self.graph_label.winfo_width()
         new_height = self.graph_label.winfo_height()

{mg-pso-gui-0.0.147 → mg-pso-gui-0.0.149}/setup.py

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