commit 6ebe64596f57bb343423c030c4a314f9c135e3bd
author jerrym <jerrym@f308d9b7-e957-4cde-b6ac-9a88185e7312> Mon Feb 18 03:00:31 2013 +0000
committer jerrym <jerrym@f308d9b7-e957-4cde-b6ac-9a88185e7312> Mon Feb 18 03:00:31 2013 +0000
tree 7832de1ade03f5e0c30a6fc9f103e7150e39a159
parent e4eba2d497b309dc5bcf00021eed752879253c43

971CV now recognizes 2012 targets.

Next: Recognize 2013 targets.

Later: Remove WPICV dependencies.

git-svn-id: https://robotics.mvla.net/svn/frc971/2013/trunk/src@4119 f308d9b7-e957-4cde-b6ac-9a88185e7312

971CV/src/org/frc971/VisionTuner.java

diff --git a/971CV/src/org/frc971/VisionTuner.java b/971CV/src/org/frc971/VisionTuner.java
index 7ecd98a..2d57ea5 100644
--- a/971CV/src/org/frc971/VisionTuner.java
+++ b/971CV/src/org/frc971/VisionTuner.java
@@ -10,6 +10,7 @@
 import com.googlecode.javacv.CanvasFrame;

 

 import edu.wpi.first.wpijavacv.WPIColorImage;

+import edu.wpi.first.wpijavacv.WPIImage;

 

 /* REQUIRED JAVA LIBRARIES:

  *   Program Files/SmartDashboard/

@@ -35,6 +36,7 @@
     private WPIColorImage[] testImages;

     private final CanvasFrame cameraFrame = new CanvasFrame("Camera");

     private int currentIndex = 0;

+    private Recognizer recognizer = new Recognizer2013();

 

     public VisionTuner(String[] imageFilenames) {

         cameraFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);

@@ -44,7 +46,6 @@
         loadTestImages(imageFilenames);

     }

 

-

     /**

      * Loads the named test image files.

      * Sets testImageFilenames and testImages.

@@ -59,9 +60,11 @@
             System.out.println("Loading image file: " + imageFilename);

             WPIColorImage rawImage = null;

             try {

-                rawImage = new WPIColorImage(ImageIO.read(new File(imageFilename)));

+                rawImage = new WPIColorImage(ImageIO.read(

+                	new File(imageFilename)));

             } catch (IOException e) {

-                System.err.println("Couldn't load image file: " + imageFilename + ": " + e.getMessage());

+                System.err.println("Couldn't load image file: " + imageFilename

+                	+ ": " + e.getMessage());

                 System.exit(1);

                 return;

             }

@@ -70,9 +73,11 @@
     }

 

     private void processCurrentImage() {

-        WPIColorImage rawImage = testImages[currentIndex];

-        cameraFrame.showImage(rawImage.getBufferedImage());

+        WPIColorImage cameraImage = testImages[currentIndex];

         cameraFrame.setTitle(testImageFilenames[currentIndex]);

+

+        WPIImage processedImage = recognizer.processImage(cameraImage);

+        cameraFrame.showImage(processedImage.getBufferedImage());

     }

 

     private void previousImage() {