Changeset 557 for ether_megapoli
- Timestamp:
- 09/26/12 18:42:00 (12 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/persistence/implementation/com/ether/dao/ParameterDAOImpl.java
r297 r557 5 5 import org.hibernate.criterion.DetachedCriteria; 6 6 import org.hibernate.criterion.Order; 7 import org.hibernate.criterion.Projections; 7 8 import org.hibernate.criterion.Restrictions; 8 9 import org.jetbrains.annotations.NotNull; … … 57 58 return selectAllByCriteria( Parametre.class, criteria ); 58 59 } 60 61 @Nullable 62 public Integer getParameterByCode( @NotNull final String parameterCode ) 63 throws PersistenceException 64 { 65 final DetachedCriteria criteria = DetachedCriteria.forClass( Parametre.class ) 66 .add( Restrictions.eq( "parametreCode", parameterCode ) ) 67 .setProjection( Projections.property( "parametreId" ) ); 68 69 return selectByCriteria( Integer.class, criteria ); 70 } 59 71 } -
ether_megapoli/trunk/persistence/interface/com/ether/dao/ParameterDAO.java
r297 r557 26 26 List<Parametre> getAllParametersOrderByCategoryByName() 27 27 throws PersistenceException; 28 29 @Nullable 30 Integer getParameterByCode( @NotNull final String parameterCode ) 31 throws PersistenceException; 28 32 } -
ether_megapoli/trunk/service/implementation/com/ether/EtherPlotServiceImpl.java
r547 r557 69 69 70 70 // Bottom Pane 71 final JPane jPaneBottom = createBottomPane( megapoliPlot.getValuesNumber(), locale ); 71 final JPane jPaneBottom; 72 if( megapoliPlot instanceof SimulationPlot ) 73 jPaneBottom = createBottomPane( megapoliPlot.getValuesNumber(), ( (SimulationPlot) megapoliPlot ).getRealDataNumber(), locale ); 74 else 75 jPaneBottom = createBottomPane( megapoliPlot.getValuesNumber(), null, locale ); 72 76 jPane.add( jPaneBottom, BorderLayout.SOUTH ); 73 77 … … 149 153 * Create the bottom JPane with the text "published .. (date)" 150 154 * 151 * @param dataNumber : the number of datas extracted from the base 155 * @param dataNumber 156 * @param realDataNumber 152 157 * @param locale 153 158 * @return 154 159 */ 155 160 @NotNull 156 public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Locale locale )161 public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Integer realDataNumber, @Nullable final Locale locale ) 157 162 { 158 163 final ResourceBundle bundle = WebHelper.getBundle( locale ); … … 171 176 if( null != dataNumber ) 172 177 { 173 final String messageDataNumber = bundle.getString( "plot.dataNumber" ); 174 final JLabel jLabelDataNumber = new JLabel( messageDataNumber + ' ' + dataNumber ); 175 jLabelDataNumber.setFont( police ); 176 jPaneBottom.add( jLabelDataNumber, BorderLayout.WEST ); 178 if( null != realDataNumber ) 179 { 180 final JLabel jLabelDataNumber = new JLabel( bundle.getString( "plot.dataNumber" ) + ' ' + dataNumber + ' ' + bundle.getString( "plot.simulatedDataNumber" ) + ", " + realDataNumber + ' ' + bundle.getString( "plot.realDataNumber" ) ); 181 jLabelDataNumber.setFont( police ); 182 jPaneBottom.add( jLabelDataNumber, BorderLayout.WEST ); 183 } 184 else 185 { 186 final String messageDataNumber = bundle.getString( "plot.dataNumber" ); 187 final JLabel jLabelDataNumber = new JLabel( messageDataNumber + ' ' + dataNumber ); 188 jLabelDataNumber.setFont( police ); 189 jPaneBottom.add( jLabelDataNumber, BorderLayout.WEST ); 190 } 177 191 } 178 192 -
ether_megapoli/trunk/service/implementation/com/ether/EtherServiceImpl.java
r556 r557 997 997 } 998 998 999 @Nullable 1000 @Transactional(readOnly = true) 1001 public Integer getParameterByCode( @NotNull final String parameterCode ) 1002 throws ServiceException 1003 { 1004 try 1005 { 1006 return _parameterDAO.getParameterByCode( parameterCode ); 1007 } 1008 catch( PersistenceException e ) 1009 { 1010 throw new ServiceException( ServiceException.ServiceCode.PARAMETER_NOT_FOUND, e ); 1011 } 1012 } 1013 999 1014 /** 1000 1015 * This method insert in database the new dimensions, attributes, variables and simulation -
ether_megapoli/trunk/service/interface/com/ether/EtherPlotService.java
r547 r557 23 23 24 24 @NotNull 25 public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Locale locale );25 public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Integer realDataNumber, @Nullable final Locale locale ); 26 26 27 27 @NotNull -
ether_megapoli/trunk/service/interface/com/ether/EtherService.java
r556 r557 231 231 List<Plateforme> getPlateformsByParameter( @NotNull final String parameterCode ) 232 232 throws ServiceException; 233 234 @Nullable 235 Integer getParameterByCode( @NotNull final String parameterCode ) 236 throws ServiceException; 233 237 } -
ether_megapoli/trunk/web/src/ApplicationResources.properties
r556 r557 552 552 plot.published=Publi\u00E9 le 553 553 plot.dataNumber=Nombre de donn\u00E9es extraites : 554 plot.simulatedDataNumber=(simul\u00E9es) 555 plot.realDataNumber=(r\u00E9elles) 554 556 plot.errorMessage=Erreur de cr\u00E9ation du quicklook. <BR>Veuillez essayer de corriger les erreurs suivantes ou contacter l'administrateur en indiquant les erreurs rencontr\u00E9es. 555 557 plot.noData=Aucune donn\u00E9e extraite -
ether_megapoli/trunk/web/src/ApplicationResources_en.properties
r556 r557 553 553 plot.published=Published 554 554 plot.dataNumber=Number of extracted datas : 555 plot.simulatedDataNumber=(simulated) 556 plot.realDataNumber=(real) 555 557 plot.errorMessage=Error creating the quicklook. <BR>Please try to correct the following errors or contact the administrator with the detected errors. 556 558 plot.noData=No extracted data -
ether_megapoli/trunk/web/src/com/ether/ControllerSimulation.java
r556 r557 71 71 72 72 @ControllerMethod(jsonResult = true) 73 public JSONObject search PlateformsByVariable( @Mandatory @ParamName(ParameterConstants.PARAMETER_CODE) final String variableCode )73 public JSONObject searchMobilePlateformsByVariable( @Mandatory @ParamName(ParameterConstants.PARAMETER_CODE) final String variableCode ) 74 74 throws ServiceException 75 75 { 76 76 final List<Plateforme> plateformsByParameter = getEtherService().getPlateformsByParameter( variableCode ); 77 77 78 final List<Plateforme> mobilePlateforms = new ArrayList<Plateforme>(); 79 for( final Plateforme plateforme : plateformsByParameter ) 80 { 81 if( "MOBILE".equals( plateforme.getTypePlateforme().getTypePlateformeNom() ) ) 82 mobilePlateforms.add( plateforme ); 83 } 84 78 85 final JSONObject result = new JSONObject(); 79 result.put( ParameterConstants.PARAMETER_PLATEFORMS, getJsonHelper().toJSON( plateformsByParameter) );86 result.put( ParameterConstants.PARAMETER_PLATEFORMS, getJsonHelper().toJSON( mobilePlateforms ) ); 80 87 return result; 81 88 } -
ether_megapoli/trunk/web/src/com/ether/ControllerSimulationPlot.java
r556 r557 18 18 import java.io.IOException; 19 19 import java.util.ArrayList; 20 import java.util.Calendar; 21 import java.util.Date; 20 22 import java.util.LinkedHashSet; 21 23 import java.util.List; … … 56 58 throws ServletException 57 59 { 58 // final boolean flagException = false;59 60 60 try 61 61 { … … 70 70 final boolean displayRealData = Boolean.parseBoolean( request.getParameter( "isRealDataToDisplay" ) ); 71 71 72 // Dates 73 // final String dateBegin = request.getParameter( ParameterConstants.PARAMETER_DATE_BEGIN ); 74 // final String dateEnd = request.getParameter( ParameterConstants.PARAMETER_DATE_END ); 75 // final Calendar calendar = Calendar.getInstance(); 76 // Date formatedDateBegin = null; 77 // Date formatedDateEnd = null; 78 // if( null != dateBegin && null != dateEnd && !"false".equals( dateBegin ) && !"false".equals( dateEnd ) ) 79 // try 80 // { 81 // calendar.setTimeInMillis( Long.valueOf( dateBegin ) ); 82 // formatedDateBegin = calendar.getTime(); 83 // calendar.setTimeInMillis( Long.valueOf( dateEnd ) ); 84 // formatedDateEnd = calendar.getTime(); 85 // } 86 // catch( Exception e ) 87 // { 88 // createErrorPane( response, request, WebException.WebCode.INVALID_DATE.toString(), e ); 89 // flagException = true; 90 // throw new ServletException( WebException.WebCode.INVALID_DATE.toString(), e ); 91 // } 72 Integer plateformId = null; 73 if( null != request.getParameter( ParameterConstants.PARAMETER_PLATEFORM_ID ) ) 74 plateformId = Integer.parseInt( request.getParameter( ParameterConstants.PARAMETER_PLATEFORM_ID ) ); 92 75 93 76 // Create plot … … 118 101 megapoliPlot.setValuesNumber( parameterValues.size() ); 119 102 120 if( displayRealData )103 if( displayRealData && null != plateformId ) 121 104 { 122 // 2D plot : only one parameter to display 123 // final Integer plateformId = (Integer) pIdPIdList.get( 0 ).getFirstValue(); 124 // final Integer parameterId = (Integer) pIdPIdList.get( 0 ).getSecondValue(); 125 // final Data realValuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd ); 126 // final Data<List, List, List> valuesLists = BouchonHelper.createValuesFor2D( 50 ); 127 // megapoliPlot.setRealData( valuesLists ); 105 final Integer parameterId = _etherService.getParameterByCode( variableName ); 106 // Dates 107 final Calendar calendar = Calendar.getInstance(); 108 final Date formatedDateBegin = DateHelper.parseDate( date, "yyyy-MM-dd" ); 109 calendar.setTime( formatedDateBegin ); 110 calendar.add( Calendar.DAY_OF_YEAR, 1 ); 111 final Date formatedDateEnd = calendar.getTime(); 128 112 129 // megapoliPlot.setRealDataNumber( ( (ArrayList) realValuesLists.getFirstArray() ).size() ); 113 final Data realValuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd ); 114 megapoliPlot.setRealData( realValuesLists ); 115 megapoliPlot.setRealDataNumber( ( (ArrayList) realValuesLists.getFirstArray() ).size() ); 130 116 } 131 117 … … 137 123 try 138 124 { 139 // if( !flagException )140 125 createErrorPane( response, request, "", e1 ); 141 126 } -
ether_megapoli/trunk/web/visualization/visu_simulation-script.jsp
r556 r557 109 109 if( this.selectedVariable ) 110 110 $.ajax( { 111 url: "simulation?methodName=search PlateformsByVariable&code=" + this.selectedVariable.getName(),111 url: "simulation?methodName=searchMobilePlateformsByVariable&code=" + this.selectedVariable.getName(), 112 112 success:jQuery.proxy( this.handlePlateformsByVariable, this ) 113 113 } ); … … 242 242 + "&level=" + this.selectLevels.getValue() 243 243 + "&isRasterContour=" + this.selectTypes.getValue() 244 + "& displayRealData=" + $( "#displayRealData" ).attr( 'checked' )244 + "&isRealDataToDisplay=" + $( "#displayRealData" ).attr( 'checked' ) 245 245 + "&title=" + encodeURIComponent( $( "#textareaTitle" ).val() ); 246 247 if( this.selectPlateforms && this.selectPlateforms.getValue() ) 248 parameters += "&plateformId=" + this.selectPlateforms.getValue(); 246 249 247 250 var url = "simulation/simulationPlotEther?" + parameters;
Note: See TracChangeset
for help on using the changeset viewer.