Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java @ 3186:c130be3fa809
FixA: Only generate outlier facet when we done the prepocessing.
flys-artifacts/trunk@4801 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 26 Jun 2012 15:16:27 +0000 |
| parents | b6da650b0718 |
| children | cd309f8597f6 |
comparison
equal
deleted
inserted
replaced
| 3185:f1e4b37dcb60 | 3186:c130be3fa809 |
|---|---|
| 101 if (res.getReport().hasProblems()) { | 101 if (res.getReport().hasProblems()) { |
| 102 facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); | 102 facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); |
| 103 } | 103 } |
| 104 facets.add( | 104 facets.add( |
| 105 new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); | 105 new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); |
| 106 | |
| 106 | 107 |
| 107 int count = access.getAnalysisPeriods().length; | 108 int count = access.getAnalysisPeriods().length; |
| 108 for (int i = 0; i < count; i++) { | 109 for (int i = 0; i < count; i++) { |
| 109 DateRange period = access.getAnalysisPeriods()[i]; | 110 DateRange period = access.getAnalysisPeriods()[i]; |
| 110 DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); | 111 DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); |
| 199 facets.add(new FixAnalysisPeriodsFacet(2, | 200 facets.add(new FixAnalysisPeriodsFacet(2, |
| 200 FIX_ANALYSIS_PERIODS_WQ, | 201 FIX_ANALYSIS_PERIODS_WQ, |
| 201 i18n_ana)); | 202 i18n_ana)); |
| 202 | 203 |
| 203 facets.add(new FixWQCurveFacet("W/Q")); | 204 facets.add(new FixWQCurveFacet("W/Q")); |
| 204 facets.add(new FixOutlierFacet(FIX_OUTLIER, | 205 |
| 205 Resources.getMsg(context.getMeta(), I18N_OUTLIER, I18N_OUTLIER))); | 206 Boolean preprocessing = access.getPreprocessing(); |
| 207 | |
| 208 if (preprocessing != null && preprocessing) { | |
| 209 facets.add(new FixOutlierFacet(FIX_OUTLIER, | |
| 210 Resources.getMsg(context.getMeta(), I18N_OUTLIER, I18N_OUTLIER))); | |
| 211 } | |
| 212 | |
| 206 facets.add(new FixDerivateFacet(FIX_DERIVATE, | 213 facets.add(new FixDerivateFacet(FIX_DERIVATE, |
| 207 Resources.getMsg(context.getMeta(), | 214 Resources.getMsg(context.getMeta(), |
| 208 I18N_DERIVATIVE, | 215 I18N_DERIVATIVE, |
| 209 I18N_DERIVATIVE))); | 216 I18N_DERIVATIVE))); |
| 210 | 217 |