Changeset 365

Timestamp:

01/31/12 18:42:46 (12 years ago)

Author:

vmipsl

Message:

copyright + indication timeZone (UTC)

Location:

ether_megapoli/trunk/service/implementation

Files:

• com/ether/EtherPlotContentServiceImpl.java (modified) (6 diffs)
• gov/noaa/pmel/sgt/TimeAxis.java (modified) (2 diffs)

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

@@ -38 +38 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
@@ -170 +171 @@
         displayLegendForEmptyLines( emptyLineToDisplayOnlyInLegend, lkey, mainPane, xsize, ysize, xt, (LinearTransform) graph.getYTransform(), megapoliPlot.getAxeType() );
 
+        // Copyright
+        displayCopyright( mainPane, xsize, ysize, xsize - 0.15, 0.1 );
+
         return mainPane;
     }
@@ -235 +239 @@
             throw new ServiceException( ServiceException.ServiceCode.LEGEND_LAYER_NOT_FOUND, new Throwable( ServiceException.ServiceCode.LEGEND_LAYER_NOT_FOUND.toString() ) );
         }
+
+        // Copyright
+        displayCopyright( jPlotLayout, 1.0, 1.0, 1.15, 0.03 );
 
         return jPlotLayout;
@@ -322 +329 @@
 
     /**
+     * This method display the copyright in the bottom right corner of the plot
+     *
+     * @param mainPane
+     * @param xSize
+     * @param ySize
+     * @param xPosition
+     * @param yPosition
+     */
+    private void displayCopyright( @NotNull final JPane mainPane, final double xSize, final double ySize, final double xPosition, final double yPosition )
+    {
+        final Layer copyrightLayer = new Layer( "Copyright", new Dimension2D( xSize, ySize ) );
+        mainPane.add( copyrightLayer );
+
+        final Calendar calendar = Calendar.getInstance();
+        final int year = calendar.get( Calendar.YEAR );
+        final String copyright = "@" + year + _copyright;
+        final SGLabel copyrightLabel = new SGLabel( "copyright", copyright, new Point2D.Double( xPosition, yPosition ) );
+        copyrightLabel.setAlign( SGLabel.TOP, SGLabel.CENTER );
+        copyrightLabel.setFont( _copyrightFont );
+
+        copyrightLayer.addChild( copyrightLabel );
+    }
+
+    /**
      * This method removes from a list the lines with no data
      *
@@ -380 +411 @@
         xbot.setLabelFont( _axisFont );
         xbot.setLabelHeightP( _heightAxisFont );
+        // TimeZone indication
+        xbot.setTitle( new SGLabel( "timeZone", " (UTC)", null ) );
 //        xbot.setMajorLabelFormat( _majorLabelFormat );
         return xbot;
@@ -618 +651 @@
 
     protected static final Font _axisFont = new Font( "Helvetica", Font.PLAIN, 15 );
+    protected static final Font _copyrightFont = new Font( "Helvetica", Font.PLAIN, 8 );
+    protected static final String _copyright = " CNES-CNRS";
     protected static final double _heightAxisFont = 0.14;
     protected static final double _markHeight = 0.1;

ether_megapoli/trunk/service/implementation/gov/noaa/pmel/sgt/TimeAxis.java

@@ -273 +273 @@
     Color saved = g.getColor();
     SGLabel label;
-    if(orientation_ == Axis.HORIZONTAL) {
-      label = new SGLabel("major", time.toString(majorLabelFormat_),
+      // VMIPSL
+      String labelStr = time.toString( majorLabelFormat_ );
+      if( title_ != null )
+          labelStr += title_.getText();
+      if(orientation_ == Axis.HORIZONTAL) {
+      label = new SGLabel("major", labelStr,
                           new Point2D.Double(val, ymajor_));
       label.setOrientation(SGLabel.HORIZONTAL);
     } else {
-      label = new SGLabel("major", time.toString(majorLabelFormat_),
+      label = new SGLabel("major", labelStr,
                           new Point2D.Double(xmajor_, val));
       label.setOrientation(SGLabel.VERTICAL);
@@ -776 +780 @@
     }
   }
-  public void setTitle(SGLabel title) {
-  // Time axes don't use title_
-    title_ = null;
-  }
+
+    public void setTitle( final SGLabel title )
+    {
+        // Time axes don't use title_
+//        title_ = null;
+        // VMIPSL
+        if( title_ == null || !title_.equals( title ) )
+        {
+            title_ = title;
+            title_.setMoveable( false );
+            modified( "Axis: setTitle()" );
+        }
+    }
 }