Mercurial > dive4elements > river

changeset 7997:9f42d161886b facet-metadata

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add river elevation model to bed diff chart export.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 03 Jul 2014 11:27:41 +0200
parents 2f88a98d9aae
children 92c57cdbd94b
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffFilterFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffPerYearFilterFacet.java
diffstat 4 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffFilterFacet.java	Wed Jul 02 15:54:23 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffFilterFacet.java	Thu Jul 03 11:27:41 2014 +0200
@@ -20,6 +20,7 @@
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.math.MovingAverage;
 import org.dive4elements.river.artifacts.model.ZoomScale;
+import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 
@@ -60,6 +61,9 @@
             double radius = scales.getRadius(river, start, end);
             BedDiffYearResult oldData = data[index];
             double[][] diffs = MovingAverage.weighted(oldData.getDifferencesData(), radius);
+            this.metaData.put(
+                Resources.getMsg(context.getMeta(),
+                    "chart.subtitle.radius", new Object[] { radius }), "");
             return diffs;
         }
         return null;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java	Wed Jul 02 15:54:23 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java	Thu Jul 03 11:27:41 2014 +0200
@@ -20,6 +20,7 @@
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.math.MovingAverage;
 import org.dive4elements.river.artifacts.model.ZoomScale;
+import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 
@@ -60,6 +61,9 @@
             double radius = scales.getRadius(river, start, end);
             BedDiffYearResult oldData = data[index];
             double[][] heights = MovingAverage.weighted(oldData.getHeights1Data(), radius);
+            this.metaData.put(
+                Resources.getMsg(context.getMeta(),
+                    "chart.subtitle.radius", new Object[] { radius }), "");
             return heights;
         }
         return null;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java	Wed Jul 02 15:54:23 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java	Thu Jul 03 11:27:41 2014 +0200
@@ -20,6 +20,7 @@
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.math.MovingAverage;
 import org.dive4elements.river.artifacts.model.ZoomScale;
+import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 
@@ -60,6 +61,9 @@
             double radius = scales.getRadius(river, start, end);
             BedDiffYearResult oldData = data[index];
             double[][] heights = MovingAverage.weighted(oldData.getHeights2Data(), radius);
+            this.metaData.put(
+                Resources.getMsg(context.getMeta(),
+                    "chart.subtitle.radius", new Object[] { radius }), "");
             return heights;
         }
         return null;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffPerYearFilterFacet.java	Wed Jul 02 15:54:23 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffPerYearFilterFacet.java	Thu Jul 03 11:27:41 2014 +0200
@@ -20,6 +20,7 @@
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.math.MovingAverage;
 import org.dive4elements.river.artifacts.model.ZoomScale;
+import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 
@@ -60,6 +61,9 @@
             double radius = scales.getRadius(river, start, end);
             BedDiffYearResult oldData = data[index];
             double[][] diffs = MovingAverage.weighted(oldData.getHeightPerYearData(), radius);
+            this.metaData.put(
+                Resources.getMsg(context.getMeta(),
+                    "chart.subtitle.radius", new Object[] { radius }), "");
             return diffs;
         }
         return null;
http://dive4elements.wald.intevation.org