dive4elements/river: artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java comparison

comparison artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.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	13bbc75ed0bc
children	9b8e8fc1f408

comparison

equal deleted inserted replaced

-:df6f1b5806f6
+:ddcd52d239cd
 import org.dive4elements.river.artifacts.model.QWDDateRange;
 import org.dive4elements.river.artifacts.model.WQKms;
 import org.dive4elements.river.artifacts.model.fixings.FixFunction;
 import org.dive4elements.river.artifacts.model.fixings.FixWQCurveFacet;
 import org.dive4elements.river.artifacts.model.fixings.QWD;
-import org.dive4elements.river.artifacts.model.fixings.QWI;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
 import org.dive4elements.river.exports.fixings.FixWQCurveGenerator;
 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation;
 public class FixWQProcessor
 extends DefaultProcessor
 implements FacetTypes
 {
 private static Logger log = Logger.getLogger(FixWQProcessor.class);
 private String I18N_AXIS_LABEL = "chart.discharge.curve.yaxis.label";
 public FixWQProcessor() {
 }
 @Override
 doEventsOut(generator, bundle, theme, visible);
 }
 else if(FIX_WQ_CURVE.equals(facetType)) {
 doWQCurveOut(generator, bundle, theme, visible);
 }
-else if(FIX_OUTLIER.equals(facetType)) {
-doOutlierOut(generator, bundle, theme, visible);
-}
 else if(QSECTOR.equals(facetType)) {
 doQSectorOut(generator, bundle, theme, visible);
 }
 else if(STATIC_WKMS_MARKS.equals(facetType) ||
 STATIC_WKMS.equals(facetType) ||
 }
 }
 /** Add sector average points to chart. */
-protected void doSectorAverageOut(
+private void doSectorAverageOut(
 DiagramGenerator generator,
 ArtifactAndFacet bundle,
 ThemeDocument theme,
 boolean visible
 ) {
 }
 }
 /** Add analysis event points to chart. */
-protected void doEventsOut(
+private void doEventsOut(
 DiagramGenerator generator,
 ArtifactAndFacet bundle,
 ThemeDocument    theme,
 boolean          visible
 ) {
 return;
 }
 // prevent potential side effects
 final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd);
-final XYSeries series = FixWQCurveGenerator.createQWDSeries(bundle, themeInterpolated, qwd);
+final XYSeries series = FixWQCurveGenerator.createQWDSeries(generator.getContext().getMeta(), bundle, themeInterpolated, qwd);
 generator.addAxisSeries(series, axisName, visible);
 if (visible && themeInterpolated.parseShowPointLabel()) {
 flysAnno.setTextAnnotations(textAnnos);
 generator.addAnnotations(flysAnno);
 }
 }
-/** Add reference event points to chart. */
+private void doWQCurveOut(
-protected void doReferenceEventsOut(
-DiagramGenerator generator,
-ArtifactAndFacet bundle,
-ThemeDocument theme,
-boolean visible) {
-log.debug("doReferenceEventsOut");
-QWI qwd = (QWI)bundle.getData(generator.getContext());
-if (qwd == null) {
-log.debug("doReferenceEventsOut: qwds == null in "
-+ bundle.getFacetDescription());
-return;
-}
-final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd);
-final XYSeries series = FixWQCurveGenerator.createQWDSeries(bundle, themeInterpolated, qwd);
-series.add(qwd.getQ(), qwd.getW(), false);
-if (visible && themeInterpolated.parseShowPointLabel()) {
-DateFormat dateFormat = DateFormat.getDateInstance(
-DateFormat.SHORT);
-XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
-dateFormat.format(qwd.getDate()),
-qwd.getQ(),
-qwd.getW());
-List<XYTextAnnotation> textAnnos = new ArrayList<>();
-textAnnos.add(anno);
-RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, themeInterpolated);
-flysAnno.setTextAnnotations(textAnnos);
-generator.addAnnotations(flysAnno);
-}
-generator.addAxisSeries(series, axisName, visible);
-}
-protected void doWQCurveOut(
 DiagramGenerator generator,
 ArtifactAndFacet bundle,
 ThemeDocument theme,
 boolean visible
 ) {
 generator.addAxisSeries(series, axisName, visible);
 }
 else {
 log.warn("doWQCurveOut: maxQ <= 0");
-}
-}
-protected void doOutlierOut(
-DiagramGenerator generator,
-ArtifactAndFacet bundle,
-ThemeDocument theme,
-boolean visible
-) {
-log.debug("doOutlierOut");
-QWI[] qws = (QWI[])bundle.getData(generator.getContext());
-if(qws != null) {
-XYSeries series = new StyledXYSeries(
-bundle.getFacetDescription(),
-false, true,
-theme);
-DateFormat dateFormat = DateFormat.getDateInstance(
-DateFormat.SHORT);
-List<XYTextAnnotation> annos = new ArrayList<>();
-for (QWI qw: qws) {
-series.add(qw.getQ(), qw.getW(), false);
-XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
-dateFormat.format(qw.getDate()),
-qw.getQ(),
-qw.getW());
-annos.add(anno);
-}
-generator.addAxisSeries(series, axisName, visible);
-if (visible && theme != null && theme.parseShowPointLabel()) {
-RiverAnnotation flysAnno =
-new RiverAnnotation(null, null, null, theme);
-flysAnno.setTextAnnotations(annos);
-generator.addAnnotations(flysAnno);
-}
-}
-else {
-log.debug("doOutlierOut: qwd == null");
 }
 }
 /** Add markers for q sectors. */
 protected void doQSectorOut(
 return facettype.startsWith(FIX_SECTOR_AVERAGE_WQ)
 || FIX_ANALYSIS_EVENTS_WQ.equals(facettype)
 || FIX_REFERENCE_EVENTS_WQ.equals(facettype)
 || FIX_EVENTS.equals(facettype)
 || FIX_WQ_CURVE.equals(facettype)
-|| FIX_OUTLIER.equals(facettype)
 || QSECTOR.equals(facettype)
 || STATIC_WKMS_MARKS.equals(facettype)
 || STATIC_WKMS.equals(facettype)
 || HEIGHTMARKS_POINTS.equals(facettype)
 || LONGITUDINAL_W.equals(facettype)

Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java @ 9360:ddcd52d239cd