Fixed a bug where image data would not be put in the float array.

I did this by not defining the size of the array beforehand,
instead I let getPixels do it.

Author: csasarak

Diff for: HoughTransformer.java

@@ -17,6 +17,20 @@
 
 public class HoughTransformer{
 
+    int centerTolerance, houghTolerance;
+    
+    /**
+     * The first constructor for HoughTransformer which
+     * will set the tolerance for the center of the circle.
+     *
+     * @param centerTolerance The tolerance in pixels for center of the circle.
+     * @param houghTolerance Tolerance for the hough transform (0.0 - 1.0)
+     */
+    public HoughTransformer(int centerTolerance, double houghTolerance){
+        this.centerTolerance = centerTolerance;
+        this.houghTolerance = houghTolerance;
+    }
+
     /**
      * This method will try to find a circle of a 
      * certain size, and then return true or 
@@ -26,9 +40,9 @@ public class HoughTransformer{
      * @return boolean Whether or not a circle was found.
      */
     public void process(RenderedImage img){
-        float[] imgData = new float[img.getWidth() * img.getHeight()];
-        img.getData().getPixels(0,0, img.getWidth(), 
-            img.getHeight(), imgData);
+        int width = img.getWidth(), height = img.getHeight();
+        float[] imgData = img.getData().getPixels(0,0, width, 
+            height, (float[])null);
 
         /*Find out more about what threshold does
         I'm referring to this site: http://homepages.inf.ed.ac.uk/rbf/HIPR2/hough.htm
@@ -38,9 +52,22 @@ public void process(RenderedImage img){
 
         LocatedCircle circle = hough.getLargestCircle(imgData, 
             img.getWidth(), img.getHeight());
+        
+        /**
+         * Check that the circle we're looking for is near the center.
+         * If it is not, then the hough transform probably found
+         * a larger object than the one in question and failed.
+         */
+        int circX = circle.getX(), circY = circle.getY();
+        if((circX < width-centerTolerance || circX > width-centerTolerance)
+            || (circY < height-centerTolerance || circY>height+centerTolerance))
+            return Category.UNDEFINED;
 
         System.out.println(circle.getRadius());
+        System.out.println("Location: ("+circle.getX() +"," +circle.getY());
+        System.out.println("Confidence: " + circle.getConfidence());
     }
+    
 
     public static void main(String args[]){
         if(args.length < 1)

Diff for: ImageProcessor.java

@@ -21,7 +21,7 @@ public static void main(String args[]){
         processor.add(new MorphologicalCloseProcess()); 
         processor.add(new GrayConvertProcess());
         processor.add(new MonoscaleProcess());
-        processor.add(new SobelDetectionProcess());
+//        processor.add(new SobelDetectionProcess());
 
         for(int n = 0; n < args.length; n++){
             String inputFilename = args[n];