fix maxproj v2

lldelisle · Dec 13, 2024 · 3c3c4d7 · 3c3c4d7
1 parent 28c2a52
commit 3c3c4d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/tools/max_projections_stack_and_upload_omero/CHANGELOG.md b/tools/max_projections_stack_and_upload_omero/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 20241213.2
+
+- Fixed a variable definition in the groovy
+- Do not ask for the Project ID when the Dataset exists
+
 ## 20241213.1
 
 - Fixed a forgotten nT

diff --git a/tools/max_projections_stack_and_upload_omero/max_projections_stack_and_upload_omero.xml b/tools/max_projections_stack_and_upload_omero/max_projections_stack_and_upload_omero.xml
@@ -1,7 +1,7 @@
 <tool id="max_projections_stack_and_upload_omero" name="Stack MaxProj" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="20.01" license="BSD-3">
     <description>And upload to omero</description>
     <macros>
-        <token name="@TOOL_VERSION@">20241213.1</token>
+        <token name="@TOOL_VERSION@">20241213.2</token>
         <token name="@VERSION_SUFFIX@">0</token>
     </macros>
     <requirements>
@@ -79,7 +79,7 @@ $password
                         <param name="dataset_name_or_id" type="text" value="MyNewDataset" label="Name of the dataset (on omero)" />
                     </when>
                     <when value="none">
-                        <param name="project_name_or_id" type="integer" min="1" value="12" label="ID of the project (on omero)" />
+                        <param name="project_name_or_id" type="hidden" value="none"/>
                         <param name="dataset_name_or_id" type="integer" min="1" value="56" label="ID of the dataset (on omero)" />
                     </when>
                 </conditional>

diff --git a/tools/max_projections_stack_and_upload_omero/stack_max_projs.groovy b/tools/max_projections_stack_and_upload_omero/stack_max_projs.groovy
@@ -29,7 +29,7 @@
  */
 
 // Version number = date of last modif
-VERSION = "20241213.1"
+VERSION = "20241213.2"
 
 /**
  * *****************************************************************************************************************
@@ -116,6 +116,7 @@ try {
 
 	// Explore the HashMap and save to tiff
 	for(String unique_identifier : samplesMap.keySet()){
+		println "Merging " + unique_identifier
 		// get the channel map
 		Map<String, ImagePlus> channelsMap = samplesMap.get(unique_identifier)
 		ArrayList<String> channels = []
@@ -135,11 +136,11 @@ try {
 			}
 		}
 
+		ImagePlus final_imp
 		if (all_compatibles) {
 			// Merge all
 			ImagePlus merged_imps = Concatenator.run(current_images as ImagePlus[])
 			// Re-order to make a multi-channel, time-lapse image
-			ImagePlus final_imp
 			if (channels.size() == 1 && ref_nT == 1) {
 				final_imp = merged_imps
 			} else {