# HG changeset patch # User Sascha L. Teichmann # Date 1340723787 0 # Node ID c130be3fa8095123204186c6fb74028eaca7e870 # Parent f1e4b37dcb60f0f19d84fff39fded24d6461d4e7 FixA: Only generate outlier facet when we done the prepocessing. flys-artifacts/trunk@4801 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r f1e4b37dcb60 -r c130be3fa809 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Tue Jun 26 13:07:18 2012 +0000 +++ b/flys-artifacts/ChangeLog Tue Jun 26 15:16:27 2012 +0000 @@ -1,3 +1,8 @@ +2012-06-26 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java: + Only generate outlier facet when we done the prepocessing. + 2012-06-26 Felix Wolfsteller Enable legend aggregation in time series charts. diff -r f1e4b37dcb60 -r c130be3fa809 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Tue Jun 26 13:07:18 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Tue Jun 26 15:16:27 2012 +0000 @@ -104,6 +104,7 @@ facets.add( new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); + int count = access.getAnalysisPeriods().length; for (int i = 0; i < count; i++) { DateRange period = access.getAnalysisPeriods()[i]; @@ -201,8 +202,14 @@ i18n_ana)); facets.add(new FixWQCurveFacet("W/Q")); - facets.add(new FixOutlierFacet(FIX_OUTLIER, - Resources.getMsg(context.getMeta(), I18N_OUTLIER, I18N_OUTLIER))); + + Boolean preprocessing = access.getPreprocessing(); + + if (preprocessing != null && preprocessing) { + facets.add(new FixOutlierFacet(FIX_OUTLIER, + Resources.getMsg(context.getMeta(), I18N_OUTLIER, I18N_OUTLIER))); + } + facets.add(new FixDerivateFacet(FIX_DERIVATE, Resources.getMsg(context.getMeta(), I18N_DERIVATIVE,