mg-pso-gui 0.0.151__tar.gz → 0.0.153__tar.gz

{mg-pso-gui-0.0.151 → mg-pso-gui-0.0.153}/PKG-INFO

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

{mg-pso-gui-0.0.151 → mg-pso-gui-0.0.153}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.0.151 → mg-pso-gui-0.0.153}/mgpsogui/gui/HomePage.py

@@ -129,8 +129,8 @@ class App(customtkinter.CTk):
         self.footer_frame.grid(row=2, column=0, sticky="nsew")
         self.footer_frame.grid_columnconfigure(4, weight=1)
         
-        self.progress_label = customtkinter.CTkLabel(self.footer_frame, text="Stopped", width=500, font=customtkinter.CTkFont(size=16, weight="bold"))
-        self.progress_label.grid(row=0, column=0, padx=(20, 5), pady=header_padding_y)
+        self.footer_progress_label = customtkinter.CTkLabel(self.footer_frame, text="Stopped", width=500, font=customtkinter.CTkFont(size=16, weight="bold"))
+        self.footer_progress_label.grid(row=0, column=0, padx=(20, 5), pady=header_padding_y)
 
         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")

{mg-pso-gui-0.0.151 → mg-pso-gui-0.0.153}/mgpsogui/gui/RunTab/RunTab.py

@@ -28,6 +28,7 @@ def create_tab(self, tab):
         self.data_y = [0]
         
         self.progress_message_middle.configure(text="Calibration starting...")
+        self.footer_progress_label.configure(text="Starting...")
         
         self.textbox.insert("0.0", "Starting calibration...\n\n")
         self.textbox.insert("0.0", "Calibration Parameters:\n")
@@ -53,6 +54,7 @@ def create_tab(self, tab):
             self.progress_message_left.configure(text="")
             self.progress_message_middle.configure(text="Calibration failed! See error log below.")
             self.progress_message_right.configure(text="")
+            self.footer_progress_label.configure(text="Failed")
             self.progress_bar.stop()
             self.footer_progress_bar.stop()
             self.progress_bar.configure(mode="determinate")
@@ -86,6 +88,7 @@ def create_tab(self, tab):
         self.footer_progress_bar.set(0)
         self.progress_message_left.configure(text="")
         self.progress_message_middle.configure(text="Calibration stopped!")
+        self.footer_progress_label.configure(text="Stopped")
         self.progress_message_right.configure(text="")
         
     def watch_loop():
@@ -180,6 +183,7 @@ def create_tab(self, tab):
                         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.footer_progress_label.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")
@@ -188,6 +192,7 @@ def create_tab(self, tab):
                         self.footer_progress_bar.start()
                         self.progress_message_left.configure(text="")
                         self.progress_message_middle.configure(text="Starting new round...")
+                        self.footer_progress_label.configure(text="Continuing...")
                         self.progress_message_right.configure(text="")
                 
                 
@@ -204,6 +209,7 @@ def create_tab(self, tab):
             self.progress_message_left.configure(text="")
             self.progress_message_middle.configure(text="Calibration finished!")
             self.progress_message_right.configure(text="")
+            self.footer_progress_label.configure(text="Finished")
             self.textbox.insert("0.0", "\nCalibration finished!\n")
     
     # URL

{mg-pso-gui-0.0.151 → mg-pso-gui-0.0.153}/setup.py

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