WIP: Refactor HoughCircle to extend AbstractSphere

This commit refactors the HoughCircle ROI to implement the new ROI
system. This commit is a WIP because it depends on a SNAPSHOT of
imglib2-roi

Author: gselzer

pom.xml

@@ -233,6 +233,7 @@ Wisconsin-Madison, University of Konstanz and Brian Northan.</license.copyrightO
 		<dependency>
 			<groupId>net.imglib2</groupId>
 			<artifactId>imglib2-roi</artifactId>
+			<version>0.4.8-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SciJava dependencies -->

src/main/java/net/imagej/ops/segment/hough/HoughCircle.java

@@ -1,8 +1,7 @@
 package net.imagej.ops.segment.hough;
 
 import net.imglib2.RealLocalizable;
-import net.imglib2.RealPoint;
-import net.imglib2.roi.util.Contains;
+import net.imglib2.roi.geom.real.AbstractSphere;
 
 /**
  * Representation of a circle segmented via Hough circle transformation.
@@ -13,21 +12,26 @@
  * can be used to sort a list of circles.
  * 
  * @author Jean-Yves Tinevez.
+ * @author Gabe Selzer.
  *
  */
-public class HoughCircle extends RealPoint implements Comparable< HoughCircle >, Contains< RealLocalizable >
+public class HoughCircle extends AbstractSphere implements Comparable< HoughCircle >
 {
 
-	private final double radius;
-
 	private final double sensitivity;
 
 	public HoughCircle( final RealLocalizable pos, final double radius, final double sensitivity )
 	{
-		super( pos );
+		super( getCenter(pos) , radius);
 		this.radius = radius;
 		this.sensitivity = sensitivity;
 	}
+	
+	private static double[] getCenter(RealLocalizable l) {
+		double[] center = new double[l.numDimensions()];
+		l.localize(center);
+		return center;
+	}
 
 	@Override
 	public String toString()
@@ -37,7 +41,7 @@ public String toString()
 		for ( int i = 0; i < numDimensions(); i++ )
 		{
 			sb.append( c );
-			sb.append( String.format( "%.1f", position[ i ] ) );
+			sb.append( String.format( "%.1f", center[ i ] ) );
 			c = ',';
 		}
 		sb.append( ")" );
@@ -61,10 +65,10 @@ public int compareTo( final HoughCircle o )
 	}
 
 	@Override
-	public boolean contains( final RealLocalizable point )
+	public boolean test( final RealLocalizable point )
 	{
-		final double dx = getDoublePosition( 0 ) - point.getDoublePosition( 0 );
-		final double dy = getDoublePosition( 1 ) - point.getDoublePosition( 1 );
+		final double dx = center[0] - point.getDoublePosition( 0 );
+		final double dy = center[1] - point.getDoublePosition( 1 );
 		final double dr2 = dx * dx + dy * dy;
 
 		if ( dr2 < radius * radius )
@@ -73,9 +77,4 @@ public boolean contains( final RealLocalizable point )
 		return true;
 	}
 
-	@Override
-	public HoughCircle copyContains()
-	{
-		return new HoughCircle( this, radius, sensitivity );
-	}
 }