Mercurial > dive4elements > river

changeset 9110:928cc44711db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nachtrag
author gernotbelger
date Fri, 01 Jun 2018 17:42:20 +0200
parents 59cf6e6a452d
children ee77e544e890
files artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml artifacts/pom.xml artifacts/src/main/resources/simply_glamorous.jar
diffstat 6 files changed, 50 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml	Fri Jun 01 16:06:12 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml	Fri Jun 01 17:42:20 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-06-01T13:49:16 -->
+<!-- 2018-06-01T17:12:29 -->
 <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" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
@@ -49,54 +49,54 @@
 	<title>
 		<band height="170" splitType="Stretch">
 			<textField>
-				<reportElement x="0" y="1" width="515" height="30"/>
+				<reportElement style="htmlStyle" x="0" y="1" width="515" height="30"/>
 				<textElement>
 					<font size="18"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{meta:header} + " " + $F{meta:river}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="40" width="165" height="20"/>
+				<reportElement style="htmlStyle" x="0" y="40" width="165" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:calcMode}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="70" width="123" height="20"/>
+				<reportElement style="htmlStyle" x="0" y="70" width="123" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:version_label} + ":"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="123" y="70" width="392" height="20"/>
+				<reportElement style="htmlStyle" x="123" y="70" width="392" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:version}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="90" width="123" height="20"/>
+				<reportElement style="htmlStyle" x="0" y="90" width="123" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:user_label} + ":"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="123" y="90" width="392" height="20"/>
+				<reportElement style="htmlStyle" x="123" y="90" width="392" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:user}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="110" width="123" height="20"/>
+				<reportElement style="htmlStyle" x="0" y="110" width="123" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:date_label} + ":"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="123" y="110" width="392" height="20"/>
+				<reportElement style="htmlStyle" x="123" y="110" width="392" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:date}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="130" width="123" height="20"/>
+				<reportElement style="htmlStyle" x="0" y="130" width="123" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:river_label} + ":"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="123" y="130" width="392" height="20"/>
+				<reportElement style="htmlStyle" x="123" y="130" width="392" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:river}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="150" width="123" height="20"/>
+				<reportElement style="htmlStyle" x="0" y="150" width="123" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:range_label} + ":"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="123" y="150" width="392" height="20"/>
+				<reportElement style="htmlStyle" x="123" y="150" width="392" height="20"/>
 				<textFieldExpression><![CDATA[$F{meta:range}]]></textFieldExpression>
 			</textField>
 		</band>
@@ -107,9 +107,11 @@
 				<reportElement positionType="FixRelativeToBottom" x="0" y="24" width="762" height="1"/>
 			</line>
 			<textField isStretchWithOverflow="true">
-				<reportElement key="0" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="24"/>
+				<reportElement key="0" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="-5" y="0" width="55" height="24"/>
 				<box padding="5"/>
-				<textElement textAlignment="Right" verticalAlignment="Bottom"/>
+				<textElement textAlignment="Right" verticalAlignment="Bottom">
+					<font fontName="Simply*Glamorous"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
@@ -179,67 +181,69 @@
 	<detail>
 		<band height="20" splitType="Prevent">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="0" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="20"/>
+				<reportElement key="0" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
-				<textElement textAlignment="Right" verticalAlignment="Top"/>
+				<textElement textAlignment="Right" verticalAlignment="Top">
+					<font isBold="false"/>
+				</textElement>
 				<textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="1" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="55" height="20"/>
+				<reportElement key="1" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="55" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="flowdepthtkh" positionType="Float" stretchType="RelativeToBandHeight" x="105" y="0" width="54" height="20"/>
+				<reportElement key="flowdepthtkh" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="105" y="0" width="54" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="tkh" positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="36" height="20"/>
+				<reportElement key="tkh" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="36" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="4" positionType="Float" stretchType="RelativeToBandHeight" x="195" y="0" width="60" height="20"/>
+				<reportElement key="4" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="195" y="0" width="60" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="5" positionType="Float" stretchType="RelativeToBandHeight" x="255" y="0" width="40" height="20"/>
+				<reportElement key="5" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="255" y="0" width="40" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="6" positionType="Float" stretchType="RelativeToBandHeight" x="295" y="0" width="80" height="20"/>
+				<reportElement key="6" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="295" y="0" width="80" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="7" positionType="Float" stretchType="RelativeToBandHeight" x="375" y="0" width="110" height="20"/>
+				<reportElement key="7" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="375" y="0" width="110" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="8" positionType="Float" stretchType="RelativeToBandHeight" x="485" y="0" width="60" height="20"/>
+				<reportElement key="8" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="485" y="0" width="60" height="20"/>
 				<box topPadding="5" leftPadding="5" rightPadding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="9" positionType="Float" stretchType="RelativeToBandHeight" x="545" y="0" width="95" height="20"/>
+				<reportElement key="9" style="htmlStyle" positionType="Float" x="545" y="0" width="95" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="10" positionType="Float" stretchType="RelativeToBandHeight" x="640" y="0" width="122" height="20"/>
+				<reportElement key="10" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="640" y="0" width="122" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA[$F{data:10}]]></textFieldExpression>
@@ -249,11 +253,11 @@
 	<pageFooter>
 		<band height="29" splitType="Stretch">
 			<textField evaluationTime="Report">
-				<reportElement x="705" y="9" width="57" height="20"/>
+				<reportElement style="htmlStyle" x="705" y="9" width="57" height="20"/>
 				<textFieldExpression><![CDATA[" / " +( $V{PAGE_NUMBER} +(($F{meta:totalpagesoffset} != null) ? $F{meta:totalpagesoffset} : 0) )]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="650" y="9" width="55" height="20"/>
+				<reportElement style="htmlStyle" x="650" y="9" width="55" height="20"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+ (($F{meta:startpageoffset} != null) ? $F{meta:startpageoffset} : 0 )]]></textFieldExpression>
 			</textField>
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml	Fri Jun 01 16:06:12 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml	Fri Jun 01 17:42:20 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-06-01T13:50:10 -->
+<!-- 2018-06-01T17:31:11 -->
 <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" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml	Fri Jun 01 16:06:12 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml	Fri Jun 01 17:42:20 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-06-01T13:52:40 -->
+<!-- 2018-06-01T17:04:03 -->
 <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" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
@@ -119,7 +119,7 @@
 	<columnHeader>
 		<band height="25" splitType="Stretch">
 			<textField isStretchWithOverflow="true">
-				<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="24"/>
+				<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="24"/>
 				<box padding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom"/>
 				<textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
@@ -204,7 +204,7 @@
 				<textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="20"/>
+				<reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
--- a/artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml	Fri Jun 01 16:06:12 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml	Fri Jun 01 17:42:20 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-06-01T13:54:51 -->
+<!-- 2018-06-01T17:01:11 -->
 <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" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
@@ -129,7 +129,7 @@
 	<columnHeader>
 		<band height="25" splitType="Stretch">
 			<textField isStretchWithOverflow="true">
-				<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="24"/>
+				<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="24"/>
 				<box padding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom"/>
 				<textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
@@ -150,7 +150,7 @@
 				<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="60" height="24"/>
 				<box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom"/>
-				<textFieldExpression><![CDATA[$F{meta:waterlevel_header}+ "<br/>[NHN + m]"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{meta:waterlevel_header}+  "<br/>["  + $F{meta:river_unit} + "]"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="220" y="0" width="50" height="24"/>
@@ -180,7 +180,7 @@
 				<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="270" y="0" width="100" height="24"/>
 				<box padding="5"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom"/>
-				<textFieldExpression><![CDATA[$F{meta:bedheight_header}+ "<br/>[NHN + m]"]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{meta:bedheight_header}+  "<br/>["  + $F{meta:river_unit} + "]"]]></textFieldExpression>
 			</textField>
 			<line>
 				<reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="740" height="1"/>
@@ -222,7 +222,7 @@
 				<textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="20"/>
+				<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="20"/>
 				<box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
--- a/artifacts/pom.xml	Fri Jun 01 16:06:12 2018 +0200
+++ b/artifacts/pom.xml	Fri Jun 01 17:42:20 2018 +0200
@@ -67,6 +67,14 @@
 
   <dependencies>    
   
+      <dependency>
+       <groupId>simply_glamorous.jar</groupId>
+       <artifactId>simply_glamorous</artifactId>
+       <version>0</version>
+       <scope>system</scope>
+        <systemPath>${project.basedir}/src/main/resources/simply_glamorous.jar</systemPath>
+    </dependency>
+  
     <dependency>
        <groupId>roboto.jar</groupId>
        <artifactId>roboto</artifactId>
Binary file artifacts/src/main/resources/simply_glamorous.jar has changed
http://dive4elements.wald.intevation.org