Changeset 188

Timestamp:

09/09/11 11:22:59 (13 years ago)

Author:

vmipsl

Message:

Servlet _ TimeSerie? :

• 1 paramètre ok
• même paramètre sur différentes plateformes ok

Location:

ether_megapoli/trunk

Files:

• applets/src/gov/noaa/pmel/sgt/LabelDrawer2.java (modified) (5 diffs)
• applets/src/gov/noaa/pmel/sgt/LineKey.java (modified) (2 diffs)
• service/Service.iml (modified) (1 diff)
• service/implementation/com/ether/EtherPlotContentServiceImpl.java (modified) (8 diffs)
• service/test/com/ether/SGTTest.java (modified) (6 diffs)

ether_megapoli/trunk/applets/src/gov/noaa/pmel/sgt/LabelDrawer2.java

@@ -11 +11 @@
  */
 
-package  gov.noaa.pmel.sgt;
-
+package gov.noaa.pmel.sgt;
+
+import gov.noaa.pmel.swing.MRJUtil;
 import gov.noaa.pmel.util.Point2D;
 import gov.noaa.pmel.util.Rectangle2D;
-import gov.noaa.pmel.util.Debug;
-import gov.noaa.pmel.swing.MRJUtil;
 
 import java.awt.*;
-import java.beans.*;
-import java.awt.image.PixelGrabber;
-import java.awt.image.MemoryImageSource;
-import java.awt.image.ColorModel;
-import java.awt.image.ImageObserver;
-import java.awt.geom.AffineTransform;
+import java.awt.font.FontRenderContext;
 import java.awt.font.TextAttribute;
 import java.awt.font.TextLayout;
-import java.awt.font.FontRenderContext;
+import java.awt.geom.AffineTransform;
 import java.text.AttributedString;
 
@@ -37 +31 @@
  * @since 2.0
  */
-public class LabelDrawer2 implements LabelDrawer, Cloneable {
-  private String label_;
-  private Color clr_;
-  private Font font_;
-  private transient Layer layer_;
-  private int orient_;
-  private int halign_;
-  private int valign_;
-  private Point dorigin_;
-  private Rectangle dbounds_;
-  private Point2D.Double porigin_;
-  private Rectangle2D.Double pbounds_;
-  private Polygon dpolygon_;
-  private double angle_;
-  private double sinthta_;
-  private double costhta_;
-  private double height_;
-  private boolean visible_;
-  private static boolean fixMetrics_ = MRJUtil.fixFontMetrics();
-
-  private int xoff_ = 0;
-  private int yoff_ = 0;
-
-  private boolean alwaysAntiAlias_ = true;
-
-  private Rectangle savedBounds_ = null;
-  private Point savedLoc_ = null;
-
-  public LabelDrawer2(String lbl, double hgt, Point2D.Double loc,
-                      int valign, int halign) {
-    label_ = lbl;
-    height_ = hgt;
-    porigin_ = loc;
-    valign_ = valign;
-    halign_ = halign;
-    //
-    dbounds_ = new Rectangle();
-    dorigin_ = new Point(0,0);
-    pbounds_ = new Rectangle2D.Double();
-  }
-
-  public LabelDrawer copy() {
-    LabelDrawer1 newLabel = null;
+public class LabelDrawer2
+        implements LabelDrawer, Cloneable
+{
+    private String label_;
+    private Color clr_;
+    private Font font_;
+    private transient Layer layer_;
+    private int orient_;
+    private int halign_;
+    private int valign_;
+    private Point dorigin_;
+    private Rectangle dbounds_;
+    private Point2D.Double porigin_;
+    private Rectangle2D.Double pbounds_;
+    private Polygon dpolygon_;
+    private double angle_;
+    private double sinthta_;
+    private double costhta_;
+    private double height_;
+    private boolean visible_;
+    private static boolean fixMetrics_ = MRJUtil.fixFontMetrics();
+
+    private int xoff_ = 0;
+    private int yoff_ = 0;
+
+    private boolean alwaysAntiAlias_ = true;
+
+    private Rectangle savedBounds_ = null;
+    private Point savedLoc_ = null;
+
+    public LabelDrawer2( String lbl, double hgt, Point2D.Double loc,
+                         int valign, int halign )
+    {
+        label_ = lbl;
+        height_ = hgt;
+        porigin_ = loc;
+        valign_ = valign;
+        halign_ = halign;
+        //
+        dbounds_ = new Rectangle();
+        dorigin_ = new Point( 0, 0 );
+        pbounds_ = new Rectangle2D.Double();
+    }
+
+    public LabelDrawer copy()
+    {
+        LabelDrawer1 newLabel = null;
 //      try {
 //        newLabel = (LabelDrawer1)clone();
@@ -93 +91 @@
 //        }
 //      }
-    return newLabel;
-  }
-
-  public void draw(Graphics g) throws LayerNotFoundException  {
-    int xs, ys;
-    if((label_.length() <= 0) || !visible_ || g == null) return;
-    if(layer_ == (Layer) null) throw new LayerNotFoundException();
-    //
-    // set label heigth in physical units
-    //
-    computeBoundsD(g);
-    if(clr_ == null) {
-      g.setColor(layer_.getPane().getComponent().getForeground());
-    } else {
-      g.setColor(clr_);
-    }
-    if(orient_ == SGLabel.HORIZONTAL) {
-      xs = dbounds_.x + xoff_;
-      ys = dbounds_.y + yoff_;
-      drawString(g, xs, ys);
-    } else if(orient_ == SGLabel.VERTICAL) {
-      //
-      // draw text in offscreen image (horizontal)
-      //
-      xs = dbounds_.x + xoff_;
-      ys = dbounds_.y + yoff_;
-      drawString(g, xs, ys);
-    } else {
-      //
-      // Angled text, draw in offscreen image and rotate
-      //
-      xs = layer_.getXPtoD(porigin_.x);
-      ys = layer_.getYPtoD(porigin_.y);
-      drawString(g, xs, ys);
-    }
-  }
-
-  public void setText(String lbl) {
-    label_ = lbl;
-  }
-  public String getText() {
-    return label_;
-  }
-
-  public void setColor(Color clr) {
-    clr_ = clr;
-  }
-  public Color getColor() {
-    return clr_;
-  }
-
-  public void setFont(Font font) {
-    font_ = font;
-  }
-  public Font getFont() {
-    return font_;
-  }
-
-  public void setLayer(Layer layer) {
-    layer_ = layer;
-    if(savedBounds_ != null) {
-      setBounds(savedBounds_.x, savedBounds_.y,
-                savedBounds_.width, savedBounds_.height);
-      savedBounds_ = null;
-    }
-    if(savedLoc_ != null) {
-      setLocation(savedLoc_);
-      savedLoc_ = null;
-    }
-  }
-  public Layer getLayer() {
-    return layer_;
-  }
-
-  public void setOrientation(int orient) {
-    if(orient_ != orient) {
-      if(orient == SGLabel.HORIZONTAL) {
-        costhta_ = 1.0;
-        sinthta_ = 0.0;
-      } else if(orient == SGLabel.VERTICAL) {
-        costhta_ = 0.0;
-        sinthta_ = 1.0;
-      }
-      orient_ = orient;
-    }
-  }
-  public int getOrientation() {
-    return orient_;
-  }
-
-  public void setHAlign(int halign) {
-    halign_ = halign;
-  }
-  public int getHAlign() {
-    return halign_;
-  }
-
-  public void setVAlign(int valign) {
-    valign_ = valign;
-  }
-  public int getVAlign() {
-    return valign_;
-  }
-
-  public void setLocation(Point loc) {
-    if(layer_ == null) {
-      savedLoc_ = new Point(loc);
-      return;
-    }
-    computeBoundsD(layer_.getPane().getComponent().getGraphics());
-    if(dbounds_.x != loc.x || dbounds_.y != loc.y) {
-      setBounds(loc.x, loc.y, dbounds_.width, dbounds_.height);
-    }
-  }
-  public Point getLocation() {
-    if(savedLoc_ != null) return savedLoc_;
-    return dorigin_;
-  }
-
-  public void setBounds(int x, int y, int width, int height) {
-    int swidth, sascent, xd, yd;
-    if(layer_ == null) {
-      savedBounds_ = new Rectangle(x, y, width, height);
-      return;
-    }
-    Graphics g = layer_.getPane().getComponent().getGraphics();
-    if(g == null) return;
-    font_ = computeFontSize(g);
-    FontRenderContext frc = getFontRenderContext((Graphics2D)g);
-    TextLayout tlayout;
-    if(label_.length() == 0) {
-      tlayout = new TextLayout(" ", font_, frc);
-    } else {
-      tlayout = new TextLayout(label_, font_, frc);
-    }
-    java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
-    int theight = (int)tbounds.getHeight();
-    int twidth = (int)tbounds.getWidth();
-    int tx = (int)tbounds.getX();
-    int ty = (int)tbounds.getY();
-    if(fixMetrics_) ty -= (int)(0.7*tlayout.getAscent());  // hack for MacOS X java.runtime.version = 1.4.1_01-39
-    sascent = (int)tlayout.getAscent();
-
-    if(orient_ == SGLabel.HORIZONTAL) {
-      swidth = width;
-      xd = x;
-      yd = y - ty;
-      switch(valign_) {
-      case SGLabel.TOP:
-        yd = yd - sascent;
-        break;
-      case SGLabel.MIDDLE:
-        yd = yd + (ty + theight/2);
-        break;
-      case SGLabel.BOTTOM:
-      }
-      switch(halign_) {
-      case SGLabel.RIGHT:
-        xd = xd + swidth;
-        break;
-      case SGLabel.CENTER:
-        xd = xd + swidth/2;
-        break;
-      case SGLabel.LEFT:
-      }
-    } else {
-      swidth = height;
-      yd = y + height;
-      xd = x - ty;
-      switch(valign_) {
-      case SGLabel.TOP:
-        xd = xd - sascent;
-        break;
-      case SGLabel.MIDDLE:
-        xd = xd - sascent/2;
-        break;
-      case SGLabel.BOTTOM:
-      }
-      switch(halign_) {
-      case SGLabel.RIGHT:
-        yd = yd - swidth;
-        break;
-      case SGLabel.CENTER:
-        yd = yd - swidth/2;
-        break;
-      case SGLabel.LEFT:
-      }
-    }
-    if(dorigin_.x != xd || dorigin_.y != yd) {
-      dorigin_.x = xd;
-      dorigin_.y = yd;
-      porigin_.x = layer_.getXDtoP(xd);
-      porigin_.y = layer_.getYDtoP(yd);
-    }
-  }
-  public Rectangle getBounds() {
-    if(savedBounds_ != null) return savedBounds_;
-    if(layer_ != null) computeBoundsD(layer_.getPane().getComponent().getGraphics());
-    return dbounds_;
-  }
-
-  public void setLocationP(Point2D.Double loc) {
-    porigin_ = loc;
-  }
-  public Point2D.Double getLocationP() {
-    return porigin_;
-  }
-
-  public Rectangle2D.Double getBoundsP() {
-    computeBoundsD(layer_.getPane().getComponent().getGraphics());
-    return pbounds_;
-  }
-
-  public void setAngle(double angle) {
-    angle_ = angle;
-    double thta = angle_*Math.PI/180.0;
-    if(Math.abs(thta) < 0.001) {
-      orient_ = SGLabel.HORIZONTAL;
-      costhta_ = 1.0;
-      sinthta_ = 0.0;
-    } else if(Math.abs(thta - 90.0) < 0.001) {
-      orient_ = SGLabel.VERTICAL;
-      costhta_ = 0.0;
-      sinthta_ = 1.0;
-    } else {
-      orient_ = SGLabel.ANGLE;
-      costhta_ = Math.cos(thta);
-      sinthta_ = Math.sin(thta);
-    }
-  }
-  public double getAngle() {
-    return angle_;
-  }
-
-  public void setHeightP(double hgt) {
-    height_ = hgt;
-  }
-  public double getHeightP() {
-    return height_;
-  }
-
-  public void setVisible(boolean vis) {
-    visible_ = vis;
-  }
-  public boolean isVisible() {
-    return visible_;
-  }
-
-  private void computeBoundsD(Graphics g) {
-    int sascent, xd, yd;
-    int xorig, yorig;
-    int[] xt = new int[4];
-    int[] yt = new int[4];
-    int[] xn = new int[4];
-    int[] yn = new int[4];
-    //
-    // compute size of font and adjust to be height tall!
-    //
-    if(g == null) return;
-    font_ = computeFontSize(g);
-    FontRenderContext frc = getFontRenderContext((Graphics2D)g);
-    TextLayout tlayout;
-    if(label_.length() == 0) {
-      tlayout = new TextLayout(" ", font_, frc);
-    } else {
-      tlayout = new TextLayout(label_, font_, frc);
-    }
-    java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
+        return newLabel;
+    }
+
+    public void draw( Graphics g )
+            throws LayerNotFoundException
+    {
+        int xs, ys;
+        if( ( label_.length() <= 0 ) || !visible_ || g == null ) return;
+        if( layer_ == (Layer) null ) throw new LayerNotFoundException();
+        //
+        // set label heigth in physical units
+        //
+        computeBoundsD( g );
+        if( clr_ == null )
+        {
+            g.setColor( layer_.getPane().getComponent().getForeground() );
+        }
+        else
+        {
+            g.setColor( clr_ );
+        }
+//        g.setFont( new Font( "Helvetica", Font.PLAIN, 6 ) );
+
+        if( orient_ == SGLabel.HORIZONTAL )
+        {
+            xs = dbounds_.x + xoff_;
+            ys = dbounds_.y + yoff_;
+            drawString( g, xs, ys );
+        }
+        else if( orient_ == SGLabel.VERTICAL )
+        {
+            //
+            // draw text in offscreen image (horizontal)
+            //
+            xs = dbounds_.x + xoff_;
+            ys = dbounds_.y + yoff_;
+            drawString( g, xs, ys );
+        }
+        else
+        {
+            //
+            // Angled text, draw in offscreen image and rotate
+            //
+            xs = layer_.getXPtoD( porigin_.x );
+            ys = layer_.getYPtoD( porigin_.y );
+            drawString( g, xs, ys );
+        }
+    }
+
+    public void setText( String lbl )
+    {
+        label_ = lbl;
+    }
+
+    public String getText()
+    {
+        return label_;
+    }
+
+    public void setColor( Color clr )
+    {
+        clr_ = clr;
+    }
+
+    public Color getColor()
+    {
+        return clr_;
+    }
+
+    public void setFont( Font font )
+    {
+        font_ = font;
+    }
+
+    public Font getFont()
+    {
+        return font_;
+    }
+
+    public void setLayer( Layer layer )
+    {
+        layer_ = layer;
+        if( savedBounds_ != null )
+        {
+            setBounds( savedBounds_.x, savedBounds_.y,
+                    savedBounds_.width, savedBounds_.height );
+            savedBounds_ = null;
+        }
+        if( savedLoc_ != null )
+        {
+            setLocation( savedLoc_ );
+            savedLoc_ = null;
+        }
+    }
+
+    public Layer getLayer()
+    {
+        return layer_;
+    }
+
+    public void setOrientation( int orient )
+    {
+        if( orient_ != orient )
+        {
+            if( orient == SGLabel.HORIZONTAL )
+            {
+                costhta_ = 1.0;
+                sinthta_ = 0.0;
+            }
+            else if( orient == SGLabel.VERTICAL )
+            {
+                costhta_ = 0.0;
+                sinthta_ = 1.0;
+            }
+            orient_ = orient;
+        }
+    }
+
+    public int getOrientation()
+    {
+        return orient_;
+    }
+
+    public void setHAlign( int halign )
+    {
+        halign_ = halign;
+    }
+
+    public int getHAlign()
+    {
+        return halign_;
+    }
+
+    public void setVAlign( int valign )
+    {
+        valign_ = valign;
+    }
+
+    public int getVAlign()
+    {
+        return valign_;
+    }
+
+    public void setLocation( Point loc )
+    {
+        if( layer_ == null )
+        {
+            savedLoc_ = new Point( loc );
+            return;
+        }
+        computeBoundsD( layer_.getPane().getComponent().getGraphics() );
+        if( dbounds_.x != loc.x || dbounds_.y != loc.y )
+        {
+            setBounds( loc.x, loc.y, dbounds_.width, dbounds_.height );
+        }
+    }
+
+    public Point getLocation()
+    {
+        if( savedLoc_ != null ) return savedLoc_;
+        return dorigin_;
+    }
+
+    public void setBounds( int x, int y, int width, int height )
+    {
+        int swidth, sascent, xd, yd;
+        if( layer_ == null )
+        {
+            savedBounds_ = new Rectangle( x, y, width, height );
+            return;
+        }
+        Graphics g = layer_.getPane().getComponent().getGraphics();
+        if( g == null ) return;
+        font_ = computeFontSize( g );
+        FontRenderContext frc = getFontRenderContext( (Graphics2D) g );
+        TextLayout tlayout;
+        if( label_.length() == 0 )
+        {
+            tlayout = new TextLayout( " ", font_, frc );
+        }
+        else
+        {
+            tlayout = new TextLayout( label_, font_, frc );
+        }
+        java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
+        int theight = (int) tbounds.getHeight();
+        int twidth = (int) tbounds.getWidth();
+        int tx = (int) tbounds.getX();
+        int ty = (int) tbounds.getY();
+        if( fixMetrics_ )
+            ty -= (int) ( 0.7 * tlayout.getAscent() );  // hack for MacOS X java.runtime.version = 1.4.1_01-39
+        sascent = (int) tlayout.getAscent();
+
+        if( orient_ == SGLabel.HORIZONTAL )
+        {
+            swidth = width;
+            xd = x;
+            yd = y - ty;
+            switch( valign_ )
+            {
+                case SGLabel.TOP:
+                    yd = yd - sascent;
+                    break;
+                case SGLabel.MIDDLE:
+                    yd = yd + ( ty + theight / 2 );
+                    break;
+                case SGLabel.BOTTOM:
+            }
+            switch( halign_ )
+            {
+                case SGLabel.RIGHT:
+                    xd = xd + swidth;
+                    break;
+                case SGLabel.CENTER:
+                    xd = xd + swidth / 2;
+                    break;
+                case SGLabel.LEFT:
+            }
+        }
+        else
+        {
+            swidth = height;
+            yd = y + height;
+            xd = x - ty;
+            switch( valign_ )
+            {
+                case SGLabel.TOP:
+                    xd = xd - sascent;
+                    break;
+                case SGLabel.MIDDLE:
+                    xd = xd - sascent / 2;
+                    break;
+                case SGLabel.BOTTOM:
+            }
+            switch( halign_ )
+            {
+                case SGLabel.RIGHT:
+                    yd = yd - swidth;
+                    break;
+                case SGLabel.CENTER:
+                    yd = yd - swidth / 2;
+                    break;
+                case SGLabel.LEFT:
+            }
+        }
+        if( dorigin_.x != xd || dorigin_.y != yd )
+        {
+            dorigin_.x = xd;
+            dorigin_.y = yd;
+            porigin_.x = layer_.getXDtoP( xd );
+            porigin_.y = layer_.getYDtoP( yd );
+        }
+    }
+
+    public Rectangle getBounds()
+    {
+        if( savedBounds_ != null ) return savedBounds_;
+        if( layer_ != null ) computeBoundsD( layer_.getPane().getComponent().getGraphics() );
+        return dbounds_;
+    }
+
+    public void setLocationP( Point2D.Double loc )
+    {
+        porigin_ = loc;
+    }
+
+    public Point2D.Double getLocationP()
+    {
+        return porigin_;
+    }
+
+    public Rectangle2D.Double getBoundsP()
+    {
+        computeBoundsD( layer_.getPane().getComponent().getGraphics() );
+        return pbounds_;
+    }
+
+    public void setAngle( double angle )
+    {
+        angle_ = angle;
+        double thta = angle_ * Math.PI / 180.0;
+        if( Math.abs( thta ) < 0.001 )
+        {
+            orient_ = SGLabel.HORIZONTAL;
+            costhta_ = 1.0;
+            sinthta_ = 0.0;
+        }
+        else if( Math.abs( thta - 90.0 ) < 0.001 )
+        {
+            orient_ = SGLabel.VERTICAL;
+            costhta_ = 0.0;
+            sinthta_ = 1.0;
+        }
+        else
+        {
+            orient_ = SGLabel.ANGLE;
+            costhta_ = Math.cos( thta );
+            sinthta_ = Math.sin( thta );
+        }
+    }
+
+    public double getAngle()
+    {
+        return angle_;
+    }
+
+    public void setHeightP( double hgt )
+    {
+        height_ = hgt;
+    }
+
+    public double getHeightP()
+    {
+        return height_;
+    }
+
+    public void setVisible( boolean vis )
+    {
+        visible_ = vis;
+    }
+
+    public boolean isVisible()
+    {
+        return visible_;
+    }
+
+    private void computeBoundsD( Graphics g )
+    {
+        int sascent, xd, yd;
+        int xorig, yorig;
+        int[] xt = new int[4];
+        int[] yt = new int[4];
+        int[] xn = new int[4];
+        int[] yn = new int[4];
+        //
+        // compute size of font and adjust to be height tall!
+        //
+        if( g == null ) return;
+        // VMIPSL
+//        font_ = computeFontSize( g );
+        FontRenderContext frc = getFontRenderContext( (Graphics2D) g );
+        TextLayout tlayout;
+        if( label_.length() == 0 )
+        {
+            tlayout = new TextLayout( " ", font_, frc );
+        }
+        else
+        {
+            tlayout = new TextLayout( label_, font_, frc );
+        }
+        java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
 
 //    System.out.println("LabelDrawer2('" + label_ + "'): fixMetrics = " + fixMetrics_);
@@ -368 +449 @@
 //    System.out.println("LabelDrawer2('" + label_ + "'): TextLayout = " + tlayout);
 
-    int theight = (int)tbounds.getHeight();
-    int twidth = (int)tbounds.getWidth();
-    int tx = (int)tbounds.getX();
-    int ty = (int)tbounds.getY();
-    if(fixMetrics_) ty -= (int)(0.7*tlayout.getAscent());  // hack for MacOS X java.runtime.version = 1.4.1_01-39
-    sascent = (int)tlayout.getAscent();
+        int theight = (int) tbounds.getHeight();
+        int twidth = (int) tbounds.getWidth();
+        int tx = (int) tbounds.getX();
+        int ty = (int) tbounds.getY();
+        if( fixMetrics_ )
+            ty -= (int) ( 0.7 * tlayout.getAscent() );  // hack for MacOS X java.runtime.version = 1.4.1_01-39
+        sascent = (int) tlayout.getAscent();
+        //
+        xd = layer_.getXPtoD( porigin_.x );
+        yd = layer_.getYPtoD( porigin_.y );
+        //
+        // set device origin
+        //
+        dorigin_.x = xd;
+        dorigin_.y = yd;
+        xorig = xd;
+        yorig = yd;
+        //
+        switch( valign_ )
+        {
+            case SGLabel.TOP:
+                yd = yd + sascent;
+                break;
+            case SGLabel.MIDDLE:
+                yd = yd - ( ty + theight / 2 );
+                break;
+            case SGLabel.BOTTOM:
+        }
+        switch( halign_ )
+        {
+            case SGLabel.RIGHT:
+                xd = xd - twidth;
+                break;
+            case SGLabel.CENTER:
+                xd = xd - twidth / 2;
+                break;
+            case SGLabel.LEFT:
+        }
+        if( orient_ == SGLabel.HORIZONTAL )
+        {
+            xoff_ = 0;
+            yoff_ = -ty;
+        }
+        else if( orient_ == SGLabel.VERTICAL )
+        {
+            xoff_ = -ty;
+            yoff_ = twidth;
+        }
+        xt[0] = xd + tx;
+        xt[1] = xt[0];
+        xt[2] = xt[0] + twidth;
+        xt[3] = xt[2];
+
+        yt[0] = yd + ty;
+        yt[1] = yt[0] + theight;
+        yt[2] = yt[1];
+        yt[3] = yt[0];
+        //
+        // rotate
+        //
+        for( int i = 0; i < 4; i++ )
+        {
+            xn[i] = (int) ( ( xt[i] - xorig ) * costhta_ + ( yt[i] - yorig ) * sinthta_ ) + xorig;
+            yn[i] = (int) ( ( yt[i] - yorig ) * costhta_ - ( xt[i] - xorig ) * sinthta_ ) + yorig;
+        }
+
+        dpolygon_ = new Polygon( xn, yn, 4 );
+        dbounds_ = dpolygon_.getBounds();
+        //
+        // compute pbounds
+        //
+        pbounds_.x = layer_.getXDtoP( dbounds_.x );
+        pbounds_.y = layer_.getYDtoP( dbounds_.y );
+        pbounds_.width = layer_.getXDtoP( dbounds_.x +
+                dbounds_.width ) - pbounds_.x;
+        pbounds_.height = pbounds_.y -
+                layer_.getYDtoP( dbounds_.y + dbounds_.height );
+    }
+
     //
-    xd = layer_.getXPtoD(porigin_.x);
-    yd = layer_.getYPtoD(porigin_.y);
+    // a bad method to compute the font size!
     //
-    // set device origin
-    //
-    dorigin_.x = xd;
-    dorigin_.y = yd;
-    xorig = xd;
-    yorig = yd;
-    //
-    switch(valign_) {
-    case SGLabel.TOP:
-      yd = yd + sascent;
-      break;
-    case SGLabel.MIDDLE:
-      yd = yd - (ty + theight/2);
-      break;
-    case SGLabel.BOTTOM:
-    }
-    switch(halign_) {
-    case SGLabel.RIGHT:
-      xd = xd - twidth;
-      break;
-    case SGLabel.CENTER:
-      xd = xd - twidth/2;
-      break;
-    case SGLabel.LEFT:
-    }
-    if(orient_ == SGLabel.HORIZONTAL) {
-      xoff_ = 0;
-      yoff_ = -ty;
-    } else if(orient_ == SGLabel.VERTICAL) {
-      xoff_ = -ty;
-      yoff_ = twidth;
-    }
-    xt[0] = xd + tx;
-    xt[1] = xt[0];
-    xt[2] = xt[0] + twidth;
-    xt[3] = xt[2];
-
-    yt[0] = yd + ty;
-    yt[1] = yt[0] + theight;
-    yt[2] = yt[1];
-    yt[3] = yt[0];
-    //
-    // rotate
-    //
-    for(int i=0; i < 4; i++) {
-      xn[i] = (int)((xt[i]-xorig)*costhta_ + (yt[i]-yorig)*sinthta_) + xorig;
-      yn[i] = (int)((yt[i]-yorig)*costhta_ - (xt[i]-xorig)*sinthta_) + yorig;
-    }
-
-    dpolygon_ = new Polygon(xn, yn, 4);
-    dbounds_ = dpolygon_.getBounds();
-    //
-    // compute pbounds
-    //
-    pbounds_.x = layer_.getXDtoP(dbounds_.x);
-    pbounds_.y = layer_.getYDtoP(dbounds_.y);
-    pbounds_.width = layer_.getXDtoP(dbounds_.x +
-                                     dbounds_.width) - pbounds_.x;
-    pbounds_.height = pbounds_.y -
-      layer_.getYDtoP(dbounds_.y + dbounds_.height);
-  }
-
-  //
-  // a bad method to compute the font size!
-  //
-  Font computeFontSize(Graphics g) {
-    Font tfont;
-    int pt_0, pt_1, hgt;
-    int count = 1;
-    double hgt_0, hgt_1, del_0, del_1;
-    double a, b;
-    FontRenderContext frc = getFontRenderContext((Graphics2D)g);
-    TextLayout tlayout;
-    //
-    // first guess
-    //
-    if(g == null) return font_;  // return original font!
-    hgt = layer_.getXPtoD(height_) - layer_.getXPtoD(0.0f);
-    pt_0 = hgt - 3;
-    tfont = new Font(font_.getName(), font_.getStyle(), pt_0);
-    if(label_.length() == 0) {
-      tlayout = new TextLayout(" ", tfont, frc);
-    } else {
-      tlayout = new TextLayout(label_, tfont, frc);
-    }
-    hgt = (int)(tlayout.getAscent() + tlayout.getDescent());
-    hgt_0 = layer_.getXDtoP(hgt) - layer_.getXDtoP(0);
-    pt_0 = tfont.getSize();
-    pt_1 = (int)((double)pt_0*(height_/hgt_0));
-    while((pt_0 != pt_1) && (count < 5)) {
-      tfont = new Font(font_.getName(), font_.getStyle(), pt_1);
-      if(label_.length() == 0) {
-        tlayout = new TextLayout(" ", tfont, frc);
-      } else {
-        tlayout = new TextLayout(label_, tfont, frc);
-      }
-      hgt = (int)(tlayout.getAscent() + tlayout.getDescent());
-      hgt_1 = layer_.getXDtoP(hgt) - layer_.getXDtoP(0);
-      del_0 = Math.abs(height_ - hgt_0);
-      del_1 = Math.abs(height_ - hgt_1);
-      if((Math.abs(pt_0 - pt_1) <= 1) && (del_0 > del_1)) return tfont;
-      pt_0 = pt_1;
-      hgt_0 = hgt_1;
-      pt_1 = (int)((double)pt_0*(height_/hgt_0));
-      count++;
-    }
-    return tfont;
-  }
-
-  private void drawString(Graphics g, int x, int y) {
-    float angle;
-    if(g == null) return;
-    if(orient_ == SGLabel.HORIZONTAL) {
-      angle = 0.0f;
-    } else if(orient_ == SGLabel.VERTICAL) {
-      angle = -90.0f;
-    } else {
-      angle = -(float)angle_;
-    }
-    RenderingHints oldRenderingHints = null;
-    Graphics2D g2 = (Graphics2D)g;
-    if(angle != 0.0f || alwaysAntiAlias_) {
-      oldRenderingHints = g2.getRenderingHints();
-      g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                          RenderingHints.VALUE_ANTIALIAS_ON);
-      g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
-                          RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-    }
-    AffineTransform oldTransform = g2.getTransform();
-    //    System.out.println("\n angle = " + angle + ", text = " + label_);
-    //    System.out.println("oldTransform = " + oldTransform);
-    AttributedString as = new AttributedString(label_);
-    as.addAttribute(TextAttribute.FONT, font_);
-    g2.translate(x, y);
-    //   System.out.println("translated = " + g2.getTransform());
-    g2.rotate(Math.PI * angle/180.0);
-    //   System.out.println("newTransform = " + g2.getTransform());
-    g2.drawString(as.getIterator(), 0, 0);
-    g2.setTransform(oldTransform);
-    if(angle != 0.0f || alwaysAntiAlias_) {
-      g2.setRenderingHints(oldRenderingHints);
-    }
-    //
+    Font computeFontSize( Graphics g )
+    {
+        Font tfont;
+        int pt_0, pt_1, hgt;
+        int count = 1;
+        double hgt_0, hgt_1, del_0, del_1;
+        double a, b;
+        FontRenderContext frc = getFontRenderContext( (Graphics2D) g );
+        TextLayout tlayout;
+        //
+        // first guess
+        //
+        if( g == null ) return font_;  // return original font!
+        hgt = layer_.getXPtoD( height_ ) - layer_.getXPtoD( 0.0f );
+        pt_0 = hgt - 3;
+        tfont = new Font( font_.getName(), font_.getStyle(), pt_0 );
+        if( label_.length() == 0 )
+        {
+            tlayout = new TextLayout( " ", tfont, frc );
+        }
+        else
+        {
+            tlayout = new TextLayout( label_, tfont, frc );
+        }
+        hgt = (int) ( tlayout.getAscent() + tlayout.getDescent() );
+        hgt_0 = layer_.getXDtoP( hgt ) - layer_.getXDtoP( 0 );
+        pt_0 = tfont.getSize();
+        pt_1 = (int) ( (double) pt_0 * ( height_ / hgt_0 ) );
+        while( ( pt_0 != pt_1 ) && ( count < 5 ) )
+        {
+            tfont = new Font( font_.getName(), font_.getStyle(), pt_1 );
+            if( label_.length() == 0 )
+            {
+                tlayout = new TextLayout( " ", tfont, frc );
+            }
+            else
+            {
+                tlayout = new TextLayout( label_, tfont, frc );
+            }
+            hgt = (int) ( tlayout.getAscent() + tlayout.getDescent() );
+            hgt_1 = layer_.getXDtoP( hgt ) - layer_.getXDtoP( 0 );
+            del_0 = Math.abs( height_ - hgt_0 );
+            del_1 = Math.abs( height_ - hgt_1 );
+            if( ( Math.abs( pt_0 - pt_1 ) <= 1 ) && ( del_0 > del_1 ) ) return tfont;
+            pt_0 = pt_1;
+            hgt_0 = hgt_1;
+            pt_1 = (int) ( (double) pt_0 * ( height_ / hgt_0 ) );
+            count++;
+        }
+        return tfont;
+    }
+
+    private void drawString( Graphics g, int x, int y )
+    {
+        float angle;
+        if( g == null ) return;
+        if( orient_ == SGLabel.HORIZONTAL )
+        {
+            angle = 0.0f;
+        }
+        else if( orient_ == SGLabel.VERTICAL )
+        {
+            angle = -90.0f;
+        }
+        else
+        {
+            angle = -(float) angle_;
+        }
+        RenderingHints oldRenderingHints = null;
+        Graphics2D g2 = (Graphics2D) g;
+        if( angle != 0.0f || alwaysAntiAlias_ )
+        {
+            oldRenderingHints = g2.getRenderingHints();
+            g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING,
+                    RenderingHints.VALUE_ANTIALIAS_ON );
+            g2.setRenderingHint( RenderingHints.KEY_FRACTIONALMETRICS,
+                    RenderingHints.VALUE_FRACTIONALMETRICS_ON );
+        }
+        AffineTransform oldTransform = g2.getTransform();
+        //    System.out.println("\n angle = " + angle + ", text = " + label_);
+        //    System.out.println("oldTransform = " + oldTransform);
+        AttributedString as = new AttributedString( label_ );
+        as.addAttribute( TextAttribute.FONT, font_ );
+        g2.translate( x, y );
+        //   System.out.println("translated = " + g2.getTransform());
+        g2.rotate( Math.PI * angle / 180.0 );
+        //   System.out.println("newTransform = " + g2.getTransform());
+        g2.drawString( as.getIterator(), 0, 0 );
+        g2.setTransform( oldTransform );
+        if( angle != 0.0f || alwaysAntiAlias_ )
+        {
+            g2.setRenderingHints( oldRenderingHints );
+        }
+        //
 //      g2.setStroke(normal);
 //      Color oldColor = g.getColor();
@@ -532 +636 @@
 //      g.setColor(oldColor);
 
-  }
-  public float getStringWidth(Graphics g) {
-    if(g == null) return 0.0f;
-    font_ = computeFontSize(g);
-    FontRenderContext frc = getFontRenderContext((Graphics2D)g);
-    TextLayout tlayout;
-    if(label_.length() == 0) {
-      tlayout = new TextLayout(" ", font_, frc);
-    } else {
-      tlayout = new TextLayout(label_, font_, frc);
-    }
-    java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
-    return (float)tbounds.getWidth();
-  }
-  public float getStringHeight(Graphics g) {
-    if(g == null) return 0.0f;
-    font_ = computeFontSize(g);
-    FontRenderContext frc = getFontRenderContext((Graphics2D)g);
-    TextLayout tlayout;
-    if(label_.length() == 0) {
-      tlayout = new TextLayout(" ", font_, frc);
-    } else {
-      tlayout = new TextLayout(label_, font_, frc);
-    }
-    java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
-    return (float)tbounds.getHeight();
-  }
-
-  FontRenderContext getFontRenderContext(Graphics2D g2) {
-    if(g2 == null) return null;
-    RenderingHints oldRenderingHints = null;
-    if(angle_ != 0.0 || alwaysAntiAlias_) {
-      oldRenderingHints = g2.getRenderingHints();
-      g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                          RenderingHints.VALUE_ANTIALIAS_ON);
-    }
-    FontRenderContext frc = g2.getFontRenderContext();
-    if(angle_ != 0.0 || alwaysAntiAlias_) {
-      g2.setRenderingHints(oldRenderingHints);
-    }
-    return frc;
-  }
+    }
+
+    public float getStringWidth( Graphics g )
+    {
+        if( g == null ) return 0.0f;
+        font_ = computeFontSize( g );
+        FontRenderContext frc = getFontRenderContext( (Graphics2D) g );
+        TextLayout tlayout;
+        if( label_.length() == 0 )
+        {
+            tlayout = new TextLayout( " ", font_, frc );
+        }
+        else
+        {
+            tlayout = new TextLayout( label_, font_, frc );
+        }
+        java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
+        return (float) tbounds.getWidth();
+    }
+
+    public float getStringHeight( Graphics g )
+    {
+        if( g == null ) return 0.0f;
+        font_ = computeFontSize( g );
+        FontRenderContext frc = getFontRenderContext( (Graphics2D) g );
+        TextLayout tlayout;
+        if( label_.length() == 0 )
+        {
+            tlayout = new TextLayout( " ", font_, frc );
+        }
+        else
+        {
+            tlayout = new TextLayout( label_, font_, frc );
+        }
+        java.awt.geom.Rectangle2D tbounds = tlayout.getBounds();
+        return (float) tbounds.getHeight();
+    }
+
+    FontRenderContext getFontRenderContext( Graphics2D g2 )
+    {
+        if( g2 == null ) return null;
+        RenderingHints oldRenderingHints = null;
+        if( angle_ != 0.0 || alwaysAntiAlias_ )
+        {
+            oldRenderingHints = g2.getRenderingHints();
+            g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING,
+                    RenderingHints.VALUE_ANTIALIAS_ON );
+        }
+        FontRenderContext frc = g2.getFontRenderContext();
+        if( angle_ != 0.0 || alwaysAntiAlias_ )
+        {
+            g2.setRenderingHints( oldRenderingHints );
+        }
+        return frc;
+    }
 }

ether_megapoli/trunk/applets/src/gov/noaa/pmel/sgt/LineKey.java

@@ -11 +11 @@
  */
 
-package  gov.noaa.pmel.sgt;
+package gov.noaa.pmel.sgt;
 
 import gov.noaa.pmel.util.Point2D;
 import gov.noaa.pmel.util.Rectangle2D;
-import gov.noaa.pmel.util.Debug;
-
+
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Enumeration;
 import java.util.Vector;
-import java.util.Enumeration;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-import java.awt.Point;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeSupport;
 
 // jdk1.2
@@ -38 +34 @@
  * @version $Revision: 1.16 $, $Date: 2003/08/22 23:02:32 $
  * @since 1.0
-**/
-public class LineKey implements Cloneable,
-        DataKey, Moveable, PropertyChangeListener {
-  private String ident_;
-/** @directed */
-  private Layer layer_;
-  /** @link aggregation
-   * @supplierCardinality *
-   * @label line*/
-  /*#LineCartesianRenderer lnkLineCartesianRenderer;*/
-  private Vector line_;
-  /** @link aggregation
-   * @supplierCardinality *
-   * @label label*/
-  /*#SGLabel lnkSGLabel;*/
-  private Vector label_;
-  private int columns_;
-  private int style_;
-  private int valign_;
-  private int halign_;
-  private Point2D.Double porigin_;
-  private double lineLengthP_;
-  private int maxLabelLength_;
-  private int maxLabelHeight_;
-  private StrokeDrawer stroke_ = null;
-  private boolean selected_;
-  private boolean selectable_;
-  private boolean visible_;
-  private boolean moveable_;
-  private PropertyChangeSupport changes_ = new PropertyChangeSupport(this);
-  private static final int VERTICAL_BORDER_ = 3;
-  private static final int HORIZONTAL_BORDER_ = 15;
-  private static final int COLUMN_SPACE_ = 10;
-  private static final int ROW_SPACE_ = 3;
-  private static final int LABEL_SPACE_ = 15;
-  /**
-   * Use plain line border.
-   */
-  public static final int PLAIN_LINE = 0;
-  /**
-   * Use raised border.
-   */
-  public static final int RAISED = 1;
-  /**
-   * Do not draw a border.
-   */
-  public static final int NO_BORDER = 2;
-  /**
-   * Align to top of key.
-   */
-  public static final int TOP = 0;
-  /**
-   * Align to middle of key.
-   */
-  public static final int MIDDLE = 1;
-  /**
-   * Align to bottom of key.
-   */
-  public static final int BOTTOM = 2;
-  /**
-   * Align to left of key.
-   */
-  public static final int LEFT = 0;
-  /**
-   * Align to center of key.
-   */
-  public static final int CENTER = 1;
-  /**
-   * Align to right of key.
-   */
-  public static final int RIGHT = 2;
-
-
-  /**
-   * Default constructor.
-   */
-  public LineKey() {
-    this(new Point2D.Double(0.0, 0.0), BOTTOM, LEFT);
-  }
-  /**
-   *
-   */
-  public LineKey(Point2D.Double loc,int valign,int halign) {
-    porigin_ = loc;
-    valign_ = valign;
-    halign_ = halign;
-    line_ = new Vector(2,2);
-    label_ = new Vector(2,2);
-    //
-    // set defaults
-    //
-    style_ = PLAIN_LINE;
-    columns_ = 1;
-    ident_ = "";
-    lineLengthP_ = 0.3f;
-    selected_ = false;
-    selectable_ = true;
-    visible_ = true;
-    moveable_ = true;
-    stroke_ = PaneProxy.strokeDrawer;
-  }
-  /**
-   * Create of copy of LineKey.
-   */
-  public LayerChild copy() {
-    LineKey newKey;
-    try {
-      newKey = (LineKey)clone();
-    } catch (CloneNotSupportedException e) {
-      newKey = new LineKey();
-    }
-    newKey.line_ = new Vector(2,2);
-    newKey.label_ = new Vector(2,2);
-    return newKey;
-  }
-  public void setSelected(boolean sel) {
-    selected_ = sel;
-  }
-  public boolean isSelected() {
-    return selected_;
-  }
-  public void setSelectable(boolean select) {
-    selectable_ = select;
-  }
-  public boolean isSelectable() {
-    return selectable_;
-  }
-  public boolean isMoveable() {
-    return moveable_;
-  }
-  public void setMoveable(boolean moveable) {
-    moveable_ = moveable;
-  }
-  /**
-   * Set parent layer.
-   *
-   * @param l parent layer
-   */
-  public void setLayer(Layer l) {
-    layer_ = l;
-  }
-  /**
-   * Get layer.
-   *
-   * @return layer
-   */
-  public Layer getLayer() {
-    return layer_;
-  }
-
-  public AbstractPane getPane() {
-    return layer_.getPane();
-  }
-
-  public void modified(String mess) {
-    if(layer_ != null)
-      layer_.modified(mess);
-  }
-  /**
-   * Set LineKey identifier.
-   *
-   * @param id key identifier
-   */
-  public void setId(String id) {
-    ident_ = id;
-  }
-  /**
-   * Get LineKey identifier
-   *
-   * @return identifier
-   */
-  public String getId() {
-    return ident_;
-  }
-  /**
-   * Set line length.
-   *
-   * @param len line length
-   */
-  public void setLineLengthP(double len) {
-    if(lineLengthP_ != len) {
-      lineLengthP_ = len;
-      modified("LineKey: setLineLengthP()");
-    }
-  }
-  /**
-   * Get line length
-   *
-   * @return line length
-   */
-  public double getLineLengthP() {
-    return lineLengthP_;
-  }
-  /**
-   * Set the number of columns.
-   *
-   * @param col number of columns
-   */
-  public void setColumns(int col) {
-    if(columns_ != col) {
-      columns_ = col;
-      modified("LineKey: setColumms()");
-    }
-  }
-  /**
-   * Get the number of columns.
-   *
-   * @return number of columns
-   */
-  public int getColumns() {
-    return columns_;
-  }
-  /**
-   * Set border style.
-   *
-   * @param style border style
-   * @see #PLAIN_LINE
-   * @see #RAISED
-   * @see #NO_BORDER
-   */
-  public void setBorderStyle(int style) {
-    if(style_ != style) {
-      style_ = style;
-      modified("LineKey: setBorderStyle()");
-    }
-  }
-  /**
-   * Get border style.
-   *
-   * @return border style
-   */
-  public int getBorderStyle() {
-    return style_;
-  }
-  /**
-   * Set alignment.
-   *
-   * @param vert vertical alignment
-   * @param horz horizontal alignment
-   */
-  public void setAlign(int vert,int horz) {
-    if(valign_ != vert || halign_ != horz) {
-      valign_ = vert;
-      halign_ = horz;
-      modified("LineKey: setAlign()");
-    }
-  }
-  /**
-   * Set vertical alignment
-   *
-   * @param vert vertical alignment
-   */
-  public void setVAlign(int vert) {
-    if(valign_ != vert) {
-      valign_ = vert;
-      modified("LineKey: setVAlign()");
-    }
-  }
-  /**
-   * Set horizontal alignment
-   *
-   * @param horz horizontal alignment
-   */
-  public void setHAlign(int horz) {
-    if(halign_ != horz) {
-      halign_ = horz;
-      modified("LineKey: setHAlign()");
-    }
-  }
-  /**
-   * Get vertical alignment
-   *
-   * @return vertical alignment
-   */
-  public int getVAlign() {
-    return valign_;
-  }
-  /**
-   * Get horizontal alignment
-   *
-   * @return horizontal alignment
-   */
-  public int getHAlign() {
-    return halign_;
-  }
-  /**
-   * Set location of key
-   * <BR><B>Property Change:</B> <code>location</code>.
-   *
-   * @param loc key location
-   */
-  public void setLocationP(Point2D.Double loc) {
-    if(porigin_ == null || !porigin_.equals(loc)) {
-      Point2D.Double temp = porigin_;
-      porigin_ = loc;
-      changes_.firePropertyChange("location",
-          temp,
-          porigin_);
-      modified("LineKey: setLocationP()");
-    }
-  }
-  /**
-   * Set the bounds of the <code>LineKey</code> in physical units.
-   */
-  public void setBoundsP(Rectangle2D.Double r) {
-    setLocationP(new Point2D.Double(r.x, r.y));
-  }
-  /**
-   * Get key bounds in physical coordinates.
-   * Not presently implemented.
-   */
-  public Rectangle2D.Double getBoundsP() {
-    throw new MethodNotImplementedError();
-  }
-  /**
-   * Get location of key.
-   *
-   * @return Key location
-   */
-  public Point2D.Double getLocationP() {
-    return porigin_;
-  }
-  /**
-   * Add a LineCartesianRenderer and label to the LineKey.
-   *
-   * @param line LineCartesianGraph object
-   * @param label descriptive label
-   */
-  public void addLineGraph(LineCartesianRenderer line, SGLabel label) {
-    line_.addElement(line);
-    label.setLayer(layer_);
-    label.setMoveable(false);
-    label.setSelectable(false);
-    label_.addElement(label);
-    ((LineAttribute)line.getAttribute()).addPropertyChangeListener(this);
-    modified("LineKey: addLineGraph()");
-  }
-  /**
-   * Add a LineCartesianRenderer and label to the LineKey.
-   *
-   * @param rend LineCartesianRenderer object
-   * @param label descriptive label
-   * @since 3.0
-   */
-  public void addGraph(CartesianRenderer rend, SGLabel label)
-      throws IllegalArgumentException {
-    if(!(rend instanceof LineCartesianRenderer))
-      throw new IllegalArgumentException("Renderer is not a LineCartesianRenderer");
-    addLineGraph((LineCartesianRenderer)rend, label);
-  }
-  /**
-   * Remove a line from the LineKey.
-   *
-   */
-  public void removeLineGraph(SGLabel label) {
-  }
-  /**
-   * Remove a line from the LineKey.
-   *
-   */
-  public void removeLineRenderer(LineCartesianRenderer line) {
-  }
-  /**
-   * Remove a line from the LineKey.
-   *
-   */
-  public void removeLineGraph(String ident) {
-  }
-  /**
-   * Remove all lines from the LineKey.
-   */
-  public void clearAll() {
-    LineAttribute attr;
-    for(Enumeration e = line_.elements(); e.hasMoreElements(); ) {
-      attr = (LineAttribute)((LineCartesianRenderer)e.nextElement()).getAttribute();
-      attr.removePropertyChangeListener(this);
-    }
-    line_.removeAllElements();
-    label_.removeAllElements();
-    modified("LineKey: clearAll()");
-  }
-  /**
-   * Remove line associated with data id from LineKey.
-   * @since 2.0
-   */
-  public void clear(String data_id) {
-    LineCartesianRenderer lcr;
-    int indx = -1;
-    for(Enumeration it = line_.elements(); it.hasMoreElements();) {
-        indx++;
-        lcr = (LineCartesianRenderer)it.nextElement();
-        if(lcr.getLine().getId().equals(data_id)) {
-    lcr.getAttribute().removePropertyChangeListener(this);
-            line_.removeElement(lcr);
-            label_.removeElementAt(indx);
-      modified("LineKey: clear()");
-            break;
-        }
-    }
-  }
-  /**
-   * Return rowheight of key in pixels.
-   * @since 2.0
-   */
-  public int getRowHeight() {
-    Rectangle bounds;
-    bounds = getBounds();
-    return ROW_SPACE_ + maxLabelHeight_;
-  }
-  /**
-   * Draw the Key.
-   */
-  public void draw(Graphics g) {
-    double maxLabelLength, maxLabelHeight;
-    int numLines, numRows, i, lineLength;
-    int col, row, ytemp;
-    double xloc, labelSpace;
-    double[] xp, yp;
-    int[] xd, yd;
-    int[] xout, yout;
-    Rectangle bounds;
-    LineCartesianRenderer render = null;
-    SGLabel label;
-    LineAttribute attr = null;
-    //
-    numLines = line_.size();
-    if((numLines <= 0) || !visible_) return;
-
-    numRows = numLines/columns_;
-    if(numLines%columns_ != 0) numRows++;
-
-    xp = new double[columns_];
-    xd = new int[columns_];
-    yp = new double[numRows];
-    yd = new int[numRows];
-    xout = new int[2];
-    yout = new int[2];
-
-    g.setColor(layer_.getPane().getComponent().getForeground());
-    bounds = getBounds();
-    //
-    // compute location of rows and columns in device and physical coordinates
-    //
-    lineLength = layer_.getXPtoD(lineLengthP_) - layer_.getXPtoD(0.0f);
-    labelSpace = layer_.getXDtoP(LABEL_SPACE_) - layer_.getXDtoP(0);
-    //
-    yd[0] = bounds.y + VERTICAL_BORDER_ + maxLabelHeight_;
-    yp[0] = layer_.getYDtoP(yd[0]);
-    for(i=1; i < numRows; i++) {
-      yd[i] = yd[i-1] + ROW_SPACE_ + maxLabelHeight_;
-      yp[i] = layer_.getYDtoP(yd[i]);
-    }
-    xd[0] = bounds.x + HORIZONTAL_BORDER_;
-    xp[0] = layer_.getXDtoP(xd[0]);
-    for(i=1; i < columns_; i++) {
-      xd[i] = xd[i-1] + COLUMN_SPACE_ + lineLength + LABEL_SPACE_ + maxLabelLength_;
-      xp[i] = layer_.getXDtoP(xd[i]);
-    }
-    //
-    row = 0;
-    col = 0;
-    Object obj;
-    Enumeration labelIt = label_.elements();
-    for(Enumeration lineIt = line_.elements(); lineIt.hasMoreElements();) {
-      obj = lineIt.nextElement();
-      render = (LineCartesianRenderer)obj;
-      attr = (LineAttribute)render.getAttribute();
-      label = (SGLabel)labelIt.nextElement();
-      //
-      // draw line
-      //
-      g.setColor(attr.getColor());
-      xout[0] = xd[col];
-      xout[1] = xout[0] + lineLength;
-      yout[0] = yd[row] - maxLabelHeight_/2;
-      yout[1] = yout[0];
-      switch(attr.getStyle()) {
-      case LineAttribute.MARK:
-        render.drawMark(g, xout, yout, 2, attr);
-        break;
-      case LineAttribute.HIGHLIGHT:
-        stroke_.drawHighlight(g, xout, yout, 2, attr);
-        break;
-      case LineAttribute.HEAVY:
-        stroke_.drawHeavy(g, xout, yout, 2, attr);
-        break;
-      case LineAttribute.DASHED:
-        stroke_.drawDashed(g, xout, yout, 2, attr);
-        break;
-      case LineAttribute.STROKE:
-        stroke_.drawStroke(g, xout, yout , 2, attr);
-        break;
-      case LineAttribute.MARK_LINE:
-        render.drawMark(g, xout, yout, 2, attr);
-      default:
-      case LineAttribute.SOLID:
-        g.drawLine(xout[0], yout[0], xout[1], yout[1]);
-      }
-      //
-      xloc = xp[col] + lineLengthP_ + labelSpace;
-      label.setLocationP(new Point2D.Double(xloc, yp[row]));
-      try {
-        label.draw(g);
-      } catch (SGException e) {}
-      //
-      col++;
-      if(col >= columns_) {
+ */
+public class LineKey
+        implements Cloneable,
+        DataKey, Moveable, PropertyChangeListener
+{
+    private String ident_;
+    /**
+     * @directed
+     */
+    private Layer layer_;
+    /**
+     * @link aggregation
+     * @supplierCardinality *
+     * @label line
+     */
+    /*#LineCartesianRenderer lnkLineCartesianRenderer;*/
+    private Vector line_;
+    /**
+     * @link aggregation
+     * @supplierCardinality *
+     * @label label
+     */
+    /*#SGLabel lnkSGLabel;*/
+    private Vector label_;
+    private int columns_;
+    private int style_;
+    private int valign_;
+    private int halign_;
+    private Point2D.Double porigin_;
+    private double lineLengthP_;
+    private int maxLabelLength_;
+    private int maxLabelHeight_;
+    private StrokeDrawer stroke_ = null;
+    private boolean selected_;
+    private boolean selectable_;
+    private boolean visible_;
+    private boolean moveable_;
+    private PropertyChangeSupport changes_ = new PropertyChangeSupport( this );
+    private static final int VERTICAL_BORDER_ = 3;
+    private static final int HORIZONTAL_BORDER_ = 15;
+    // VMIPSL
+    private static final int COLUMN_SPACE_ = 0;
+    private static final int ROW_SPACE_ = 15;
+    private static final int LABEL_SPACE_ = 10;
+    /**
+     * Use plain line border.
+     */
+    public static final int PLAIN_LINE = 0;
+    /**
+     * Use raised border.
+     */
+    public static final int RAISED = 1;
+    /**
+     * Do not draw a border.
+     */
+    public static final int NO_BORDER = 2;
+    /**
+     * Align to top of key.
+     */
+    public static final int TOP = 0;
+    /**
+     * Align to middle of key.
+     */
+    public static final int MIDDLE = 1;
+    /**
+     * Align to bottom of key.
+     */
+    public static final int BOTTOM = 2;
+    /**
+     * Align to left of key.
+     */
+    public static final int LEFT = 0;
+    /**
+     * Align to center of key.
+     */
+    public static final int CENTER = 1;
+    /**
+     * Align to right of key.
+     */
+    public static final int RIGHT = 2;
+
+
+    /**
+     * Default constructor.
+     */
+    public LineKey()
+    {
+        this( new Point2D.Double( 0.0, 0.0 ), BOTTOM, LEFT );
+    }
+
+    /**
+     *
+     */
+    public LineKey( Point2D.Double loc, int valign, int halign )
+    {
+        porigin_ = loc;
+        valign_ = valign;
+        halign_ = halign;
+        line_ = new Vector( 2, 2 );
+        label_ = new Vector( 2, 2 );
+        //
+        // set defaults
+        //
+        style_ = PLAIN_LINE;
+        columns_ = 1;
+        ident_ = "";
+        lineLengthP_ = 0.3f;
+        selected_ = false;
+        selectable_ = true;
+        visible_ = true;
+        moveable_ = true;
+        stroke_ = PaneProxy.strokeDrawer;
+    }
+
+    /**
+     * Create of copy of LineKey.
+     */
+    public LayerChild copy()
+    {
+        LineKey newKey;
+        try
+        {
+            newKey = (LineKey) clone();
+        }
+        catch( CloneNotSupportedException e )
+        {
+            newKey = new LineKey();
+        }
+        newKey.line_ = new Vector( 2, 2 );
+        newKey.label_ = new Vector( 2, 2 );
+        return newKey;
+    }
+
+    public void setSelected( boolean sel )
+    {
+        selected_ = sel;
+    }
+
+    public boolean isSelected()
+    {
+        return selected_;
+    }
+
+    public void setSelectable( boolean select )
+    {
+        selectable_ = select;
+    }
+
+    public boolean isSelectable()
+    {
+        return selectable_;
+    }
+
+    public boolean isMoveable()
+    {
+        return moveable_;
+    }
+
+    public void setMoveable( boolean moveable )
+    {
+        moveable_ = moveable;
+    }
+
+    /**
+     * Set parent layer.
+     *
+     * @param l parent layer
+     */
+    public void setLayer( Layer l )
+    {
+        layer_ = l;
+    }
+
+    /**
+     * Get layer.
+     *
+     * @return layer
+     */
+    public Layer getLayer()
+    {
+        return layer_;
+    }
+
+    public AbstractPane getPane()
+    {
+        return layer_.getPane();
+    }
+
+    public void modified( String mess )
+    {
+        if( layer_ != null )
+            layer_.modified( mess );
+    }
+
+    /**
+     * Set LineKey identifier.
+     *
+     * @param id key identifier
+     */
+    public void setId( String id )
+    {
+        ident_ = id;
+    }
+
+    /**
+     * Get LineKey identifier
+     *
+     * @return identifier
+     */
+    public String getId()
+    {
+        return ident_;
+    }
+
+    /**
+     * Set line length.
+     *
+     * @param len line length
+     */
+    public void setLineLengthP( double len )
+    {
+        if( lineLengthP_ != len )
+        {
+            lineLengthP_ = len;
+            modified( "LineKey: setLineLengthP()" );
+        }
+    }
+
+    /**
+     * Get line length
+     *
+     * @return line length
+     */
+    public double getLineLengthP()
+    {
+        return lineLengthP_;
+    }
+
+    /**
+     * Set the number of columns.
+     *
+     * @param col number of columns
+     */
+    public void setColumns( int col )
+    {
+        if( columns_ != col )
+        {
+            columns_ = col;
+            modified( "LineKey: setColumms()" );
+        }
+    }
+
+    /**
+     * Get the number of columns.
+     *
+     * @return number of columns
+     */
+    public int getColumns()
+    {
+        return columns_;
+    }
+
+    /**
+     * Set border style.
+     *
+     * @param style border style
+     * @see #PLAIN_LINE
+     * @see #RAISED
+     * @see #NO_BORDER
+     */
+    public void setBorderStyle( int style )
+    {
+        if( style_ != style )
+        {
+            style_ = style;
+            modified( "LineKey: setBorderStyle()" );
+        }
+    }
+
+    /**
+     * Get border style.
+     *
+     * @return border style
+     */
+    public int getBorderStyle()
+    {
+        return style_;
+    }
+
+    /**
+     * Set alignment.
+     *
+     * @param vert vertical alignment
+     * @param horz horizontal alignment
+     */
+    public void setAlign( int vert, int horz )
+    {
+        if( valign_ != vert || halign_ != horz )
+        {
+            valign_ = vert;
+            halign_ = horz;
+            modified( "LineKey: setAlign()" );
+        }
+    }
+
+    /**
+     * Set vertical alignment
+     *
+     * @param vert vertical alignment
+     */
+    public void setVAlign( int vert )
+    {
+        if( valign_ != vert )
+        {
+            valign_ = vert;
+            modified( "LineKey: setVAlign()" );
+        }
+    }
+
+    /**
+     * Set horizontal alignment
+     *
+     * @param horz horizontal alignment
+     */
+    public void setHAlign( int horz )
+    {
+        if( halign_ != horz )
+        {
+            halign_ = horz;
+            modified( "LineKey: setHAlign()" );
+        }
+    }
+
+    /**
+     * Get vertical alignment
+     *
+     * @return vertical alignment
+     */
+    public int getVAlign()
+    {
+        return valign_;
+    }
+
+    /**
+     * Get horizontal alignment
+     *
+     * @return horizontal alignment
+     */
+    public int getHAlign()
+    {
+        return halign_;
+    }
+
+    /**
+     * Set location of key
+     * <BR><B>Property Change:</B> <code>location</code>.
+     *
+     * @param loc key location
+     */
+    public void setLocationP( Point2D.Double loc )
+    {
+        if( porigin_ == null || !porigin_.equals( loc ) )
+        {
+            Point2D.Double temp = porigin_;
+            porigin_ = loc;
+            changes_.firePropertyChange( "location",
+                    temp,
+                    porigin_ );
+            modified( "LineKey: setLocationP()" );
+        }
+    }
+
+    /**
+     * Set the bounds of the <code>LineKey</code> in physical units.
+     */
+    public void setBoundsP( Rectangle2D.Double r )
+    {
+        setLocationP( new Point2D.Double( r.x, r.y ) );
+    }
+
+    /**
+     * Get key bounds in physical coordinates.
+     * Not presently implemented.
+     */
+    public Rectangle2D.Double getBoundsP()
+    {
+        throw new MethodNotImplementedError();
+    }
+
+    /**
+     * Get location of key.
+     *
+     * @return Key location
+     */
+    public Point2D.Double getLocationP()
+    {
+        return porigin_;
+    }
+
+
+    /**
+     * Add a LineCartesianRenderer and label to the LineKey.
+     *
+     * @param line  LineCartesianGraph object
+     * @param label descriptive label
+     */
+    public void addLineGraph( LineCartesianRenderer line, SGLabel label )
+    {
+        line_.addElement( line );
+        label.setLayer( layer_ );
+        label.setMoveable( false );
+        label.setSelectable( false );
+        label_.addElement( label );
+        ( (LineAttribute) line.getAttribute() ).addPropertyChangeListener( this );
+        modified( "LineKey: addLineGraph()" );
+    }
+
+    /**
+     * Add a LineCartesianRenderer and label to the LineKey.
+     *
+     * @param rend  LineCartesianRenderer object
+     * @param label descriptive label
+     * @since 3.0
+     */
+    public void addGraph( CartesianRenderer rend, SGLabel label )
+            throws IllegalArgumentException
+    {
+        if( !( rend instanceof LineCartesianRenderer ) )
+            throw new IllegalArgumentException( "Renderer is not a LineCartesianRenderer" );
+        addLineGraph( (LineCartesianRenderer) rend, label );
+    }
+
+    /**
+     * Remove a line from the LineKey.
+     */
+    public void removeLineGraph( SGLabel label )
+    {
+    }
+
+    /**
+     * Remove a line from the LineKey.
+     */
+    public void removeLineRenderer( LineCartesianRenderer line )
+    {
+    }
+
+    /**
+     * Remove a line from the LineKey.
+     */
+    public void removeLineGraph( String ident )
+    {
+    }
+
+    /**
+     * Remove all lines from the LineKey.
+     */
+    public void clearAll()
+    {
+        LineAttribute attr;
+        for( Enumeration e = line_.elements(); e.hasMoreElements(); )
+        {
+            attr = (LineAttribute) ( (LineCartesianRenderer) e.nextElement() ).getAttribute();
+            attr.removePropertyChangeListener( this );
+        }
+        line_.removeAllElements();
+        label_.removeAllElements();
+        modified( "LineKey: clearAll()" );
+    }
+
+    /**
+     * Remove line associated with data id from LineKey.
+     *
+     * @since 2.0
+     */
+    public void clear( String data_id )
+    {
+        LineCartesianRenderer lcr;
+        int indx = -1;
+        for( Enumeration it = line_.elements(); it.hasMoreElements(); )
+        {
+            indx++;
+            lcr = (LineCartesianRenderer) it.nextElement();
+            if( lcr.getLine().getId().equals( data_id ) )
+            {
+                lcr.getAttribute().removePropertyChangeListener( this );
+                line_.removeElement( lcr );
+                label_.removeElementAt( indx );
+                modified( "LineKey: clear()" );
+                break;
+            }
+        }
+    }
+
+    /**
+     * Return rowheight of key in pixels.
+     *
+     * @since 2.0
+     */
+    public int getRowHeight()
+    {
+        Rectangle bounds;
+        bounds = getBounds();
+        return ROW_SPACE_ + maxLabelHeight_;
+    }
+
+    /**
+     * Draw the Key.
+     */
+    public void draw( Graphics g )
+    {
+        double maxLabelLength, maxLabelHeight;
+        int numLines, numRows, i, lineLength;
+        int col, row, ytemp;
+        double xloc, labelSpace;
+        double[] xp, yp;
+        int[] xd, yd;
+        int[] xout, yout;
+        Rectangle bounds;
+        LineCartesianRenderer render = null;
+        SGLabel label;
+        LineAttribute attr = null;
+        //
+        numLines = line_.size();
+        if( ( numLines <= 0 ) || !visible_ ) return;
+
+        numRows = numLines / columns_;
+        if( numLines % columns_ != 0 ) numRows++;
+
+        xp = new double[columns_];
+        xd = new int[columns_];
+        yp = new double[numRows];
+        yd = new int[numRows];
+        xout = new int[2];
+        yout = new int[2];
+
+        g.setColor( layer_.getPane().getComponent().getForeground() );
+        bounds = getBounds();
+        //
+        // compute location of rows and columns in device and physical coordinates
+        //
+        lineLength = layer_.getXPtoD( lineLengthP_ ) - layer_.getXPtoD( 0.0f );
+        labelSpace = layer_.getXDtoP( LABEL_SPACE_ ) - layer_.getXDtoP( 0 );
+        //
+        yd[0] = bounds.y + VERTICAL_BORDER_ + maxLabelHeight_;
+        yp[0] = layer_.getYDtoP( yd[0] );
+        for( i = 1; i < numRows; i++ )
+        {
+            yd[i] = yd[i - 1] + ROW_SPACE_ + maxLabelHeight_;
+            yp[i] = layer_.getYDtoP( yd[i] );
+        }
+        xd[0] = bounds.x + HORIZONTAL_BORDER_;
+        xp[0] = layer_.getXDtoP( xd[0] );
+        for( i = 1; i < columns_; i++ )
+        {
+            xd[i] = xd[i - 1] + COLUMN_SPACE_ + lineLength + LABEL_SPACE_ + maxLabelLength_;
+            xp[i] = layer_.getXDtoP( xd[i] );
+        }
+        //
+        row = 0;
         col = 0;
-        row++;
-      }
-    }
-    switch(style_) {
-    case PLAIN_LINE:
-      g.drawRect(bounds.x, bounds.y, bounds.width-1, bounds.height-1);
-      break;
-    case RAISED:
-      break;
-    default:
-    case NO_BORDER:
-    }
-  }
-  /**
-   * Get the bounding rectangle.
-   *
-   * @return bounding rectangle
-   */
-  public Rectangle getBounds() {
-    int lineLength;
-    int numLines, rows;
-    int x, y, height, width;
-
-    numLines = line_.size();
-    if(numLines <= 0) return new Rectangle(0, 0, 0, 0);
-    //
-    // find longest label
-    //
-    maxLabelLength_ = 0;
-    maxLabelHeight_ = 0;
-    SGLabel label;
-    for(Enumeration it = label_.elements(); it.hasMoreElements();) {
-      label = (SGLabel)it.nextElement();
-      Rectangle sz = label.getBounds();
-      maxLabelLength_ = Math.max(maxLabelLength_, sz.width);
-      maxLabelHeight_ = Math.max(maxLabelHeight_, sz.height);
-    }
-    //
-    rows = numLines/columns_;
-    if(numLines%columns_ != 0) rows++;
-    lineLength = layer_.getXPtoD(lineLengthP_) - layer_.getXPtoD(0.0f);
-    width = 2*HORIZONTAL_BORDER_ + columns_*(lineLength + LABEL_SPACE_ + maxLabelLength_)
-      + (columns_ - 1)*COLUMN_SPACE_;
-    height = 2*VERTICAL_BORDER_ + rows*maxLabelHeight_ + (rows-1)*ROW_SPACE_;
-    //
-    x = layer_.getXPtoD(porigin_.x);
-    y = layer_.getYPtoD(porigin_.y);
-    switch(halign_) {
-    case RIGHT:
-      x = x - width;
-      break;
-    case CENTER:
-      x = x - width/2;
-    }
-    switch(valign_) {
-    case BOTTOM:
-      y = y - height;
-      break;
-    case MIDDLE:
-      y = y - height/2;
-    }
-    return new Rectangle(x, y, width, height);
-  }
-  public Point getLocation() {
-    Rectangle bnds = getBounds();
-    return new Point(bnds.x, bnds.y);
-  }
-  public void setLocation(Point loc) {
-    Rectangle bnds = getBounds();
-    setBounds(loc.x, loc.y, bnds.width, bnds.height);
-  }
-  /**
-   * Set the bounds of the <code>LineKey</code>.
-   */
-  public void setBounds(Rectangle r) {
-    setBounds(r.x, r.y, r.width, r.height);
-  }
-  /**
-   * Set the bounds of the <code>LineKey</code>.
-   * <BR><B>Property Change:</B> <code>location</code>.
-   */
-  public void setBounds(int x, int y, int width, int height) {
-    switch(halign_) {
-    case RIGHT:
-      x = x + width;
-      break;
-    case CENTER:
-      x = x + width/2;
-    }
-    switch(valign_) {
-    case BOTTOM:
-      y = y + height;
-      break;
-    case MIDDLE:
-      y = y + height/2;
-    }
-    double xp = layer_.getXDtoP(x);
-    double yp = layer_.getYDtoP(y);
-    if(porigin_.x != xp || porigin_.y != yp) {
-      Point2D.Double temp = porigin_;
-      porigin_.x = xp;
-      porigin_.y = yp;
-      changes_.firePropertyChange("location",
-          temp,
-          new Point2D.Double(xp, yp));
-      modified("LineKey: setBounds()");
-    }
-  }
-  Object getObjectAt(Point pt) {
-    Rectangle lbnds;
-    Rectangle bounds;
-    LineCartesianRenderer line;
-    int[] xout, yout;
-    int[] xd, yd;
-    int numLines, numRows;
-    int lineLength;
-    double labelSpace;
-    int i;
-
-    numLines = line_.size();
-    if(numLines <= 0) return null;
-
-    numRows = numLines/columns_;
-    if(numLines%columns_ != 0) numRows++;
-
-    xd = new int[columns_];
-    yd = new int[numRows];
-    xout = new int[2];
-    yout = new int[2];
-    bounds = getBounds();
-    //
-    // compute location of rows and columns in device and physical coordinates
-    //
-    lineLength = layer_.getXPtoD(lineLengthP_) - layer_.getXPtoD(0.0);
-    labelSpace = layer_.getXDtoP(LABEL_SPACE_) - layer_.getXDtoP(0);
-    //
-    yd[0] = bounds.y + VERTICAL_BORDER_ + maxLabelHeight_;
-    for(i=1; i < numRows; i++) {
-      yd[i] = yd[i-1] + ROW_SPACE_ + maxLabelHeight_;
-    }
-    xd[0] = bounds.x + HORIZONTAL_BORDER_;
-    for(i=1; i < columns_; i++) {
-      xd[i] = xd[i-1] + COLUMN_SPACE_ + lineLength + LABEL_SPACE_ + maxLabelLength_;
-    }
-    // loop over all the lines
-    int row = 0;
-    int col = 0;
-    for(Enumeration lineIt = line_.elements(); lineIt.hasMoreElements();) {
-      line = (LineCartesianRenderer)lineIt.nextElement();
-      xout[0] = xd[col];
-      xout[1] = xout[0] + lineLength + LABEL_SPACE_ + maxLabelLength_;
+        Object obj;
+        Enumeration labelIt = label_.elements();
+        for( Enumeration lineIt = line_.elements(); lineIt.hasMoreElements(); )
+        {
+            obj = lineIt.nextElement();
+            render = (LineCartesianRenderer) obj;
+            attr = (LineAttribute) render.getAttribute();
+            label = (SGLabel) labelIt.nextElement();
+            //
+            // draw line
+            //
+            g.setColor( attr.getColor() );
+            xout[0] = xd[col];
+            xout[1] = xout[0] + lineLength;
+
+            // VMIPSL
+            if( 0 != maxLabelHeight_ )
+                yout[0] = yd[row] - maxLabelHeight_ / 2;
+            else
+                yout[0] = yd[row] - 4;
+            yout[1] = yout[0];
+            switch( attr.getStyle() )
+            {
+                case LineAttribute.MARK:
+                    // VMIPSL
+                    xout[0] = xout[1];
+                    render.drawMark( g, xout, yout, 1, attr );
+                    break;
+                case LineAttribute.HIGHLIGHT:
+                    stroke_.drawHighlight( g, xout, yout, 2, attr );
+                    break;
+                case LineAttribute.HEAVY:
+                    stroke_.drawHeavy( g, xout, yout, 2, attr );
+                    break;
+                case LineAttribute.DASHED:
+                    stroke_.drawDashed( g, xout, yout, 2, attr );
+                    break;
+                case LineAttribute.STROKE:
+                    stroke_.drawStroke( g, xout, yout, 2, attr );
+                    break;
+                case LineAttribute.MARK_LINE:
+                    render.drawMark( g, xout, yout, 2, attr );
+                default:
+                case LineAttribute.SOLID:
+                    g.drawLine( xout[0], yout[0], xout[1], yout[1] );
+            }
+            //
+            xloc = xp[col] + lineLengthP_ + labelSpace;
+            label.setLocationP( new Point2D.Double( xloc, yp[row] ) );
+            try
+            {
+                label.draw( g );
+            }
+            catch( SGException e )
+            {
+            }
+            //
+            col++;
+            if( col >= columns_ )
+            {
+                col = 0;
+                row++;
+            }
+        }
+        switch( style_ )
+        {
+            case PLAIN_LINE:
+                g.drawRect( bounds.x, bounds.y, bounds.width - 1, bounds.height - 1 );
+                break;
+            case RAISED:
+                break;
+            default:
+            case NO_BORDER:
+        }
+    }
+
+    /**
+     * Get the bounding rectangle.
+     *
+     * @return bounding rectangle
+     */
+    public Rectangle getBounds()
+    {
+        int lineLength;
+        int numLines, rows;
+        int x, y, height, width;
+
+        numLines = line_.size();
+        if( numLines <= 0 ) return new Rectangle( 0, 0, 0, 0 );
+        //
+        // find longest label
+        //
+        maxLabelLength_ = 0;
+        maxLabelHeight_ = 0;
+        SGLabel label;
+        for( Enumeration it = label_.elements(); it.hasMoreElements(); )
+        {
+            label = (SGLabel) it.nextElement();
+            Rectangle sz = label.getBounds();
+            maxLabelLength_ = Math.max( maxLabelLength_, sz.width );
+            maxLabelHeight_ = Math.max( maxLabelHeight_, sz.height );
+        }
+        //
+        rows = numLines / columns_;
+        if( numLines % columns_ != 0 ) rows++;
+        lineLength = layer_.getXPtoD( lineLengthP_ ) - layer_.getXPtoD( 0.0f );
+        width = 2 * HORIZONTAL_BORDER_ + columns_ * ( lineLength + LABEL_SPACE_ + maxLabelLength_ )
+                + ( columns_ - 1 ) * COLUMN_SPACE_;
+        height = 2 * VERTICAL_BORDER_ + rows * maxLabelHeight_ + ( rows - 1 ) * ROW_SPACE_;
+        //
+        x = layer_.getXPtoD( porigin_.x );
+        y = layer_.getYPtoD( porigin_.y );
+        switch( halign_ )
+        {
+            case RIGHT:
+                x = x - width;
+                break;
+            case CENTER:
+                x = x - width / 2;
+        }
+        switch( valign_ )
+        {
+            case BOTTOM:
+                y = y - height;
+                break;
+            case MIDDLE:
+                y = y - height / 2;
+        }
+        return new Rectangle( x, y, width, height );
+    }
+
+    public Point getLocation()
+    {
+        Rectangle bnds = getBounds();
+        return new Point( bnds.x, bnds.y );
+    }
+
+    public void setLocation( Point loc )
+    {
+        Rectangle bnds = getBounds();
+        setBounds( loc.x, loc.y, bnds.width, bnds.height );
+    }
+
+    /**
+     * Set the bounds of the <code>LineKey</code>.
+     */
+    public void setBounds( Rectangle r )
+    {
+        setBounds( r.x, r.y, r.width, r.height );
+    }
+
+    /**
+     * Set the bounds of the <code>LineKey</code>.
+     * <BR><B>Property Change:</B> <code>location</code>.
+     */
+    public void setBounds( int x, int y, int width, int height )
+    {
+        switch( halign_ )
+        {
+            case RIGHT:
+                x = x + width;
+                break;
+            case CENTER:
+                x = x + width / 2;
+        }
+        switch( valign_ )
+        {
+            case BOTTOM:
+                y = y + height;
+                break;
+            case MIDDLE:
+                y = y + height / 2;
+        }
+        double xp = layer_.getXDtoP( x );
+        double yp = layer_.getYDtoP( y );
+        if( porigin_.x != xp || porigin_.y != yp )
+        {
+            Point2D.Double temp = porigin_;
+            porigin_.x = xp;
+            porigin_.y = yp;
+            changes_.firePropertyChange( "location",
+                    temp,
+                    new Point2D.Double( xp, yp ) );
+            modified( "LineKey: setBounds()" );
+        }
+    }
+
+    Object getObjectAt( Point pt )
+    {
+        Rectangle lbnds;
+        Rectangle bounds;
+        LineCartesianRenderer line;
+        int[] xout, yout;
+        int[] xd, yd;
+        int numLines, numRows;
+        int lineLength;
+        double labelSpace;
+        int i;
+
+        numLines = line_.size();
+        if( numLines <= 0 ) return null;
+
+        numRows = numLines / columns_;
+        if( numLines % columns_ != 0 ) numRows++;
+
+        xd = new int[columns_];
+        yd = new int[numRows];
+        xout = new int[2];
+        yout = new int[2];
+        bounds = getBounds();
+        //
+        // compute location of rows and columns in device and physical coordinates
+        //
+        lineLength = layer_.getXPtoD( lineLengthP_ ) - layer_.getXPtoD( 0.0 );
+        labelSpace = layer_.getXDtoP( LABEL_SPACE_ ) - layer_.getXDtoP( 0 );
+        //
+        yd[0] = bounds.y + VERTICAL_BORDER_ + maxLabelHeight_;
+        for( i = 1; i < numRows; i++ )
+        {
+            yd[i] = yd[i - 1] + ROW_SPACE_ + maxLabelHeight_;
+        }
+        xd[0] = bounds.x + HORIZONTAL_BORDER_;
+        for( i = 1; i < columns_; i++ )
+        {
+            xd[i] = xd[i - 1] + COLUMN_SPACE_ + lineLength + LABEL_SPACE_ + maxLabelLength_;
+        }
+        // loop over all the lines
+        int row = 0;
+        int col = 0;
+        for( Enumeration lineIt = line_.elements(); lineIt.hasMoreElements(); )
+        {
+            line = (LineCartesianRenderer) lineIt.nextElement();
+            xout[0] = xd[col];
+            xout[1] = xout[0] + lineLength + LABEL_SPACE_ + maxLabelLength_;
 //        xout[1] = xout[0] + lineLength + LABEL_SPACE_;
-      yout[0] = yd[row] - maxLabelHeight_;
-      yout[1] = yd[row];
-      lbnds = new Rectangle(xout[0], yout[0],
-                            xout[1] - xout[0],
-                            yout[1] - yout[0]);
-      if(lbnds.contains(pt)) {
-        return line;
-      }
-      //
-      col++;
-      if(col >= columns_) {
-        col = 0;
-        row++;
-      }
-    }
-    if(bounds.contains(pt)) {
-      return this;
-    }
-    return null;
-  }
-  public String toString() {
-    String name = getClass().getName();
-    return name.substring(name.lastIndexOf(".")+1) + ": " + ident_;
-  }
-  public boolean isVisible() {
-    return visible_;
-  }
-  public void setVisible(boolean visible) {
-    if(visible_ != visible) {
-      visible_ = visible;
-      modified("LineKey: setVisible()");
-    }
-  }
-  public void propertyChange(PropertyChangeEvent evt) {
+            yout[0] = yd[row] - maxLabelHeight_;
+            yout[1] = yd[row];
+            lbnds = new Rectangle( xout[0], yout[0],
+                    xout[1] - xout[0],
+                    yout[1] - yout[0] );
+            if( lbnds.contains( pt ) )
+            {
+                return line;
+            }
+            //
+            col++;
+            if( col >= columns_ )
+            {
+                col = 0;
+                row++;
+            }
+        }
+        if( bounds.contains( pt ) )
+        {
+            return this;
+        }
+        return null;
+    }
+
+    public String toString()
+    {
+        String name = getClass().getName();
+        return name.substring( name.lastIndexOf( "." ) + 1 ) + ": " + ident_;
+    }
+
+    public boolean isVisible()
+    {
+        return visible_;
+    }
+
+    public void setVisible( boolean visible )
+    {
+        if( visible_ != visible )
+        {
+            visible_ = visible;
+            modified( "LineKey: setVisible()" );
+        }
+    }
+
+    public void propertyChange( PropertyChangeEvent evt )
+    {
 //      if(Debug.EVENT) {
 //        System.out.println("LineKey: " + evt);
 //        System.out.println("         " + evt.getPropertyName());
 //      }
-    modified("LineKey: propertyChange(" +
-       evt.getSource().toString() + "[" +
-       evt.getPropertyName() + "]" + ")");
-  }
-  public void addPropertyChangeListener(PropertyChangeListener l) {
-    changes_.addPropertyChangeListener(l);
-  }
-  public void removePropertyChangeListener(PropertyChangeListener l) {
-    changes_.removePropertyChangeListener(l);
-  }
+        modified( "LineKey: propertyChange(" +
+                evt.getSource().toString() + "[" +
+                evt.getPropertyName() + "]" + ")" );
+    }
+
+    public void addPropertyChangeListener( PropertyChangeListener l )
+    {
+        changes_.addPropertyChangeListener( l );
+    }
+
+    public void removePropertyChangeListener( PropertyChangeListener l )
+    {
+        changes_.removePropertyChangeListener( l );
+    }
 }

ether_megapoli/trunk/service/Service.iml

@@ -12 +12 @@
     <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="lib_sgt" level="project" />
     <orderEntry type="library" name="lib_ether" level="project" />
     <orderEntry type="module" module-name="Persistence" />

ether_megapoli/trunk/service/implementation/com/ether/EtherPlotContentServiceImpl.java

@@ -81 +81 @@
         mainPane.add( layer );
 
+        final CartesianGraph graph = new CartesianGraph( "First Graph" );
+        layer.setGraph( graph );
+
         final Pair<List, List> listPairOfPIdPIdForTwoAxes = extractListPairForAxes( megapoliPlot.getpIdPIdList() );
         final List<Pair> pIdPIdListForFirstAxis = listPairOfPIdPIdForTwoAxes.getFirstValue();
         final List<Pair> pIdPIdListForSecondAxis = listPairOfPIdPIdForTwoAxes.getSecondValue();
 
-        final List<SimpleLine> lines = createLines( pIdPIdListForFirstAxis, megapoliPlot.getBeginDate(), megapoliPlot.getEndDate(), 1 );
-        final List<SimpleLine> linesForSecondAxis = createLines( pIdPIdListForSecondAxis, megapoliPlot.getBeginDate(), megapoliPlot.getEndDate(), 10 );
+        final List<SimpleLine> lines = createLines( pIdPIdListForFirstAxis, megapoliPlot.getBeginDate(), megapoliPlot.getEndDate(), 1, layer );
+        final List<SimpleLine> linesForSecondAxis = createLines( pIdPIdListForSecondAxis, megapoliPlot.getBeginDate(), megapoliPlot.getEndDate(), 10, layer );
         final SimpleLine firstLine = lines.get( 0 );
 
@@ -122 +125 @@
         /** ************ GRAPH ********** **/
         // Create first CartesianGraph and transforms
-        final CartesianGraph graph = new CartesianGraph( "First Graph" );
+//        final CartesianGraph graph = new CartesianGraph( "First Graph" );
         final LinearTransform xt = new LinearTransform( new Range2D( xstart, xend ), xnRange );
         graph.setXTransform( xt );
@@ -153 +156 @@
         }
 
-        layer.setGraph( graph );
+//        layer.setGraph( graph );
 
         final LineAttribute lineAttribute = createRandomLineAttrbute( megapoliPlot.getAxeType() );
@@ -165 +168 @@
             lkey.setLocationP( new Point2D.Double( 0.1, ysize - 0.1 ) );
             lkey.setBorderStyle( LineKey.NO_BORDER );
+            lkey.setVAlign( LineKey.TOP );
+            lkey.setHAlign( LineKey.LEFT );
             layer.addChild( lkey );
             lkey.addLineGraph( (LineCartesianRenderer) graph.getRenderer(), firstLine.getKeyTitle() );
@@ -203 +208 @@
             otherGraph.setData( line, otherLineAttribute );
             lkey.addLineGraph( (LineCartesianRenderer) otherGraph.getRenderer(), line.getKeyTitle() );
+//            lkey.setColumns( lkey.getColumns() + 1 );
         }
     }
@@ -285 +291 @@
      */
     @NotNull
-    private List<SimpleLine> createLines( @NotNull final List<Pair> pIdPIdList, @Nullable final Date beginDate, @Nullable final Date endDate, final Integer delta )
+    private List<SimpleLine> createLines( @NotNull final List<Pair> pIdPIdList, @Nullable final Date beginDate, @Nullable final Date endDate, final Integer delta, @NotNull final Layer layer )
             throws ServiceException
     {
@@ -315 +321 @@
             SGTMetaData meta = new SGTMetaData( "", "", false, false );
             line.setXMetaData( meta );
-            line.setKeyTitle( new SGLabel( "Line", plateform.getPlateformeNom() + "-" + parametre.getParametreNom(), new Point2D.Double( 0.0, 0.0 ) ) );
+            final SGLabel sgLabel = new SGLabel( "Line", plateform.getPlateformeNom() + "-" + parametre.getParametreNom(), new Point2D.Double( 0.0, 0.0 ) );
+            line.setKeyTitle( sgLabel );
 
             if( isFirstLine )
@@ -863 +870 @@
     protected static final int ERROR_FONT_SIZE = 10;
 
-    protected static final Font _axisFont = new Font( "Helvetica", Font.PLAIN, 6 );
+    protected static final Font _axisFont = new Font( "Helvetica", Font.PLAIN, 15 );
     protected static final double _heightAxisFont = 0.14;
     protected static final double _markHeight = 0.1;

ether_megapoli/trunk/service/test/com/ether/SGTTest.java

@@ -4 +4 @@
 import com.ether.annotation.Mandatory;
 import com.ether.annotation.ParamName;
-import com.ether.tutorial.src.tutorial.Example1;
-import com.ether.tutorial.src.tutorial.SBExample1;
-import com.ether.tutorial.src.tutorial.SBExample2;
-import com.ether.tutorial.src.tutorial.SBExample3;
-import com.keypoint.PngEncoder;
-import com.keypoint.PngEncoderB;
+//import com.ether.tutorial.src.tutorial.Example1;
+//import com.ether.tutorial.src.tutorial.SBExample1;
+//import com.ether.tutorial.src.tutorial.SBExample2;
+//import com.ether.tutorial.src.tutorial.SBExample3;
+//import com.keypoint.PngEncoder;
+//import com.keypoint.PngEncoderB;
 import gov.noaa.pmel.sgt.JPane;
 import gov.noaa.pmel.sgt.LineAttribute;
@@ -111 +111 @@
     }
 
-    @Test
-    public void testExample1()
-            throws Exception
-    {
-        new Example1();
-    }
-
-    @Test
-    public void testSBExamples()
-            throws Exception
-    {
-        final SBExample1 frame = new SBExample1();
-        frame.pack();
-        frame.setResizable( false );
-        frame.setVisible( true );
-        Thread.sleep( 100 );
-        copyToFile( frame, "service/test/test_SBExample1.jpg" );
-
-        final SBExample2 frame2 = new SBExample2();
-        frame2.pack();
-        frame2.setResizable( false );
-        frame2.setVisible( true );
-        Thread.sleep( 100 );
-        copyToFile( frame2, "service/test/test_SBExample2.jpg" );
-
-        final SBExample3 frame3 = new SBExample3();
-        frame3.pack();
-        //Center the window
-        final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        final Dimension frameSize = frame3.getSize();
-        if( frameSize.height > screenSize.height )
-        {
-            frameSize.height = screenSize.height;
-        }
-        if( frameSize.width > screenSize.width )
-        {
-            frameSize.width = screenSize.width;
-        }
-        frame3.setLocation( ( screenSize.width - frameSize.width ) / 2, ( screenSize.height - frameSize.height ) / 2 );
-        frame3.setResizable( false );
-        frame3.setVisible( true );
-        Thread.sleep( 100 );
-        copyToFile( frame3, "service/test/test_SBExample3.jpg" );
-    }
+//    @Test
+//    public void testExample1()
+//            throws Exception
+//    {
+//        new Example1();
+//    }
+//
+//    @Test
+//    public void testSBExamples()
+//            throws Exception
+//    {
+//        final SBExample1 frame = new SBExample1();
+//        frame.pack();
+//        frame.setResizable( false );
+//        frame.setVisible( true );
+//        Thread.sleep( 100 );
+//        copyToFile( frame, "service/test/test_SBExample1.jpg" );
+//
+//        final SBExample2 frame2 = new SBExample2();
+//        frame2.pack();
+//        frame2.setResizable( false );
+//        frame2.setVisible( true );
+//        Thread.sleep( 100 );
+//        copyToFile( frame2, "service/test/test_SBExample2.jpg" );
+//
+//        final SBExample3 frame3 = new SBExample3();
+//        frame3.pack();
+//        //Center the window
+//        final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+//        final Dimension frameSize = frame3.getSize();
+//        if( frameSize.height > screenSize.height )
+//        {
+//            frameSize.height = screenSize.height;
+//        }
+//        if( frameSize.width > screenSize.width )
+//        {
+//            frameSize.width = screenSize.width;
+//        }
+//        frame3.setLocation( ( screenSize.width - frameSize.width ) / 2, ( screenSize.height - frameSize.height ) / 2 );
+//        frame3.setResizable( false );
+//        frame3.setVisible( true );
+//        Thread.sleep( 100 );
+//        copyToFile( frame3, "service/test/test_SBExample3.jpg" );
+//    }
 
     @Test
@@ -214 +214 @@
 //        encoder.encode( bufferedImage );
 
-        PngEncoder pngEncoder = new PngEncoder();
+//        PngEncoder pngEncoder = new PngEncoder();
 //        pngEncoder.setImage( image );
-        byte[] bytes = pngEncoder.pngEncode();
+//        byte[] bytes = pngEncoder.pngEncode();
     }
 
@@ -305 +305 @@
         if( bImageKer != null )
         {
-            final PngEncoderB pngEncoderB = new PngEncoderB();
-            pngEncoderB.setImage( bImageKer );
+//            final PngEncoderB pngEncoderB = new PngEncoderB();
+//            pngEncoderB.setImage( bImageKer );
 
 //            ImageIO.write( bImageKer, "png", response.getOutputStream() );
@@ -507 +507 @@
 //        encoder.encode( bufferedImage );
 
-        PngEncoder pngEncoder = new PngEncoder();
+//        PngEncoder pngEncoder = new PngEncoder();
 //        pngEncoder.setImage( image );
-        byte[] bytes = pngEncoder.pngEncode();
+//        byte[] bytes = pngEncoder.pngEncode();
 
         //final BufferedImage bufferedImage = ImageHelper.createBufferedImage( timeSeriesPlot );
@@ -517 +517 @@
         g2.dispose();
 
-        final PngEncoderB pngEncoderB = new PngEncoderB();
-        pngEncoderB.setImage( bufferedImage );
-        final byte[] bytesB = pngEncoderB.pngEncode();
+//        final PngEncoderB pngEncoderB = new PngEncoderB();
+//        pngEncoderB.setImage( bufferedImage );
+//        final byte[] bytesB = pngEncoderB.pngEncode();
 
         final JSONObject result = new JSONObject();
-        result.put( ParameterConstants.PARAMETER_IMAGE, bytesB );
+//        result.put( ParameterConstants.PARAMETER_IMAGE, bytesB );
         return result;
 //        return new JSONObject();