Changeset 563

Timestamp:

09/28/12 16:04:49 (12 years ago)

Author:

vmipsl

Message:

simulation

• ajout exemple ds index

Location:

ether_megapoli/trunk

Files:

• service/implementation/com/ether/EtherPlotContentServiceImpl.java (modified) (1 diff)
• web/resources/css/visu_parameter_by_pf.css (modified) (1 diff)
• web/src/ApplicationResources.properties (modified) (1 diff)
• web/src/ApplicationResources_en.properties (modified) (1 diff)
• web/src/com/ether/ControllerSimulationPlot.java (modified) (1 diff)
• web/visualization/visu.jsp (modified) (2 diffs)

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

@@ -316 +316 @@
             final Layer keyLayer = jPlotLayout.getKeyPane().getLayer( "Key Layer" );
             jPlotLayout.add( keyLayer );
-
-//            if( megapoliPlot.isRealDataToDisplay() && null != megapoliPlot.getRealData() )
-//            {
-//                final List<Double> realRarameterValues = (List<Double>) megapoliPlot.getRealData().getFirstArray();
-//                final List<Double> realLatitudeValues = (List<Double>) megapoliPlot.getRealData().getSecondArray();
-//                final List<Double> realLongitudeValues = (List<Double>) megapoliPlot.getRealData().getThirdArray();
-//                final SimpleGrid simpleGridForRealData = new SimpleGrid( EtherHelper.convertListDoubleToDoubleArray( realRarameterValues ), EtherHelper.convertListDoubleToDoubleArray( realLongitudeValues ), EtherHelper.convertListDoubleToDoubleArray( realLatitudeValues ), "GridForRealData" );
-//                simpleGridForRealData.setXMetaData( xMeta );
-//                simpleGridForRealData.setYMetaData( yMeta );
-//                simpleGridForRealData.setFullGridForRasterContour( false );
-//                final JPlotLayout realJPlotLayout = new JPlotLayout( true, false, false, "JPlotLayout Pane Real", null, true );
-//                realJPlotLayout.setEditClasses( false );
-//                realJPlotLayout.addData( simpleGridForRealData, gridAttribute, "" );
-//                realJPlotLayout.setTitles( "", "", "" );
-//                realJPlotLayout.setSize( new Dimension( plotWidth, plotHeight ) );
-//
-////                final Layer realKeyLayer = new Layer( "Real Data", new Dimension2D( plotWidth, plotHeight ) );
-////                realKeyLayer.addChild( (LayerChild) realJPlotLayout.getKeyPane().getLayer( "Key Layer" ) );
-//                final Layer realKeyLayer = realJPlotLayout.getKeyPane().getLayer( "Key Layer" );
-//                realJPlotLayout.add( realKeyLayer );
-//                jPlotLayout.add( realJPlotLayout );
-//            }
-
         }
         catch( LayerNotFoundException e )

ether_megapoli/trunk/web/resources/css/visu_parameter_by_pf.css

@@ -104 +104 @@
 }
 
+.textExamples2 {
+    float:left;
+    margin-bottom: 10px;
+    margin-right: 50px;
+}
+
 .textExamplesTD {
     margin: 10px;

ether_megapoli/trunk/web/src/ApplicationResources.properties

@@ -483 +483 @@
 visualization.general.example.2D=Exemple de visualisation 2D :
 visualization.general.example.2D.ATR42=Mesures \u00E0 bord de l'ATR-42
+visualization.general.example.Simulation=Exemple de simulation :
+visualization.general.example.Simulation.Chimere.O3=Mesures d'Ozone obtenues avec le mod\u00E8le CHIMERE
 
 visualization=Visualisation

ether_megapoli/trunk/web/src/ApplicationResources_en.properties

@@ -483 +483 @@
 visualization.general.example.2D=Example of 2D :
 visualization.general.example.2D.ATR42=Measurements on ATR-42 board
+visualization.general.example.Simulation=Example of simulation :
+visualization.general.example.Simulation.Chimere.O3=Ozone with CHIMERE model
 
 visualization=Visualization

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

@@ -102 +102 @@
 
                 final Data realValuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
-                megapoliPlot.setRealData( realValuesLists );
+                if( !( (ArrayList) realValuesLists.getFirstArray() ).isEmpty() && !( (ArrayList) realValuesLists.getSecondArray() ).isEmpty() && !( (ArrayList) realValuesLists.getThirdArray() ).isEmpty() )
+                    megapoliPlot.setRealData( realValuesLists );
                 megapoliPlot.setRealDataNumber( ( (ArrayList) realValuesLists.getFirstArray() ).size() );
             }

ether_megapoli/trunk/web/visualization/visu.jsp

@@ -87 +87 @@
         <BR/>
 
-        <div class="textExamples"><bean:message key="visualization.general.example.2D"/></div>
+        <div class="textExamples2"><bean:message key="visualization.general.example.2D"/>
         <table class="smallRoundTable" border="1">
             <tr>
@@ -99 +99 @@
             </tr>
         </table>
+        </div>
+
+        <div class="textExamples2"><bean:message key="visualization.general.example.Simulation"/>
+        <table class="smallRoundTable" border="1">
+            <tr>
+                <td>
+                    <center>
+                        <a href="/megapoli/resources/images/CaptureSimulation.png" rel="lightbox" title="<bean:message key="visualization.general.example.Simulation.Chimere.O3"/>">
+                            <img src="/megapoli/resources/images/CaptureSimulation.png" height="150px" width="150px" class="imageExamples">
+                        </a>
+                    </center>
+                </td>
+            </tr>
+        </table>
+        </div>
 
     </tiles:put>