Changeset 38889

Timestamp:

2024-03-28T22:04:59+13:00 (4 weeks ago)

Author:

anupama

Message:

1. width and height can now be passed in as parameters to the GsdlCollageApplet to customise its size. This makes sense when it is run as an application (I'm not sure if the dimensions of an applet can be controlled in the Java code that gets run after the applet element parameters are preconfigured, and I can't yet run this as a webswing-applet). 2. The width and height set on the webswing element in webswing-collage.xsl are now used to set the GsdlCollageApplet's width and height by passing it in as command line arguments.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/applet/GsdlCollageApplet/DisplayImages.java (modified) (2 diffs)
• src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java (modified) (5 diffs)
• web/interfaces/default/transform/pages/webswing-collage.xsl (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/DisplayImages.java

@@ -104 +104 @@
     if (is_java2_)
     {
-        //app_x_dim_  = (app_.getWidth() == 0) ? xDim_fallback : app_.getWidth();
-        //app_y_dim_  = (app_.getHeight() == 0) ? yDim_fallback : app_.getHeight();
-        app_x_dim_  = app_.getWidth();
-        app_y_dim_  = app_.getHeight();
+        //app_x_dim_  = app_.getWidth();
+        //app_y_dim_  = app_.getHeight();
+        app_x_dim_  = (app_.getWidth() <= 0) ? app_.X_DIM() : app_.getWidth();
+        app_y_dim_  = (app_.getHeight() <= 0) ? app_.Y_DIM() : app_.getHeight();
 
         System.err.println("@@@ xDim: " + app_x_dim_);
@@ -114 +114 @@
     else
     {
-        app_x_dim_  = app_.X_DIM;
-        app_y_dim_  = app_.Y_DIM;
+        app_x_dim_  = app_.X_DIM();
+        app_y_dim_  = app_.Y_DIM();
     }
 

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java

@@ -30 +30 @@
 public class GsdlCollageApplet extends JApplet {
     static final int EXTRA_HEIGHT = 30; // for status bar or any extra elements
-    static final int X_DIM = 600;
-    static final int Y_DIM = 300;
-    
+    private int X_DIM = 600;
+    private int Y_DIM = 300;
+
+    public int X_DIM() {
+    return X_DIM;
+    }
+    public int Y_DIM() {
+    return Y_DIM;
+    }
+
     // To run this GsdlCollageApplet as Application instead of as Applet
     boolean isWebswingApplication = false; // if run as webswing *and* application (not applet)
@@ -195 +202 @@
     
     isWebswingApplication = appParams.getOrDefault("webswing", "0").equals("1") ? true : false;
+    // Need these parameters set before init(), so that the display works
+    int w = this.getWidth();
+    if(appParams.get("width") != null) {
+        w = Integer.parseInt(appParams.get("width"));
+    }
+    int h = this.getHeight();
+    if(appParams.get("height") != null) {
+        h = Integer.parseInt(appParams.get("height"));
+    }
+    // For applet, w and h may now be set to a positive value. But if GsdlCollageApplet
+    // is run as an application, it won't yet be visible and not have a non-zero dimension.
+    // So use defaults here:
+    this.X_DIM = (w <= 0) ? X_DIM : w;
+    this.Y_DIM = (h <= 0) ? Y_DIM : h;
+    
     try {
         this.docBaseURL = new URL(appParams.get("baseurl"));
@@ -619 +641 @@
     /**
      * After building the GS3 Multimedia collection, try running this Application as:
-java -cp ./web/applet/GsdlCollageApplet.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet --statusbar 1 --baseurl "http://localhost:8383/greenstone3/" --library library --collection smallbea --gsdlversion 3 --hrefMustHave "library/sites/localsite/collect/smallbea" --documentroot greenstone3 --verbosity 3 --imageType ".jpg%.png" --imageMustNotHave "interfaces/" --classifier "CL2.3" --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor "#96c29a"
+java -cp ./web/applet/GsdlCollageApplet.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet --statusbar 0 --baseurl "http://localhost:8383/greenstone3/" --library library --collection smallbea --gsdlversion 3 --hrefMustHave "library/sites/localsite/collect/smallbea" --documentroot greenstone3 --verbosity 3 --imageType ".jpg%.png" --imageMustNotHave "interfaces/" --classifier "CL2.3" --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --isJava2 auto --bgcolor "#96c29a" --width 645 --height 780
      */
     public static void main(String[] args) {
@@ -630 +652 @@
         GsdlCollageApplet collageApp = new GsdlCollageApplet();
         frame.getContentPane().add(collageApp, BorderLayout.CENTER);
-        frame.setSize(X_DIM, Y_DIM); //Y_DIM+EXTRA_HEIGHT);
+        //frame.setSize(X_DIM, Y_DIM); //Y_DIM+EXTRA_HEIGHT);
         frame.setVisible(true);
         // https://stackoverflow.com/questions/19433358/difference-between-dispose-and-exit-on-close-in-java
@@ -638 +660 @@
         // prepare to run the collage applet as an application
         collageApp.applicationPreInit(args);
-
+        // It's now figured out the dimensions based on anything specified, so set frame size
+        frame.setSize(collageApp.X_DIM(), collageApp.Y_DIM()); //Y_DIM+EXTRA_HEIGHT);
         // status bar code. Not ideal, but had to add it here to get relative dimensions right
         collageApp.setLayout(new BorderLayout());

main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-collage.xsl

@@ -83 +83 @@
       <link rel="stylesheet" href="/webswing-server/css/style.css" />
 
-      <div id="webswing-collage" class="webswing-element" data-webswing-instance="webswingInstance0" style="width: 645px; height: 780px;">
+      <div id="webswing-collage" class="webswing-element" data-webswing-instance="webswingInstance0" style="width: 800px; height: 400px;">
         <div id="loading" class="ws-modal-container">
               <div class="ws-login">
@@ -163 +163 @@
        webswingInstance0.options.args += " --imageType " + "\".jpg%.png\"";
        webswingInstance0.options.args += " --classifier \"CL2.3\"";
-       webswingInstance0.options.args += " --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --bgcolor \"#96c29a\"";
+       webswingInstance0.options.args += " --maxDepth 500 --maxDisplay 25 --refreshDelay 1500 --bgcolor \"#96c29a\"";       
+
+       // Control the width and height of the Java application launched with webswing
+       // by passing width and height params set to the attributes of the webswing element
+       // https://stackoverflow.com/questions/21851633/get-height-from-style-attribute
+       var w = document.getElementById("webswing-collage").style.width;
+       var suffixIndex = 0;
+       if(w) {       
+       suffixIndex = w.indexOf("px");
+       if(suffixIndex>0) {
+          w = w.substring(0, suffixIndex);
+       }
+       webswingInstance0.options.args += " --width " + w;
+       }
+       var h = document.getElementById("webswing-collage").style.height;
+       if(h) {
+       suffixIndex = h.indexOf("px");
+       if(suffixIndex>0) {
+          h = h.substring(0, suffixIndex);
+       }
+       webswingInstance0.options.args += " --height " + h;
+       }
        
        //console.log("args: " +  webswingInstance0.options.args);