Changeset 11647 for trunk

Timestamp:

2006-04-12T09:31:03+12:00 (18 years ago)

Author:

shaoqun

Message:

add a new variable (url) to CollageImage class, so we known where the images was downloaded

Location:

trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet

Files:

• CollageImage.java (modified) (3 diffs)
• DownloadImages.java (modified) (11 diffs)

trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/CollageImage.java

@@ -4 +4 @@
 import java.awt.geom.*;
 import java.io.*;
+import java.net.*;
 
 /** 
@@ -29 +30 @@
     /** Indicates whether or not the image has been drawn on the applet previously */
     boolean fresh       = true;
-
+    
+    URL url_ = null;      
+ 
     /** Reflects the translation of the image from the origin to its position on the screen */
     AffineTransform af_ = null;
@@ -46 +49 @@
      *  @param from_url The source url for the image
      *  @param name The file name of the image */
-    public CollageImage(Image image, String from_url, String name)
+    public CollageImage(Image image, URL url, String from_url, String name)
     {
     image_    = image;
     from_url_ = from_url;
+    url_ = url;
     name_     = name;
     }

trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/DownloadImages.java

@@ -24 +24 @@
 
     Image image_;
-    String url_;
+    String urlString_;
     String name_;
+        URL url_;
 
     /** Constructs a downloaded image structure from the given parameters
@@ -31 +32 @@
      *  @param url the source url for this image
      *  @param name the name of the image file */
-    public ImageUrlTriple (Image image, String url, String name)
+    public ImageUrlTriple (Image image, URL url, String urlString, String name)
     {
         image_ = image;
         url_ = url;
+            urlString_ = urlString; 
         name_ = name;
     }
@@ -42 +44 @@
     }
 
-    String url() {
-        return url_;
+    String urlString() {
+        return urlString_;
     }
 
@@ -50 +52 @@
     }
 
-    }
-
+    URL url(){
+        return url_;
+    }
+
+    }
 
    
@@ -62 +67 @@
     int num_of_downloads;
     boolean stopDownload;
- 
+
   
 
@@ -92 +97 @@
 
     }
+
         Image image = Toolkit.getDefaultToolkit().getImage(url);
 
-         tracker.addImage(image,num_of_downloads);
-
-         try{
+        tracker.addImage(image,num_of_downloads);
+
+        try{
            System.out.println( "   downloading ..."); 
-         tracker.waitForID(num_of_downloads);
+           tracker.waitForID(num_of_downloads);
                 System.out.println(Thread.currentThread().getName() + " get!!!"); 
            }
@@ -105 +111 @@
          }
      
-    downloaded_image  = new ImageUrlTriple(image,urlString,name);
+    downloaded_image  = new ImageUrlTriple(image,url,urlString,name);
     num_of_downloads++;
 
@@ -131 +137 @@
         }
         catch(InterruptedException e){
+        //e.printStackTrace();  
         return null;
         }
@@ -150 +157 @@
     private CollageImage process(ImageUrlTriple iutriple){
             Image image     = iutriple.image();
-        String from_url = iutriple.url();
+        String from_url = iutriple.urlString();
         String img_name = iutriple.name();
- 
-        CollageImage collage_image = new CollageImage(image,from_url,img_name);
+        URL url =  iutriple.url();
+        
+        CollageImage collage_image = new CollageImage(image,url,from_url,img_name);
 
         image = collage_image.image_;
@@ -195 +203 @@
     // declare an array to hold the pixels
     int[] pixels = new int[w * h];
-
+    
     // get the pixels of the image into the pixels array
     PixelGrabber pg = new PixelGrabber(img, x, y, w, h, pixels, 0, w);
-
+       
     try {
         System.err.println("  grab pixels....");
         pg.grabPixels();
-        System.err.println("  got pixels!!!");
+        System.err.println("  got pixels");
     } catch (InterruptedException e) {
         System.err.println("interrupted waiting for pixels!");
@@ -216 +224 @@
 
     // loop through every pixel in the picture and handle it
-    for (int j = 0; j < h; j++) {
-        for (int i = 0; i < w; i++) {
-        pixels[j * w + i] |= (255 << 24) & 0xff000000;
-        }
-    }
-
-    // set the pixels of the whole picture to the pixels array
-    pg.setPixels(0, 0, w, h, pg.getColorModel(), pixels, 0, w);
-
-    // create the new image and return it
-    return( app_.createImage(new MemoryImageSource(w, h, pixels, 0, w)) );
-    
+       for (int j = 0; j < h; j++) {
+           for (int i = 0; i < w; i++) {
+           pixels[j * w + i] |= (255 << 24) & 0xff000000;
+           }
+       }
+       
+       // set the pixels of the whole picture to the pixels array
+       pg.setPixels(0, 0, w, h, pg.getColorModel(), pixels, 0, w);
+       // create the new image and return it
+       return( app_.createImage(new MemoryImageSource(w, h, pixels, 0, w)) );
+      
+    
+       
+       
     }