[PATCH 2 of 2] bundu.bezugswst missing volume calcResult3
Wald Commits
scm-commit at wald.intevation.org
Fri Jul 27 19:25:09 CEST 2018
# HG changeset patch
# User gernotbelger
# Date 1532712297 -7200
# Node ID c64de8cc4e9711d4a5a3e8563a68a4b17785ab66
# Parent 127638669052aecb823ede13ba9af5bfb179bd30
bundu.bezugswst missing volume calcResult3
diff -r 127638669052 -r c64de8cc4e97 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Fri Jul 27 18:49:55 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Fri Jul 27 19:24:57 2018 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-07-27T18:45:12 -->
+<!-- 2018-07-27T19:05:38 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="762" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
diff -r 127638669052 -r c64de8cc4e97 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml Fri Jul 27 19:24:57 2018 +0200
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
+<!-- 2018-07-27T19:12:41 -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20">
+ <property name="ireport.zoom" value="1.0"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto">
+ <paragraph lineSpacing="Single"/>
+ </style>
+ <field name="meta:totalpages" class="java.lang.Integer"/>
+ <field name="meta:startpageoffset" class="java.lang.Integer"/>
+ <field name="meta:header" class="java.lang.String"/>
+ <field name="meta:calcMode" class="java.lang.String"/>
+ <field name="meta:version_label" class="java.lang.String"/>
+ <field name="meta:version" class="java.lang.String"/>
+ <field name="meta:user_label" class="java.lang.String"/>
+ <field name="meta:user" class="java.lang.String"/>
+ <field name="meta:date_label" class="java.lang.String"/>
+ <field name="meta:date" class="java.lang.String"/>
+ <field name="meta:river_label" class="java.lang.String"/>
+ <field name="meta:river" class="java.lang.String"/>
+ <field name="meta:range_label" class="java.lang.String"/>
+ <field name="meta:range" class="java.lang.String"/>
+ <field name="meta:calculation_label" class="java.lang.String"/>
+ <field name="meta:calculation_name" class="java.lang.String"/>
+ <field name="meta:station_header" class="java.lang.String"/>
+ <field name="meta:flowdepthdevelopment_header" class="java.lang.String"/>
+ <field name="meta:flowdepthdevelopmentperyear_header" class="java.lang.String"/>
+ <field name="meta:waterleveldifference_header" class="java.lang.String"/>
+ <field name="meta:waterleveldifference_header2" class="java.lang.String"/>
+ <field name="meta:waterleveldifference_header_label" class="java.lang.String"/>
+ <field name="meta:bedheightdifference_header" class="java.lang.String"/>
+ <field name="meta:bedheightdifference_header2" class="java.lang.String"/>
+ <field name="meta:bedheightdifference_header_label" class="java.lang.String"/>
+ <field name="meta:flowdepthcurrent_header" class="java.lang.String"/>
+ <field name="meta:flowdepthcurrent_header2" class="java.lang.String"/>
+ <field name="meta:flowdepthhistorical_header" class="java.lang.String"/>
+ <field name="meta:flowdepthhistorical_header2" class="java.lang.String"/>
+ <field name="meta:flowdepthcurrent_header_label" class="java.lang.String"/>
+ <field name="meta:flowdepthhistorical_header_label" class="java.lang.String"/>
+ <field name="meta:flowdepth_header" class="java.lang.String"/>
+ <field name="meta:flowdepthdevelopment" class="java.lang.String"/>
+ <field name="meta:flowdepthmin_header" class="java.lang.String"/>
+ <field name="meta:flowdepthmax_header" class="java.lang.String"/>
+ <field name="meta:flowdepthdevelopment_header_label" class="java.lang.String"/>
+ <field name="meta:flowdepth_tkh_header" class="java.lang.String"/>
+ <field name="meta:tkh_header" class="java.lang.String"/>
+ <field name="meta:tkhkind_header" class="java.lang.String"/>
+ <field name="meta:waterlevel_header" class="java.lang.String"/>
+ <field name="meta:discharge_header" class="java.lang.String"/>
+ <field name="meta:waterlevel_name_header" class="java.lang.String"/>
+ <field name="meta:gauge_header" class="java.lang.String"/>
+ <field name="meta:bedheight_header" class="java.lang.String"/>
+ <field name="meta:sounding_name_header" class="java.lang.String"/>
+ <field name="meta:location_header" class="java.lang.String"/>
+ <field name="meta:river_unit" class="java.lang.String"/>
+ <field name="meta:riverside_header" class="java.lang.String"/>
+ <field name="meta:inundationduration_header" class="java.lang.String"/>
+ <field name="meta:inundationduration_q_header" class="java.lang.String"/>
+ <field name="meta:infrastructure_height_header" class="java.lang.String"/>
+ <field name="meta:infrastructure_type_header" class="java.lang.String"/>
+ <field name="meta:w_1_header" class="java.lang.String"/>
+ <field name="meta:q_1_header" class="java.lang.String"/>
+ <field name="meta:bezeichnung_1_header" class="java.lang.String"/>
+ <field name="meta:duration_1_header" class="java.lang.String"/>
+ <field name="meta:w_2_header" class="java.lang.String"/>
+ <field name="meta:q_2_header" class="java.lang.String"/>
+ <field name="meta:bezeichnung_2_header" class="java.lang.String"/>
+ <field name="meta:duration_2_header" class="java.lang.String"/>
+ <field name="meta:w_3_header" class="java.lang.String"/>
+ <field name="meta:q_3_header" class="java.lang.String"/>
+ <field name="meta:bezeichnung_3_header" class="java.lang.String"/>
+ <field name="meta:duration_3_header" class="java.lang.String"/>
+ <field name="meta:bezugswst_result_header" class="java.lang.String"/>
+ <field name="meta:bezugswst_header" class="java.lang.String"/>
+ <field name="meta:sounding_header" class="java.lang.String"/>
+ <field name="meta:channel_lower_edge_header" class="java.lang.String"/>
+ <field name="meta:channel_min_depth_header" class="java.lang.String"/>
+ <field name="meta:channel_miss_depth_header" class="java.lang.String"/>
+ <field name="meta:channel_miss_volume_header" class="java.lang.String"/>
+ <field name="meta:channel_miss_mass_header" class="java.lang.String"/>
+ <field name="meta:excavation_volume_header" class="java.lang.String"/>
+ <field name="meta:excavation_costs_header" class="java.lang.String"/>
+ <field name="meta:channel_width_header" class="java.lang.String"/>
+ <field name="meta:density_header" class="java.lang.String"/>
+ <field name="meta:mean_bedheight_header" class="java.lang.String"/>
+ <field name="meta:field_header1" class="java.lang.String"/>
+ <field name="meta:field_header2" class="java.lang.String"/>
+ <field name="meta:field_header3" class="java.lang.String"/>
+ <field name="meta:field_header4" class="java.lang.String"/>
+ <field name="meta:field_header5" class="java.lang.String"/>
+ <field name="meta:field_header6" class="java.lang.String"/>
+ <field name="meta:field_header7" class="java.lang.String"/>
+ <field name="meta:field_header8" class="java.lang.String"/>
+ <field name="meta:field_header9" class="java.lang.String"/>
+ <field name="meta:field_header10" class="java.lang.String"/>
+ <field name="data:0" class="java.lang.String"/>
+ <field name="data:1" class="java.lang.String"/>
+ <field name="data:2" class="java.lang.String"/>
+ <field name="data:3" class="java.lang.String"/>
+ <field name="data:4" class="java.lang.String"/>
+ <field name="data:5" class="java.lang.String"/>
+ <field name="data:6" class="java.lang.String"/>
+ <field name="data:7" class="java.lang.String"/>
+ <field name="data:8" class="java.lang.String"/>
+ <field name="data:9" class="java.lang.String"/>
+ <field name="data:10" class="java.lang.String"/>
+ <field name="data:11" class="java.lang.String"/>
+ <field name="data:12" class="java.lang.String"/>
+ <field name="data:13" class="java.lang.String"/>
+ <field name="data:14" class="java.lang.String"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <title>
+ <band height="30" splitType="Stretch">
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="0" width="515" height="30"/>
+ <textElement>
+ <font size="18"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{meta:bezugswst_result_header}]]></textFieldExpression>
+ </textField>
+ </band>
+ </title>
+ <columnHeader>
+ <band height="25" splitType="Stretch">
+ <line>
+ <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="550" height="1"/>
+ </line>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="150" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:channel_miss_volume_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="230" y="0" width="150" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:channel_miss_mass_header}]]></textFieldExpression>
+ </textField>
+ </band>
+ </columnHeader>
+ <detail>
+ <band height="15" splitType="Prevent">
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="15"/>
+ <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
+ <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="150" height="15"/>
+ <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
+ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="230" y="0" width="150" height="15"/>
+ <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
+ <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
+ </textField>
+ </band>
+ </detail>
+ <pageFooter>
+ <band height="15" splitType="Stretch">
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" x="437" y="0" width="55" height="15"/>
+ <box topPadding="2" rightPadding="3"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$V{PAGE_NUMBER} +(($F{meta:startpageoffset} != null) ? $F{meta:startpageoffset} : 0 )]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" evaluationTime="Report">
+ <reportElement style="htmlStyle" x="493" y="0" width="57" height="15"/>
+ <box topPadding="2" leftPadding="0" bottomPadding="0" rightPadding="0"/>
+ <textFieldExpression><![CDATA["/ " + ( $V{PAGE_NUMBER}+( ($F{meta:totalpages} != null) ? $F{meta:totalpages} -$V{PAGE_NUMBER} : 0 ) )]]></textFieldExpression>
+ </textField>
+ </band>
+ </pageFooter>
+ <summary>
+ <band height="30" splitType="Stretch"/>
+ </summary>
+</jasperReport>
diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Fri Jul 27 18:49:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Fri Jul 27 19:24:57 2018 +0200
@@ -233,4 +233,16 @@
}
};
+ public static final BunduResultType stationForMiss = new BunduResultType(I18NStrings.UNIT_KM, I18NStrings.CSV_KM_HEADER) {
+ @Override
+ public String exportValue(final CallContext context, final Object value) {
+ return exportStringValue(value); // leider doof...
+ }
+
+ @Override
+ protected NumberFormat createFormatter(final CallContext context) {
+ throw new UnsupportedOperationException();
+ }
+ };
+
}
\ No newline at end of file
diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Jul 27 18:49:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Jul 27 19:24:57 2018 +0200
@@ -129,6 +129,20 @@
Resources.getMsg(m, "bundu.export.csv.title.bezugswst.result2"), listResult2);
results.addResult(r2, null);
+ // Third RESULT
+ final List<ResultRow> listResult3 = new ArrayList<>();
+ final ResultRow rowResult3 = ResultRow.create();
+
+ rowResult3.putValue(BunduResultType.stationForMiss, "650 - 651");
+ rowResult3.putValue(BunduResultType.missVolume, 52950);
+ rowResult3.putValue(BunduResultType.missMass, 91491);
+
+ listResult3.add(rowResult3);
+
+ final BezugswstMissVolCalculationResult3 r3 = new BezugswstMissVolCalculationResult3(
+ Resources.getMsg(m, "bundu.export.csv.title.bezugswst.result3"), listResult3);
+ results.addResult(r3, null);
+
}
return new CalculationResult(results, null);// problems);
diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java Fri Jul 27 18:49:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java Fri Jul 27 19:24:57 2018 +0200
@@ -27,7 +27,7 @@
*
* @author Gernot Belger
*/
-final class BezugswstMissVolCalculationResult1 extends AbstractCalculationExportableResult {
+final class BezugswstMissVolCalculationResult1 extends AbstractCalculationExportableResult implements BunduWstExporter.MissResultType {
private static final long serialVersionUID = 1L;
diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Fri Jul 27 18:49:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Fri Jul 27 19:24:57 2018 +0200
@@ -28,7 +28,7 @@
*
* @author Gernot Belger
*/
-final class BezugswstMissVolCalculationResult2 extends AbstractCalculationExportableResult {
+final class BezugswstMissVolCalculationResult2 extends AbstractCalculationExportableResult implements BunduWstExporter.MissResultType {
private static final long serialVersionUID = 1L;
@@ -69,7 +69,7 @@
@Override
public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) {
- final int colSize = 15;
+ final int colSize = fieldSize + 2;
exportContextCSV.writeTitleForTabs("bundu.export.csv.title.bezugswst.result2", colSize); // Voraussetzung für Tabs ist, dass der Titel vor den Headern
final Collection<String> header = new ArrayList<>(colSize);
diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Fri Jul 27 19:24:57 2018 +0200
@@ -0,0 +1,96 @@
+/* Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
+ * Software engineering by
+ * Björnsen Beratende Ingenieure GmbH
+ * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+package org.dive4elements.river.artifacts.bundu.bezugswst;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.dive4elements.river.artifacts.bundu.BunduResultType;
+import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
+import org.dive4elements.river.artifacts.common.AbstractExportContext;
+import org.dive4elements.river.artifacts.common.ExportContextCSV;
+import org.dive4elements.river.artifacts.common.ExportContextPDF;
+import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
+import org.dive4elements.river.artifacts.common.ResultRow;
+import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
+
+/**
+ * Contains the results of a //TODO LINK{@link BezugswstCalculation}.
+ *
+ * @author Gernot Belger
+ */
+final class BezugswstMissVolCalculationResult3 extends AbstractCalculationExportableResult implements BunduWstExporter.MissResultType {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String JASPER_FILE = "/jasper/templates/bundu.bezugswst.result3.jrxml";
+
+ public BezugswstMissVolCalculationResult3(final String label, final Collection<ResultRow> rows) {
+ super(label, rows);
+
+ }
+
+ @Override
+ protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
+ // no metadata
+ }
+
+ @Override
+ protected String getJasperFile() {
+ return JASPER_FILE;
+ }
+
+ protected String[] formatRow(final AbstractExportContext exportContext, final ResultRow row) {
+
+ final Collection<String> lines = new ArrayList<>(20);
+
+ lines.add(exportContext.formatRowValue(row, BunduResultType.stationForMiss));
+ lines.add(exportContext.formatRowValue(row, BunduResultType.missVolume));
+ lines.add(exportContext.formatRowValue(row, BunduResultType.missMass));
+ return lines.toArray(new String[lines.size()]);
+ }
+
+ @Override
+ public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) {
+
+ final int colSize = 3;
+ exportContextCSV.writeTitleForTabs("bundu.export.csv.title.bezugswst.result3", colSize); // Voraussetzung für Tabs ist, dass der Titel vor den Headern
+ final Collection<String> header = new ArrayList<>(colSize);
+
+ header.add(exportContextCSV.formatCsvHeader(BunduResultType.stationForMiss));
+ header.add(exportContextCSV.formatCsvHeader(BunduResultType.missVolume));
+ header.add(exportContextCSV.formatCsvHeader(BunduResultType.missMass));
+
+ exportContextCSV.writeCSVLine(header.toArray(new String[header.size()]));
+
+ }
+
+ @Override
+ protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) {
+
+ return this.formatRow(exportContextCSV, row);
+ }
+
+ @Override
+ protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) {
+
+ return this.formatRow(exportContextPDF, row);
+ }
+
+ @Override
+ protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) {
+ /* column headings */
+
+ exportContextPDF.addJRMetadata(source, "station_header", BunduResultType.stationForMiss);
+ exportContextPDF.addJRMetadata(source, "channel_miss_volume_header", BunduResultType.missVolume);
+ exportContextPDF.addJRMetadata(source, "channel_miss_mass_header", BunduResultType.missMass);
+
+ }
+}
\ No newline at end of file
diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java Fri Jul 27 18:49:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java Fri Jul 27 19:24:57 2018 +0200
@@ -24,6 +24,10 @@
*/
public class BunduWstExporter extends AbstractCommonExporter<AbstractCalculationExportableResult, BezugswstCalculationResults> {
+ public interface MissResultType {
+ // missuse for casting
+ }
+
/** The log used in this exporter. */
private static Logger log = Logger.getLogger(BunduWstExporter.class);
@@ -40,10 +44,7 @@
@Override
protected void configureDesign(final AbstractCalculationExportableResult result, final JasperDesigner design) {
- if (result instanceof BezugswstMissVolCalculationResult1 || result instanceof BezugswstMissVolCalculationResult2)// || result intanceof
- // BezugswstMiss...2,3 TODO
-
- {
+ if (result instanceof MissResultType) {
design.getSource().addMetaData("bezugswst_result_header", result.getLabel()); // globalMeta? wrong place. only one result expected, so it works
}
}
More information about the Dive4Elements-commits
mailing list