Made minor changes

6 files changed, 39 insertions, 32 deletions

diff --git a/java/ImageProcessing/framework/GIFHandler.java b/java/ImageProcessing/framework/GIFHandler.java
index 2c18a4643b5..18b9ad9d52f 100644
--- a/java/ImageProcessing/framework/GIFHandler.java
+++ b/java/ImageProcessing/framework/GIFHandler.java
@@ -12,32 +12,8 @@ public class GIFHandler extends BlobWriter
   {
     super (null, length, 0, filename);
     this.image_ = image;
-    //    this.initialize ();
   }
   
-  private void initialize ()
-  {
-    System.out.println ("In initialize ()");
-    // Get the length -- number of bytes that will be sent
-    try
-      {
-	GIFOutputStream ostream = new GIFOutputStream ();
-	this.encoder_ = new GifEncoder (this.image_, ostream);
-	this.encoder_.encode ();
-	//	this.encoder_.Write (ostream);
-
-	//	this.encoder_ = new GIFEncoder (this.image_);
-	//	this.encoder_.Write (ostream);
-	//	StringBuffer buf = ostream.data ();
-	this.length_ = ostream.count ();
-	System.out.println ("initialize: " + this.length_);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR ("Error writing to server");
-      }
-  }
-
   protected int sendRequest ()
   {
     if (this.sendHeader () == -1)
diff --git a/java/ImageProcessing/framework/ImageApp.java b/java/ImageProcessing/framework/ImageApp.java
index 85d5a93f7b7..767ee6508f2 100644
--- a/java/ImageProcessing/framework/ImageApp.java
+++ b/java/ImageProcessing/framework/ImageApp.java
@@ -20,6 +20,14 @@ public class ImageApp extends Applet
     //    this.loadFilters ();
     this.setupButtonPanel ();
     this.add ("Center", this.imageCanvas_);
+    // Check if we are running in test mode
+    String testInFile = getParameter ("testInFile");
+    if (testInFile != null)
+      {
+	String testOutFile = getParameter ("testOutFile");
+	this.tester_ = new Tester (testInFile, testOutFile, this);
+	System.out.println ("Initializing tester...");
+      }    
   }
 
   private void setupButtonPanel ()
@@ -73,6 +81,11 @@ public class ImageApp extends Applet
     this.filterPanel_.loadFilters ();
     repaint ();
   }
+  
+  public Hashtable filterTable ()
+  {
+    return this.filterTable_;
+  }
 
   public ImageFilter getFilter (String s)
   {
@@ -82,6 +95,11 @@ public class ImageApp extends Applet
   public void apply ()
   {
     ImageFilter filter = this.getFilter (this.filterPanel_.choice ().getSelectedItem ());
+    this.apply (filter);
+  }
+
+  public void apply (ImageFilter filter)
+  {
     if (filter != null)
       {
 	Util.getFrame (this).setCursor (Frame.WAIT_CURSOR);
@@ -265,5 +283,6 @@ public class ImageApp extends Applet
   private StatusDisplay statusDisplay_;
   private Hashtable filterTable_ = new Hashtable ();
   private ImageFilterFactory iff_ = new ImageFilterFactory ();
-  //  private FilterRepository filterRepository_ = new FilterRepository ();
+  private Tester tester_;
+  
 }
diff --git a/java/ImageProcessing/framework/ImageSender.java b/java/ImageProcessing/framework/ImageSender.java
index bdc4b5208fe..d4d1915e162 100644
--- a/java/ImageProcessing/framework/ImageSender.java
+++ b/java/ImageProcessing/framework/ImageSender.java
@@ -42,17 +42,19 @@ public class ImageSender
 
   public int send ()
   {
-    int length = 0;
+    //    StatusIndicator indicator = new StatusIndicator ("");
+    ImageByteCounter byteCounter = new ImageByteCounter ("", this.image_);
+    //    ImageByteCounter byteCounter = new ImageByteCounter ("", this.image_, indicator);
+    int length = byteCounter.count ();
+    //    indicator.dispose ();
+    // First determine how many bytes we will be sending
+    /*
     try
       {
 	GIFOutputStream ostream = new GIFOutputStream ();
 	GifEncoder encoder = new GifEncoder (this.image_, ostream);
 	encoder.encode ();
-	//	this.encoder_.Write (ostream);
 
-	//	this.encoder_ = new GIFEncoder (this.image_);
-	//	this.encoder_.Write (ostream);
-	//	StringBuffer buf = ostream.data ();
 	length = ostream.count ();
 	System.out.println ("send: " + length);
       }
@@ -60,6 +62,7 @@ public class ImageSender
       {
 	ACE.ERROR ("Exception generating gif");
       }
+      */
 
     GIFHandler gifHandler = new GIFHandler (this.filename_, this.image_, length);
     try
diff --git a/java/ImageProcessing/framework/Makefile b/java/ImageProcessing/framework/Makefile
index a2091e843ae..42d43d45ba9 100644
--- a/java/ImageProcessing/framework/Makefile
+++ b/java/ImageProcessing/framework/Makefile
@@ -35,6 +35,8 @@ files =	ImageFilterFactory.java \
 	IntHashtable.java \
 	ImageEncoder.java \
 	GifEncoder.java \
-	GIFOutputStream.java \
+	ImageByteCounter.java \
+	StatusIndicator.java \
 	GIFHandler.java \
-	ImageSender.java
+	ImageSender.java \
+	Tester.java
diff --git a/java/ImageProcessing/framework/URLFrame.java b/java/ImageProcessing/framework/URLFrame.java
index 66f3448a0fa..bc1d25f6fa4 100644
--- a/java/ImageProcessing/framework/URLFrame.java
+++ b/java/ImageProcessing/framework/URLFrame.java
@@ -125,6 +125,11 @@ class URLFrame extends Frame
     String url = this.openURLText_.getText ();
     this.hide ();
     this.dispose ();
+
+    // The following is only for debugging
+    if (url.startsWith ("#"))
+      url = "http://merengue.cs:5432/" + url.substring (1);
+
     this.parent_.saveFile (url);
   }
 
diff --git a/java/ImageProcessing/framework/test.html b/java/ImageProcessing/framework/test.html
index eedc08fb924..109ba6f39e7 100644
--- a/java/ImageProcessing/framework/test.html
+++ b/java/ImageProcessing/framework/test.html
@@ -9,6 +9,8 @@ bgcolor="#888888">
 <APPLET CODEBASE="../../classes" CODE="imaging.framework.ImageApp.class" width=700 height=700>
 <!param name=filename value="cow.gif">
 <param name=filename value="myphoto.gif">
+<param name=testInFile value="http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/testImages.conf">
+<param name=testOutFile value="http://www.cs.wustl.edu/~pjain/java/ACE_wrappers/java/ImageProcessing/framework/perf.out">
 </APPLET>
 <HR>