Changed YouSCope version for new release

Changed position numbering in file names to be one based, consistent with the rest.
langmo · Jul 29, 2016 · dbed311 · dbed311
1 parent 9d6ca8a
commit dbed311
Show file tree

Hide file tree

Showing 23 changed files with 4 additions and 23 deletions.
diff --git a/youscope-bd-bioscience-multiwell-tc-microplates/bin/.gitignore b/youscope-bd-bioscience-multiwell-tc-microplates/bin/.gitignore
diff --git a/youscope-cell-detection/bin/.gitignore b/youscope-cell-detection/bin/.gitignore
diff --git a/youscope-common/bin/org/youscope/common/YouScopeVersion.class b/youscope-common/bin/org/youscope/common/YouScopeVersion.class
diff --git a/youscope-common/src/org/youscope/common/YouScopeVersion.java b/youscope-common/src/org/youscope/common/YouScopeVersion.java
@@ -52,7 +52,7 @@ public YouScopeVersion(String applicationName)
 	{
 		this.applicationName = applicationName;
 		String extractedMajorVersion = "2.0";
-		String extractedVersion = "R2016-04"; 
+		String extractedVersion = "R2016-05";  
 		String extractedRevision = UNKNOWN;
 		boolean extractedCleanFlag = false;
 		final InputStream stream = YouScopeVersion.class.getResourceAsStream("/BUILD-" + applicationName + ".INFO");

diff --git a/youscope-common/src/org/youscope/common/saving/FileNameMacroConverter.java b/youscope-common/src/org/youscope/common/saving/FileNameMacroConverter.java
@@ -388,10 +388,10 @@ else if(loopNumbers[i] <= 9)
 		int[] positions = positionInformation.getPositions();
 		for(int i = 0; i < positions.length; i++)
 		{
-			if(positions[i] < 10)
-				string += "0" + Integer.toString(positions[i]);
+			if(positions[i] < 9)
+				string += "0" + Integer.toString(positions[i]+1);
 			else
-				string += Integer.toString(positions[i]);
+				string += Integer.toString(positions[i]+1);
 		}
 		info.add(new ReplaceInformation(PATTERN_IMAGE_POSITION, string, string.length()));
 

diff --git a/youscope-custom-microplates/bin/.gitignore b/youscope-custom-microplates/bin/.gitignore
diff --git a/youscope-device-setting-manager/bin/.gitignore b/youscope-device-setting-manager/bin/.gitignore
diff --git a/youscope-documentation-converter/bin/.gitignore b/youscope-documentation-converter/bin/.gitignore
diff --git a/matlab-scripting/bin/.gitignore → ...cope-droplet-microfluidics/bin/.gitignore b/matlab-scripting/bin/.gitignore → ...cope-droplet-microfluidics/bin/.gitignore
diff --git a/youscope-livestream/bin/.gitignore b/youscope-livestream/bin/.gitignore
diff --git a/youscope-measurement-viewer/bin/.gitignore b/youscope-measurement-viewer/bin/.gitignore
diff --git a/youscope-multi-camera-and-color-stream/bin/.gitignore b/youscope-multi-camera-and-color-stream/bin/.gitignore
diff --git a/youscope-multi-color-stream/bin/.gitignore b/youscope-multi-color-stream/bin/.gitignore
diff --git a/youscope-nemesys/bin/.gitignore b/youscope-nemesys/bin/.gitignore
diff --git a/youscope-open-house/bin/.gitignore b/youscope-open-house/bin/.gitignore
diff --git a/youscope-open-measurement-folder/bin/.gitignore b/youscope-open-measurement-folder/bin/.gitignore
diff --git a/youscope-openbis/bin/.gitignore b/youscope-openbis/bin/.gitignore
diff --git a/youscope-position-control/bin/.gitignore b/youscope-position-control/bin/.gitignore
diff --git a/youscope-repeat-job/bin/.gitignore b/youscope-repeat-job/bin/.gitignore
diff --git a/youscope-scripting/bin/.gitignore b/youscope-scripting/bin/.gitignore
diff --git a/youscope-server/bin/.gitignore b/youscope-server/bin/.gitignore
diff --git a/youscope-starter/bin/.gitignore b/youscope-starter/bin/.gitignore
diff --git a/youscope-youpong/bin/.gitignore b/youscope-youpong/bin/.gitignore