Changeset 7334 for trunk

Timestamp:

2004-05-13T20:52:00+12:00 (20 years ago)

Author:

davidb

Message:

General improvements to the Collaging code, including
support options specified in Collasge classify line
in collectin configuration file control some of the
runtime aspects.

Location:

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

Files:

• CURL.java (modified) (1 diff)
• Display.java (modified) (2 diffs)
• DisplayImages.java (modified) (17 diffs)
• DownloadUrls.java (modified) (15 diffs)
• GsdlCollageApplet.java (modified) (12 diffs)

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

@@ -119 +119 @@
         value = peek_value;
         peek_value = -1;
-    } else {
+    } 
+    else {
         try {
         value = input.read();

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

@@ -25 +25 @@
     try {
 
-        System.err.println("@@@DISPLAY");
+        System.err.println("Started display thread.");
 
         Thread curr_thread = Thread.currentThread();
@@ -36 +36 @@
         }
 
-        System.err.println("###DISPLAY");
+        System.err.println("Stopped display thread.");
         
     } catch (Exception e) {

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

@@ -40 +40 @@
     /** Refers to download thread */
     DownloadImages download_images_ = null;
+
     /** Refers to applet */
     GsdlCollageApplet app_ = null;
+
     /** Applets width on screen */
     public static int app_x_dim_  = 0;
+
     /** Applets height on screen */
     public static int app_y_dim_  = 0;
     
     /** Background colour of the applet screen */
-    Color bgcolor_        = null;
+    protected Color bgcolor_        = null;
+
     /** Indicates whether java2 functionality should be used <br>
      *  If true will allow advanced image processing techniques to occur, 
@@ -54 +58 @@
      *  If false, images will maintain an alpha value of 1 (appear solid), 
      *  newer images will simply be pasted on top of existing images <br> */
-    boolean is_java2_     = false;
+    protected boolean is_java2_     = false;
+
     /** Holds images currently on display in the applet */
-    Vector inuse_    = null;
+    protected Vector inuse_    = null;
+
     /** Holds previously displayed images for re-use */
-    Vector notinuse_ = null;
+    protected Vector notinuse_ = null;
    
-    Image      screen_buffer_  = null;
-    Graphics screen_graphic_   = null;
-    Image    finished_buffer_  = null;
-    Graphics finished_graphic_ = null;
+    protected Image    screen_buffer_    = null;
+    protected Graphics screen_graphic_   = null;
+    protected Image    finished_buffer_  = null;
+    protected Graphics finished_graphic_ = null;
 
     /** Used to determine where to place new images on the applet to optimize
@@ -136 +142 @@
      *  @param y the y co-ordinate of the mouse
      *  @return the image that the user has clicked on or null if the user has clicked whitespace */
-    public CollageImage clickedOnImage(int x, int y)
+ 
+   public synchronized CollageImage clickedOnImage(int x, int y)
     {
     if (app_.verbosity() > 1)
@@ -195 +202 @@
         int image_y_dim = image.getHeight(app_);
 
+        int status = app_.checkImage(image,app_);
+
         if ((image_x_dim>0) && (image_y_dim>0))
         {
@@ -210 +219 @@
             
             if (is_java2_) {
-                
-                collage_image.image_ = restoreAlpha(collage_image.image_, 0, 0, 
-                                collage_image.image_x_dim_, collage_image.image_y_dim_); 
+                collage_image.image_ 
+                = restoreAlpha(collage_image.image_, 0, 0, 
+                           collage_image.image_x_dim_, collage_image.image_y_dim_); 
             }
             
@@ -227 +236 @@
            
         }
-        if (collage_image.fresh)
-                collage_image.fresh = false;
+        if (collage_image.fresh) {
+            collage_image.fresh = false;
+        }
            
+        }
+        else {
+        if (app_.verbosity()>=3) {
+            System.err.println("  Image ["+i+"] not ready yet!");
+        }
         }
         //finished_graphic_.drawImage(screen_buffer_,0,0,app_);
@@ -241 +256 @@
 
     /** loops through removing oldest images and reduces number of images if excessive overlap is occuring */
-    void remove_old_images() {
+    synchronized void remove_old_images() {
 
     // loops through removing oldest images that have almost faded completely
@@ -318 +333 @@
      *  repaint it as the newest. <br>
      *  Then the collage is asked to display and repaint with the new image set. */
-    void next_frame()
+
+    synchronized void next_frame()
     {
     double random = Math.random();
@@ -326 +342 @@
     {
         int position = (int) ((download_images_.size() - 1) * random);
-        Image image;
-
-        // get the image and it's associated url
+
+        // get the image and its associated url (and remove from download area)
         DownloadImages.ImageUrlTriple iutriple = download_images_.retrieve(position);
-        image = iutriple.image();
+        Image image     = iutriple.image();
         String from_url = iutriple.url();
         String img_name = iutriple.name();
-        
+
         // prepare the image for collaging
-        app_.prepareImage(image,app_);
+        // app_.prepareImage(image,app_);
         CollageImage collage_image = new CollageImage(image,from_url,img_name);
         
@@ -341 +356 @@
         inuse_.addElement(collage_image);       
         
-        if (app_.verbosity()>3)
+        if (app_.verbosity()>=1)
         {
-        System.err.println("Using a downloaded image");
+        System.err.println("Adding in a newly downloaded image");
+        if (app_.verbosity()>=2)
+            {
+            System.err.println("  name="+img_name+", url="+from_url);
+            }
+
         }
     }
@@ -362 +382 @@
     }
     // otherwise repaint the first image as the last image
-    else if (inuse_.size() > 0)
-    {
+    else if (inuse_.size() > 0){
         CollageImage removed_image = (CollageImage)inuse_.elementAt(0);
         
@@ -370 +389 @@
         for (int m = removed_image.yt_; m < (removed_image.yt_ + removed_image.image_y_dim_); m++)
             used_space[n][m]--;
-
+        
         // reset the alpha and add it
         removed_image.fresh = true;
@@ -378 +397 @@
                             removed_image.image_x_dim_, removed_image.image_y_dim_); 
         }
-
+        
         notinuse_.addElement(removed_image);
         inuse_.removeElementAt(0);
         
-        if (app_.verbosity()>3)
-        {
+        if (app_.verbosity()>=4){
         System.err.println("Removing oldest image");
         }
     }
-    else
-        {
-        if (app_.verbosity()>3)
-            System.err.println("no images in download area");
-        }
+    else{
+        if (app_.verbosity()>=4)
+        System.err.println("No images in download area");
+    }
     
     display_collage();
     }
-
+    
     /** Adjusts the colour and alpha value of an individual pixel <br>
      *  If the image is being drawn for the first time, the RGB values are
@@ -475 +492 @@
      *  @param p the position of the image in the applet (indicates age)
      *  @param fresh whether the image is being processed for the first time */
-    public Image handlepixels(Image img, int x, int y, int w, int h, int p, boolean fresh) {
+
+    public synchronized Image handlepixels(Image img, int x, int y, int w, int h, int p, boolean fresh) {
     
     // declare an array to hold the pixels
@@ -666 +684 @@
     public synchronized void paint(Graphics g)
     {
-    //System.err.println("......" + is_java2_);
-
     screen_graphic_.setColor(bgcolor_);
     screen_graphic_.fillRect(0,0,app_x_dim_,app_y_dim_);
@@ -678 +694 @@
         CollageImage collage_image = (CollageImage)inuse_.elementAt(i);
         // don't paint new images yet
-        if (collage_image.fresh)
-            System.err.println("doing nothing... " + i + " " + n);
+        if (collage_image.fresh) {
+            if (app_.verbosity()>3) {
+            System.err.println("doing nothing... image " + i + " of "+n+ " images in use is fresh.");
+            }
+        }
 
         // advanced image processing may be used
-        else if (is_java2_)
-            {
+        //      else if (is_java2_) {
+        else if (false) {
             // the alphacomposite controls the blending of these two images.
             Graphics2D sg2d = (Graphics2D)screen_graphic_;
@@ -695 +714 @@
         else
             {
-            // System.err.println("patu");
             // add the image to the collage
             screen_graphic_.drawImage(collage_image.image_, 

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

@@ -5 +5 @@
 import java.net.*;
 import java.util.*;
+
+// import javax.swing.ImageIcon; //****
+
 
 /** 
@@ -15 +18 @@
  *  of downloading that occurs by restricting the number of downloaded images that are yet to
  *  be displayed to 10, and the total number of downloads allowed is also restricted by
- *  the applet application (to prevent downloading occur infinitely). */
+ *  the applet application (to prevent downloading occuring infinitely). */
+
 public class DownloadUrls extends Thread {
 
@@ -25 +29 @@
     /** The address from which the application should start looking for images */
     String starting_url_  = null;
+
+    /** CHRIS - Holds the contents of the collection's assoc directory */
+    //    File[] assocDir_ = null;
+
     /** Restricts links followed from the starting url to links that contain this string */
     String href_musthave_ = null;
@@ -50 +58 @@
     /** Determines whether there are still pages to examine and images to download */
     boolean thread_running_ = true;
+
+    int verbosity_;
 
     /** Constructor to initialise a download thread from which images are found, 
@@ -64 +74 @@
             DownloadImages download_images, String starting_url, 
             String href_musthave, String image_mustnothave, 
-            String image_ignore, String image_type)
+            String image_ignore, String image_type, int verbosity)
     {
     super("DownloadUrls");
@@ -75 +85 @@
     image_ignore_  = image_ignore;
     image_type_    = image_type;
-    }
+    
+    verbosity_ = verbosity;
+    }
+
+    
 
     /** Determines whether or not a url has already been examined
@@ -93 +107 @@
     if (visited_url_.containsKey(url_string))
     {
-        if (app_.verbosity() > 3)
+        if (verbosity_ > 3)
         {
-            System.err.println("Visited " + url_string + " Before!");
+            System.err.println("Visited " + url_string + " before!");
         }
         return true;
@@ -179 +193 @@
             }
 
-            if (app_.verbosity() > 2) {
+            if (verbosity_ > 2) {
             System.err.println("src url = "+ url_string);
             }
@@ -205 +219 @@
     String original_href_musthave_ = href_musthave_;
 
-    // checks the it does contain this content
+    // checks that it does contain this content
     if (href_musthave_ !=  null) {
 
@@ -266 +280 @@
     /** Adds an image to the stored downloaded images as a triplet.
      *  Ensures that the number of images downloaded but not displayed at
-     *  anyone time is controlled by using a buffer. If the buffer is
+     *  any one time is controlled by using a buffer. If the buffer is
      *  full this function will wait until space becomes available before
      *  continuing. It also restricts the
@@ -288 +302 @@
         
         // get the image from the url
+        if (verbosity_>=2) {
+        System.err.println("  Downloading image URL: " + url.toString());
+        }
+
+        //ImageIcon image_icon = new ImageIcon(url);
+        // Image image = image_icon.getImage();
+
+        // Image image = Toolkit.getDefaultToolkit().createImage(url);
+        // Image image = app_.getImage(url);
         Image image = Toolkit.getDefaultToolkit().getImage(url);
 
+        //System.err.println("###DownloadingED image URL: " + url.toString());
+
+        boolean status = app_.prepareImage(image,app_);
+        //System.err.println(" Prepare Image status = " + status);
+
+        Thread.sleep(100);
+
         // push image onto the downloaded images
+        /* System.err.println("*** Pushing: name="+img_name
+                   +" dimensions = "+image_icon.getIconWidth()+"x"+image_icon.getIconHeight());
+        //                 +" dimensions = "+image.getWidth(app_)+"x"+image.getHeight(app_));
+        */
+
         download_images_.push(image,from_url, img_name);
         
         // if have completed the maximum number of downloads for the
         // application then stop
-        if (download_images_.size() == app_.maxDownloads())
-        {
-            stop();
-        }
+        if (download_images_.size() == app_.maxDownloads()) {
+        stop();
+        }
         
     }
@@ -329 +363 @@
     if (curl.connected_ok())
     {
+        if (verbosity_ >= 1) {
+        System.err.print("Connected OK ... ");
+        }
+
         // read the page
         curl.readAll();
+        if (verbosity_ >= 1) {
+        System.err.println("URL read.");
+        }
 
         // get all the <code><img src=</code> links into a vector
         Vector src_links = curl.getSrcLinks();
         
+        if (verbosity_ >= 2) {
+        System.err.println("  Got src links... there are " + src_links.size() + " of them.");
+        }
         // process each of the image links according to the parameters given.
         for (int i = 0; i < src_links.size(); i++) 
@@ -341 +385 @@
         String url_string  = url.toString();
 
+        if (verbosity_ >= 3) {
+            System.err.println("    Unfiltered: src_link[" + i + "] = " + url_string);
+        }
+
         if (image_file_extension(url_string))
             {
@@ -347 +395 @@
                 img_name = url_string.substring(url_string.lastIndexOf("/") + 1, url_string.length());
 
-                if (external_links_ != null && ! external_links_.isEmpty()) {
+                if (verbosity_ >= 2) {
+                    System.err.println("    Filtered: src_link[" + i + "] = " + url_string);
+                }
+
+                if ((external_links_ != null) && (!external_links_.isEmpty())) {
                     String ext = (String) external_links_.get(img_name);
                     
@@ -378 +430 @@
                     img_name = url_string.substring(url_string.lastIndexOf("/") + 1, url_string.length());
 
-                    if (external_links_ != null && ! external_links_.isEmpty()) {
+                    if ((external_links_ != null) && (!external_links_.isEmpty())) {
                     String ext = (String) external_links_.get(img_name);
 

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

@@ -29 +29 @@
      *  If false, images will maintain an alpha value of 1 (appear solid), 
      *  newer images will simply be pasted on top of existing images <br> */
-    protected boolean is_java2_  = true;
+    protected boolean isJava2_  = true;
     /** Number of nested links to follow
      *  When used with greenstone, controls to which level of the document links will be followed
@@ -35 +35 @@
      *  while a depth of 2 will include sections within this document, 3 includes sections within 
      *  sections, and so on */
-    protected int max_depth_     = 1;
-    /** Maximum number of downloaded images to stored <br>
+    protected int maxDepth_     = 3;
+
+    /** Maximum number of images to display on the canvas */
+    protected int maxDisplay_ = 25;
+
+    /** Maximum number of downloaded images to store <br>
      *  Prevents applet from using excessive amounts of bandwidth by downloading too many images simulataneously*/
-    protected int max_downloads_ = Integer.MAX_VALUE;
+    protected int maxDownloads_ = Integer.MAX_VALUE;
+
     /** Types of images permitted in the collage, for example gif, jpg, png... */
-    protected String image_type;
+    protected String imageType_ = ".jpg%.png";
+
+    /** Caption of the collage */
+    protected String caption_ = "";
+
     /** Background color of applet screen */
-    protected Color bgcolor_     = new Color(150, 193, 155);
+    protected Color bgcolor_ = new Color(150, 193, 155);
 
     /** Time lapse between repainting of the applet */
-    protected int refresh_delay_ = 1500;
+    protected int refreshDelay_ = 1500;
     
     /** Stores an image and url pair and provides associated methods */
@@ -56 +65 @@
     protected Display display_ = null;
 
+
+    public static int app_x_dim_  = 0;
+    public static int app_y_dim_  = 0;
+
+
     /** Gets verbosity */
     public int verbosity()    { return verbosity_; }
     /** Gets maximum depth for nested links */
-    public int maxDepth()     { return max_depth_; }
+    public int maxDepth()     { return maxDepth_; }
+
+    /** Gets maximum number of images to display */
+    public int maxDisplay() { return maxDisplay_;}
+
     /** Gets maximum number of images to store during downloading */
-    public int maxDownloads() { return max_downloads_; }
+    public int maxDownloads() { return maxDownloads_; }
     /** Gets the refresh delay used between repaint */
-    public int refreshDelay() { return refresh_delay_; }
+    public int refreshDelay() { return refreshDelay_; }
 
     /** Gets parameters from the applet code and stores locally<br>
@@ -74 +92 @@
      * Then starts downloading and displaying images */
     public void init() 
-    {
+    {       
+    if (verbosity_ >= 4) { 
+        System.err.println("Attempting to retrieve parameters...");
+    }
 
     // gets the parameters specified
@@ -81 +102 @@
     String max_depth_param      = getParameter("maxDepth");
     String max_downloads_param  = getParameter("maxDownloads");
+    String max_display_param    = getParameter("maxDisplay");
     String refresh_delay_param  = getParameter("refreshDelay");
     String image_type_param     = getParameter("imageType");
     String bgcolor_param        = getParameter("bgcolor");
-
-    if (bgcolor_param != null) {
-        String [] c = bgcolor_param.split(",");
-        if (c.length == 3)
-        bgcolor_ = new Color(Integer.parseInt(c[0]), Integer.parseInt(c[1]), Integer.parseInt(c[2]));
-    }
-
-    if (image_type_param != null) {
-        image_type = image_type_param;
-    }
-
-    if (verbosity_param!=null)
-    {
+    String caption_param        = getParameter("caption");
+
+    // Check it isn't null
+    if ((verbosity_param!=null) && (!verbosity_param.startsWith("_"))) {
         verbosity_  = Integer.parseInt(verbosity_param);
     }
-
-    if (is_java2_param == null || is_java2_param.equals("auto"))
-    {
+    else {
+        verbosity_ = 2;
+    }
+
+    if (verbosity_ >= 4) { 
+        System.err.println("Got parameters.");
+    }
+
+    if (caption_param != null && !caption_param.startsWith("_")) {
+        caption_ = caption_param;
+    }
+    else {
+        if (verbosity_ >= 4) { 
+        System.err.println("No Caption: setting to a space.");
+        }
+        caption_ = " ";
+    }
+
+    if ((bgcolor_param != null) && (!bgcolor_param.startsWith("_"))) {
+        if (bgcolor_param.startsWith("#")) {
+        bgcolor_ = Color.decode(bgcolor_param);   
+        }
+        else {
+        String [] c = bgcolor_param.split(",");
+        if (c.length == 3)
+            bgcolor_ = new Color(Integer.parseInt(c[0]), Integer.parseInt(c[1]), Integer.parseInt(c[2]));
+        }
+        if (verbosity_ >= 4){ 
+        System.err.println("Set BG to be " + bgcolor_.toString());
+        }
+    }
+    else {
+        if (verbosity_ >= 4) { 
+        System.err.println("No BG: setting to NZDL green.");
+        }      
+        bgcolor_ = new Color(150, 193, 155);
+    }
+
+    if ((image_type_param != null) && (!image_type_param.startsWith("_"))) {
+        imageType_ = image_type_param;
+    }
+
+    if (is_java2_param == null || is_java2_param.equals("auto")) {
         String version = System.getProperty("java.version");
         version = version.substring(0, version.lastIndexOf("."));
-        System.err.println("VERSION:" + version);
+        System.err.println("VERSION: " + version);
         float ver = (new Float(version)).floatValue();
-        is_java2_ = (ver >= 1.2) ? true : false;
+        isJava2_ = (ver >= 1.2) ? true : false;
     }
     else {
-        is_java2_ = (is_java2_param.equals("true")) ? true : false;
-    }
-
-    if (max_depth_param!=null)
-    {
-        max_depth_ = Integer.parseInt(max_depth_param);
-    }
-    if (max_downloads_param!=null)
-    {
-        max_downloads_ = Integer.parseInt(max_downloads_param);
-    }
-
-    if (refresh_delay_param!=null)
-    {
-        refresh_delay_ = Integer.parseInt(refresh_delay_param);
+        isJava2_ = (is_java2_param.equals("true")) ? true : false;
+    }
+
+    if (max_depth_param != null) {
+        System.err.println("maxDepth = " + max_depth_param);
+        maxDepth_ = Integer.parseInt(max_depth_param);
+    }
+
+    if (max_downloads_param!=null) {
+        maxDownloads_ = Integer.parseInt(max_downloads_param);
+    }
+
+    if (max_display_param!=null) {
+        maxDisplay_ = Integer.parseInt(max_display_param);
+    }
+
+    if (refresh_delay_param!=null) {
+        refreshDelay_ = Integer.parseInt(refresh_delay_param);
     }
 
@@ -145 +201 @@
     }
 
+    /*  
     // creates a class to store the image and it's associated url
     download_images_ = new DownloadImages(verbosity_);
@@ -150 +207 @@
     download_thread_ = new DownloadUrls(this, download_images_, 
                         image_url, href_musthave, image_mustnothave, 
-                        image_ignore, image_type);
+                        image_ignore, imageType_, verbosity_);
     // starts the display image thread with the currently downloaded images
-    display_thread_ = new DisplayImages(this,download_images_,is_java2_, bgcolor_);
-    display_ = new Display(this);
+    display_thread_ = new DisplayImages(this,download_images_, isJava2_, bgcolor_);
+
+    */
+
+
+
+    // creates initial screen
+    app_x_dim_ = getWidth();
+    app_y_dim_ = getHeight();
+
+    // display_ = new Display(this);
     }
 
@@ -165 +231 @@
     if (cimage != null)
     {
-        //System.err.println("Click on image: from url = " + cimage.from_url_);
+        System.err.println("Click on image: from url = " + cimage.from_url_);
         try {
         // displays the associated url in a new window
@@ -182 +248 @@
     public void start() 
     {
-    download_thread_.start();
-    display_thread_.start();
-    display_.start();
+    // download_thread_.start();
+    // display_thread_.start();
+    // display_.start();
     }
 
@@ -190 +256 @@
     public void stop() 
     {
-    download_thread_.stop();
-    display_thread_.stop();
-    display_.stop();
+    // download_thread_.stop();
+    // display_thread_.stop();
+    // display_.stop();
 
     download_thread_ = null;
@@ -202 +268 @@
     public void destroyed() 
     {
-    download_thread_ = null;
-    display_thread_ = null;
-    display_ = null;
+    // download_thread_ = null;
+    // display_thread_ = null;
+    // display_ = null;
     }
 
@@ -216 +282 @@
     /** Repaints the applet using the paint method of the thread that is currently displaying images */
     public void paint(Graphics g) {
-    if (display_thread_!=null)
-    {
-        //display_thread_.display_collage();
-        display_thread_.paint(g);
-    }
-    else
-    {
-        System.err.println("Applet still trying to paint!!");
-    }
+
+    System.err.println("Paint called!");
+    g.setColor(bgcolor_);
+    g.fillRect(0,0,app_x_dim_,app_y_dim_);
+    g.fillRect(0,0,100,200);
+
     }