Add getType implementations for most of RA/RAI classes.

imglib · Mar 2, 2022 · dc0b039 · dc0b039
1 parent 1f67b63
commit dc0b039
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 0 deletions.
diff --git a/src/main/java/net/imglib2/converter/read/BiConvertedRandomAccessible.java b/src/main/java/net/imglib2/converter/read/BiConvertedRandomAccessible.java
@@ -107,4 +107,9 @@ public C getDestinationType()
 	{
 		return converterSupplier.get();
 	}
+
+	@Override
+	public C getType() {
+		return converted.createVariable();
+	}
 }
diff --git a/src/main/java/net/imglib2/converter/read/BiConvertedRandomAccessibleInterval.java b/src/main/java/net/imglib2/converter/read/BiConvertedRandomAccessibleInterval.java
@@ -116,4 +116,9 @@ public C getDestinationType()
 	{
 		return converterSupplier.get();
 	}
+
+	@Override
+	public C getType() {
+		return converted.createVariable();
+	}
 }
diff --git a/src/main/java/net/imglib2/converter/read/ConvertedRandomAccessibleInterval.java b/src/main/java/net/imglib2/converter/read/ConvertedRandomAccessibleInterval.java
@@ -103,4 +103,9 @@ public B getDestinationType()
 	{
 		return converterSupplier.get();
 	}
+
+	@Override
+	public B getType() {
+		return converted.createVariable();
+	}
 }
diff --git a/src/main/java/net/imglib2/converter/readwrite/WriteConvertedRandomAccessible.java b/src/main/java/net/imglib2/converter/readwrite/WriteConvertedRandomAccessible.java
@@ -38,6 +38,7 @@
 
 import net.imglib2.Interval;
 import net.imglib2.RandomAccessible;
+import net.imglib2.Sampler;
 import net.imglib2.converter.AbstractConvertedRandomAccessible;
 
 /**
@@ -74,4 +75,31 @@ public WriteConvertedRandomAccess< A, B > randomAccess( final Interval interval
 	{
 		return new WriteConvertedRandomAccess< A, B >( source.randomAccess( interval ), converterSupplier );
 	}
+
+	@Override
+	public B getType() {
+		return converterSupplier.get().convert( ( Sampler< ? extends A > ) new ConstantSampler( getSource().getType() ) );
+	}
+
+	private static class ConstantSampler< T > implements Sampler< T >
+	{
+
+		private final T t;
+
+		public ConstantSampler( T t ) {
+			this.t = t;
+		}
+
+		@Override
+		public T get()
+		{
+			return t;
+		}
+
+		@Override
+		public Sampler< T > copy()
+		{
+			return new ConstantSampler<>( t );
+		}
+	}
 }
diff --git a/src/main/java/net/imglib2/converter/readwrite/WriteConvertedRandomAccessibleInterval.java b/src/main/java/net/imglib2/converter/readwrite/WriteConvertedRandomAccessibleInterval.java
@@ -39,6 +39,7 @@
 import net.imglib2.AbstractWrappedInterval;
 import net.imglib2.Interval;
 import net.imglib2.RandomAccessibleInterval;
+import net.imglib2.Sampler;
 
 /**
  * TODO
@@ -74,4 +75,31 @@ public WriteConvertedRandomAccess< A, B > randomAccess( final Interval interval
 	{
 		return new WriteConvertedRandomAccess< A, B >( sourceInterval.randomAccess( interval ), converterSupplier );
 	}
+
+	@Override
+	public B getType() {
+		return converterSupplier.get().convert( ( Sampler< ? extends A > ) new ConstantSampler( getSource().getType() ) );
+	}
+
+	private static class ConstantSampler< T > implements Sampler< T >
+	{
+
+		private final T t;
+
+		public ConstantSampler( T t ) {
+			this.t = t;
+		}
+
+		@Override
+		public T get()
+		{
+			return t;
+		}
+
+		@Override
+		public Sampler< T > copy()
+		{
+			return new ConstantSampler<>( t );
+		}
+	}
 }
diff --git a/src/main/java/net/imglib2/histogram/DiscreteFrequencyDistribution.java b/src/main/java/net/imglib2/histogram/DiscreteFrequencyDistribution.java
@@ -366,4 +366,9 @@ public DiscreteFrequencyDistribution copy()
 		return new DiscreteFrequencyDistribution( counts.copy() );
 	}
 
+	@Override
+	public LongType getType() {
+		return new LongType();
+	}
+
 }
diff --git a/src/main/java/net/imglib2/histogram/Histogram1d.java b/src/main/java/net/imglib2/histogram/Histogram1d.java
@@ -721,6 +721,10 @@ public Histogram1d< T > copy()
 		return new Histogram1d< T >( this );
 	}
 
+	public LongType getType() {
+		return new LongType();
+	}
+
 	// -- helpers --
 
 	private void reset()

diff --git a/src/main/java/net/imglib2/histogram/HistogramNd.java b/src/main/java/net/imglib2/histogram/HistogramNd.java
@@ -1020,6 +1020,11 @@ public HistogramNd< T > copy()
 		return new HistogramNd< T >( this );
 	}
 
+	@Override
+	public LongType getType() {
+		return new LongType();
+	}
+
 	// -- helpers --
 
 	private void reset()

diff --git a/src/main/java/net/imglib2/position/FunctionRandomAccessible.java b/src/main/java/net/imglib2/position/FunctionRandomAccessible.java
@@ -109,4 +109,9 @@ public FunctionRandomAccess randomAccess( final Interval interval )
 	{
 		return randomAccess();
 	}
+
+	@Override
+	public T getType() {
+		return super.typeSupplier.get();
+	}
 }
diff --git a/src/main/java/net/imglib2/position/PositionRandomAccessible.java b/src/main/java/net/imglib2/position/PositionRandomAccessible.java
@@ -108,4 +108,9 @@ public RandomAccess< LongType > randomAccess( final Interval interval )
 	{
 		return randomAccess();
 	}
+
+	@Override
+	public LongType getType() {
+		return new LongType();
+	}
 }
diff --git a/src/main/java/net/imglib2/util/ConstantUtils.java b/src/main/java/net/imglib2/util/ConstantUtils.java
@@ -94,6 +94,11 @@ public RandomAccess< T > randomAccess( final Interval interval )
 			{
 				return randomAccess();
 			}
+
+			@Override
+			public T getType() {
+				return constant;
+			}
 		};
 	}
 

diff --git a/src/main/java/net/imglib2/util/Grid.java b/src/main/java/net/imglib2/util/Grid.java
@@ -567,6 +567,9 @@ public Iterator< Interval > iterator()
 		{
 			return cursor();
 		}
+
+		@Override
+		public Interval getType() { return firstElement(); }
 	}
 
 	private final CellIntervals cellIntervals;

diff --git a/src/main/java/net/imglib2/view/StackView.java b/src/main/java/net/imglib2/view/StackView.java
@@ -147,6 +147,11 @@ public RandomAccess< T > randomAccess( final Interval interval )
 				new DefaultRA< T >( slices, interval );
 	}
 
+	@Override
+	public T getType() {
+		return slices.length > 0 ? slices[0].getType() : null;
+	}
+
 	/**
 	 * Get the source slices that are stacked in this {@link StackView}. These
 	 * are {@code (numDimensions() - 1)} dimensional

diff --git a/src/main/java/net/imglib2/view/TransformBuilder.java b/src/main/java/net/imglib2/view/TransformBuilder.java
@@ -388,6 +388,11 @@ public RandomAccess< T > randomAccess( final Interval interval )
 			{
 				return new TransformRandomAccess< T >( s.randomAccess(), t );
 			}
+
+			@Override
+			public T getType() {
+				return s.getType();
+			}
 		};
 	}
 
@@ -417,6 +422,11 @@ public RandomAccess< T > randomAccess( final Interval interval )
 					return new FullSourceMapMixedRandomAccess< T >( s.randomAccess(), t );
 				return new MixedRandomAccess< T >( s.randomAccess(), t );
 			}
+
+			@Override
+			public T getType() {
+				return s.getType();
+			}
 		};
 	}
 
@@ -441,6 +451,11 @@ public TranslationRandomAccess< T > randomAccess( final Interval interval )
 			{
 				return new TranslationRandomAccess< T >( s.randomAccess(), t );
 			}
+
+			@Override
+			public T getType() {
+				return s.getType();
+			}
 		};
 	}
 
@@ -470,6 +485,11 @@ public RandomAccess< T > randomAccess( final Interval interval )
 					return new FullSourceMapSlicingRandomAccess< T >( s.randomAccess(), t );
 				return new SlicingRandomAccess< T >( s.randomAccess(), t );
 			}
+
+			@Override
+			public T getType() {
+				return s.getType();
+			}
 		};
 	}
 }