Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationHistoricalResult.java @ 9361:2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
author | mschaefer |
---|---|
date | Wed, 01 Aug 2018 18:01:11 +0200 |
parents | b3d3c958a594 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationHistoricalResult.java Wed Aug 01 17:13:52 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationHistoricalResult.java Wed Aug 01 18:01:11 2018 +0200 @@ -12,32 +12,24 @@ import java.util.Collection; import org.dive4elements.river.artifacts.common.ExportContextCSV; -import org.dive4elements.river.artifacts.common.IExportContext; import org.dive4elements.river.artifacts.common.ResultRow; -import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; -import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType; /** * @author Domenico Nardi Tironi */ -final class SalixLineCalculationHistoricalResult extends SalixLineCalculationNoScenarioResult { +final class SalixLineCalculationHistoricalResult extends SalixLineCalculationResult { private static final long serialVersionUID = 1L; - public SalixLineCalculationHistoricalResult(final String label, final Collection<ResultRow> rows) { - super(label, rows); + private final String timeString; + + public SalixLineCalculationHistoricalResult(final String label, final String[] scenarioLabels, final String partialRangeString, final String timeString, + final Collection<ResultRow> rows) { + + super(label, scenarioLabels, partialRangeString, "", rows); + this.timeString = timeString; } - @Override - public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { - - final Collection<String> header = super.writeNoScenarioHeader(exportContextCSV); - - header.add(exportContextCSV.formatCsvHeader(UInfoResultType.salixlinehist)); - header.add(exportContextCSV.formatCsvHeader(UInfoResultType.salix_line_scenario_dwspl)); - - exportContextCSV.writeCSVLine(header.toArray(new String[header.size()])); - } @Override protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) { @@ -45,29 +37,20 @@ exportContextCSV.writeBlankLine(); } - @Override - protected String[] formatRow(final IExportContext context, final ResultRow row) { - - final Collection<String> lines = super.getNoScenarioFormat(row, context); - - if (context instanceof ExportContextCSV) { // enum gespart - pdf-export hat ja nur die drei spalten - lines.add(context.formatRowValue(row, UInfoResultType.salixlinehist)); - lines.add(context.formatRowValue(row, UInfoResultType.salix_line_scenario_dwspl)); + private void writeHistoricalViewCSVMetadata(final ExportContextCSV exportContextCSV) { - } - return lines.toArray(new String[lines.size()]); - } + final String main = "uinfo.export.csv.meta.header.salix"; + final String mainSub = "uinfo.export.csv.meta.header.salix.historical"; - private void writeHistoricalViewCSVMetadata(final ExportContextCSV exportContextCSV) { - final String main = "uinfo.export.csv.meta.header.salix.historical"; // "##Historische Betrachtung" - exportContextCSV.writeCSVMetaEntry(main); + exportContextCSV.writeCSVMetaEntry(mainSub); - final String mainSub = "uinfo.export.csv.meta.header.salix"; // "# Teilabschnitt: " - exportContextCSV.writeCSVMetaEntry(mainSub + ".teilabschnitt"); + exportContextCSV.writeCSVMetaEntry(main + ".teilabschnitt", this.getPartialRangeString()); // "# Historischer Zeitpunkt: " - exportContextCSV.writeCSVMetaEntry(main + ".zeitpunkt"); + exportContextCSV.writeCSVMetaEntry(mainSub + ".zeitpunkt", this.timeString); + + exportContextCSV.writeBlankLine(); } } \ No newline at end of file