--- capa/capa51/JavaTools/GLabel.java	1999/11/29 19:44:21	1.1
+++ capa/capa51/JavaTools/GLabel.java	2000/03/16 18:52:07	1.2
@@ -5,7 +5,7 @@
 <CENTER>
 
 <APPLET CODE=GLabel.class CODEBASE=JAVA/Class width=550 height=304>
-<PARAM NAME="BGIMG" VALUE="path/to/D.gif">
+<PARAM NAME="BGIMG" VALUE="path/to/background.gif">
 <PARAM NAME="GRID"  VALUE="10">
 <PARAM NAME="COUNT" VALUE="7">
 <PARAM NAME="LB0" VALUE="X">
@@ -29,6 +29,13 @@
 <PARAM NAME="LB6" VALUE="7">
 <PARAM NAME="X6" VALUE="49">
 <PARAM NAME="Y6" VALUE="106">
+<PARAM NAME="ICOUNT" VALUE="2">
+<PARAM NAME="IMG0" VALUE="path/to/image0.gif">
+<PARAM NAME="IX0" VALUE="106">
+<PARAM NAME="IY0" VALUE="106">
+<PARAM NAME="IMG1" VALUE="path/to/image1.gif">
+<PARAM NAME="IX1" VALUE="106">
+<PARAM NAME="IY1" VALUE="106">
 </APPLET>
 
 </CENTER>
@@ -63,7 +70,12 @@ public class GLabel extends Applet imple
  public int     Xcord[];
  public int     Ycord[];
  public String  sLabel[];
+ public Image   iImg[];
+ public int     iX[];
+ public int     iY[];
+ 
  public int     label_cnt;
+ public int     img_cnt;
  public int     fsize;
  public int     show_grid;
  public int     grid_ww;
@@ -78,6 +90,9 @@ public void init()
    
    Xcord = new int[64]; Ycord = new int[64];
    sLabel = new String[64];
+   iImg = new Image[64];
+   iX = new int[64]; iY = new int[64];
+   
    show_grid = 0;
    f16 = new Font("TimesRoman",Font.PLAIN,16);
    
@@ -95,6 +110,33 @@ public void init()
      Ycord[idx]=(p==null)?30:Integer.valueOf(p).intValue();
      // System.out.println("X= "+Xcord[idx]+" Y= "+Ycord[idx]+" L= "+sLabel[idx]);
    }
+   
+   p=getParameter("ICOUNT");
+   img_cnt=(p==null)?1:Integer.valueOf(p).intValue();
+   for(idx=0;idx<img_cnt;idx++){
+     q = "IMG" + idx;
+     p = getParameter(q);
+     if(p != null) {
+     try {
+          System.out.print("URL=" + p + "\n");
+          f_url = new URL(p);
+     } 
+     catch (MalformedURLException exc) {
+          System.out.print("Malformed URL=" + p + "\n");
+       }
+       iImg[idx] = getImage(f_url);
+     }
+     q = "IX" + idx;
+     p = getParameter(q);
+     iX[idx]=(p==null)?20:Integer.valueOf(p).intValue();
+     q = "IY" + idx;
+     p = getParameter(q);
+     iY[idx]=(p==null)?30:Integer.valueOf(p).intValue();
+     // System.out.println("X= "+Xcord[idx]+" Y= "+Ycord[idx]+" L= "+sLabel[idx]);
+   }
+   
+   
+   
    p=getParameter("BGIMG");
    if(p != null) {
      try {
@@ -119,7 +161,7 @@ public void init()
 public void paint(Graphics g)
  {
    int        idx; 
-   Dimension  d = size();
+   Dimension  d = getSize();
    int        appw = d.width;
    int        apph = d.height;
    int        x1,y1,x2,y2;
@@ -131,6 +173,18 @@ public void paint(Graphics g)
        g.setColor(Color.white);
        g.fillRect(0, 0, appw, apph);
     }
+    
+    for(idx=0;idx<img_cnt;idx++){
+      if( iImg[idx] != null ) {
+        g.drawImage(iImg[idx], iX[idx],iY[idx], this);
+      } else {
+        g.setColor(Color.white);
+        g.fillRect(iX[idx], iY[idx], appw, apph);
+      }
+    }
+    
+    
+    
     g.setColor(Color.black);
     for(idx=0;idx<label_cnt;idx++){
       g.drawString(sLabel[idx],Xcord[idx],Ycord[idx]);