# HG changeset patch # User Ingo Weinzierl # Date 1340191470 0 # Node ID e52a3b62fc20d36db969ea9c63c75ffb12f2932e # Parent 238803b2cb8be6e1f7782db349e04124497879fd Fixed broken naming of curves in SQ relation charts. flys-artifacts/trunk@4721 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 238803b2cb8b -r e52a3b62fc20 flys-artifacts/ChangeLog --- 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 + + * 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 * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: diff -r 238803b2cb8b -r e52a3b62fc20 flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.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()); diff -r 238803b2cb8b -r e52a3b62fc20 flys-artifacts/src/main/resources/messages.properties --- 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 diff -r 238803b2cb8b -r e52a3b62fc20 flys-artifacts/src/main/resources/messages_de.properties --- 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 diff -r 238803b2cb8b -r e52a3b62fc20 flys-artifacts/src/main/resources/messages_de_DE.properties --- 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 diff -r 238803b2cb8b -r e52a3b62fc20 flys-artifacts/src/main/resources/messages_en.properties --- 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