mg-pso-gui 0.0.149__py3-none-any.whl → 0.0.151__py3-none-any.whl

{mg_pso_gui-0.0.149.dist-info → mg_pso_gui-0.0.151.dist-info}/METADATA

@@ -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.dist-info → mg_pso_gui-0.0.151.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=6CWjecKYRqMLDQHUe-s9aQ9Q19_ygToT2zBySTK0bxA,12061
+mgpsogui/gui/HomePage.py,sha256=d0ecw2OYig51sZv3b7n2affDlPZI14ju9F72I7G2luU,12980
 mgpsogui/gui/OptionManager.py,sha256=bFN2jWJbx1Din3waOFLmbWGt0BXD_KthGJ8Mgue_FEE,11712
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=N2HSRqT45NH4PPeOwXdLhOASMDjh-1OwUa2WmV47T5M,10465
@@ -22,15 +22,18 @@ mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 mgpsogui/gui/images/collapse.png,sha256=yicb16LaY7Nl5q9V8HHlht-Fbg5xU-l4_LJ_Arfmu1c,2989
 mgpsogui/gui/images/down.png,sha256=pspJkvUitD648C_2y8JLLD4Eagpk4MDEKQJGOO_yIaY,2654
 mgpsogui/gui/images/expand.png,sha256=YQyxXipCiNiZpTok5Y4juNU5davxoK7MTlRQI4Id27w,2922
+mgpsogui/gui/images/play.png,sha256=zbWtyZqvqCMT81bo6D3KhDPulWZH5lh1oCEs-X_X5Sk,2790
+mgpsogui/gui/images/refresh.png,sha256=B1nbOlky6nVhgSjDWT35FLZKW2LWxmliWWP_qZjZ7k8,4657
+mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,2153
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/util/GraphGenerator.py,sha256=11YD4deBYmu3fWWvXHnz1z85BjXWTKBNkD8rQcPv1F4,7849
+mgpsogui/util/GraphGenerator.py,sha256=hEPhka0ZKQJ9DSSywDfwoXFQMsk3RHyG8QyTLOQnN4M,7851
 mgpsogui/util/PSORunner.py,sha256=7iUYRUXgpZ0l0rqoyHQYY1Yg9q0gl9TE0jNaHZMv04c,2921
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/CTkToolTip/__init__.py,sha256=G1jxV55hGtGgwyC1sR-uUUdasDdh0XZgcI-aILgGYA0,225
 mgpsogui/util/CTkToolTip/ctk_tooltip.py,sha256=SZMovpQIGvdpDRbqCKl9SHs92DrFCO2MOYL2ifolvOE,6329
-mg_pso_gui-0.0.149.dist-info/METADATA,sha256=6pobSjlj4BkEMOEBX28YgDWN_RCSV3YvXlHin-2viCI,9459
-mg_pso_gui-0.0.149.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mg_pso_gui-0.0.149.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.0.149.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.0.149.dist-info/RECORD,,
+mg_pso_gui-0.0.151.dist-info/METADATA,sha256=30YcVT1uCRIFoZNaup63q0mjzzIb8JKY9UTkZWOk_8k,9459
+mg_pso_gui-0.0.151.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+mg_pso_gui-0.0.151.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.0.151.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.0.151.dist-info/RECORD,,

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()

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(