Changeset 197
- Timestamp:
- 09/14/11 19:35:21 (13 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/service/implementation/com/ether/EtherPlotContentServiceImpl.java
r196 r197 29 29 import gov.noaa.pmel.util.Point2D; 30 30 import gov.noaa.pmel.util.Range2D; 31 import gov.noaa.pmel.util.Rectangle2D;32 31 import gov.noaa.pmel.util.SoTPoint; 33 32 import gov.noaa.pmel.util.SoTRange; … … 185 184 186 185 // Create the grid 187 // final SGTMetaData zMeta = new SGTMetaData( "ts", "m s-1" );188 186 final SGTMetaData xMeta = new SGTMetaData( bundle.getString( "plot.longitude" ), bundle.getString( "plot.degres" ) ); 189 187 final SGTMetaData yMeta = new SGTMetaData( bundle.getString( "plot.latitude" ), bundle.getString( "plot.degres" ) ); … … 192 190 simpleGrid.setXMetaData( xMeta ); 193 191 simpleGrid.setYMetaData( yMeta ); 194 // simpleGrid.setZMetaData( zMeta );195 192 simpleGrid.setRealFullGrid( false ); 196 193 … … 212 209 final Integer parameterId = pIdPId.getSecondValue(); 213 210 214 //final Parametre parametre = _etherService.getParameterById( parameterId );215 final Parametre parametre = BouchonHelper.getParameterById( parameterId );211 final Parametre parametre = _etherService.getParameterById( parameterId ); 212 // final Parametre parametre = BouchonHelper.getParameterById( parameterId ); 216 213 if( null == parametre ) 217 214 throw new ServiceException( ServiceException.ServiceCode.PARAMETER_IS_NULL, new Throwable( ServiceException.ServiceCode.PARAMETER_IS_NULL.toString() ) ); -
ether_megapoli/trunk/web/resources/css/visu_parameter_by_pf.css
r173 r197 96 96 } 97 97 98 .imageExamples { 99 margin : 10px; 100 } 101 102 .textExamples { 103 color: #04155D; 104 margin-bottom: 10px; 105 } 106 107 .textExamplesTD { 108 color: #04155D; 109 text-align: center; 110 } 111 98 112 /** ************************************ **/ 99 113 /** ************ CALENDAR ************** **/ -
ether_megapoli/trunk/web/src/ApplicationResources.properties
r175 r197 426 426 ####################### ETHER ################################## 427 427 ################################################################ 428 data.visualization.general.text=Dans cette zone, vous pouvez visualiser en ligne les donn\u00E9es disponibles. Plusieurs types de visualisations vous sont propos\u00E9s :<ul><li>un param\u00E8tre pour un site</li><li>un param\u00E8tre pour plusieurs sites</li><li>diff\u00E9rents param\u00E8tre pour un site</li><li>des visualisations en 2D</li></ul> 429 data.visualization.general.text2=Vous pouvez visualiser au maximum deux types de param\u00E8tres diff\u00E9rents sur autant de plateformes disponibles. 430 data.visualization.general.example=Exemples de s\u00E9ries temporelles : 431 data.visualization.general.example.param.site=Ozone au LHVP 432 data.visualization.general.example.param.sites=Ozone au LHVP et au SIRTA 433 data.visualization.general.example.params.site=Ozone et Temp\u00E9rature au SIRTA 434 data.visualization.general.example.params.sites=Ozone (LHVP et SIRTA) <BR/> Temp\u00E9rature (SIRTA) 435 data.visualization.general.example.2D=Exemple de visualisation 2D : 436 437 ####################### VISUALIZATION ####################### 428 438 inWork=Page en cours de construction.. 429 439 all.visualization=Visualisation -
ether_megapoli/trunk/web/src/ApplicationResources_en.properties
r173 r197 425 425 ####################### ETHER ################################## 426 426 ################################################################ 427 data.visualization.general.text=In this area you can visualize available data with the following types of visualization : <ul><li>one parameter by plateform</li><li>one parameter by many plateforms</li><li>differents parameters by plateform</li><li>2D visualizations</li></ul> 428 data.visualization.general.text2=You can visualize up two differents parameters at the same time for many plateforms 429 data.visualization.general.example=Examples of time series : 430 data.visualization.general.example.param.site=Ozone at the LHVP 431 data.visualization.general.example.param.sites=Ozone at the LHVP and the SIRTA 432 data.visualization.general.example.params.site=Ozone and Temperature at the SIRTA 433 data.visualization.general.example.params.sites=Ozone (at the LHVP and SIRTA) and Temperature (at the SIRTA) 434 data.visualization.general.example.2D=Example of 2D : 435 436 ####################### VISUALIZATION ####################### 427 437 inWork=Work in progress.. 428 438 all.visualization=Visualization -
ether_megapoli/trunk/web/src/com/ether/Controller.java
r186 r197 50 50 throws ServiceException 51 51 { 52 //final List<Plateforme> plateforms = _etherService.getAllPlateforms();53 final List<Plateforme> plateforms = BouchonHelper.createPlateforms();52 final List<Plateforme> plateforms = _etherService.getAllPlateforms(); 53 // final List<Plateforme> plateforms = BouchonHelper.createPlateforms(); 54 54 55 55 final Map<String, Object> model = new HashMap<String, Object>(); … … 69 69 throws ServiceException, EtherException 70 70 { 71 //final List<Parametre> parametersByPlateform = _etherService.getParametersByPlateformId( plateformId );72 final List<Parametre> parametersByPlateform = BouchonHelper.createParameters( plateformId );71 final List<Parametre> parametersByPlateform = _etherService.getParametersByPlateformId( plateformId ); 72 // final List<Parametre> parametersByPlateform = BouchonHelper.createParameters( plateformId ); 73 73 74 74 final JSONObject result = new JSONObject(); -
ether_megapoli/trunk/web/src/com/ether/ControllerPlot.java
r195 r197 113 113 final Integer plateformId = (Integer) pIdPIdList.get( 0 ).getFirstValue(); 114 114 final Integer parameterId = (Integer) pIdPIdList.get( 0 ).getSecondValue(); 115 //final Data valuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd );116 final Data<List, List, List> valuesLists = BouchonHelper.createValuesFor2D( 50 );115 final Data valuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd ); 116 // final Data<List, List, List> valuesLists = BouchonHelper.createValuesFor2D( 50 ); 117 117 megapoliPlot.setData( valuesLists ); 118 118 119 119 megapoliPlot.setTimeSerie( false ); 120 120 megapoliPlot.setLegendToHide( false ); 121 megapoliPlot.setValuesNumber( ( valuesLists.getFirstArray() ).size() );121 megapoliPlot.setValuesNumber( ( (ArrayList) valuesLists.getFirstArray() ).size() ); 122 122 } 123 123 -
ether_megapoli/trunk/web/visualization/visu.jsp
r171 r197 13 13 <tiles:put name="insertCss" type="string"> 14 14 <ether:htmlCss cssFile="ether"/> 15 <ether:htmlCss cssFile="visu_parameter_by_pf"/> 16 <ether:htmlCss cssFile="slimbox-1.8/css/slimbox"/> 15 17 </tiles:put> 16 18 17 19 <tiles:put name="insertJsOrJsp" type="string"> 20 <ether:htmlJs jsFile="slimbox-1.8/js/mootools"/> 21 <ether:htmlJs jsFile="slimbox-1.8/js/slimbox"/> 18 22 </tiles:put> 19 23 … … 26 30 27 31 <tiles:put name="body" type="string"> 28 - Liste des sites et types de mesure<br> 29 - Photo des stations<br> 30 - etc... 32 <div class="textExamples"> 33 <bean:message key="data.visualization.general.text"/> 34 <bean:message key="data.visualization.general.text2"/> 35 </div> 36 37 <BR/> 38 39 <div class="textExamples"><bean:message key="data.visualization.general.example"/></div> 40 <table border="1" width="100%"> 41 <tr> 42 <td width="25%"> 43 <div class="textExamplesTD"><bean:message key="data.visualization.general.example.param.site"/></div> 44 </td> 45 <td width="25%"> 46 <div class="textExamplesTD"><bean:message key="data.visualization.general.example.param.sites"/></div> 47 </td> 48 <td width="25%"> 49 <div class="textExamplesTD"><bean:message key="data.visualization.general.example.params.site"/></div> 50 </td> 51 <td width="25%"> 52 <div class="textExamplesTD"><bean:message key="data.visualization.general.example.params.sites"/></div> 53 </td> 54 </tr> 55 56 <tr> 57 <td> 58 <center> 59 <a href="/Megapoli/resources/images/CaptureOzone.png" rel="lightbox" title="<bean:message key="data.visualization.general.example.param.site"/>"> 60 <img src="/Megapoli/resources/images/CaptureOzone.png" height="150px" width="150px" class="imageExamples"> 61 </a> 62 </center> 63 </td> 64 <td> 65 <center> 66 <a href="/Megapoli/resources/images/Capture2Ozones.png" rel="lightbox" title="<bean:message key="data.visualization.general.example.param.sites"/>"> 67 <img src="/Megapoli/resources/images/Capture2Ozones.png" height="150px" width="150px" class="imageExamples"> 68 </a> 69 </center> 70 </td> 71 <td> 72 <center> 73 <a href="/Megapoli/resources/images/Capture1Ozone1TempPoints.png" rel="lightbox" title="<bean:message key="data.visualization.general.example.params.site"/>"> 74 <img src="/Megapoli/resources/images/Capture1Ozone1TempPoints.png" height="150px" width="150px" class="imageExamples"> 75 </a> 76 </center> 77 </td> 78 <td> 79 <center> 80 <a href="/Megapoli/resources/images/Capture2Ozones1Temp.png" rel="lightbox" title="<bean:message key="data.visualization.general.example.params.sites"/>"> 81 <img src="/Megapoli/resources/images/Capture2Ozones1Temp.png" height="150px" width="150px" class="imageExamples"> 82 </a> 83 </center> 84 </td> 85 </tr> 86 </table> 87 88 <BR/> 89 90 <div class="textExamples"><bean:message key="data.visualization.general.example.2D"/></div> 91 <table border="1"> 92 <tr> 93 <td> 94 <center><img src="/Megapoli/resources/images/Capture2Ozones1Temp.png" height="150px" width="150px" 95 class="imageExamples"></center> 96 </td> 97 </tr> 98 </table> 99 31 100 </tiles:put> 32 101
Note: See TracChangeset
for help on using the changeset viewer.