mg-pso-gui 0.2.124__tar.gz → 0.2.126__tar.gz

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.126}/PKG-INFO

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

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.126}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.126}/mg_pso_gui.egg-info/SOURCES.txt

@@ -65,7 +65,9 @@ mgpsogui/util/CTkToolTip/ctk_tooltip.py
 mgpsogui/util/recosu/__init__.py
 mgpsogui/util/recosu/pso/__init__.py
 mgpsogui/util/recosu/pso/csip_access.py
+mgpsogui/util/recosu/pso/pso modified.py
 mgpsogui/util/recosu/pso/pso.py
+mgpsogui/util/recosu/pso/pso_new.py
 mgpsogui/util/recosu/sampling/__init__.py
 mgpsogui/util/recosu/sampling/sample_trace_writer.py
 mgpsogui/util/recosu/sampling/sampler_task.py

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.126}/mgpsogui/gui/HomePage.py

@@ -113,6 +113,8 @@ class App(customtkinter.CTk):
 		self.calibration_data = None
 		self.testing = False
 
+		self.running_loop_ticks = 1
+
 		# Configure window
 		version = "v0.2.120"
 		self.title("COSU Manager (" + version + ")")
@@ -143,7 +145,7 @@ class App(customtkinter.CTk):
 		self.sidebar_frame.grid_columnconfigure(4, weight=1)
 		self.logo_label = customtkinter.CTkLabel(self.sidebar_frame, text="COSU Manager (" + version + ")", font=customtkinter.CTkFont(size=20, weight="bold"))
 		self.logo_label.grid(row=0, column=0, padx=(20, 10), pady=header_padding_y)
-		self.save_button = customtkinter.CTkButton(self.sidebar_frame, text="Save", width=60, command=self.save_project)
+		self.save_button = customtkinter.CTkButton(self.sidebar_frame, text="Save As", width=60, command=self.save_project)
 		self.save_button.grid(row=0, column=1, padx=header_padding_x, pady=header_padding_y)
 		self.load_button = customtkinter.CTkButton(self.sidebar_frame, text="Load", width=60, command=self.load_project)
 		self.load_button.grid(row=0, column=2, padx=header_padding_x, pady=header_padding_y)
@@ -241,7 +243,8 @@ class App(customtkinter.CTk):
 		GraphGenerator.generate_graphs(self)
 			
 	def save_project(self):
-		filename = asksaveasfilename(filetypes=[("JSON", "*.json")], initialfile="config", defaultextension="json", title="Save Project")
+		name = self.option_manager.get_project_data()['name']
+		filename = asksaveasfilename(filetypes=[("JSON", "*.json")], initialfile=name, defaultextension="json", title="Save Project")
 		
 		try:
 			self.option_manager.set_path(filename)
@@ -255,11 +258,32 @@ class App(customtkinter.CTk):
 				os.makedirs(os.path.join(folder, "results"))
 				
 			self.save_button.configure(text="Saved!")
-			self.after(3000, lambda: self.save_button.configure(text="Save"))
+			self.after(3000, lambda: self.save_button.configure(text="Save As"))
 		except Exception as e:
 			self.save_button.configure(text="Error!")
 			print(e)
-			self.after(3000, lambda: self.save_button.configure(text="Save"))
+			self.after(3000, lambda: self.save_button.configure(text="Save As"))
+
+	def auto_save_project(self):
+		data = self.option_manager.get_project_data()
+
+		if (data['path'] != "/tmp"):
+			filename = os.path.join(data['path'], data['name'] + ".json")
+			
+			try:
+				self.option_manager.set_path(filename)
+				self.option_manager.save_project(filename)
+
+				folder = self.option_manager.get_project_folder()
+				if not os.path.exists(folder):
+					os.makedirs(folder)
+
+				if not os.path.exists(os.path.join(folder, "results")):
+					os.makedirs(os.path.join(folder, "results"))
+					
+			except Exception as e:
+				self.save_button.configure(text="Error!")
+				print(e)
 	
 	def refresh_step_view(self, value):
 		mode = self.option_manager.get_mode()
@@ -419,6 +443,8 @@ class App(customtkinter.CTk):
 			NW(title="Error", message="A process is already running!", x = 400, y = 200)
 			return 0
 		
+		self.auto_save_project()
+
 		data = self.option_manager.get_all_data()
 		mode = self.option_manager.get_mode()
 		data = data[mode]
@@ -528,8 +554,11 @@ class App(customtkinter.CTk):
 			active_tab = self.tabview.get()
 			if (active_tab == "Results"):
 				GraphGenerator.generate_graphs(self)
+			if (self.running_loop_ticks % 10 == 0):
+				self.auto_save_project()
 		finally:
 			self.after(1000, self.running_loop)
+			self.running_loop_ticks += 1
 
 	def watch_loop(self):
 		print("Watch loop running...")

{mg_pso_gui-0.2.124 → mg_pso_gui-0.2.126}/mgpsogui/gui/SetupTab/ListParametersView.py

@@ -138,7 +138,7 @@ class ListParametersView(CTkScrollableFrame):
         row += 1
         
         CTkButton(self.containerFrame, text="Open", command=self.open_csv).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
-        CTkButton(self.containerFrame, text="Import", command=self.import_csv).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+        CTkButton(self.containerFrame, text="Paste", command=self.import_csv).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
         row += 1