Mercurial > dive4elements > river
changeset 9531:267ac3012150
Salix line: reference gauge column removed
| author | mschaefer |
|---|---|
| date | Tue, 02 Oct 2018 18:08:02 +0200 |
| parents | 144a184a414d |
| children | 8e6b9cb9486a |
| files | artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationResult.java |
| diffstat | 2 files changed, 0 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml Tue Oct 02 18:07:22 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml Tue Oct 02 18:08:02 2018 +0200 @@ -46,7 +46,6 @@ <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"/> @@ -140,12 +139,6 @@ <line> <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="550" height="1"/> </line> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="0" width="230" height="24"/> - <box padding="5"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:gauge_header}]]></textFieldExpression> - </textField> </band> </columnHeader> <detail> @@ -183,17 +176,6 @@ <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="0" width="230" 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="Left"/> - <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> - </textField> </band> </detail> <pageFooter>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationResult.java Tue Oct 02 18:07:22 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationResult.java Tue Oct 02 18:08:02 2018 +0200 @@ -89,7 +89,6 @@ header.add(exportContextCSV.msg(SalixScenario.getDeltaWHeader())); header.add(exportContextCSV.msg(SalixScenario.getScenarioValueHeader())); } - header.add(exportContextCSV.formatCsvHeader(GeneralResultType.gaugeLabel)); exportContextCSV.writeCSVLine(header.toArray(new String[header.size()])); } @@ -119,7 +118,6 @@ for (int i = 1; i <= this.getScenarioCount(); i++) { // TODO Spaltenueberschriften der Scenarios (falls gefordert) } - exportContextPDF.addJRMetadata(source, "gauge_header", GeneralResultType.gaugeLabel); } private String[] formatRow(final IExportContext context, final ResultRow row) { @@ -145,7 +143,6 @@ } } } - lines.add(context.formatRowValue(row, GeneralResultType.gaugeLabel)); return lines.toArray(new String[lines.size()]); }