Mercurial > dive4elements > river

changeset 3120:e52a3b62fc20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed broken naming of curves in SQ relation charts. flys-artifacts/trunk@4721 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 20 Jun 2012 11:24:30 +0000
parents 238803b2cb8b
children 0b86b005bb9a
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties
diffstat 6 files changed, 27 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Wed Jun 20 11:04:24 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Jun 20 11:24:30 2012 +0000
@@ -1,3 +1,14 @@
+2012-06-20  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java:
+	  Fixed broken naming of chart curves.
+
+	* src/main/resources/messages.properties,
+	  src/main/resources/messages_de_DE.properties,
+	  src/main/resources/messages_en.properties,
+	  src/main/resources/messages_de.properties: Renamed facets for SQ
+	  relation chart curves.
+
 2012-06-20  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/SQRelation.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java	Wed Jun 20 11:04:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java	Wed Jun 20 11:24:30 2012 +0000
@@ -131,7 +131,8 @@
         Document         attr,
         boolean          visible
     ) {
-        logger.debug("doSQCurveOut");
+        String desc = artifactAndFacet.getFacetDescription();
+        logger.debug("doSQCurveOut: " + desc);
 
         Facet      f    = artifactAndFacet.getFacet();
         SQFunction func = (SQFunction) artifactAndFacet.getData(context);
@@ -139,13 +140,13 @@
         XYSeries series = JFreeUtil.sampleFunction2D(
             func.getFunction(),
             attr,
-            f.getDescription(),
+            desc,
             10,
             func.getMinQ(),
             func.getMaxQ());
 
         if (logger.isDebugEnabled()) {
-            logger.debug("Series '" + f.getDescription() + "' has "
+            logger.debug("Series '" + desc + "' has "
                 + series.getItemCount() + " items.");
 
             logger.debug("   -> min x = " + series.getMinX());
@@ -163,18 +164,19 @@
         Document         attr,
         boolean          visible
     ) {
-        logger.debug("doSQOut: " + artifactAndFacet.getFacetDescription());
+        String desc = artifactAndFacet.getFacetDescription();
+        logger.debug("doSQOut: " + desc);
 
         Facet    f      = artifactAndFacet.getFacet();
         SQ[]     sqs    = (SQ[]) artifactAndFacet.getData(context);
-        XYSeries series = new StyledXYSeries(f.getDescription(), attr);
+        XYSeries series = new StyledXYSeries(desc, attr);
 
         for (SQ sq: sqs) {
             series.add(sq.getQ(), sq.getS());
         }
 
         if (logger.isDebugEnabled()) {
-            logger.debug("Series '" + f.getDescription() + "' has "
+            logger.debug("Series '" + desc + "' has "
                 + series.getItemCount() + " items.");
 
             logger.debug("   -> min x = " + series.getMinX());
--- a/flys-artifacts/src/main/resources/messages.properties	Wed Jun 20 11:04:24 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages.properties	Wed Jun 20 11:24:30 2012 +0000
@@ -147,8 +147,8 @@
 chart.sq_relation_d.title = Fein- und Mittelkies
 chart.sq_relation_e.title = Grobkornanteil (> Mittelkies)
 chart.sq_relation_f.title = Geschiebetransport gesamt
-facet.sq_relation.curve = Sedimenttransport
-facet.sq_relation.measurements = Messwerte
+facet.sq_relation.curve = Potenziell (Geschiebedaten)
+facet.sq_relation.measurements = Geschiebedaten
 facet.sq_relation.outliers = Ausrei\u00dfer Durchgang {0}
 
 facet.longitudinal_section.annotations = POIs
--- a/flys-artifacts/src/main/resources/messages_de.properties	Wed Jun 20 11:04:24 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Wed Jun 20 11:24:30 2012 +0000
@@ -146,8 +146,8 @@
 chart.sq_relation_d.title = Fein- und Mittelkies
 chart.sq_relation_e.title = Grobkornanteil (> Mittelkies)
 chart.sq_relation_f.title = Geschiebetransport gesamt
-facet.sq_relation.curve = Sedimenttransport
-facet.sq_relation.measurements = Messwerte
+facet.sq_relation.curve = Potenziell (Geschiebedaten)
+facet.sq_relation.measurements = Geschiebedaten
 facet.sq_relation.outliers = Ausrei\u00dfer Durchgang {0}
 
 facet.longitudinal_section.annotations = Streckenfavoriten
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Wed Jun 20 11:04:24 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Wed Jun 20 11:24:30 2012 +0000
@@ -144,8 +144,8 @@
 chart.sq_relation_d.title = Fein- und Mittelkies
 chart.sq_relation_e.title = Grobkornanteil (> Mittelkies)
 chart.sq_relation_f.title = Geschiebetransport gesamt
-facet.sq_relation.curve = Sedimenttransport
-facet.sq_relation.measurements = Messwerte
+facet.sq_relation.curve = Potenziell (Geschiebedaten)
+facet.sq_relation.measurements = Geschiebedaten
 facet.sq_relation.outliers = Ausrei\u00dfer Durchgang {0}
 
 facet.longitudinal_section.annotations = Streckenfavoriten
--- a/flys-artifacts/src/main/resources/messages_en.properties	Wed Jun 20 11:04:24 2012 +0000
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Wed Jun 20 11:24:30 2012 +0000
@@ -146,8 +146,8 @@
 chart.sq_relation_d.title = Fein- und Mittelkies
 chart.sq_relation_e.title = Grobkornanteil (> Mittelkies)
 chart.sq_relation_f.title = Geschiebetransport gesamt
-facet.sq_relation.curve = Sedimenttransport
-facet.sq_relation.measurements = Messwerte
+facet.sq_relation.curve = Potenziell (Geschiebedaten)
+facet.sq_relation.measurements = Geschiebedaten
 facet.sq_relation.outliers = Ausrei\u00dfer Durchgang {0}
 
 facet.longitudinal_section.annotations = POIs
http://dive4elements.wald.intevation.org