Added option to change the acquisition directory prefix, was defaulted to cell_

Author: SJShep

src/navigate/config/config.py

@@ -367,6 +367,7 @@ def verify_experiment_config(manager, configuration):
         "celltype": "MV3",
         "label": "GFP",
         "file_type": "TIFF",
+        "prefix":"Cell_",
         "date": time.strftime("%Y-%m-%d"),
         "solvent": "BABB",
     }

src/navigate/tools/file_functions.py

@@ -64,6 +64,7 @@ def create_save_path(saving_settings):
     tissue_string = saving_settings["tissue"]
     cell_type_string = saving_settings["celltype"]
     label_string = saving_settings["label"]
+    prefix_string = saving_settings["prefix"]
     date_string = str(datetime.now().date())
 
     # Make sure that there are no spaces in the variables
@@ -85,15 +86,18 @@ def create_save_path(saving_settings):
     os.makedirs(save_directory, exist_ok=True)
     # Determine Number of Cells in Directory
     # Cell1/Position1/1_CH00_000000.tif
+    prefix_num = len(prefix_string)
     cell_directories = list(
-        filter(lambda v: v[:5] == "Cell_", os.listdir(save_directory))
+        # filter(lambda v: v[:5] == "Cell_", os.listdir(save_directory))
+        filter(lambda v: v[:prefix_num] == prefix_string, os.listdir(save_directory))
     )
     if len(cell_directories) != 0:
         cell_directories.sort()
-        cell_index = int(cell_directories[-1][5:]) + 1
+        cell_index = int(cell_directories[-1][prefix_num:]) + 1
     else:
         cell_index = 1
-    cell_string = "Cell_" + str(cell_index).zfill(3)
+    # cell_string = "Cell_" + str(cell_index).zfill(3)
+    cell_string = prefix_string + str(cell_index).zfill(3)
 
     save_directory = os.path.join(save_directory, cell_string)
     os.makedirs(save_directory, exist_ok=True)

src/navigate/view/popups/acquire_popup.py

@@ -99,6 +99,7 @@ def __init__(self, root, *args, **kwargs):
             "tissue",
             "celltype",
             "label",
+            "prefix",
             "solvent",
             "file_type",
             "misc",
@@ -110,6 +111,7 @@ def __init__(self, root, *args, **kwargs):
             "Tissue Type",
             "Cell Type",
             "Label",
+            "Prefix",
             "Solvent",
             "File Type",
             "Notes",
@@ -163,15 +165,16 @@ def __init__(self, root, *args, **kwargs):
         self.inputs["user"].widget.grid(padx=(53, 0))
         self.inputs["tissue"].widget.grid(padx=(16, 0))
         self.inputs["celltype"].widget.grid(padx=(28, 0))
+        self.inputs["prefix"].widget.grid(padx=(46,0))
         self.inputs["label"].widget.grid(padx=(48, 0))
-        self.inputs["misc"].widget.grid(padx=(24, 0))
+        self.inputs["misc"].widget.grid(padx=(40, 0))
 
         # Done and Cancel Buttons
         self.buttons["Cancel"] = ttk.Button(content_frame, text="Cancel Acquisition")
-        self.buttons["Cancel"].grid(row=9, column=0, padx=5, sticky=tk.NSEW)
+        self.buttons["Cancel"].grid(row=10, column=0, padx=5, sticky=tk.NSEW)
 
         self.buttons["Done"] = ttk.Button(content_frame, text="Acquire Data")
-        self.buttons["Done"].grid(row=9, column=1, padx=5, sticky=tk.NSEW)
+        self.buttons["Done"].grid(row=10, column=1, padx=5, sticky=tk.NSEW)
 
     def get_variables(self):
         """Get the variables of the popup