diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationMainValuesQFacet.java @ 9259:66b003701546

Added infrastructure height and Q annotation to S-Info flood duration curve chart
author mschaefer
date Mon, 16 Jul 2018 08:43:07 +0200
parents ef7b65576d4b
children 83ebeb620b5a
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationMainValuesQFacet.java	Mon Jul 16 08:41:51 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationMainValuesQFacet.java	Mon Jul 16 08:43:07 2018 +0200
@@ -16,6 +16,7 @@
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.model.WQDay;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
+import org.dive4elements.river.jfree.RiverAnnotation;
 import org.dive4elements.river.jfree.StickyAxisAnnotation;
 
 
@@ -30,8 +31,8 @@
     /** Trivial Constructor. */
     public FloodDurationMainValuesQFacet(final String name, final String description) {
         this.description = description;
-        this.name        = name;
-        this.index       = 0;
+        this.name = name;
+        this.index = 1;
     }
 
     /**
@@ -39,17 +40,14 @@
      * curve in WQDay (if hit).
      * Employ linear interpolation.
      */
-    protected static void setHitPoint(final WQDay wqday, final StickyAxisAnnotation annotation) {
+    public static void setHitPoint(final WQDay wqday, final StickyAxisAnnotation annotation) {
 
         final float q = annotation.getPos();
         final Double day = wqday.interpolateDayByQ(q);
-
-        if (day != null) {
+        if (day != null)
             annotation.setHitPoint(day.floatValue());
-        }
-        else if (log.isDebugEnabled()) {
+        else
             log.debug("StickyAnnotation does not hit wqday curve: " + q);
-        }
     }
 
 
@@ -73,7 +71,7 @@
 
         final FloodDurationCalculationResults data = (FloodDurationCalculationResults) res.getData();
 
-        return data.getMainValueQAnnotation();
+        return new RiverAnnotation(this.description, data.getMainValueQAnnotations());
     }
 
 

http://dive4elements.wald.intevation.org