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

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

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

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

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

{mg-pso-gui-0.0.149 → mg-pso-gui-0.0.151}/mg_pso_gui.egg-info/SOURCES.txt

@@ -29,6 +29,9 @@ mgpsogui/gui/VisualizeTab/__init__.py
 mgpsogui/gui/images/collapse.png
 mgpsogui/gui/images/down.png
 mgpsogui/gui/images/expand.png
+mgpsogui/gui/images/play.png
+mgpsogui/gui/images/refresh.png
+mgpsogui/gui/images/stop.png
 mgpsogui/gui/images/trash.png
 mgpsogui/gui/images/up.png
 mgpsogui/util/GraphGenerator.py

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

@@ -89,7 +89,7 @@ class App(customtkinter.CTk):
         self.service_label.grid(row=0, column=3, padx=(80, 5), pady=header_padding_y)
         self.url_header = customtkinter.CTkEntry(self.sidebar_frame, textvariable=self.option_manager.get_arguments()['url'])
         self.url_header.grid(row=0, column=4, columnspan=1, padx=header_padding_x, pady=header_padding_y, sticky="nsew")
-        refresh_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "up.png")), size=(20, 20))
+        refresh_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "refresh.png")), size=(20, 20))
         self.refresh_button = customtkinter.CTkButton(self.sidebar_frame, text=None, width=30, image=refresh_image)
         self.refresh_button.grid(row=0, column=5, padx=(5, 80), pady=header_padding_y)
         
@@ -128,10 +128,21 @@ class App(customtkinter.CTk):
         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.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_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)
+        
+        play_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "play.png")), size=(20, 20))
+        self.new_window = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=play_image, command=self.new_window)
+        self.new_window.grid(row=0, column=7, padx=(5, 5), pady=header_padding_y)
+        
+        stop_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "stop.png")), size=(20, 20))
+        self.new_window = customtkinter.CTkButton(self.footer_frame, text=None, width=30, image=stop_image, command=self.new_window)
+        self.new_window.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
 
     def _resize_image(self, event):
         self.graph_label.update_idletasks()

{mg-pso-gui-0.0.149 → mg-pso-gui-0.0.151}/mgpsogui/util/GraphGenerator.py

@@ -17,7 +17,7 @@ def best_cost_stacked(config, dataframe, option_manager):
         step_index = ((iteration) % total_steps)
         round_index = ((iteration) // total_steps)
         
-        fig.add_trace(go.Scatter(x=df['completed_rounds'], y=df['best_cost'], name='Round ' + str(round_index + 1) +  ' Step ' + str(step_index + 1)))
+        fig.add_trace(go.Scatter(x=df['completed_rounds'], y=df['best_cost'], name='Round ' + str(round_index + 1) +  ' Group ' + str(step_index + 1)))
 
     fig.update_layout(
         title="",
@@ -117,7 +117,7 @@ def best_cost_by_round(config, dataframe, option_manager):
         step_index = ((iteration) % total_steps)
         round_index = ((iteration) // total_steps)
         
-        fig.add_trace(go.Scatter(x=df['completed_rounds'] + (df['total_rounds'] * round_index), y=df['best_cost'], name='Step ' + str(step_index + 1)))
+        fig.add_trace(go.Scatter(x=df['completed_rounds'] + (df['total_rounds'] * round_index), y=df['best_cost'], name='Group ' + str(step_index + 1)))
         
         xx = np.max(df['completed_rounds']) + (np.max(df['total_rounds']) * round_index)
         fig.add_shape(

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

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