Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixAnalysisCompute.java @ 9360:ddcd52d239cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Outliers in fixation calculation are now shown within the other 'B' event themes and get a separate symbol (triangle). Removed old outliers theme. Also consider showpoints property. Also consider pointsize property.
author gernotbelger
date Wed, 01 Aug 2018 17:13:52 +0200
parents 42c15e2f95fb
children 9744ce3c3853
comparison
equal deleted inserted replaced
9359:df6f1b5806f6 9360:ddcd52d239cd
34 import org.dive4elements.river.artifacts.model.fixings.FixDeviationFacet; 34 import org.dive4elements.river.artifacts.model.fixings.FixDeviationFacet;
35 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalAnalysisFacet; 35 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalAnalysisFacet;
36 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalAvSectorFacet; 36 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalAvSectorFacet;
37 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalDeviationFacet; 37 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalDeviationFacet;
38 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalReferenceFacet; 38 import org.dive4elements.river.artifacts.model.fixings.FixLongitudinalReferenceFacet;
39 import org.dive4elements.river.artifacts.model.fixings.FixOutlierFacet;
40 import org.dive4elements.river.artifacts.model.fixings.FixReferenceEventsFacet; 39 import org.dive4elements.river.artifacts.model.fixings.FixReferenceEventsFacet;
41 import org.dive4elements.river.artifacts.model.fixings.FixWQCurveFacet; 40 import org.dive4elements.river.artifacts.model.fixings.FixWQCurveFacet;
42 import org.dive4elements.river.artifacts.resources.Resources; 41 import org.dive4elements.river.artifacts.resources.Resources;
43 import org.dive4elements.river.artifacts.states.DefaultState; 42 import org.dive4elements.river.artifacts.states.DefaultState;
44 import org.dive4elements.river.utils.Formatter; 43 import org.dive4elements.river.utils.Formatter;
55 private static final String I18N_REFERENCEPERIOD_SHORT = "fix.reference.period.event.short"; 54 private static final String I18N_REFERENCEPERIOD_SHORT = "fix.reference.period.event.short";
56 55
57 private static final String I18N_ANALYSISPERIODS = "fix.analysis.periods"; 56 private static final String I18N_ANALYSISPERIODS = "fix.analysis.periods";
58 57
59 private static final String I18N_DERIVATIVE = "fix.derivative"; 58 private static final String I18N_DERIVATIVE = "fix.derivative";
60
61 private static final String I18N_OUTLIER = "fix.outlier";
62 59
63 private static final String I18N_ANALYSIS = "fix.analysis.short"; 60 private static final String I18N_ANALYSIS = "fix.analysis.short";
64 61
65 private static final String I18N_DEVIATION = "fix.deviation"; 62 private static final String I18N_DEVIATION = "fix.deviation";
66 63
226 final String i18n_refp = Resources.getMsg(context.getMeta(), I18N_REFERENCEPERIOD, I18N_REFERENCEPERIOD); 223 final String i18n_refp = Resources.getMsg(context.getMeta(), I18N_REFERENCEPERIOD, I18N_REFERENCEPERIOD);
227 facets.add(new DataFacet(idg.next(), FIX_REFERENCE_PERIOD_DWT, i18n_refp, ComputeType.ADVANCE, null, null)); 224 facets.add(new DataFacet(idg.next(), FIX_REFERENCE_PERIOD_DWT, i18n_refp, ComputeType.ADVANCE, null, null));
228 225
229 facets.add(new FixWQCurveFacet(idg.next(), "W/Q")); 226 facets.add(new FixWQCurveFacet(idg.next(), "W/Q"));
230 227
231 final Boolean preprocessing = access.getPreprocessing();
232
233 if (preprocessing != null && preprocessing) {
234 facets.add(new FixOutlierFacet(idg.next(), FIX_OUTLIER, Resources.getMsg(context.getMeta(), I18N_OUTLIER, I18N_OUTLIER)));
235 }
236
237 facets.add(new FixDerivateFacet(idg.next(), FIX_DERIVATE_CURVE, Resources.getMsg(context.getMeta(), I18N_DERIVATIVE, I18N_DERIVATIVE))); 228 facets.add(new FixDerivateFacet(idg.next(), FIX_DERIVATE_CURVE, Resources.getMsg(context.getMeta(), I18N_DERIVATIVE, I18N_DERIVATIVE)));
238 229
239 facets.add(new FixDeviationFacet(idg.next(), FIX_DEVIATION_DWT, Resources.getMsg(context.getMeta(), I18N_DEVIATION, I18N_DEVIATION))); 230 facets.add(new FixDeviationFacet(idg.next(), FIX_DEVIATION_DWT, Resources.getMsg(context.getMeta(), I18N_DEVIATION, I18N_DEVIATION)));
240 return res; 231 return res;
241 } 232 }
242 } 233 }
243 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
http://dive4elements.wald.intevation.org