Mercurial > dive4elements > river
changeset 9630:8da911b5169c
3 Significant also for Q_1, Q_2...
| author | dnt_bjoernsen <d.tironi@bjoernsen.de> |
|---|---|
| date | Mon, 14 Oct 2019 18:07:31 +0200 |
| parents | d1c7ee4a3723 |
| children | 6ecd1a28017f |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/DurationWaterlevel.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/DurationWaterlevel.java Mon Oct 14 17:34:58 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/DurationWaterlevel.java Mon Oct 14 18:07:31 2019 +0200 @@ -12,6 +12,9 @@ import java.io.Serializable; import java.text.NumberFormat; +import org.dive4elements.artifacts.CallContext; +import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType; + /** * @author Domenico Nardi Tironi * @@ -56,6 +59,10 @@ return qFormatter.format(this.q); } + public String getQFormatted3Significant(final CallContext context) { + return SInfoResultType.floodDischarge.exportValue(context, this.q); + } + public String getWFormatted(final NumberFormat wFormatter) { return wFormatter.format(this.w); }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java Mon Oct 14 17:34:58 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java Mon Oct 14 18:07:31 2019 +0200 @@ -163,11 +163,10 @@ final DurationWaterlevel item = waterlevelList.get(i); lines.add(item.getWFormatted(wFormatter)); lines.add(item.getFloodDurDaysPerYearFormatted(durFormatter)); - lines.add(item.getQFormatted(qFormatter)); + lines.add(item.getQFormatted3Significant(exportContextCSV.getContext())); lines.add(item.getBezeichnung()); } - final int lineSize = lines.size(); while (mode == ExportMode.pdf && lines.size() < expectedSizetoGaugelabel) lines.add("");