commit b3d24eef5e070e245b4340c13400f9cb1dc81e80
author danielp <danielp@f308d9b7-e957-4cde-b6ac-9a88185e7312> Fri Feb 22 19:47:11 2013 +0000
committer danielp <danielp@f308d9b7-e957-4cde-b6ac-9a88185e7312> Fri Feb 22 19:47:11 2013 +0000
tree eed37814ffdd6ada972607b03e08c4d32783adc4
parent 54e997e7528978d4ea39486c0c62204344408a6e

-Created a mock-up debug server to serve images from a webcam
to a single client. A cleaner version of this code will follow shortly.
-Updated the image handling system in HTTPclient to actually work.
NOTE: private_aos_camera_jar.jar is a custom jar file; I made changes
to the original java code to make it play better with this vision system. 
Replacing this jar with one compiled directly from the code currently in svn
will likely break this system.


git-svn-id: https://robotics.mvla.net/svn/frc971/2013/trunk/src@4145 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 4d062dc..a6f08c2 100644
--- a/971CV/src/org/frc971/VisionTuner.java
+++ b/971CV/src/org/frc971/VisionTuner.java
@@ -61,6 +61,8 @@
     private double maxMsec;

     

     private TestImageGetter getter;

+    

+    private WPIColorImage current;

 

     public VisionTuner() {

     	//set logger to log everything

@@ -94,7 +96,7 @@
                         hueMinSlider.getValue(), hueMaxSlider.getValue(),

                         satMinSlider.getValue(),

                         valMinSlider.getValue());

-                processImage(getter.GetCurrent());

+                processImage(current);

             }

         };

 

@@ -136,6 +138,7 @@
      */

 

     private void processImage(WPIColorImage cameraImage) {

+    	current = cameraImage;

         cameraFrame.setTitle("Input:");

 

         long startTime = System.nanoTime();