Merge branch 'master' of https://gitlab.pasteur.fr/bia/sequence-blocks

src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetImage.java → src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterGetImage.java

@@ -38,11 +38,11 @@ public class SequenceFileImporterGetImage extends Plugin implements IOBlock, Plu
         super();
 
         importer = new Var<PositionedSequenceFileImporter>("Importer", PositionedSequenceFileImporter.class);
-        series = new VarInteger("Series", -1);
+        series = new VarInteger("Series", 0);
         resolution = new VarInteger("Resolution (0=full, 1=1/2, ..)", 0);
         region = new VarROIArray("XY region (ROI)", null);
-        zIndex = new VarInteger("Z (slice) index", -1);
-        tIndex = new VarInteger("T (frame) index", -1);
+        zIndex = new VarInteger("Z (slice) index", 0);
+        tIndex = new VarInteger("T (frame) index", 0);
         cIndex = new VarInteger("C (channel) index", -1);
 
         image = new Var<IcyBufferedImage>("Image", IcyBufferedImage.class);
@@ -71,7 +71,7 @@ public class SequenceFileImporterGetImage extends Plugin implements IOBlock, Plu
         Rectangle rect = ((rois != null) && (rois.length > 0)) ? rois[0].getBounds5D().toRectangle2D().getBounds()
                 : null;
 
-        // undefined values ? use internal position if any defined
+        // default values ? use internal position if any defined
         if ((s == 0) && (pi.s != -1))
             s = pi.s;
         if ((z == 0) && (pi.z != -1))
@@ -83,10 +83,6 @@ public class SequenceFileImporterGetImage extends Plugin implements IOBlock, Plu
         if ((rect == null) && (pi.xyRegion != null))
             rect = pi.xyRegion;
 
-        // still undefined ? --> set default value for series
-        if (s == -1)
-            s = 0;
-
         try
         {
             image.setValue(imp.getImage(s, res, rect, z, t, c));

src/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterLoadSequence.java → src/main/java/plugins/tprovoost/sequenceblocks/importer/SequenceFileImporterLoadSequence.java

@@ -43,7 +43,7 @@ public class SequenceFileImporterLoadSequence extends Plugin implements IOBlock,
 
         importer = new Var<PositionedSequenceFileImporter>("Importer", PositionedSequenceFileImporter.class);
 
-        series = new VarInteger("Series", -1);
+        series = new VarInteger("Series", 0);
         resolution = new VarInteger("Resolution (0=full, 1=1/2, ..)", 0);
         region = new VarROIArray("XY region (ROI)", null);
         minZIndex = new VarInteger("Z min (slice)", -1);
@@ -80,8 +80,8 @@ public class SequenceFileImporterLoadSequence extends Plugin implements IOBlock,
         Rectangle rect = ((rois != null) && (rois.length > 0)) ? rois[0].getBounds5D().toRectangle2D().getBounds()
                 : null;
 
-        // undefined values ? use internal position if any defined
-        if ((s == -1) && (pi.s != -1))
+        // default values ? use internal position if any defined
+        if ((s == 0) && (pi.s != -1))
             s = pi.s;
         if ((minZ == -1) && (maxZ == -1) && (pi.z != -1))
         {
@@ -93,14 +93,10 @@ public class SequenceFileImporterLoadSequence extends Plugin implements IOBlock,
             minT = pi.t;
             maxT = pi.t;
         }
-        if ((c == -1) && (pi.c != -1))
+        if ((c == 0) && (pi.c != -1))
             c = pi.c;
         if ((rect == null) && (pi.xyRegion != null))
             rect = pi.xyRegion;
-        
-        // still undefined ? --> set default value for series
-        if (s == -1)
-            s = 0;
 
         try
         {