Projects >> imglib2 >>3487e26780bde67471309e7088b6f0387d57608a

Chunk
Conflicting content 
package examples;

import gui.Interactive2DViewer;
<<<<<<< HEAD:imglib2/tests/src/test/java/tobias/ViewImageExample.java
import gui.Interactive3DViewer;
import ij.IJ;
=======

import java.util.ArrayList;

import net.imglib2.FinalInterval;
>>>>>>> 87cc10b91a44b7b37d89eec774cd93ab22c34e04:imglib2/tests/src/test/java/examples/ViewImageExample.java
import net.imglib2.IterableInterval;
import net.imglib2.RandomAccessible;
import net.imglib2.RandomAccessibleInterval;
Solution content 
package examples;

import gui.Interactive2DViewer;
import gui.Interactive3DViewer;
import ij.IJ;

import java.util.ArrayList;

import net.imglib2.FinalInterval;
import net.imglib2.IterableInterval;
import net.imglib2.RandomAccessible;
import net.imglib2.RandomAccessibleInterval;
File
ViewImageExample.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
	{
		final RandomAccessible< T > source = Views.extendValue( interval, min );
		final RealARGBConverter< T > converter = new RealARGBConverter< T >( min.getRealDouble(), max.getRealDouble() );
<<<<<<< HEAD:imglib2/tests/src/test/java/tobias/ViewImageExample.java
		final int n = interval.numDimensions();
		if ( n == 2 )
		{
			final AffineTransform2D initial = new AffineTransform2D();
			initial.set(
				1, 0, ( width - interval.dimension( 0 ) ) / 2.0 - interval.min( 0 ),
				0, 1, ( height - interval.dimension( 1 ) ) / 2.0 - interval.min( 1 ) );
			new Interactive2DViewer< T >( ( int ) width, ( int ) height, source, converter, initial );
		}
		else if ( n == 3 )
		{
			final double yScale = 1;
			final double zScale = 1;

			final double currentSlice = ( interval.dimension( 2 ) / 2.0 - 0.5 ) * zScale;

			final AffineTransform3D initial = new AffineTransform3D();
			initial.set(
				1,      0,      0, ( width - interval.dimension( 0 ) ) / 2.0 - interval.min( 0 ),
				0, yScale,      0, ( height - interval.dimension( 1 ) * yScale ) / 2.0 - interval.min( 1 ) * yScale,
				0,      0, zScale, 0 );

			new Interactive3DViewer< T >( ( int ) width, ( int ) height, source, interval, converter, initial, yScale, zScale, currentSlice );
		}
		else
		{
			IJ.error( "Interactive viewer only supports 2D and 3D images" );
		}
=======
		final AffineTransform2D initial = new AffineTransform2D();
		initial.set(
			1, 0, ( width - interval.dimension( 0 ) ) / 2.0 - interval.min( 0 ),
			0, 1, ( height - interval.dimension( 1 ) ) / 2.0 - interval.min( 1 ) );
		new Interactive2DViewer< T >( ( int ) width, ( int ) height, source, converter, initial, new ArrayList< Object >() );
>>>>>>> 87cc10b91a44b7b37d89eec774cd93ab22c34e04:imglib2/tests/src/test/java/examples/ViewImageExample.java
	}

	public static void main( final String[] args ) throws ImgIOException
Solution content 
	{
		final RandomAccessible< T > source = Views.extendValue( interval, min );
		final RealARGBConverter< T > converter = new RealARGBConverter< T >( min.getRealDouble(), max.getRealDouble() );
		final int n = interval.numDimensions();
		if ( n == 2 )
		{
			final AffineTransform2D initial = new AffineTransform2D();
			initial.set(
				1, 0, ( width - interval.dimension( 0 ) ) / 2.0 - interval.min( 0 ),
				0, 1, ( height - interval.dimension( 1 ) ) / 2.0 - interval.min( 1 ) );
			new Interactive2DViewer< T >( ( int ) width, ( int ) height, source, converter, initial, new ArrayList< Object >() );
		}
		else if ( n == 3 )
		{
			final double yScale = 1;
			final double zScale = 1;

			final double currentSlice = ( interval.dimension( 2 ) / 2.0 - 0.5 ) * zScale;

			final AffineTransform3D initial = new AffineTransform3D();
			initial.set(
				1,      0,      0, ( width - interval.dimension( 0 ) ) / 2.0 - interval.min( 0 ),
				0, yScale,      0, ( height - interval.dimension( 1 ) * yScale ) / 2.0 - interval.min( 1 ) * yScale,
				0,      0, zScale, 0 );

			new Interactive3DViewer< T >( ( int ) width, ( int ) height, source, interval, converter, initial, yScale, zScale, currentSlice );
		}
		else
		{
			IJ.error( "Interactive viewer only supports 2D and 3D images" );
		}
	}

	public static void main( final String[] args ) throws ImgIOException
File
ViewImageExample.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
import net.imglib2.type.numeric.ARGBType;
import net.imglib2.type.numeric.NumericType;

<<<<<<< HEAD
public class Interactive2DViewer< T extends NumericType< T > > extends AbstractInteractiveViewer implements TransformEventHandler2D.TransformListener
=======
public class Interactive2DViewer< T extends NumericType< T > & NativeType< T > > extends AbstractInteractive2DViewer< T >
>>>>>>> 87cc10b91a44b7b37d89eec774cd93ab22c34e04
{
	/**
	 * the {@link RandomAccessible} to display
Solution content 
import net.imglib2.type.numeric.ARGBType;
import net.imglib2.type.numeric.NumericType;

public class Interactive2DViewer< T extends NumericType< T > > extends AbstractInteractive2DViewer< T >
{
	/**
	 * the {@link RandomAccessible} to display
File
Interactive2DViewer.java
Developer's decision
Manual
Kind of conflict
Class signature