Changeset 171 for ether_megapoli/trunk/web/src/com/ether/ControllerPlot.java

Timestamp:

08/30/11 12:06:07 (13 years ago)

Author:

vmipsl

Message:

Fixe application : english/french _ ok before applet

File:

• ether_megapoli/trunk/web/src/com/ether/ControllerPlot.java (modified) (5 diffs)

ether_megapoli/trunk/web/src/com/ether/ControllerPlot.java

@@ -3 +3 @@
 import com.medias.Context;
 import com.medias.database.objects.Parametre;
-import com.medias.database.objects.Unite;
-import gov.noaa.pmel.sgt.dm.SGTMetaData;
-import gov.noaa.pmel.sgt.dm.SimpleLine;
-import gov.noaa.pmel.util.GeoDateArray;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24 +20 @@
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Locale;
-import java.util.ResourceBundle;
 
 /**
@@ -91 +85 @@
 
             // Parameter
-//            final Parametre parametre = _etherService.getParameterById( parameterId );
-            final Parametre parametre = new Parametre();
-            parametre.setParametreNom( "Ozone" );
-            final Unite unit = new Unite();
-            unit.setUniteCode( "ppb" );
-            parametre.setUnite( unit );
+            final Parametre parametre = _etherService.getParameterById( parameterId );
+//            final Parametre parametre = new Parametre();
+//            parametre.setParametreNom( "Ozone" );
+//            final Unite unit = new Unite();
+//            unit.setUniteCode( "ppb" );
+//            parametre.setUnite( unit );
             if( null == parametre )
             {
@@ -105 +99 @@
 
             // Create plot
-            final SimpleLine data;
-            if( AxeTypeForFixedPlateform.TIME.name().equals( axeType ) )
+            final MegapoliPlot megapoliPlot = new MegapoliPlot();
+            megapoliPlot.setTitle( title );
+            megapoliPlot.setAxeType( axeType );
+            megapoliPlot.setParameterName( parametre.getParametreNom() );
+            if( null != parametre.getUnite() && null != parametre.getUnite().getUniteCode() )
+                megapoliPlot.setParameterUnitCode( parametre.getUnite().getUniteCode() );
+
+
+            if( AxeTypeForFixedPlateform.TIME_LINE.name().equals( axeType ) || AxeTypeForFixedPlateform.TIME_POINTS.name().equals( axeType ) )
             {
-                final Pair valuesLists = _etherService.getValuesListsByPlateformByParameterByPeriod( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
+                final Data valuesLists = _etherService.getListsByPlateformByParameterByPeriodForTimeSerie( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
+                megapoliPlot.setData( valuesLists );
 
-                final double[] dataArray = (double[]) valuesLists.getFirstValue();
-                final Date[] dateValues = (Date[]) valuesLists.getSecondValue();
-
-                data = createTimeSerie( new GeoDateArray( dateValues ), dataArray, parametre.getParametreNom(), parametre.getUnite() );
+                megapoliPlot.setTimeSerie( true );
+                megapoliPlot.setLegendToHide( true );
+                megapoliPlot.setValuesNumber( ( (double[]) valuesLists.getFirstArray() ).length );
             }
             else
             {
-//                final Pair valuesLists = _etherService.getValuesListsByPlateformByParameterByPeriod( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
-                final double[] latitudeArray = {2.1, 2.2, 2.3};
-                final double[] longitudeValues = {112.1, 12.2, 22.3};
-//                final double[] latitudeArray = (double[]) valuesLists.getFirstValue();
-//                final double[] longitudeValues = (double[]) valuesLists.getFirstValue();
+                final Data valuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
+                megapoliPlot.setData( valuesLists );
+//                final double[] latitudeArray = {2.1, 2.2, 2.3};
+//                final double[] longitudeValues = {112.1, 12.2, 22.3};
 
-                data = createLatitudeSerie( longitudeValues, latitudeArray, parametre.getParametreNom(), Context.getLocale( request ) );
+                megapoliPlot.setTimeSerie( false );
+                megapoliPlot.setLegendToHide( false );
+                megapoliPlot.setValuesNumber( ( (double[]) valuesLists.getFirstArray() ).length );
             }
-
-
-            // MegapoliPlot
-            final MegapoliPlot megapoliPlot = new MegapoliPlot();
-            megapoliPlot.setTitle( title );
-            megapoliPlot.setData( data );
-            megapoliPlot.setLegendToHide( null == data.getTitle() );
-            megapoliPlot.setXTime( AxeTypeForFixedPlateform.TIME.name().equals( axeType ) );
 
             final BufferedImage bufferedImage = _etherPlotService.createMainPane( megapoliPlot, Context.getLocale( request ) );
@@ -149 +143 @@
             }
         }
-    }
-
-    @NotNull
-    private SimpleLine createTimeSerie( @NotNull final GeoDateArray dateArray, @NotNull final double[] dataArray, @Nullable final String parameterName, @Nullable final Unite unit )
-    {
-        final SimpleLine data = new SimpleLine( dateArray, dataArray, null );
-        SGTMetaData meta = new SGTMetaData( null, null, false, false );
-        data.setXMetaData( meta );
-
-        meta = new SGTMetaData( parameterName, unit.getUniteCode(), false, false );
-        data.setYMetaData( meta );
-        return data;
-    }
-
-    @NotNull
-    private SimpleLine createLatitudeSerie( @NotNull final double[] dateArray, @NotNull final double[] dataArray, @Nullable final String legend, @Nullable final Locale locale )
-    {
-        final ResourceBundle bundle = WebHelper.getBundle( locale );
-
-        final SimpleLine data = new SimpleLine( dateArray, dataArray, legend );
-        SGTMetaData meta = new SGTMetaData( bundle.getString( "plot.longitude" ), bundle.getString( "plot.degres" ), false, true );
-        // TODO : vérifier modulo = 360
-//        meta.setModuloValue( 360 );
-        data.setXMetaData( meta );
-
-        meta = new SGTMetaData( bundle.getString( "plot.latitude" ), bundle.getString( "plot.degres" ), false, true );
-        // TODO : vérifier modulo = 360
-//        meta.setModuloValue( 360 );
-        data.setYMetaData( meta );
-        return data;
     }