Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java @ 9360:ddcd52d239cd
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 | 0c621beceb2f |
children | 9744ce3c3853 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Wed Aug 01 13:21:34 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Wed Aug 01 17:13:52 2018 +0200 @@ -26,7 +26,6 @@ import org.dive4elements.river.artifacts.model.ReportFacet; import org.dive4elements.river.artifacts.model.WQCKms; import org.dive4elements.river.artifacts.model.WQKms; -import org.dive4elements.river.artifacts.model.fixings.FixOutlierFacet; import org.dive4elements.river.artifacts.model.fixings.FixRealizingCalculation; import org.dive4elements.river.artifacts.model.fixings.FixRealizingResult; import org.dive4elements.river.artifacts.model.fixings.FixReferenceEventsFacet; @@ -49,8 +48,6 @@ public static final String I18N_WQ_CURVE = "fix.vollmer.wq.curve"; - public static final String I18N_WQ_OUTLIER = "fix.vollmer.wq.outliers"; - /** * The default constructor that initializes an empty State object. */ @@ -98,29 +95,19 @@ nameQ = "Q(" + nameW + ")"; } - final Facet wq = new FixWaterlevelFacet(i, FIX_WQ_LS, nameW, ComputeType.ADVANCE, hash, id); - - final Facet w = new FixWaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, hash, id); - - final Facet q = new FixWaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, hash, id); - final Facet csFacet = new CrossSectionWaterLineFacet(i, nameW); - - facets.add(wq); - facets.add(w); - facets.add(q); - facets.add(csFacet); + facets.add(new FixWaterlevelFacet(i, FIX_WQ_LS, nameW, ComputeType.ADVANCE, hash, id)); + facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, hash, id)); + facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, hash, id)); + facets.add(new CrossSectionWaterLineFacet(i, nameW)); // XXX: THIS CAN NOT HAPPEN! REMOVE IT! if (wqkms[i] instanceof WQCKms) { final String nameC = nameW.replace("benutzerdefiniert", "benutzerdefiniert [korrigiert]"); - - final Facet c = new FixWaterlevelFacet(i, DISCHARGE_LONGITUDINAL_C, nameC); - - facets.add(c); + facets.add(new FixWaterlevelFacet(i, DISCHARGE_LONGITUDINAL_C, nameC)); } } - if (wqkms.length > 0) { + if (fixRes != null && wqkms.length > 0) { final DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy"); final DateFormat lf = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy'T'HH:mm"); @@ -145,10 +132,6 @@ if (fixRes != null) facets.add(new FixWQCurveFacet(0, Resources.getMsg(meta, I18N_WQ_CURVE, I18N_WQ_CURVE) + " (" + access.getFunction() + ")")); - if (access.getPreprocessing() && fixRes != null) { - facets.add(new FixOutlierFacet(0, FIX_OUTLIER, Resources.getMsg(meta, I18N_WQ_OUTLIER, I18N_WQ_OUTLIER))); - } - return res; } } \ No newline at end of file