Changeset 563 for ether_megapoli/trunk
- Timestamp:
- 09/28/12 16:04:49 (12 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/service/implementation/com/ether/EtherPlotContentServiceImpl.java
r561 r563 316 316 final Layer keyLayer = jPlotLayout.getKeyPane().getLayer( "Key Layer" ); 317 317 jPlotLayout.add( keyLayer ); 318 319 // if( megapoliPlot.isRealDataToDisplay() && null != megapoliPlot.getRealData() )320 // {321 // final List<Double> realRarameterValues = (List<Double>) megapoliPlot.getRealData().getFirstArray();322 // final List<Double> realLatitudeValues = (List<Double>) megapoliPlot.getRealData().getSecondArray();323 // final List<Double> realLongitudeValues = (List<Double>) megapoliPlot.getRealData().getThirdArray();324 // final SimpleGrid simpleGridForRealData = new SimpleGrid( EtherHelper.convertListDoubleToDoubleArray( realRarameterValues ), EtherHelper.convertListDoubleToDoubleArray( realLongitudeValues ), EtherHelper.convertListDoubleToDoubleArray( realLatitudeValues ), "GridForRealData" );325 // simpleGridForRealData.setXMetaData( xMeta );326 // simpleGridForRealData.setYMetaData( yMeta );327 // simpleGridForRealData.setFullGridForRasterContour( false );328 // final JPlotLayout realJPlotLayout = new JPlotLayout( true, false, false, "JPlotLayout Pane Real", null, true );329 // realJPlotLayout.setEditClasses( false );330 // realJPlotLayout.addData( simpleGridForRealData, gridAttribute, "" );331 // realJPlotLayout.setTitles( "", "", "" );332 // realJPlotLayout.setSize( new Dimension( plotWidth, plotHeight ) );333 //334 //// final Layer realKeyLayer = new Layer( "Real Data", new Dimension2D( plotWidth, plotHeight ) );335 //// realKeyLayer.addChild( (LayerChild) realJPlotLayout.getKeyPane().getLayer( "Key Layer" ) );336 // final Layer realKeyLayer = realJPlotLayout.getKeyPane().getLayer( "Key Layer" );337 // realJPlotLayout.add( realKeyLayer );338 // jPlotLayout.add( realJPlotLayout );339 // }340 341 318 } 342 319 catch( LayerNotFoundException e ) -
ether_megapoli/trunk/web/resources/css/visu_parameter_by_pf.css
r556 r563 104 104 } 105 105 106 .textExamples2 { 107 float:left; 108 margin-bottom: 10px; 109 margin-right: 50px; 110 } 111 106 112 .textExamplesTD { 107 113 margin: 10px; -
ether_megapoli/trunk/web/src/ApplicationResources.properties
r557 r563 483 483 visualization.general.example.2D=Exemple de visualisation 2D : 484 484 visualization.general.example.2D.ATR42=Mesures \u00E0 bord de l'ATR-42 485 visualization.general.example.Simulation=Exemple de simulation : 486 visualization.general.example.Simulation.Chimere.O3=Mesures d'Ozone obtenues avec le mod\u00E8le CHIMERE 485 487 486 488 visualization=Visualisation -
ether_megapoli/trunk/web/src/ApplicationResources_en.properties
r557 r563 483 483 visualization.general.example.2D=Example of 2D : 484 484 visualization.general.example.2D.ATR42=Measurements on ATR-42 board 485 visualization.general.example.Simulation=Example of simulation : 486 visualization.general.example.Simulation.Chimere.O3=Ozone with CHIMERE model 485 487 486 488 visualization=Visualization -
ether_megapoli/trunk/web/src/com/ether/ControllerSimulationPlot.java
r561 r563 102 102 103 103 final Data realValuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd ); 104 megapoliPlot.setRealData( realValuesLists ); 104 if( !( (ArrayList) realValuesLists.getFirstArray() ).isEmpty() && !( (ArrayList) realValuesLists.getSecondArray() ).isEmpty() && !( (ArrayList) realValuesLists.getThirdArray() ).isEmpty() ) 105 megapoliPlot.setRealData( realValuesLists ); 105 106 megapoliPlot.setRealDataNumber( ( (ArrayList) realValuesLists.getFirstArray() ).size() ); 106 107 } -
ether_megapoli/trunk/web/visualization/visu.jsp
r306 r563 87 87 <BR/> 88 88 89 <div class="textExamples "><bean:message key="visualization.general.example.2D"/></div>89 <div class="textExamples2"><bean:message key="visualization.general.example.2D"/> 90 90 <table class="smallRoundTable" border="1"> 91 91 <tr> … … 99 99 </tr> 100 100 </table> 101 </div> 102 103 <div class="textExamples2"><bean:message key="visualization.general.example.Simulation"/> 104 <table class="smallRoundTable" border="1"> 105 <tr> 106 <td> 107 <center> 108 <a href="/megapoli/resources/images/CaptureSimulation.png" rel="lightbox" title="<bean:message key="visualization.general.example.Simulation.Chimere.O3"/>"> 109 <img src="/megapoli/resources/images/CaptureSimulation.png" height="150px" width="150px" class="imageExamples"> 110 </a> 111 </center> 112 </td> 113 </tr> 114 </table> 115 </div> 101 116 102 117 </tiles:put>
Note: See TracChangeset
for help on using the changeset viewer.