Changeset 561 for ether_megapoli/trunk/web/src/com/ether/ControllerSimulationPlot.java

Timestamp:

09/28/12 15:23:24 (12 years ago)

Author:

vmipsl

Message:

simulation

• contours ok

File:

• ether_megapoli/trunk/web/src/com/ether/ControllerSimulationPlot.java (modified) (3 diffs)

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

@@ -85 +85 @@
             megapoliPlot.setRealDataToDisplay( displayRealData );
 
-            if( displayRealData && null != plateformId )
+            // Extract simulated values from file
+            final List<Double> allParameterValues = _etherService.extractValuesByModelByVariableByDateByLevelFromFile( megapoliPlot.getModelId(), megapoliPlot.getVariableName(), dateNumber, level, true );
+            final List<Double> allLatitudeValues = _etherService.extractValuesByModelByVariableByDateByLevelFromFile( megapoliPlot.getModelId(), "lat", dateNumber, level, true );
+            final List<Double> allLongitudeValues = _etherService.extractValuesByModelByVariableByDateByLevelFromFile( megapoliPlot.getModelId(), "lon", dateNumber, level, true );
+
+            // Extract real data from database
+            if( megapoliPlot.isRealDataToDisplay() && null != plateformId )
             {
                 final Integer parameterId = _etherService.getParameterByCode( variableName );
@@ -100 +106 @@
             }
 
-            final List<Double> allParameterValues = _etherService.extractValuesByModelByVariableByDateByLevelFromFile( megapoliPlot.getModelId(), megapoliPlot.getVariableName(), dateNumber, level, true );
-            final List<Double> allLatitudeValues = _etherService.extractValuesByModelByVariableByDateByLevelFromFile( megapoliPlot.getModelId(), "lat", dateNumber, level, true );
-            final List<Double> allLongitudeValues = _etherService.extractValuesByModelByVariableByDateByLevelFromFile( megapoliPlot.getModelId(), "lon", dateNumber, level, true );
-
-            // If we have to display the real data, we need probably to zoom all the data on the same geographic map
+            // If we have to display the real data, we need probably to zoom all the data on the same geographic map, otherwise we keep all values
             final Data allZoomedData = _etherService.makeZoom( allParameterValues, allLatitudeValues, allLongitudeValues, megapoliPlot.getRealData() );
-
             final List<Double> parameterValues = (List<Double>) allZoomedData.getFirstArray();
             final List<Double> latitudeValues = (List<Double>) allZoomedData.getSecondArray();
@@ -112 +113 @@
 
             final Data valuesLists;
+            // If we display the contours, the latitudes and longitudes must contain only unique value, we remove the duplicated values
             if( isRasterContour )
             {
                 final Set<Double> latitudeValuesSet = new LinkedHashSet<Double>( latitudeValues );
                 final Set<Double> longitudeValuesSet = new LinkedHashSet<Double>( longitudeValues );
-                valuesLists = new Data( parameterValues, new ArrayList<Double>( latitudeValuesSet ), new ArrayList<Double>( longitudeValuesSet ) );
+                // We have to flip the parameter values
+                final List<Double> flipedParameterValues = _etherService.flipList( parameterValues, latitudeValuesSet.size(), longitudeValuesSet.size() );
+                valuesLists = new Data( flipedParameterValues, new ArrayList<Double>( latitudeValuesSet ), new ArrayList<Double>( longitudeValuesSet ) );
             }
             else
                 valuesLists = new Data( parameterValues, new ArrayList<Double>( latitudeValues ), new ArrayList<Double>( longitudeValues ) );
+
             megapoliPlot.setData( valuesLists );
             megapoliPlot.setValuesNumber( parameterValues.size() );