Mercurial > dive4elements > river
changeset 9617:1d4262a68f1f
#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/sinfo.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/artifacts/sinfo.xml Thu Oct 10 15:29:02 2019 +0200 @@ -69,6 +69,10 @@ <facet name="sinfo_facet_flow_depth.filtered" description="flow depth, filtered by current zoom state" /> <facet name="sinfo_facet_flow_depth" description="flow depth" /> + <facet name="sinfo_facet_flow_depth_bedheight" description="mean bedheight" /> + <facet name="sinfo_facet_flow_depth_waterlevel" description="waterlevel" /> + <facet name="sinfo_facet_flow_depth_discharge" description="discharge" /> + <facet name="sinfo_facet_flow_depth_with_tkh.filtered" description="flow depth including tkh, filtered by current zoom state" /> <facet name="sinfo_facet_flow_depth_with_tkh" description="flow depth including tkh" /> @@ -126,10 +130,14 @@ <facet name="sinfo_facet_flow_depth_min" description="min flow depth" /> <facet name="sinfo_facet_flow_depth_max.filtered" description="max flow depth" /> <facet name="sinfo_facet_flow_depth_max" description="max flow depth" /> - + <facet name="sinfo_facet_flow_depth_bedheight_min" description="min bedheight" /> + <facet name="sinfo_facet_flow_depth_bedheight_max" description="max bedheight" /> + <facet name="sinfo_facet_flow_depth_waterlevel" description="waterlevel" /> + <facet name="sinfo_facet_flow_depth_discharge" description="discharge" /> + <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" /> - - <facet name="sinfo_flow_depth_minmax.manualpoints" description="Manual Points" /> + + <facet name="sinfo_flow_depth_minmax.manualpoints" description="Manual Points" /> </facets> </outputmode> @@ -189,7 +197,9 @@ <facet name="sinfo_facet_flow_depth_development" description="flow depth development" /> <facet name="sinfo_facet_waterlevel_difference.filtered" description="waterlevel difference" /> + <facet name="sinfo_facet_waterlevel_difference" description="waterlevel difference (raw)" /> <facet name="sinfo_facet_bedheight_difference.filtered" description="bed level difference" /> + <facet name="sinfo_facet_bedheight_difference" description="bed level difference (raw)" /> <facet name="sinfo_facet_flow_depth_current.filtered" description="flow depth current" /> <facet name="sinfo_facet_flow_depth_current" description="flow depth current" /> @@ -197,8 +207,8 @@ <facet name="sinfo_facet_flow_depth_historical" description="flow depth historical" /> <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" /> - - <facet name="sinfo_flow_depth_development.manualpoints" description="Manual Points" /> + + <facet name="sinfo_flow_depth_development.manualpoints" description="Manual Points" /> </facets> </outputmode> @@ -208,8 +218,8 @@ <facet name="sinfo_facet_flow_depth_development_per_year" description="flow depth development per year" /> <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations" /> - - <facet name="sinfo_flow_depth_development_peryear.manualpoints" description="Manual Points" /> + + <facet name="sinfo_flow_depth_development_peryear.manualpoints" description="Manual Points" /> </facets> </outputmode> @@ -228,9 +238,6 @@ </outputmodes> </state> - - - <!-- Calculation Mode: Grundberührungen --> <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> @@ -246,7 +253,7 @@ </transition> <state id="state.sinfo.year_epoch" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.collisions.year_epoch_choice"> - <data name="ye_select" type="String" /> + <data name="ye_select" type="String" /> </state> @@ -470,6 +477,9 @@ <facet name="sinfo_facet_flow_depth.filtered" description="mean flow depth" /> <facet name="sinfo_facet_flow_depth" description="mean flow depth" /> + <facet name="sinfo_facet_flow_depth_discharge" description="discharge" /> + <facet name="sinfo_facet_flow_depth_waterlevel" description="waterlevel" /> + <facet name="sinfo_facet_flow_depth_bedheight" description="mean bedheight" /> <facet name="sinfo_facet_velocity" description="Velocity" /> <facet name="sinfo_facet_d50" description="D50" />
--- a/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/generators/longitudinal-diagram-defaults.xml Thu Oct 10 15:29:02 2019 +0200 @@ -52,6 +52,8 @@ <processor class="org.dive4elements.river.exports.process.BedHeightProcessor" axis="W"/> <!-- S-INFO --> + <processor class="org.dive4elements.river.artifacts.sinfo.common.FlowDepthDischargeProcessor" axis="Q"/> + <processor class="org.dive4elements.river.artifacts.sinfo.common.FlowDepthWaterlevelProcessor" axis="W"/> <processor class="org.dive4elements.river.artifacts.sinfo.common.FlowDepthProcessor" axis="flowdepthAxis"/> <processor class="org.dive4elements.river.artifacts.sinfo.common.TkhProcessor" axis="tkhAxis"/> <processor class="org.dive4elements.river.artifacts.sinfo.common.TauProcessor" axis="Tau"/>
--- a/artifacts/doc/conf/meta-data.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/meta-data.xml Thu Oct 10 15:29:02 2019 +0200 @@ -2,9 +2,9 @@ <dc:template xmlns:dc="http://www.intevation.org/2011/Datacage"> <datacage> - <dc:call-macro name="load-user"/> + <dc:call-macro name="load-user" /> - <dc:call-macro name="load-system"/> + <dc:call-macro name="load-system" /> <dc:macro name="load-system"> <dc:context connection="system"> @@ -14,14 +14,14 @@ WHERE lower(name) LIKE lower(${river}) </dc:statement> <dc:for-each> - <dc:call-macro name="generate-system-content"/> + <dc:call-macro name="generate-system-content" /> </dc:for-each> </dc:context> </dc:macro> <dc:macro name="load-user"> <old_calculations> - <dc:call-macro name="generate-user-content"/> + <dc:call-macro name="generate-user-content" /> </old_calculations> </dc:macro> @@ -39,120 +39,120 @@ <dc:choose> <dc:comment> Longitudinal sections </dc:comment> <dc:when test="$out = 'w_differences'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="officiallines_user"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="officiallines_user" /> </dc:when> <dc:when test="$out = 'longitudinal_section'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="officiallines_user"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="officiallines_user" /> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bedheight_middle'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bed_difference_year'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="basedata_6_delta_w"/> - <dc:call-macro name="sounding-width-recommendations"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="basedata_6_delta_w" /> + <dc:call-macro name="sounding-width-recommendations" /> </dc:when> <dc:when test="$out = 'bed_difference_height_year'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="basedata_6_delta_w"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="basedata_6_delta_w" /> </dc:when> <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="annotations"/> - <dc:call-macro name="sedimentload_off_epochs"/> + <dc:call-macro name="annotations" /> + <dc:call-macro name="sedimentload_off_epochs" /> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'flow_velocity'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:comment> Discharge curves </dc:comment> <dc:when test="$out = 'historical_discharge_wq'"> - <dc:call-macro name="hist_discharge_rec"/> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="hist_discharge_rec" /> + <dc:call-macro name="mainvalues" /> </dc:when> <dc:when test="$out = 'discharge_curve'"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="basedata_3_officials_wq"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="basedata_3_officials_wq" /> </dc:when> <dc:when test="$out = 'computed_discharge_curve'"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="basedata_3_officials_wq"/> - <dc:call-macro name="basedata_2_fixations_wq"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="basedata_3_officials_wq" /> + <dc:call-macro name="basedata_2_fixations_wq" /> </dc:when> <dc:when test="$out = 'fix_wq_curve'"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="qsectors"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="qsectors" /> </dc:when> <dc:when test="$out = 'fix_derivate_curve'"> - <dc:call-macro name="qmainvalues"/> + <dc:call-macro name="qmainvalues" /> </dc:when> <dc:when test="starts-with($out, 'sq_') and not($out = 'sq_relation_export')"> - <dc:call-macro name="qmainvalues"/> + <dc:call-macro name="qmainvalues" /> </dc:when> <dc:comment> Cross sections </dc:comment> <dc:when test="$out = 'cross_section'"> - <dc:call-macro name="cross_sections"/> - <dc:call-macro name="hyks"/> - <dc:call-macro name="officiallines_user"/> + <dc:call-macro name="cross_sections" /> + <dc:call-macro name="hyks" /> + <dc:call-macro name="officiallines_user" /> </dc:when> <dc:comment> Duration curve </dc:comment> <dc:when test="$out = 'duration_curve'"> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="mainvalues" /> </dc:when> <dc:comment> Reference curve </dc:comment> <dc:when test="$out = 'reference_curve'"> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="mainvalues" /> </dc:when> <dc:comment> Maps </dc:comment> <dc:when test="$out = 'floodmap'"> - <dc:call-macro name="flood-map-recommended"/> + <dc:call-macro name="flood-map-recommended" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_minmax'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development_peryear'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_tkk'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_collision'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flood_duration'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_flood_height'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'sinfo_floodduration_curve'"> <dc:call-macro name="mainvalues" /> </dc:when> <dc:when test="$out = 'uinfo_salix_line'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> <dc:when test="$out = 'bundu_depth_longitudinal_section'"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations" /> </dc:when> </dc:choose> </dc:iterate> @@ -166,179 +166,179 @@ <dc:choose> <dc:comment> Inline datacage panels </dc:comment> <dc:when test="$out = 'minfo_diff_panel'"> - <dc:call-macro name="minfo-heights-diff"/> + <dc:call-macro name="minfo-heights-diff" /> </dc:when> <dc:when test="$out = 'floodmap_dem_panel'"> - <dc:call-macro name="flood-map-dem"/> + <dc:call-macro name="flood-map-dem" /> </dc:when> <dc:when test="$out = 'floodmap_hws_panel'"> <hws> - <dc:call-macro name="flood-map-hws-lines"/> - <dc:call-macro name="flood-map-hws-points"/> + <dc:call-macro name="flood-map-hws-lines" /> + <dc:call-macro name="flood-map-hws-points" /> </hws> </dc:when> <dc:when test="$out = 'winfo_diff_twin_panel'"> <dc:if test="$current-state-id != 'state.winfo.uesk.wsp'"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> - <dc:call-macro name="basedata_2_fixations"/> - <dc:call-macro name="basedata_4_heightmarks-points"/> - <dc:call-macro name="basedata_5_flood-protections"/> + <dc:call-macro name="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="basedata_5_flood-protections" /> </dc:if> </dc:when> <dc:when test="$out = 'waterlevels_panel'"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> - <dc:call-macro name="basedata_2_fixations"/> - <dc:call-macro name="basedata_3_officials"/> - <dc:call-macro name="basedata_4_heightmarks-points"/> - <dc:call-macro name="basedata_5_flood-protections"/> + <dc:call-macro name="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_3_officials" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="basedata_5_flood-protections" /> </dc:when> <dc:comment> Longitudinal sections </dc:comment> <dc:when test="$out = 'longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'w_differences'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'flow_velocity'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bedheight_middle'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_height_year'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_year'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:comment> Discharge curves </dc:comment> <dc:when test="$out = 'historical_discharge_wq'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'discharge_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'fix_wq_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'fix_derivate_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="$out = 'computed_discharge_curve'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:when test="starts-with($out, 'sq_relation') or $out = 'sq_overview'"> - <dc:call-macro name="discharge-curve-prototype"/> + <dc:call-macro name="discharge-curve-prototype" /> </dc:when> <dc:comment> Cross sections </dc:comment> <dc:when test="$out = 'cross_section'"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> - <dc:call-macro name="basedata_2_fixations"/> - <dc:call-macro name="basedata_3_officials"/> - <dc:call-macro name="basedata_4_heightmarks-points"/> - <dc:call-macro name="cross_sections"/> - <dc:call-macro name="basedata_5_flood-protections"/> - <dc:call-macro name="hyks"/> - <dc:call-macro name="predefined_vegetation_zones"/> + <dc:call-macro name="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_3_officials" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="cross_sections" /> + <dc:call-macro name="basedata_5_flood-protections" /> + <dc:call-macro name="hyks" /> + <dc:call-macro name="predefined_vegetation_zones" /> </dc:when> <dc:comment> Duration curve </dc:comment> <dc:when test="$out = 'duration_curve'"> - <dc:call-macro name="duration_curve_system"/> + <dc:call-macro name="duration_curve_system" /> </dc:when> <dc:comment> Reference curve </dc:comment> <dc:when test="$out = 'reference_curve'"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="annotations"/> - <dc:call-macro name="basedata_1_additionals-relative_point"/> - <dc:call-macro name="basedata_2_fixations_relative_point"/> - <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> - <dc:call-macro name="basedata_5_flood-protections_relative_points"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="annotations" /> + <dc:call-macro name="basedata_1_additionals-relative_point" /> + <dc:call-macro name="basedata_2_fixations_relative_point" /> + <dc:call-macro name="basedata_4_heightmarks-points-relative_points" /> + <dc:call-macro name="basedata_5_flood-protections_relative_points" /> </dc:when> <dc:comment> Maps </dc:comment> <dc:when test="$out = 'map'"> - <dc:call-macro name="flood-map-complete"/> + <dc:call-macro name="flood-map-complete" /> </dc:when> <dc:when test="$out = 'floodmap'"> - <dc:call-macro name="flood-map-complete"/> + <dc:call-macro name="flood-map-complete" /> </dc:when> <dc:comment> S-INFO </dc:comment> <dc:when test="$out = 'sinfo_flowdepth_minfo_heights'"> - <dc:call-macro name="bed-heights-single-MW"/> + <dc:call-macro name="bed-heights-single-MW" /> </dc:when> <dc:when test="$out = 'sinfo_flowdepthminmax_heights'"> - <dc:call-macro name="bed-heights-single-KL_TW"/> + <dc:call-macro name="bed-heights-single-KL_TW" /> </dc:when> <dc:when test="$out = 'sinfo_flowdepth_waterlevels'"> <minfo module="minfo"> <fixanalysis> - <dc:call-macro name="basedata_7_waterlevels"/> + <dc:call-macro name="basedata_7_waterlevels" /> </fixanalysis> </minfo> - <dc:call-macro name="basedata_3_officials"/> - <dc:call-macro name="basedata_2_fixations"/> + <dc:call-macro name="basedata_3_officials" /> + <dc:call-macro name="basedata_2_fixations" /> <sinfo module="sinfo"> <sinfo_additional_ls> - <dc:call-macro name="basedata_1_additionals-sinfo-with-q"/> - <dc:call-macro name="basedata_1_additionals-sinfo-without-q"/> + <dc:call-macro name="basedata_1_additionals-sinfo-with-q" /> + <dc:call-macro name="basedata_1_additionals-sinfo-without-q" /> </sinfo_additional_ls> </sinfo> </dc:when> <dc:when test="$out = 'sinfo_flow_depth'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_minmax'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development_peryear'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_tkk'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_collision'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flood_duration'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flood_height'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_floodduration_curve'"> <dc:call-macro name="floodduration_curve_system" /> </dc:when> <dc:when test="$out = 'uinfo_salix_line'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'"> - <dc:call-macro name="predefined_vegetation_zones"/> + <dc:call-macro name="predefined_vegetation_zones" /> </dc:when> <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> <dc:when test="$out = 'bundu_depth_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-prototype"/> + <dc:call-macro name="longitudinal-section-prototype" /> </dc:when> </dc:choose> </dc:iterate> @@ -361,7 +361,7 @@ <dc:iterate var="out" container="artifact-outs"> <dc:choose> <dc:when test="$out = 'longitudinal_section'"> - <dc:call-macro name="officiallines_user"/> + <dc:call-macro name="officiallines_user" /> </dc:when> </dc:choose> </dc:iterate> @@ -374,140 +374,140 @@ <dc:choose> <dc:comment> Inline datacage panels </dc:comment> <dc:when test="$out = 'winfo_diff_twin_panel'"> - <dc:call-macro name="differences-fix"/> - <dc:call-macro name="differences"/> + <dc:call-macro name="differences-fix" /> + <dc:call-macro name="differences" /> <dc:comment comment="Candidate for:"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:comment> </dc:when> <dc:when test="$out = 'waterlevels_panel'"> - <dc:call-macro name="waterlevels-user"/> + <dc:call-macro name="waterlevels-user" /> <dc:comment comment="Candidate for:"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:comment> </dc:when> <dc:when test="$out = 'floodmap_hws_panel'"> - <dc:call-macro name="floodmap-hws-user"/> + <dc:call-macro name="floodmap-hws-user" /> </dc:when> <dc:comment> Longitudinal sections </dc:comment> <dc:when test="$out = 'longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'w_differences'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bedheight_middle'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'flow_velocity'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sedimentload_ls'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_year'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bed_difference_height_year'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_minmax'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flow_depth_development_peryear'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_tkk'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_collision'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flood_duration'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_floodduration_curve'"> - <dc:call-macro name="floodduration-curve-user"/> + <dc:call-macro name="floodduration-curve-user" /> </dc:when> <dc:when test="$out = 'sinfo_flood_height'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'sinfo_flowdepth_waterlevels'"> - <dc:call-macro name="longitudinal-section-fix-vollmer_w"/> + <dc:call-macro name="longitudinal-section-fix-vollmer_w" /> </dc:when> <dc:when test="$out = 'uinfo_salix_line'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'uinfo.inundation_duration.vegzoneselect'"> - <dc:call-macro name="vegetationzones"/> + <dc:call-macro name="vegetationzones" /> </dc:when> <dc:when test="$out = 'bundu_wspl_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:when test="$out = 'bundu_depth_longitudinal_section'"> - <dc:call-macro name="longitudinal-section-user-prototype"/> + <dc:call-macro name="longitudinal-section-user-prototype" /> </dc:when> <dc:comment> Discharge curves </dc:comment> <dc:when test="$out = 'computed_discharge_curve'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="$out = 'fix_derivate_curve'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="$out = 'fix_wq_curve'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="$out = 'historical_discharge_wq'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:when test="starts-with($out, 'sq_relation') or $out = 'sq_overview'"> - <dc:call-macro name="discharge-curve-user-prototype"/> + <dc:call-macro name="discharge-curve-user-prototype" /> </dc:when> <dc:comment> Time series </dc:comment> <dc:when test="$out = 'fix_deltawt_curve'"> - <dc:call-macro name="delta-wt"/> + <dc:call-macro name="delta-wt" /> </dc:when> <dc:when test="$out = 'historical_discharge'"> - <dc:call-macro name="historical-discharge-user"/> + <dc:call-macro name="historical-discharge-user" /> </dc:when> <dc:comment> Cross sections </dc:comment> <dc:when test="$out = 'cross_section'"> - <dc:call-macro name="cross_section_user_content"/> + <dc:call-macro name="cross_section_user_content" /> </dc:when> <dc:comment> Duration curve </dc:comment> <dc:when test="$out = 'duration_curve'"> - <dc:call-macro name="duration-curve-user"/> + <dc:call-macro name="duration-curve-user" /> </dc:when> <dc:comment> Reference curve </dc:comment> <dc:when test="$out = 'reference_curve'"> - <dc:call-macro name="reference-curves"/> + <dc:call-macro name="reference-curves" /> </dc:when> <dc:comment> Maps </dc:comment> <dc:when test="$out = 'floodmap'"> - <dc:call-macro name="flood-map"/> + <dc:call-macro name="flood-map" /> </dc:when> <dc:when test="$out = 'map'"> - <dc:call-macro name="flood-map"/> + <dc:call-macro name="flood-map" /> </dc:when> </dc:choose> </dc:iterate> @@ -528,12 +528,12 @@ <discharges description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="out" value="historical_discharge"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="out" value="historical_discharge" /> </dc:element> </dc:for-each> </discharges> @@ -551,12 +551,12 @@ <differences description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </differences> @@ -574,12 +574,12 @@ <ref_curve description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="out" value="reference_curve"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="out" value="reference_curve" /> </dc:element> </dc:for-each> </ref_curve> @@ -595,14 +595,14 @@ <dc:if test="dc:has-result()"> <floodmap> <dc:for-each> - <dc:variable name="combined_desc" expr="concat($facet_description, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"/> + <dc:variable name="combined_desc" expr="concat($facet_description, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)" /> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${combined_desc}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_id}"/> - <dc:attribute name="ids" value="${a_id}"/> - <dc:attribute name="out" value="floodmap"/> + <dc:attribute name="description" value="${combined_desc}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_id}" /> + <dc:attribute name="ids" value="${a_id}" /> + <dc:attribute name="out" value="floodmap" /> </dc:element> </dc:for-each> </floodmap> @@ -611,9 +611,9 @@ </dc:macro> <dc:macro name="cross_section_user_content"> - <dc:call-macro name="cross_section_user_content_waterlevels"/> - <dc:call-macro name="cross_section_user_content_iota"/> - <dc:call-macro name="vegetationzones"/> + <dc:call-macro name="cross_section_user_content_waterlevels" /> + <dc:call-macro name="cross_section_user_content_iota" /> + <dc:call-macro name="vegetationzones" /> </dc:macro> <dc:macro name="cross_section_user_content_waterlevels"> @@ -625,12 +625,12 @@ <longitudinal_section_columns description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="cross_section"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="cross_section" /> </dc:element> </dc:for-each> </longitudinal_section_columns> @@ -649,12 +649,12 @@ <longitudinal_section_columns description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="uinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="cross_section"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="uinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="cross_section" /> </dc:element> </dc:for-each> </longitudinal_section_columns> @@ -666,7 +666,7 @@ <dc:macro name="collection-group"> <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)"> - <dc:macro-body/> + <dc:macro-body /> </dc:group> </dc:macro> @@ -679,12 +679,12 @@ <longitudinal_section_columns description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="longitudinal_section"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="longitudinal_section" /> </dc:element> </dc:for-each> </longitudinal_section_columns> @@ -697,13 +697,13 @@ <dc:macro name="longitudinal-section-fix-vollmer"> <dc:filter expr="($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and ($facet_name = 'longitudinal_section.w' or $facet_name = 'longitudinal_section.q')"> - <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> + <dc:call-macro name="longitudinal-section-fix-vollmer_macro" /> </dc:filter> </dc:macro> <dc:macro name="longitudinal-section-fix-vollmer_w"> <dc:filter expr=" ($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and $facet_name = 'longitudinal_section.w'"> - <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> + <dc:call-macro name="longitudinal-section-fix-vollmer_macro" /> </dc:filter> </dc:macro> @@ -714,19 +714,19 @@ <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> <!-- FIXME --> - <dc:attribute name="factory" value="fixanalysis"/> + <dc:attribute name="factory" value="fixanalysis" /> <!-- bundu works due to same implementation - <dc:attribute name="factory" value="bundu"/> - --> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="longitudinal_section"/> + <dc:attribute name="factory" value="bundu"/> + --> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="longitudinal_section" /> - <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)"/> - <dc:attribute name="year" value="${fixAnalysisYear}"/> + <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)" /> + <dc:attribute name="year" value="${fixAnalysisYear}" /> </dc:element> </dc:for-each> </waterlevels> @@ -748,12 +748,12 @@ <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="fixanalysis"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="fix_longitudinal_section_curve"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="fixanalysis" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="fix_longitudinal_section_curve" /> </dc:element> </dc:for-each> </waterlevels> @@ -776,12 +776,12 @@ <waterlevels description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="fixanalysis"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="fix_deltawt_curve"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="fixanalysis" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="fix_deltawt_curve" /> </dc:element> </dc:for-each> </waterlevels> @@ -807,22 +807,22 @@ <dc:choose> <dc:when test="$out_name = 'fix_wq_curve'"> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="fixanalysis"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="fix_wq_curve"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="fixanalysis" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="fix_wq_curve" /> </dc:element> </dc:when> <dc:when test="$out_name = 'fix_derivate_curve'"> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="fixanalysis"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="fix_derivate_curve"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="fixanalysis" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="fix_derivate_curve" /> </dc:element> </dc:when> </dc:choose> @@ -840,12 +840,12 @@ <computed_discharge_curves> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="fixanalysis"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="ids" value="${a_gid}"/> - <dc:attribute name="out" value="computed_discharge_curve"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="fixanalysis" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="ids" value="${a_gid}" /> + <dc:attribute name="out" value="computed_discharge_curve" /> </dc:element> </dc:for-each> </computed_discharge_curves> @@ -861,12 +861,12 @@ <projects description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="ids" value="${a_gid}"/> - <dc:attribute name="out" value="computed_discharge_curve"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="ids" value="${a_gid}" /> + <dc:attribute name="out" value="computed_discharge_curve" /> </dc:element> </dc:for-each> </projects> @@ -878,12 +878,12 @@ <!-- Unterschreitungsdauern aus WINFO --> <dc:macro name="duration-curve-user"> - <dc:call-macro name="duration-curve-user_winfo-duration-curve"/> + <dc:call-macro name="duration-curve-user_winfo-duration-curve" /> </dc:macro> <!-- Überschrautungsdauern aus SINFO --> <dc:macro name="floodduration-curve-user"> - <dc:call-macro name="duration-curve-user_sinfo-flood-duration"/> + <dc:call-macro name="duration-curve-user_sinfo-flood-duration" /> </dc:macro> <dc:macro name="duration-curve-user_winfo-duration-curve"> @@ -894,12 +894,12 @@ <computed_discharge_curves> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </computed_discharge_curves> @@ -910,20 +910,20 @@ <dc:macro name="duration-curve-user_sinfo-flood-duration"> <!-- Restults of SINFO-Überflutungsdauern-Aue calculation --> <dc:filter expr="$a_state = 'state.sinfo.flood_duration' and $out_name = 'sinfo_floodduration_curve'"> - <!-- FIXME: group by calculation? --> + <!-- FIXME: group by calculation? --> <dc:if test="dc:has-result()"> <sinfo_flood_durations> - + <dc:call-macro name="collection-group"> <sinfo_flood_durations description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_flood_durations> @@ -946,20 +946,20 @@ <dc:choose> <dc:when test="$ld_m = 'location'"> <dc:variable name="combined_desc" expr="concat($facet_description, - ' an KM ', $deffrom)"/> + ' an KM ', $deffrom)" /> </dc:when> <dc:otherwise> <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', - $deffrom, ' bis KM ', $defto)"/> + $deffrom, ' bis KM ', $defto)" /> </dc:otherwise> </dc:choose> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${combined_desc}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="longitudinal_section"/> + <dc:attribute name="description" value="${combined_desc}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="longitudinal_section" /> </dc:element> </dc:for-each> </waterlevels> @@ -969,9 +969,9 @@ </dc:filter> </dc:macro> - <dc:comment comment="For building differences."/> + <dc:comment comment="For building differences." /> <dc:macro name="differences-fix"> - <dc:comment comment="Vollmer curves need own factory"/> + <dc:comment comment="Vollmer curves need own factory" /> <dc:filter expr="($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and $facet_name = 'longitudinal_section.w'"> <dc:if test="dc:has-result()"> <vollmer_waterlevels> @@ -980,21 +980,21 @@ <dc:for-each> <dc:choose> <dc:when test="$ld_m = 'location'"> - <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)"/> + <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)" /> </dc:when> <dc:otherwise> <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', - $deffrom, ' bis KM ', $defto)"/> + $deffrom, ' bis KM ', $defto)" /> </dc:otherwise> </dc:choose> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${combined_desc}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <!-- FIXME: different factories! --> - <dc:attribute name="factory" value="fixanalysis"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="longitudinal_section"/> + <dc:attribute name="description" value="${combined_desc}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <!-- FIXME: different factories! --> + <dc:attribute name="factory" value="fixanalysis" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="longitudinal_section" /> </dc:element> </dc:for-each> </waterlevels> @@ -1011,20 +1011,20 @@ <dc:for-each> <dc:choose> <dc:when test="$ld_m = 'location'"> - <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)"/> + <dc:variable name="combined_desc" expr="concat($facet_description, ' an KM ', $deffrom)" /> </dc:when> <dc:otherwise> <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', - $deffrom, ' bis KM ', $defto)"/> + $deffrom, ' bis KM ', $defto)" /> </dc:otherwise> </dc:choose> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${combined_desc}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="longitudinal_section"/> + <dc:attribute name="description" value="${combined_desc}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="longitudinal_section" /> </dc:element> </dc:for-each> </waterlevels> @@ -1041,12 +1041,12 @@ <own-hws> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="floodmap"/> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="floodmap" /> </dc:element> </dc:for-each> </own-hws> @@ -1062,12 +1062,12 @@ <quality-bed description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="bed_longitudinal_section"/> + <dc:attribute name="factory" value="minfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="bed_longitudinal_section" /> </dc:element> </dc:for-each> </quality-bed> @@ -1086,12 +1086,12 @@ <flow description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="flow_velocity"/> + <dc:attribute name="factory" value="minfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="flow_velocity" /> </dc:element> </dc:for-each> </flow> @@ -1109,12 +1109,12 @@ <load description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="minfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </load> @@ -1133,12 +1133,12 @@ <middle_bedheight description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="minfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </middle_bedheight> @@ -1157,12 +1157,12 @@ <difference description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="minfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </difference> @@ -1189,12 +1189,12 @@ <sqrel description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="minfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="minfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sqrel> @@ -1212,12 +1212,12 @@ <discharge description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="discharge_longitudinal_section"/> + <dc:attribute name="factory" value="winfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}-${facet_name}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="discharge_longitudinal_section" /> </dc:element> </dc:for-each> </discharge> @@ -1231,23 +1231,23 @@ <!-- Macros to load system data --> <dc:macro name="duration_curve_system"> - <dc:call-macro name="mainvalues"/> - <dc:call-macro name="basedata_2_fixations_relative_point"/> - <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> - <dc:call-macro name="basedata_5_flood-protections_relative_points"/> + <dc:call-macro name="mainvalues" /> + <dc:call-macro name="basedata_2_fixations_relative_point" /> + <dc:call-macro name="basedata_4_heightmarks-points-relative_points" /> + <dc:call-macro name="basedata_5_flood-protections_relative_points" /> </dc:macro> <dc:macro name="floodduration_curve_system"> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="mainvalues" /> </dc:macro> <dc:macro name="qmainvalues"> - <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}"/> + <qmainvalue factory="mainvalue" ids="{$river_id}:q" target_out="{$out}" /> </dc:macro> <dc:macro name="mainvalues"> - <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}"/> - <dc:call-macro name="qmainvalues"/> + <wmainvalue factory="mainvalue" ids="{$river_id}:w" target_out="{$out}" /> + <dc:call-macro name="qmainvalues" /> </dc:macro> <!-- discharge curves --> @@ -1256,17 +1256,17 @@ <dc:variable name="validity" expr="concat( dc:date-format('dd.MM.yyyy', $start_time), ' - ', - dc:date-format('dd.MM.yyyy', $stop_time))"/> + dc:date-format('dd.MM.yyyy', $stop_time))" /> <histdis name="{concat($bfg_id, ' ', $validity)}" description="{concat($bfg_id, ' ', $validity)}" factory="gaugedischarge" target_out="{$out}" ids="{$gauge_name};{$dt_id};{concat($bfg_id, ' ', - $gauge_name, ' ', $validity)}"/> + $gauge_name, ' ', $validity)}" /> </dc:for-each> </dc:macro> <dc:macro name="hist_discharge_rec"> <dc:variable name="start" type="number" expr="dc:date-format('yyyyMMdd', - number(substring-before($year_range, ';')))"/> + number(substring-before($year_range, ';')))" /> <dc:variable name="stop" type="number" expr="dc:date-format('yyyyMMdd', - number(substring-after($year_range, ';')))"/> + number(substring-after($year_range, ';')))" /> <dc:call-macro name="discharge_curve_choose_context"> <dc:filter expr="$kind = 1 and number(dc:date-format('yyyyMMdd', $start_time)) @@ -1275,7 +1275,7 @@ dc:date-format('yyyyMMdd', $stop_time), '99999999')) > $start"> - <dc:call-macro name="hist_discharge_factory"/> + <dc:call-macro name="hist_discharge_factory" /> </dc:filter> </dc:call-macro> </dc:macro> @@ -1286,7 +1286,7 @@ <dc:group expr="$gauge_name"> <gauge name="{dc:group-key()}"> <dc:for-each> - <current_gauge factory="gaugedischarge" target_out="{$out}" ids="{$gauge_name}"/> + <current_gauge factory="gaugedischarge" target_out="{$out}" ids="{$gauge_name}" /> </dc:for-each> </gauge> </dc:group> @@ -1300,7 +1300,7 @@ <historical_discharge_curves> <dc:group expr="$gauge_name"> <gauge name="{dc:group-key()}"> - <dc:call-macro name="hist_discharge_factory"/> + <dc:call-macro name="hist_discharge_factory" /> </gauge> </dc:group> </historical_discharge_curves> @@ -1312,15 +1312,15 @@ <dc:choose> <dc:when test="$fromkm > -99999 and $tokm < 99999"> <dc:context> - <dc:call-macro name="discharge_curves_km"/> - <dc:macro-body/> + <dc:call-macro name="discharge_curves_km" /> + <dc:macro-body /> </dc:context> </dc:when> <dc:otherwise> - <dc:variable name="refgauge" type="number" expr="dc:get('reference_gauge')"/> + <dc:variable name="refgauge" type="number" expr="dc:get('reference_gauge')" /> <dc:context> - <dc:call-macro name="discharge_curves_refgauge"/> - <dc:macro-body/> + <dc:call-macro name="discharge_curves_refgauge" /> + <dc:macro-body /> </dc:context> </dc:otherwise> </dc:choose> @@ -1374,7 +1374,7 @@ AND csl.km BETWEEN ${fromkm} AND ${tokm} </dc:statement> <dc:for-each> - <cross_section name="{$prot_description}" ids="{$prot_id}" factory="crosssections" target_out="{$out}"/> + <cross_section name="{$prot_description}" ids="{$prot_id}" factory="crosssections" target_out="{$out}" /> </dc:for-each> </dc:context> </cross_sections> @@ -1393,7 +1393,7 @@ AND he.km BETWEEN ${fromkm} AND ${tokm} </dc:statement> <dc:for-each> - <hyk name="{$hyk_description}" ids="{$hyk_id}" factory="hyk" target_out="{$out}"/> + <hyk name="{$hyk_description}" ids="{$hyk_id}" factory="hyk" target_out="{$out}" /> </dc:for-each> </dc:context> </hyks> @@ -1403,9 +1403,9 @@ <dc:macro name="predefined_vegetation_zones"> <uinfo module="uinfo"> <vegetation_zones> - <dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)"/> + <dc:variable name="vegzonedata" expr="dc:defaultvegetationzone($river)" /> - <defaultVegetationZone factory="predefined_vegetation_zonesf" target_out="{$out}" ids="{$vegzonedata}"/> + <defaultVegetationZone factory="predefined_vegetation_zonesf" target_out="{$out}" ids="{$vegzonedata}" /> </vegetation_zones> </uinfo> </dc:macro> @@ -1420,7 +1420,7 @@ <dc:group expr="$wst_description"> <basedata name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </basedata> </dc:group> @@ -1431,13 +1431,13 @@ <dc:macro name="basedata_0"> <dc:call-macro name="basedata_0_macro"> - <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_0_wq"> <dc:call-macro name="basedata_0_macro"> - <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1449,7 +1449,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1460,7 +1460,7 @@ <dc:macro name="basedata_1_additionals"> <dc:call-macro name="basedata_1_additionals_macro"> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1471,7 +1471,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1482,7 +1482,7 @@ <dc:macro name="basedata_1_additionals-sinfo-with-q"> <dc:call-macro name="basedata_1_additionals-sinfo-with-q_macro"> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> @@ -1493,7 +1493,7 @@ <dc:group expr="dc:replace($wst_description, 'Zus.Längsschnitte/', '')"> <additional name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </additional> </dc:group> @@ -1504,20 +1504,20 @@ <dc:macro name="basedata_1_additionals-sinfo-without-q"> <dc:call-macro name="basedata_1_additionals-sinfo-without-q_macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_1_additionals_wq"> <dc:call-macro name="basedata_1_additionals_macro"> - <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="base_data-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_1_additionals-relative_point"> <dc:call-macro name="basedata_1_additionals_macro"> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1529,7 +1529,7 @@ <dc:group expr="dc:replace($wst_description, 'Fixierungen/', '')"> <fixation name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </fixation> </dc:group> @@ -1540,20 +1540,20 @@ <dc:macro name="basedata_2_fixations"> <dc:call-macro name="fixings-macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_2_fixations_wq"> <dc:call-macro name="fixings-macro"> - <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_2_fixations_relative_point"> <dc:call-macro name="fixings-macro"> - <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="fixations-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1565,7 +1565,7 @@ <dc:group expr="$wst_description"> <official name="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </official> </dc:group> @@ -1576,14 +1576,14 @@ <dc:macro name="basedata_3_officials"> <dc:call-macro name="basedata_3_macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_3_officials_wq"> <dc:call-macro name="basedata_3_macro"> - <column name="{$wst_column_name}" ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="officials_wq-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1595,7 +1595,7 @@ <dc:group expr="dc:replace($wst_description, 'HW-Marken/', '')"> <heightmark name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </heightmark> </dc:group> @@ -1606,19 +1606,19 @@ <dc:macro name="basedata_4_heightmarks-points"> <dc:call-macro name="basedata_4_macro"> - <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_4_heightmarks-points_wq"> <dc:call-macro name="basedata_4_macro"> - <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_4_heightmarks-points-relative_points"> <dc:call-macro name="basedata_4_macro"> - <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="heightmarks_points-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1630,7 +1630,7 @@ <dc:group expr="dc:replace($wst_description, 'HW-Schutzanlagen/', '')"> <flood_protection name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </flood_protection> </dc:group> @@ -1641,19 +1641,19 @@ <dc:macro name="basedata_5_flood-protections"> <dc:call-macro name="basedata_5_macro"> - <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_5_flood-protections_wq"> <dc:call-macro name="basedata_5_macro"> - <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_5_flood-protections_relative_points"> <dc:call-macro name="basedata_5_macro"> - <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="flood_protection-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1667,7 +1667,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <column name="{$wst_column_name}" ids="delta_w-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="delta_w-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:for-each> </relativepoint> </dc:group> @@ -1678,7 +1678,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <column name="{$wst_column_name}" ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="delta_w_cma-wstv-{$wst_column_position}-{$wst_id}" factory="staticwkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:for-each> </relativepoint> </dc:group> @@ -1697,7 +1697,7 @@ <dc:group expr="dc:replace($wst_description, 'CSV/', '')"> <relativepoint name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </relativepoint> </dc:group> @@ -1708,14 +1708,14 @@ <dc:macro name="basedata_7_waterlevels"> <dc:call-macro name="basedata_7_macro"> - <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)"/> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}"/> + <dc:variable name="start_year" expr="dc:date-format('yyyy', $start_time)" /> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="staticwqkms" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" year="{dc:date-format('yyyy', $start_time)}" /> </dc:call-macro> </dc:macro> <dc:macro name="basedata_7_waterlevels_wq"> <dc:call-macro name="basedata_7_macro"> - <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]"/> + <column name="{$wst_column_name}" ids="additionals-wstv-{$wst_column_position}-{$wst_id}" factory="wqinterpol" target_out="{$out}" info="{$info} [km {$deffrom} - {$defto}]" /> </dc:call-macro> </dc:macro> @@ -1724,84 +1724,84 @@ <dc:macro name="discharge-curve-prototype"> <computed_discharge_curve> - <dc:call-macro name="discharge_table_gauge"/> - <dc:call-macro name="mainvalues"/> + <dc:call-macro name="discharge_table_gauge" /> + <dc:call-macro name="mainvalues" /> </computed_discharge_curve> - <dc:call-macro name="historical_discharge_curve"/> - <dc:call-macro name="basedata_0_wq"/> - <dc:call-macro name="basedata_1_additionals_wq"/> - <dc:call-macro name="basedata_2_fixations_wq"/> - <dc:call-macro name="basedata_3_officials_wq"/> - <dc:call-macro name="basedata_4_heightmarks-points_wq"/> - <dc:call-macro name="basedata_5_flood-protections_wq"/> + <dc:call-macro name="historical_discharge_curve" /> + <dc:call-macro name="basedata_0_wq" /> + <dc:call-macro name="basedata_1_additionals_wq" /> + <dc:call-macro name="basedata_2_fixations_wq" /> + <dc:call-macro name="basedata_3_officials_wq" /> + <dc:call-macro name="basedata_4_heightmarks-points_wq" /> + <dc:call-macro name="basedata_5_flood-protections_wq" /> <minfo module="minfo"> - <dc:call-macro name="sqrelations"/> - <dc:call-macro name="basedata_7_waterlevels_wq"/> + <dc:call-macro name="sqrelations" /> + <dc:call-macro name="basedata_7_waterlevels_wq" /> </minfo> </dc:macro> <dc:macro name="discharge-curve-user-prototype"> - <dc:call-macro name="waterlevels-user"/> - <dc:call-macro name="computed-discharge-curve"/> + <dc:call-macro name="waterlevels-user" /> + <dc:call-macro name="computed-discharge-curve" /> <!-- TODO: macro for discharge longitudinal section --> - <dc:call-macro name="fix-wq-curve"/> + <dc:call-macro name="fix-wq-curve" /> <!-- TODO: own macro for Vollmer-curve (extract from fix-wq-curve and waterlevels-user) --> - <dc:call-macro name="extreme-wq-curve"/> + <dc:call-macro name="extreme-wq-curve" /> <minfo module="minfo"> - <dc:call-macro name="sqrelations_user"/> + <dc:call-macro name="sqrelations_user" /> </minfo> </dc:macro> <dc:macro name="longitudinal-section-prototype"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> - <dc:call-macro name="basedata_2_fixations"/> - <dc:call-macro name="basedata_3_officials"/> - <dc:call-macro name="basedata_4_heightmarks-points"/> - <dc:call-macro name="basedata_5_flood-protections"/> - <dc:call-macro name="annotations_per_type"/> + <dc:call-macro name="basedata_0" /> + <dc:call-macro name="basedata_1_additionals" /> + <dc:call-macro name="basedata_2_fixations" /> + <dc:call-macro name="basedata_3_officials" /> + <dc:call-macro name="basedata_4_heightmarks-points" /> + <dc:call-macro name="basedata_5_flood-protections" /> + <dc:call-macro name="annotations_per_type" /> <minfo module="minfo"> <fixanalysis> - <dc:call-macro name="basedata_6_delta_w"/> - <dc:call-macro name="basedata_7_waterlevels"/> + <dc:call-macro name="basedata_6_delta_w" /> + <dc:call-macro name="basedata_7_waterlevels" /> </fixanalysis> - <dc:call-macro name="sedimentloads"/> - <dc:call-macro name="densities"/> - <dc:call-macro name="minfo-heights"/> - <dc:call-macro name="sounding-width"/> - <dc:call-macro name="morph_width"/> - <dc:call-macro name="porosities"/> + <dc:call-macro name="sedimentloads" /> + <dc:call-macro name="densities" /> + <dc:call-macro name="minfo-heights" /> + <dc:call-macro name="sounding-width" /> + <dc:call-macro name="morph_width" /> + <dc:call-macro name="porosities" /> <flow_velocities> - <dc:call-macro name="flow_velocity_measurements"/> - <dc:call-macro name="flow_velocity_models"/> + <dc:call-macro name="flow_velocity_measurements" /> + <dc:call-macro name="flow_velocity_models" /> </flow_velocities> </minfo> <sinfo module="sinfo"> <sinfo_predefined_flowdepths> - <dc:call-macro name="sinfo_predefined_flowdepth-m"/> + <dc:call-macro name="sinfo_predefined_flowdepth-m" /> </sinfo_predefined_flowdepths> <sinfo_predefined_collision> - <dc:call-macro name="sinfo_predefined_collision"/> + <dc:call-macro name="sinfo_predefined_collision" /> </sinfo_predefined_collision> <sinfo_predefined_channel> - <dc:call-macro name="sinfo_predefined_channel"/> + <dc:call-macro name="sinfo_predefined_channel" /> </sinfo_predefined_channel> <sinfo_predefined_infrastructure> - <dc:call-macro name="sinfo_predefined_infrastructure"/> + <dc:call-macro name="sinfo_predefined_infrastructure" /> </sinfo_predefined_infrastructure> <sinfo_predefined_tkh> - <dc:call-macro name="sinfo_predefined_tkh-berechnung"/> - <dc:call-macro name="sinfo_predefined_tkh-messung"/> + <dc:call-macro name="sinfo_predefined_tkh-berechnung" /> + <dc:call-macro name="sinfo_predefined_tkh-messung" /> </sinfo_predefined_tkh> <sinfo_predefined_depthevol> - <dc:call-macro name="sinfo_predefined_depthevol-aktuell"/> - <dc:call-macro name="sinfo_predefined_depthevol-etappe"/> + <dc:call-macro name="sinfo_predefined_depthevol-aktuell" /> + <dc:call-macro name="sinfo_predefined_depthevol-etappe" /> </sinfo_predefined_depthevol> </sinfo> @@ -1810,32 +1810,32 @@ <dc:macro name="longitudinal-section-user-prototype"> <dc:comment> SINFO </dc:comment> - <dc:call-macro name="sinfo_flowdepths"/> - <dc:call-macro name="sinfo_flowdepths_minmax"/> - <dc:call-macro name="sinfo_flow_depth_development"/> - <dc:call-macro name="sinfo_tkh"/> - <dc:call-macro name="sinfo_collision"/> - <dc:call-macro name="sinfo_flood_duration"/> + <dc:call-macro name="sinfo_flowdepths" /> + <dc:call-macro name="sinfo_flowdepths_minmax" /> + <dc:call-macro name="sinfo_flow_depth_development" /> + <dc:call-macro name="sinfo_tkh" /> + <dc:call-macro name="sinfo_collision" /> + <dc:call-macro name="sinfo_flood_duration" /> <dc:comment> WINFO/DIFF/FIX </dc:comment> - <dc:call-macro name="longitudinal"/> - <dc:call-macro name="differences"/> - <dc:call-macro name="waterlevels-discharge"/> - <dc:call-macro name="longitudinal-section-fix"/> - <dc:call-macro name="longitudinal-section-fix-vollmer"/> + <dc:call-macro name="longitudinal" /> + <dc:call-macro name="differences" /> + <dc:call-macro name="waterlevels-discharge" /> + <dc:call-macro name="longitudinal-section-fix" /> + <dc:call-macro name="longitudinal-section-fix-vollmer" /> <dc:comment> MINFO </dc:comment> - <dc:call-macro name="middle_bedheights"/> - <dc:call-macro name="bedheight_differences"/> - <dc:call-macro name="bedquality"/> - <dc:call-macro name="flow-velocity"/> - <dc:call-macro name="sediment-load"/> + <dc:call-macro name="middle_bedheights" /> + <dc:call-macro name="bedheight_differences" /> + <dc:call-macro name="bedquality" /> + <dc:call-macro name="flow-velocity" /> + <dc:call-macro name="sediment-load" /> <dc:comment> UINFO </dc:comment> - <dc:call-macro name="uinfo_salix_line"/> + <dc:call-macro name="uinfo_salix_line" /> <dc:comment> BUNDU </dc:comment> - <dc:call-macro name="bundu_bezugswst"/> + <dc:call-macro name="bundu_bezugswst" /> </dc:macro> <!-- porosities --> @@ -1864,7 +1864,7 @@ <dc:if test="dc:has-result()"> <dc:for-each> <porosity description="{$depth_lower}-{$depth_upper} cm" factory="porosity" target_out="{$out}" info="{concat($info, dc:date-format('yyyy', $syear), - ' - ', dc:date-format('yyyy', $eyear))}" ids="{$pid};{$description}"/> + ' - ', dc:date-format('yyyy', $eyear))}" ids="{$pid};{$description}" /> </dc:for-each> </dc:if> </dc:context> @@ -1891,7 +1891,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <density description="{$depth_lower}-{$depth_upper} cm" factory="sedimentdensity" target_out="{$out}" info="{$info}" ids="{$sdid}"/> + <density description="{$depth_lower}-{$depth_upper} cm" factory="sedimentdensity" target_out="{$out}" info="{$info}" ids="{$sdid}" /> </dc:for-each> </dc:if> </dc:context> @@ -1900,11 +1900,11 @@ <!-- sediment load --> <dc:macro name="load"> - <year description="{$timespan}" factory="sedimentload" target_out="{$out}" info="{$info}" ids="{$slid};{$fraction};{$timespan};{$kind}"/> + <year description="{$timespan}" factory="sedimentload" target_out="{$out}" info="{$info}" ids="{$slid};{$fraction};{$timespan};{$kind}" /> </dc:macro> <dc:macro name="load_ls"> - <year description="{$timespan}" factory="sedimentload_ls" target_out="{$out}" info="{$info}" ids="{$slid};{$timespan};{$kind}"/> + <year description="{$timespan}" factory="sedimentload_ls" target_out="{$out}" info="{$info}" ids="{$slid};{$timespan};{$kind}" /> </dc:macro> <dc:macro name="loads"> @@ -1913,24 +1913,24 @@ dc:date-format('yyyy', $sqstop))"> <sq_time description="{dc:group-key()}"> <dc:group expr="$fraction"> - <dc:variable name="fraction_name" expr="concat('${', dc:group-key(), '}')"/> + <dc:variable name="fraction_name" expr="concat('${', dc:group-key(), '}')" /> <fraction description="{$fraction_name}"> <dc:for-each> <dc:choose> <dc:when test="string-length(dc:get('endyear')) = 0"> - <dc:variable name="timespan" type="string" expr="dc:date-format('yyyy', $startyear)"/> + <dc:variable name="timespan" type="string" expr="dc:date-format('yyyy', $startyear)" /> </dc:when> <dc:otherwise> <dc:variable name="timespan" type="string" expr="concat(dc:date-format('yyyy', $startyear), '-', - dc:date-format('yyyy', $endyear))"/> + dc:date-format('yyyy', $endyear))" /> </dc:otherwise> </dc:choose> <dc:if test="$kind = 'official'"> <dc:variable name="info" type="string" expr="concat('Amtliche Epoche<BR>', - dc:get('info'))"/> + dc:get('info'))" /> </dc:if> - <dc:macro-body/> + <dc:macro-body /> </dc:for-each> </fraction> </dc:group> @@ -1943,41 +1943,41 @@ <years> <dc:filter expr="string-length(dc:get('endyear')) = 0 and $kind != 'official'"> - <dc:macro-body/> + <dc:macro-body /> </dc:filter> </years> <epochs> <dc:filter expr="string-length(dc:get('endyear')) > 0 and $kind != 'official'"> - <dc:macro-body/> + <dc:macro-body /> </dc:filter> </epochs> <off_epochs> <dc:filter expr="$kind = 'official'"> - <dc:macro-body/> + <dc:macro-body /> </dc:filter> </off_epochs> </dc:macro> <dc:macro name="sedimentloads"> <sedimentloads> - <dc:call-macro name="annotations_sediment_load_ls"/> + <dc:call-macro name="annotations_sediment_load_ls" /> <measurement_stations> <dc:context> - <dc:call-macro name="sedimentload_stations_statement"/> + <dc:call-macro name="sedimentload_stations_statement" /> <dc:call-macro name="sedimentloads-filter"> <dc:call-macro name="loads"> - <dc:call-macro name="load"/> + <dc:call-macro name="load" /> </dc:call-macro> </dc:call-macro> </dc:context> </measurement_stations> <sediment_load_ls> <dc:context> - <dc:call-macro name="sedimentload_ls_statement"/> + <dc:call-macro name="sedimentload_ls_statement" /> <dc:call-macro name="sedimentloads-filter"> <dc:call-macro name="loads"> - <dc:call-macro name="load_ls"/> + <dc:call-macro name="load_ls" /> </dc:call-macro> </dc:call-macro> </dc:context> @@ -2054,20 +2054,20 @@ <!-- annotations --> <dc:macro name="annotations"> - <annotation factory="annotations" ids="{$river_id}" target_out="{$out}"/> + <annotation factory="annotations" ids="{$river_id}" target_out="{$out}" /> </dc:macro> <dc:macro name="annotations_per_type"> <annotations> <dc:context> - <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}"/> + <all_annotations factory="annotations" ids="{$river_id}" target_out="{$out}" /> <dc:statement> SELECT id AS anno_id, name AS anno_description FROM annotation_types </dc:statement> <dc:for-each> - <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}"/> + <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}" /> </dc:for-each> </dc:context> </annotations> @@ -2083,26 +2083,26 @@ WHERE name LIKE 'Quelle %' OR name LIKE 'Senke %' </dc:statement> <dc:for-each> - <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}"/> + <annotation name="{$anno_description}" factory="annotations" target_out="{$out}" ids="{$river_id}:{$anno_description}" /> </dc:for-each> </dc:context> </sources_sinks> </dc:macro> <dc:macro name="qsectors"> - <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}"/> + <qsector factory="qsectors" ids="{$river_id}" target_out="{$out}" /> </dc:macro> <dc:macro name="flood-map-recommended"> <kilometrage> - <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}"/> + <riveraxis factory="riveraxis" ids="{$river_id}" target_out="{$out}" /> </kilometrage> <rastermap> - <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}"/> + <background factory="wmsbackground" ids="{$river_id}" target_out="{$out}" /> </rastermap> </dc:macro> - <!-- bed levels --> + <!-- bed heights --> <dc:macro name="minfo-heights-diff"> <dc:context> <dc:statement> @@ -2137,8 +2137,8 @@ </dc:statement> <dc:if test="dc:has-result()"> <bedheights> - <dc:call-macro name="bed-heights-single-diff"/> - <dc:call-macro name="bed-heights-epoch-diff"/> + <dc:call-macro name="bed-heights-single-diff" /> + <dc:call-macro name="bed-heights-epoch-diff" /> </bedheights> </dc:if> </dc:context> @@ -2147,7 +2147,7 @@ <dc:macro name="bed-heights-single-diff"> <dc:filter expr="not(contains(dc:lowercase($b1desc), 'epoche'))"> <years> - <dc:call-macro name="minfo-heights-diff-tree"/> + <dc:call-macro name="minfo-heights-diff-tree" /> </years> </dc:filter> </dc:macro> @@ -2155,7 +2155,7 @@ <dc:macro name="bed-heights-epoch-diff"> <dc:filter expr="contains(dc:lowercase($b1desc), 'epoche')"> <epochs> - <dc:call-macro name="minfo-heights-diff-tree"/> + <dc:call-macro name="minfo-heights-diff-tree" /> </epochs> </dc:filter> </dc:macro> @@ -2166,11 +2166,11 @@ <dc:for-each> <dc:choose> <dc:when test="dc:group-key() = $b1year"> - <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}" /> </dc:when> <dc:when test="dc:group-key() = 'sonstige'"> - <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}"/> - <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b2id}-{$b1desc}#bedheight-single-{$b1id}-{$b2desc}" info="{$b2desc}#{$b1desc}" description="{$b2desc} - {$b1desc}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b1id}-{$b1desc}#bedheight-single-{$b2id}-{$b2desc}" info="{$b1desc}#{$b2desc}" description="{$b1desc} - {$b2desc}" /> + <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$b2id}-{$b1desc}#bedheight-single-{$b1id}-{$b2desc}" info="{$b2desc}#{$b1desc}" description="{$b2desc} - {$b1desc}" /> </dc:when> </dc:choose> </dc:for-each> @@ -2180,8 +2180,8 @@ <dc:macro name="minfo-heights"> <bedheights> - <dc:call-macro name="bed-heights-single"/> - <dc:call-macro name="bed-heights-epoch"/> + <dc:call-macro name="bed-heights-single" /> + <dc:call-macro name="bed-heights-epoch" /> </bedheights> </dc:macro> @@ -2189,13 +2189,13 @@ <dc:macro name="bed-heights-factory_MW_TW_KL"> <dc:for-each> <dc:if test="$bedh_height_count > 0"> - <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-MW-{$bedh_descr}" info="{$info}" description="MW-{$bedh_descr}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-MW-{$bedh_descr}" info="{$info}" description="MW-{$bedh_descr}" /> </dc:if> <dc:if test="$bedh_min_count > 0"> - <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMin-{$bedh_id}-{$bedh_year}-TW-{$bedh_descr}" info="{$info}" description="TW-{$bedh_descr}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMin-{$bedh_id}-{$bedh_year}-TW-{$bedh_descr}" info="{$info}" description="TW-{$bedh_descr}" /> </dc:if> <dc:if test="$bedh_max_count > 0"> - <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMax-{$bedh_id}-{$bedh_year}-KL-{$bedh_descr}" info="{$info}" description="KL-{$bedh_descr}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-singleMax-{$bedh_id}-{$bedh_year}-KL-{$bedh_descr}" info="{$info}" description="KL-{$bedh_descr}" /> </dc:if> </dc:for-each> </dc:macro> @@ -2205,7 +2205,7 @@ <dc:for-each> <dc:if test="$bedh_height_count > 0"> <!-- REMARK: addition 'yaer' attribute is used by intelligent datacage filter of SINFO --> - <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" year="{$bedh_year}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-single-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" year="{$bedh_year}" /> </dc:if> </dc:for-each> </dc:macro> @@ -2213,11 +2213,11 @@ <dc:macro name="bed-heights-single"> <single> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:if test="dc:has-result()"> <dc:group expr="dc:coalesce($bedh_year, 'sonstige')"> <heights name="{dc:group-key()}" description="{dc:group-key()}"> - <dc:call-macro name="bed-heights-factory_MW_TW_KL"/> + <dc:call-macro name="bed-heights-factory_MW_TW_KL" /> </heights> </dc:group> </dc:if> @@ -2229,12 +2229,12 @@ <dc:macro name="bed-heights-single-MW"> <single> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:filter expr="$bedh_height_count"> <dc:if test="dc:has-result()"> <dc:group expr="dc:coalesce($bedh_year, 'sonstige')"> <heights name="{dc:group-key()}" description="{dc:group-key()}"> - <dc:call-macro name="bed-heights-factory_MW"/> + <dc:call-macro name="bed-heights-factory_MW" /> </heights> </dc:group> </dc:if> @@ -2247,12 +2247,12 @@ <dc:macro name="bed-heights-single-KL_TW"> <single> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:filter expr="$bedh_max_count > 0 and $bedh_min_count > 0"> <dc:if test="dc:has-result()"> <dc:group expr="dc:coalesce($bedh_year, 'sonstige')"> <heights name="{dc:group-key()}" description="{dc:group-key()}"> - <dc:call-macro name="bed-heights-factory_MW"/> + <dc:call-macro name="bed-heights-factory_MW" /> </heights> </dc:group> </dc:if> @@ -2264,9 +2264,9 @@ <dc:macro name="bed-heights-epoch"> <epoch> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:filter expr="contains($bedh_descr, 'Epoche')"> - <dc:call-macro name="bed-heights-factory_MW_TW_KL"/> + <dc:call-macro name="bed-heights-factory_MW_TW_KL" /> </dc:filter> </dc:context> </epoch> @@ -2274,16 +2274,16 @@ <dc:macro name="sounding-width-factory"> <dc:for-each> - <height factory="bedheight" target_out="{$out}" ids="bedheight-soundings-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}"/> + <height factory="bedheight" target_out="{$out}" ids="bedheight-soundings-{$bedh_id}-{$bedh_year}-{$bedh_descr}" info="{$info}" description="{$bedh_descr}" /> </dc:for-each> </dc:macro> <dc:macro name="sounding-width"> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:if test="dc:has-result()"> <soundings_width> - <dc:call-macro name="sounding-width-factory"/> + <dc:call-macro name="sounding-width-factory" /> </soundings_width> </dc:if> </dc:context> @@ -2291,9 +2291,9 @@ <dc:macro name="sounding-width-recommendations"> <dc:context> - <dc:call-macro name="bed-heights-statement"/> + <dc:call-macro name="bed-heights-statement" /> <dc:filter expr="dc:contains($diffids, concat(';', $bedh_descr, ']'))"> - <dc:call-macro name="sounding-width-factory"/> + <dc:call-macro name="sounding-width-factory" /> </dc:filter> </dc:context> </dc:macro> @@ -2352,7 +2352,7 @@ <dc:for-each> <measurement_value name="{$fvmd}" description="{$fvmd}" ids="{$fvmid}" factory="flowvelocitymodel" info="{$lowerQ} - {$upperQ}<BR> Pegel {$gauge}<BR> - Q = {$q} m3/s" target_out="{$out}"/> + Q = {$q} m3/s" target_out="{$out}" /> </dc:for-each> </flowvelocitymodel> </dc:if> @@ -2379,7 +2379,7 @@ AND station BETWEEN ${fromkm} AND ${tokm} </dc:statement> <dc:for-each> - <measurement_value name="{$description} - {$station} - {$datetime}" description="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}"/> + <measurement_value name="{$description} - {$station} - {$datetime}" description="{$description} - {$station} - {$datetime}" ids="{$id}" factory="flowvelocity" target_out="{$out}" /> </dc:for-each> </dc:context> </flow_velocity_measurement> @@ -2407,7 +2407,7 @@ WHERE morphologic_width_id = ${width_id} </dc:statement> <dc:for-each> - <morphologic-width name="{$from_station} - {$to_station}" description="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}"/> + <morphologic-width name="{$from_station} - {$to_station}" description="{$from_station} - {$to_station}" ids="{$width_id}" factory="morph-width" target_out="{$out}" /> </dc:for-each> </dc:context> </dc:for-each> @@ -2448,8 +2448,8 @@ <dc:variable name="combined_desc" expr="concat(dc:date-format('yyyy', $start_time), ' bis ', dc:date-format('yyyy', - $stop_time))"/> - <sqvalue factory="sqrelationdatacage" target_out="{$out}" ids="{$sqvid};{dc:uppercase($parameter)} - {$station_name}: {$combined_desc}" description="{$combined_desc}"/> + $stop_time))" /> + <sqvalue factory="sqrelationdatacage" target_out="{$out}" ids="{$sqvid};{dc:uppercase($parameter)} - {$station_name}: {$combined_desc}" description="{$combined_desc}" /> </dc:for-each> </station> </dc:group> @@ -2463,36 +2463,36 @@ <!-- Floodmap part --> <dc:macro name="flood-map-complete"> - <dc:call-macro name="flood-map-buildings"/> - <dc:call-macro name="flood-map-gaugelocations"/> - <dc:call-macro name="floodmarks"/> + <dc:call-macro name="flood-map-buildings" /> + <dc:call-macro name="flood-map-gaugelocations" /> + <dc:call-macro name="floodmarks" /> <hws> - <dc:call-macro name="hwslines"/> - <dc:call-macro name="hwspoints"/> + <dc:call-macro name="hwslines" /> + <dc:call-macro name="hwspoints" /> </hws> - <dc:call-macro name="flood-map-routing"/> + <dc:call-macro name="flood-map-routing" /> <hydrboundaries> - <dc:call-macro name="flood-map-floodplain"/> - <dc:call-macro name="flood-map-hydr-boundaries"/> + <dc:call-macro name="flood-map-floodplain" /> + <dc:call-macro name="flood-map-hydr-boundaries" /> </hydrboundaries> - <dc:call-macro name="flood-map-uesk"/> + <dc:call-macro name="flood-map-uesk" /> </dc:macro> <dc:macro name="flood-map-routing"> <route_data> - <dc:call-macro name="flood-map-qps"/> - <dc:call-macro name="flood-map-fixpoints"/> - <dc:call-macro name="flood-map-km"/> - <dc:call-macro name="flood-map-riveraxis"/> + <dc:call-macro name="flood-map-qps" /> + <dc:call-macro name="flood-map-fixpoints" /> + <dc:call-macro name="flood-map-km" /> + <dc:call-macro name="flood-map-riveraxis" /> </route_data> </dc:macro> <dc:macro name="flood-map-hydr-boundaries"> <bfg_model> - <dc:call-macro name="flood-map-hydr-boundaries-poly"/> - <dc:call-macro name="flood-map-hydr-boundaries-lines"/> + <dc:call-macro name="flood-map-hydr-boundaries-poly" /> + <dc:call-macro name="flood-map-hydr-boundaries-lines" /> </bfg_model> - <dc:call-macro name="flood-map-hydr-boundaries-state"/> + <dc:call-macro name="flood-map-hydr-boundaries-state" /> </dc:macro> <dc:macro name="flood-map-dem"> @@ -2518,7 +2518,7 @@ AND NOT((${tokm} < r.a) or (${fromkm} > r.b)) </dc:statement> <dc:for-each> - <dem factory="demfactory" target_out="{$out}" ids="{$dem_id}" name="{$name}" info="{$info}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}"/> + <dem factory="demfactory" target_out="{$out}" ids="{$dem_id}" name="{$name}" info="{$info}{dc:date-format('yyyy', $start_time)} - {dc:date-format('yyyy', $stop_time)}" /> </dc:for-each> </dc:context> </dems> @@ -2528,14 +2528,14 @@ <dc:macro name="durchlass_damm_graben"> <dc:macro name="ddg_factory"> <dc:for-each> - <hws factory="hwsfactory" name="{$hws_name}" target_out="{$out}"/> + <hws factory="hwsfactory" name="{$hws_name}" target_out="{$out}" /> </dc:for-each> </dc:macro> <dc:filter expr="$hws_kind=1"> <dc:if test="dc:has-result()"> <Durchlass> - <dc:call-macro name="ddg_factory"/> + <dc:call-macro name="ddg_factory" /> </Durchlass> </dc:if> </dc:filter> @@ -2543,7 +2543,7 @@ <dc:filter expr="$hws_kind=2"> <dc:if test="dc:has-result()"> <Damm> - <dc:call-macro name="ddg_factory"/> + <dc:call-macro name="ddg_factory" /> </Damm> </dc:if> </dc:filter> @@ -2551,7 +2551,7 @@ <dc:filter expr="$hws_kind=3"> <dc:if test="dc:has-result()"> <Graben> - <dc:call-macro name="ddg_factory"/> + <dc:call-macro name="ddg_factory" /> </Graben> </dc:if> </dc:filter> @@ -2560,7 +2560,7 @@ <dc:filter expr="$hws_official=1"> <dc:if test="dc:has-result()"> <official> - <dc:call-macro name="durchlass_damm_graben"/> + <dc:call-macro name="durchlass_damm_graben" /> </official> </dc:if> </dc:filter> @@ -2568,7 +2568,7 @@ <dc:filter expr="$hws_official=0"> <dc:if test="dc:has-result()"> <inofficial> - <dc:call-macro name="durchlass_damm_graben"/> + <dc:call-macro name="durchlass_damm_graben" /> </inofficial> </dc:if> </dc:filter> @@ -2586,7 +2586,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <lines> - <dc:call-macro name="filter_hws_ddg"/> + <dc:call-macro name="filter_hws_ddg" /> </lines> </dc:if> </dc:context> @@ -2604,7 +2604,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <points> - <dc:call-macro name="filter_hws_ddg"/> + <dc:call-macro name="filter_hws_ddg" /> </points> </dc:if> </dc:context> @@ -2621,7 +2621,7 @@ AND kind = 2 </dc:statement> <dc:for-each> - <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}"/> + <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}" /> </dc:for-each> </dc:context> <dc:context> @@ -2633,7 +2633,7 @@ AND kind = 2 </dc:statement> <dc:for-each> - <line factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}"/> + <line factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name};2" name="{$name}" /> </dc:for-each> </dc:context> </federal> @@ -2652,7 +2652,7 @@ <dc:if test="dc:has-result()"> <lines> <dc:for-each> - <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};1" name="{$name}"/> + <line factory="wmshydrboundariesfactory" target_out="{$out}" ids="{$river_id};{$name};1" name="{$name}" /> </dc:for-each> </lines> </dc:if> @@ -2674,7 +2674,7 @@ <dc:if test="dc:has-result()"> <sobek_areas> <dc:for-each> - <boundary name="{$sectie}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sectie};1;{$sectie_id};-1"/> + <boundary name="{$sectie}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sectie};1;{$sectie_id};-1" /> </dc:for-each> </sobek_areas> </dc:if> @@ -2692,7 +2692,7 @@ <dc:if test="dc:has-result()"> <sobek_flooded> <dc:for-each> - <boundary name="{$sobek}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sobek};1;-1;{$sobek_id}"/> + <boundary name="{$sobek}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$sobek};1;-1;{$sobek_id}" /> </dc:for-each> </sobek_flooded> </dc:if> @@ -2708,7 +2708,7 @@ AND b.sectie is NULL </dc:statement> <dc:for-each> - <boundary name="{$name}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name}"/> + <boundary name="{$name}" factory="wmshydrboundariespolyfactory" target_out="{$out}" ids="{$river_id};{$name}" /> </dc:for-each> </dc:context> </areas> @@ -2738,7 +2738,7 @@ <dc:if test="dc:has-result()"> <bfg> <dc:for-each> - <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/> + <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" /> </dc:for-each> </bfg> </dc:if> @@ -2752,7 +2752,7 @@ <dc:if test="dc:has-result()"> <federal> <dc:for-each> - <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/> + <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" /> </dc:for-each> </federal> </dc:if> @@ -2776,7 +2776,7 @@ <dc:if test="dc:has-result()"> <bfg> <dc:for-each> - <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/> + <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" /> </dc:for-each> </bfg> </dc:if> @@ -2791,7 +2791,7 @@ <dc:if test="dc:has-result()"> <federal> <dc:for-each> - <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/> + <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" /> </dc:for-each> </federal> </dc:if> @@ -2820,7 +2820,7 @@ ${source} </dc:statement> <dc:for-each> - <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}"/> + <floodmaps factory="wmsfloodmapsfactory" target_out="{$out}" ids="{$river_id};{$name}" name="{$name}" /> </dc:for-each> </dc:context> </year> @@ -2847,14 +2847,14 @@ <floodplain> <dc:filter expr="$kind_id=1"> <dc:for-each> - <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}"/> + <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}" /> </dc:for-each> </dc:filter> <dc:filter expr="$kind_id != 1"> <dc:if test="dc:has-result()"> <other> <dc:for-each> - <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}"/> + <floody factory="wmsfloodplainfactory" target_out="{$out}" description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}" /> </dc:for-each> </other> </dc:if> @@ -2872,14 +2872,14 @@ <dc:macro name="hwspoints_by_kind_factory"> <dc:for-each> - <hws factory="wmshwspointsfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}"/> + <hws factory="wmshwspointsfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}" /> </dc:for-each> </dc:macro> <dc:filter expr="$hws_kind=1"> <dc:if test="dc:has-result()"> <Durchlass> - <dc:call-macro name="hwspoints_by_kind_factory"/> + <dc:call-macro name="hwspoints_by_kind_factory" /> </Durchlass> </dc:if> </dc:filter> @@ -2887,7 +2887,7 @@ <dc:filter expr="$hws_kind=2"> <dc:if test="dc:has-result()"> <Damm> - <dc:call-macro name="hwspoints_by_kind_factory"/> + <dc:call-macro name="hwspoints_by_kind_factory" /> </Damm> </dc:if> </dc:filter> @@ -2895,7 +2895,7 @@ <dc:filter expr="$hws_kind=3"> <dc:if test="dc:has-result()"> <Graben> - <dc:call-macro name="hwspoints_by_kind_factory"/> + <dc:call-macro name="hwspoints_by_kind_factory" /> </Graben> </dc:if> </dc:filter> @@ -2926,7 +2926,7 @@ AND fed_state_id = ${fed_id} ORDER BY name </dc:statement> <fedstate description="{$fed_name}"> - <dc:call-macro name="hwspoints_by_kind"/> + <dc:call-macro name="hwspoints_by_kind" /> </fedstate> </dc:context> </dc:for-each> @@ -2943,7 +2943,7 @@ ORDER BY name </dc:statement> <hws_fed_unknown> - <dc:call-macro name="hwspoints_by_kind"/> + <dc:call-macro name="hwspoints_by_kind" /> </hws_fed_unknown> </dc:context> </official> @@ -2970,7 +2970,7 @@ AND fed_state_id = ${fed_id} ORDER BY name </dc:statement> <fedstate description="{$fed_name}"> - <dc:call-macro name="hwspoints_by_kind"/> + <dc:call-macro name="hwspoints_by_kind" /> </fedstate> </dc:context> </dc:for-each> @@ -2986,7 +2986,7 @@ AND fed_state_id IS NULL ORDER BY name </dc:statement> <hws_fed_unknown> - <dc:call-macro name="hwspoints_by_kind"/> + <dc:call-macro name="hwspoints_by_kind" /> </hws_fed_unknown> </dc:context> </inofficial> @@ -3001,14 +3001,14 @@ <dc:macro name="hwslines_by_kind_factory"> <dc:for-each> - <hws factory="wmshwslinesfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}"/> + <hws factory="wmshwslinesfactory" target_out="{$out}" ids="{$river_id};{$hws_name}" name="{$hws_name}" /> </dc:for-each> </dc:macro> <dc:filter expr="$hws_kind=1"> <dc:if test="dc:has-result()"> <Durchlass> - <dc:call-macro name="hwslines_by_kind_factory"/> + <dc:call-macro name="hwslines_by_kind_factory" /> </Durchlass> </dc:if> </dc:filter> @@ -3016,7 +3016,7 @@ <dc:filter expr="$hws_kind=2"> <dc:if test="dc:has-result()"> <Damm> - <dc:call-macro name="hwslines_by_kind_factory"/> + <dc:call-macro name="hwslines_by_kind_factory" /> </Damm> </dc:if> </dc:filter> @@ -3024,7 +3024,7 @@ <dc:filter expr="$hws_kind=3"> <dc:if test="dc:has-result()"> <Graben> - <dc:call-macro name="hwslines_by_kind_factory"/> + <dc:call-macro name="hwslines_by_kind_factory" /> </Graben> </dc:if> </dc:filter> @@ -3055,7 +3055,7 @@ AND fed_state_id = ${fed_id} ORDER BY name </dc:statement> <fedstate description="{$fed_name}"> - <dc:call-macro name="hwslines_by_kind"/> + <dc:call-macro name="hwslines_by_kind" /> </fedstate> </dc:context> </dc:for-each> @@ -3072,7 +3072,7 @@ ORDER BY name </dc:statement> <hws_fed_unknown> - <dc:call-macro name="hwslines_by_kind"/> + <dc:call-macro name="hwslines_by_kind" /> </hws_fed_unknown> </dc:context> </official> @@ -3099,7 +3099,7 @@ AND fed_state_id = ${fed_id} ORDER BY name </dc:statement> <fedstate description="{$fed_name}"> - <dc:call-macro name="hwslines_by_kind"/> + <dc:call-macro name="hwslines_by_kind" /> </fedstate> </dc:context> </dc:for-each> @@ -3115,7 +3115,7 @@ AND fed_state_id IS NULL ORDER BY name </dc:statement> <hws_fed_unknown> - <dc:call-macro name="hwslines_by_kind"/> + <dc:call-macro name="hwslines_by_kind" /> </hws_fed_unknown> </dc:context> </inofficial> @@ -3133,7 +3133,7 @@ <dc:if test="dc:has-result()"> <floodmarks> <dc:for-each> - <floodmark name="{$year}" factory="wmsfloodmarkfactory" target_out="{$out}" ids="{$river_id};{$year};{$year}"/> + <floodmark name="{$year}" factory="wmsfloodmarkfactory" target_out="{$out}" ids="{$river_id};{$year};{$year}" /> </dc:for-each> </floodmarks> </dc:if> @@ -3142,10 +3142,10 @@ <dc:macro name="flood-map-gaugelocations"> <gaugelocations> - <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)" target_out="{$out}"/> - <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)" target_out="{$out}"/> - <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)" target_out="{$out}"/> - <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)" target_out="{$out}"/> + <gauge_points factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelpunkte;Pegelpunkte (WSV)" target_out="{$out}" /> + <gauge_names factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelnamen;Pegelnamen (WSV)" target_out="{$out}" /> + <gauge_level factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;Pegelwasserstand;Aktueller Wasserstand (WSV)" target_out="{$out}" /> + <gauge_tendency factory="externalwmsfactory" ids="http://www.pegelonline.wsv.de/webservices/gis/wms;TendenzWasserstand;Tendenz des Wasserstands (WSV)" target_out="{$out}" /> </gaugelocations> </dc:macro> @@ -3164,13 +3164,13 @@ <axis> <dc:filter expr="$kind_id=1"> <dc:for-each> - <actual description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}" factory="riveraxis" target_out="{$out}"/> + <actual description="{$kind_name}" ids="{$river_id};{$kind_name};{$kind_id}" factory="riveraxis" target_out="{$out}" /> </dc:for-each> </dc:filter> <dc:filter expr="$kind_id!=1"> <other> <dc:for-each> - <misc-axis description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}" factory="riveraxis" target_out="{$out}"/> + <misc-axis description="{$layer_name}" ids="{$river_id};{$layer_name};{$kind_id}" factory="riveraxis" target_out="{$out}" /> </dc:for-each> </other> </dc:filter> @@ -3185,7 +3185,7 @@ SELECT DISTINCT 1 FROM river_axes_km WHERE river_id = ${river_id} </dc:statement> <dc:for-each> - <kilometrage factory="wmskmfactory" ids="{$river_id}" target_out="{$out}"/> + <kilometrage factory="wmskmfactory" ids="{$river_id}" target_out="{$out}" /> </dc:for-each> </dc:context> </dc:macro> @@ -3199,7 +3199,7 @@ GROUP BY name </dc:statement> <dc:for-each> - <fixpoints factory="wmsfixpointsfactory" target_out="{$out}" ids="{$river_id};{$name}"/> + <fixpoints factory="wmsfixpointsfactory" target_out="{$out}" ids="{$river_id};{$name}" /> </dc:for-each> </dc:context> </dc:macro> @@ -3219,14 +3219,14 @@ <qps> <dc:filter expr="$kind_id=1"> <dc:for-each> - <actual description="{$kind_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$kind_name};{$kind_id}"/> + <actual description="{$kind_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$kind_name};{$kind_id}" /> </dc:for-each> </dc:filter> <dc:filter expr="$kind_id = 0"> <dc:if test="dc:has-result()"> <other> <dc:for-each> - <misc-qps description="{$layer_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$layer_name};{$kind_id}"/> + <misc-qps description="{$layer_name}" factory="wmsqpsfactory" target_out="{$out}" ids="{$river_id};{$layer_name};{$kind_id}" /> </dc:for-each> </other> </dc:if> @@ -3251,13 +3251,13 @@ <dc:if test="dc:has-result()"> <dc:filter expr="$building_kind_id!=0"> <dc:for-each> - <buildings description="{$building_kind}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_kind};{$building_kind_id}"/> + <buildings description="{$building_kind}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_kind};{$building_kind_id}" /> </dc:for-each> </dc:filter> <dc:filter expr="$building_kind_id=0"> <other> <dc:for-each> - <buildings description="{$building_name}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_name}"/> + <buildings description="{$building_name}" factory="wmsbuildingsfactory" target_out="{$out}" ids="{$river_id};{$building_name}" /> </dc:for-each> </other> </dc:filter> @@ -3275,7 +3275,7 @@ <dc:if test="dc:has-result()"> <jetties> <dc:for-each> - <jetty description="{$jetty_kind}" factory="wmsjettiesfactory" target_out="{$out}" ids="{$river_id};{$jetty_kind};{$jetty_kind_id}"/> + <jetty description="{$jetty_kind}" factory="wmsjettiesfactory" target_out="{$out}" ids="{$river_id};{$jetty_kind};{$jetty_kind_id}" /> </dc:for-each> </jetties> </dc:if> @@ -3287,14 +3287,14 @@ <dc:if test="dc:contains($parameters, 'official-lines')"> <dc:container-context container="official-lines"> <dc:properties> - <dc:property name="name" alias="olname"/> - <dc:property name="wstId" alias="wstid"/> - <dc:property name="columnPos" alias="wstcolpos"/> + <dc:property name="name" alias="olname" /> + <dc:property name="wstId" alias="wstid" /> + <dc:property name="columnPos" alias="wstcolpos" /> </dc:properties> <dc:if test="dc:has-result()"> <officiallines> <dc:for-each> - <column name="{$olname}" ids="official-wstv-{$wstcolpos}-{$wstid}" factory="staticwqkms" target_out="{$out}"/> + <column name="{$olname}" ids="official-wstv-{$wstcolpos}-{$wstid}" factory="staticwqkms" target_out="{$out}" /> </dc:for-each> </officiallines> </dc:if> @@ -3305,14 +3305,14 @@ <!-- sediment loads --> <dc:macro name="sedimentload_off_epoch_filter"> <dc:if test="dc:has-result()"> - <dc:variable name="sq_time_id" type="number" expr="number($sq_ti_id)"/> + <dc:variable name="sq_time_id" type="number" expr="number($sq_ti_id)" /> <dc:if test="string-length(dc:get('epochs')) > 0"> - <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $epochs))"/> - <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $epochs))"/> + <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $epochs))" /> + <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $epochs))" /> </dc:if> <dc:if test="string-length(dc:get('years')) > 0"> - <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $years))"/> - <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $years))"/> + <dc:variable name="start" type="number" expr="dc:min-number(dc:find-all('\d{4}', $years))" /> + <dc:variable name="end" type="number" expr="dc:max-number(dc:find-all('\d{4}', $years))" /> </dc:if> <dc:filter expr="$kind = 'official' and $sqid = $sq_time_id and @@ -3320,25 +3320,25 @@ number(dc:date-format('yyyy', $startyear)) or number($start) > number(dc:date-format('yyyy', $endyear)))"> - <dc:macro-body/> + <dc:macro-body /> </dc:filter> </dc:if> </dc:macro> <dc:macro name="sedimentload_off_epochs"> <dc:context> - <dc:call-macro name="sedimentload_stations_statement"/> + <dc:call-macro name="sedimentload_stations_statement" /> <dc:call-macro name="sedimentload_off_epoch_filter"> <dc:call-macro name="loads"> - <dc:call-macro name="load"/> + <dc:call-macro name="load" /> </dc:call-macro> </dc:call-macro> </dc:context> <dc:context> - <dc:call-macro name="sedimentload_ls_statement"/> + <dc:call-macro name="sedimentload_ls_statement" /> <dc:call-macro name="sedimentload_off_epoch_filter"> <dc:call-macro name="loads"> - <dc:call-macro name="load_ls"/> + <dc:call-macro name="load_ls" /> </dc:call-macro> </dc:call-macro> </dc:context> @@ -3371,7 +3371,7 @@ NOT((${tokm} < wr.a) or (${fromkm} > wr.b)) ORDER BY wst_column_position </dc:statement> - <dc:macro-body/> + <dc:macro-body /> </dc:context> </dc:macro> @@ -3408,7 +3408,8 @@ JOIN facets f ON f.out_id = o.id WHERE u.gid = CAST(${user-id} AS UUID) AND ma.gid <> CAST(${artifact-id} AS uuid) - AND f.name NOT LIKE '%empty.facet%' + AND f.name NOT LIKE + '%empty.facet%' AND EXISTS ( SELECT id @@ -3419,7 +3420,7 @@ </dc:statement> <dc:virtual-column name="deffrom" type="number" expr="dc:fromValue($ld_m, $ld_l, $ld_f)"> <dc:virtual-column name="defto" type="number" expr="dc:toValue($ld_m, $ld_l, $ld_t)"> - <dc:macro-body/> + <dc:macro-body /> </dc:virtual-column> </dc:virtual-column> </dc:context> @@ -3432,7 +3433,7 @@ </dc:comment> <dc:filter expr="not($deffrom > $tokm or $defto < $fromkm) or starts-with($facet_name, 'sq_')"> - <dc:macro-body/> + <dc:macro-body /> </dc:filter> </dc:macro> @@ -3440,32 +3441,40 @@ <dc:choose> <dc:when test="dc:coalesce(dc:get('ld_locations'), ' ') != ' '"> <dc:variable name="fromkm" type="number" expr="dc:min-number(dc:find-all('\d*\.?\d*', - dc:get('ld_locations')))"/> + dc:get('ld_locations')))" /> <dc:variable name="tokm" type="number" expr="dc:max-number(dc:find-all('\d*\.?\d*', - dc:get('ld_locations')))"/> + dc:get('ld_locations')))" /> </dc:when> <dc:otherwise> <dc:variable name="fromkm" type="number" expr="dc:fromValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_from'))"/> + dc:get('ld_locations'), dc:get('ld_from'))" /> <dc:variable name="tokm" type="number" expr="dc:toValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_to'))"/> + dc:get('ld_locations'), dc:get('ld_to'))" /> <dc:if test="$fromkm > $tokm"> <dc:message>Inverting KM filter.</dc:message> <dc:variable name="fromkm" type="number" expr="dc:toValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_to'))"/> + dc:get('ld_locations'), dc:get('ld_to'))" /> <dc:variable name="tokm" type="number" expr="dc:fromValue(dc:get('ld_mode'), - dc:get('ld_locations'), dc:get('ld_from'))"/> + dc:get('ld_locations'), dc:get('ld_from'))" /> </dc:if> </dc:otherwise> </dc:choose> - <dc:macro-body/> + <dc:macro-body /> </dc:macro> <!-- S-INFO --> <dc:macro name="sinfo_flowdepths"> - <dc:filter expr="$a_state = 'state.sinfo.flow_depth' and - ( $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or - $facet_name = 'sinfo_facet_flow_depth_with_tkh' or $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or + <dc:filter + expr="$a_state = 'state.sinfo.flow_depth' and + ( $facet_name = 'sinfo_facet_flow_depth' or + $facet_name = 'sinfo_facet_flow_depth.filtered' or + $facet_name = 'sinfo_facet_flow_depth_waterlevel' or + $facet_name = 'sinfo_facet_flow_depth_bedheight' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_max' or + $facet_name = 'sinfo_facet_flow_depth_discharge' or + $facet_name = 'sinfo_facet_flow_depth_with_tkh' or + $facet_name = 'sinfo_facet_flow_depth_with_tkh.filtered' or $facet_name = 'sinfo_facet_tkh' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths> @@ -3473,12 +3482,12 @@ <sinfo_flow_depth description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_flow_depth> @@ -3490,20 +3499,26 @@ <dc:macro name="sinfo_flowdepths_minmax"> <dc:filter expr="$a_state = 'state.sinfo.flow_depth_minmax' and - ( $facet_name = 'sinfo_facet_flow_depth_min' or $facet_name = 'sinfo_facet_flow_depth_min.filtered' or - $facet_name = 'sinfo_facet_flow_depth_max' or $facet_name = 'sinfo_facet_flow_depth_max.filtered' )"> + ( $facet_name = 'sinfo_facet_flow_depth_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_max' or + $facet_name = 'sinfo_facet_flow_depth_waterlevel' or + $facet_name = 'sinfo_facet_flow_depth_discharge' or + $facet_name = 'sinfo_facet_flow_depth_min.filtered' or + $facet_name = 'sinfo_facet_flow_depth_max' or + $facet_name = 'sinfo_facet_flow_depth_max.filtered' )"> <dc:if test="dc:has-result()"> <sinfo_flow_depths_minmax> <dc:call-macro name="collection-group"> <sinfo_flow_depth_minmax description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_flow_depth_minmax> @@ -3528,12 +3543,12 @@ <sinfo_flow_depth_development description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_flow_depth_development> @@ -3548,6 +3563,11 @@ expr="$a_state = 'state.sinfo.transport_bodies_heights' and ( $facet_name = 'sinfo_facet_tkh' or $facet_name = 'sinfo_facet_flow_depth' or $facet_name = 'sinfo_facet_flow_depth.filtered' or + $facet_name = 'sinfo_facet_flow_depth_discharge' or + $facet_name = 'sinfo_facet_flow_depth_waterlevel' or + $facet_name = 'sinfo_facet_flow_depth_bedheight' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_min' or + $facet_name = 'sinfo_facet_flow_depth_bedheight_max' or $facet_name = 'sinfo_facet_velocity' or $facet_name = 'sinfo_facet_velocity.filtered' or $facet_name = 'sinfo_facet_tau' or $facet_name = 'sinfo_facet_tau.filtered' or $facet_name = 'sinfo_facet_d50' or $facet_name = 'sinfo_facet_d50.filtered' )"> @@ -3557,12 +3577,12 @@ <sinfo_tkh description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_tkh> @@ -3581,12 +3601,12 @@ <sinfo_collision description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_collision> @@ -3607,12 +3627,12 @@ <sinfo_flood_duration description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="sinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="sinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </sinfo_flood_duration> @@ -3640,7 +3660,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <channelseries name="{$seriesname}" description="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}"/> + <channelseries name="{$seriesname}" description="{$seriesname}" ids="channelx-{$id}-{$seriesname}" factory="channelf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3649,15 +3669,15 @@ <!-- tkh imported from CSV-files for S-INFO --> <dc:macro name="sinfo_predefined_tkh-berechnung"> <predefined_tkh_berechnung> - <dc:variable name="tkh_groupname" expr="'berechnung'"/> - <dc:call-macro name="sinfo_predefined_tkh"/> + <dc:variable name="tkh_groupname" expr="'berechnung'" /> + <dc:call-macro name="sinfo_predefined_tkh" /> </predefined_tkh_berechnung> </dc:macro> <dc:macro name="sinfo_predefined_tkh-messung"> <predefined_tkh_messung> - <dc:variable name="tkh_groupname" expr="'messung'"/> - <dc:call-macro name="sinfo_predefined_tkh"/> + <dc:variable name="tkh_groupname" expr="'messung'" /> + <dc:call-macro name="sinfo_predefined_tkh" /> </predefined_tkh_messung> </dc:macro> @@ -3685,7 +3705,7 @@ <dc:group expr="$tkh_name"> <tkhx name="{dc:group-key()}" description="{dc:group-key()}"> <dc:for-each> - <tkhcolumn name="{$tkh_col_name}" description="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}"/> + <tkhcolumn name="{$tkh_col_name}" description="{$tkh_col_name}" ids="tkhx-{$tkh_col_id}-{$tkh_id}" factory="tkhxf" target_out="{$out}" info="{$info}" /> </dc:for-each> </tkhx> </dc:group> @@ -3696,15 +3716,15 @@ <!-- depth_evolution imported from CSV-files for S-INFO --> <dc:macro name="sinfo_predefined_depthevol-aktuell"> <predefined_depthevol_aktuell> - <dc:variable name="depthevol_groupname" expr="'aktuell'"/> - <dc:call-macro name="sinfo_predefined_depthevol"/> + <dc:variable name="depthevol_groupname" expr="'aktuell'" /> + <dc:call-macro name="sinfo_predefined_depthevol" /> </predefined_depthevol_aktuell> </dc:macro> <dc:macro name="sinfo_predefined_depthevol-etappe"> <predefined_depthevol_etappe> - <dc:variable name="depthevol_groupname" expr="'etappe'"/> - <dc:call-macro name="sinfo_predefined_depthevol"/> + <dc:variable name="depthevol_groupname" expr="'etappe'" /> + <dc:call-macro name="sinfo_predefined_depthevol" /> </predefined_depthevol_etappe> </dc:macro> @@ -3728,14 +3748,14 @@ ORDER BY s.id </dc:statement> <dc:for-each> - <depth_evol name="{$depthevol_name}" description="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}"/> + <depth_evol name="{$depthevol_name}" description="{$depthevol_name}" ids="depthevolx-{$depthevol_id}-{$depthevol_name}" factory="depthevolxf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:context> </dc:macro> <!-- flow depth imported from CSV-files for S-INFO --> <dc:macro name="sinfo_predefined_flowdepth-m"> - <dc:call-macro name="sinfo_predefined_flowdepth-m1"/> + <dc:call-macro name="sinfo_predefined_flowdepth-m1" /> </dc:macro> <dc:macro name="sinfo_predefined_flowdepth-m1"> @@ -3761,7 +3781,7 @@ <dc:group expr="$flowdepth_name"> <sinfo_predefined_flowdepth> <dc:for-each> - <flowdepthcolumn name="{$flowdepth_col_name}" description="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}"/> + <flowdepthcolumn name="{$flowdepth_col_name}" description="{$flowdepth_col_name}" ids="flowdepthx-{$flowdepth_col_id}-{$flowdepth_id}" factory="flowdepthxf" target_out="{$out}" info="{$info}" /> </dc:for-each> </sinfo_predefined_flowdepth> </dc:group> @@ -3790,7 +3810,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <infrastructureseries name="{$seriesname}" description="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}"/> + <infrastructureseries name="{$seriesname}" description="{$seriesname}" ids="infrastructurex-{$id}-{$seriesname}" factory="infrastructuref" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3814,7 +3834,7 @@ </dc:statement> <dc:if test="dc:has-result()"> <dc:for-each> - <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}"/> + <collisionseries name="{$seriesname}" description="{$seriesname}" ids="collisionx-{$id}-{$year}-{$seriesname}" factory="collisionf" target_out="{$out}" info="{$info}" /> </dc:for-each> </dc:if> </dc:context> @@ -3832,12 +3852,12 @@ <uinfo_salix_line description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="uinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="uinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </uinfo_salix_line> @@ -3853,18 +3873,18 @@ <dc:if test="dc:has-result()"> <vegetation_zones> <dc:for-each> - <dc:variable name="vegzonedata" expr="dc:data_from_artifact($a_gid,'vegzones')"/> - <dc:variable name="label_temp" type="string" expr="concat(dc:get('ld_f'), ' km - ', dc:get('ld_t'), ' km')"/> + <dc:variable name="vegzonedata" expr="dc:data_from_artifact($a_gid,'vegzones')" /> + <dc:variable name="label_temp" type="string" expr="concat(dc:get('ld_f'), ' km - ', dc:get('ld_t'), ' km')" /> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="uinfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${label_temp}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> - <dc:attribute name="ids" value="${facet_num}"/> + <dc:attribute name="factory" value="uinfo" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${label_temp}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> + <dc:attribute name="ids" value="${facet_num}" /> <!-- veg zones string as attribute --> - <dc:attribute name="data" value="${vegzonedata}"/> + <dc:attribute name="data" value="${vegzonedata}" /> </dc:element> </dc:for-each> </vegetation_zones> @@ -3917,12 +3937,12 @@ <bundu_bezugswst description="{dc:group-key()}"> <dc:for-each> <dc:element name="${facet_name}"> - <dc:attribute name="factory" value="bundu"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="ids" value="${facet_num}"/> - <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:attribute name="out" value="${out_name}"/> + <dc:attribute name="factory" value="bundu" /> + <dc:attribute name="target_out" value="${out}" /> + <dc:attribute name="description" value="${facet_description}" /> + <dc:attribute name="ids" value="${facet_num}" /> + <dc:attribute name="artifact-id" value="${a_gid}" /> + <dc:attribute name="out" value="${out_name}" /> </dc:element> </dc:for-each> </bundu_bezugswst>
--- a/artifacts/doc/conf/themes.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/themes.xml Thu Oct 10 15:29:02 2019 +0200 @@ -410,6 +410,11 @@ <mapping from="bedheight_min" to="SInfoBedHeightMin"/> <mapping from="bedheight_max" to="SInfoBedHeightMax"/> + <mapping from="sinfo_facet_flow_depth_discharge" to="SInfoFlowDepthDischarge"/> + <mapping from="sinfo_facet_flow_depth_waterlevel" to="SInfoFlowDepthWaterlevel"/> + <mapping from="sinfo_facet_flow_depth_bedheight" to="SInfoFlowDepthBedheight"/> + <mapping from="sinfo_facet_flow_depth_bedheight_min" to="SInfoFlowDepthBedheightMin"/> + <mapping from="sinfo_facet_flow_depth_bedheight_max" to="SInfoFlowDepthBedheightMax"/> <mapping from="sinfo_facet_flow_depth" to="SInfoFlowDepth"/> <mapping from="sinfo_facet_flow_depth.filtered" to="SInfoFlowDepth"/> <mapping from="sinfo_facet_flow_depth_with_tkh" to="SInfoFlowDepthWithTkh"/> @@ -440,7 +445,9 @@ <mapping from="sinfo_facet_flow_depth_development_per_year" to="SInfoFlowDepthDevelopmentPerYear"/> <mapping from="sinfo_facet_flow_depth_development_per_year.filtered" to="SInfoFlowDepthDevelopmentPerYear"/> <mapping from="sinfo_facet_waterlevel_difference.filtered" to="SInfoWaterlevelDifference"/> + <mapping from="sinfo_facet_waterlevel_difference" to="SInfoWaterlevelDifference"/> <mapping from="sinfo_facet_bedheight_difference.filtered" to="SInfoBedHeightDifference"/> + <mapping from="sinfo_facet_bedheight_difference" to="SInfoBedHeightDifference"/> <mapping from="sinfo_facet_collision_calc_count" to="SInfoCollisionCount"/> <mapping from="sinfo_facet_collision_calc_count.2" to="SInfoCollisionCount2"/>
--- a/artifacts/doc/conf/themes/default.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/themes/default.xml Thu Oct 10 15:29:02 2019 +0200 @@ -2633,6 +2633,46 @@ </theme> <!-- S-INFO Flow-Depth Themes --> + <theme name="SInfoFlowDepthBedheightMax"> + <inherits> + <inherit from="LongitudinalSection"/> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 128, 0"/> + </fields> + </theme> + <theme name="SInfoFlowDepthBedheightMin"> + <inherits> + <inherit from="LongitudinalSection"/> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="128,128, 0"/> + </fields> + </theme> + <theme name="SInfoFlowDepthBedheight"> + <inherits> + <inherit from="LongitudinalSection"/> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + </fields> + </theme> + <theme name="SInfoFlowDepthDischarge"> + <inherits> + <inherit from="LongitudinalSection"/> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 0"/> + </fields> + </theme> + <theme name="SInfoFlowDepthWaterlevel"> + <inherits> + <inherit from="LongitudinalSection"/> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128"/> + </fields> + </theme> <theme name="SInfoFlowDepth"> <inherits> <inherit from="LongitudinalSectionW"/>
--- a/artifacts/doc/conf/themes/legend.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/themes/legend.xml Thu Oct 10 15:29:02 2019 +0200 @@ -23,6 +23,28 @@ <fields> </fields> </theme> + + <theme name="sinfo_facet_flood_duration.left" desc="sinfo.flood_duration.infrastructures.left"> + <fields> + </fields> + </theme> + + <theme name="sinfo_facet_flood_duration.right" desc="sinfo.flood_duration.infrastructures.right"> + <fields> + </fields> + </theme> + + <theme name="sinfo_facet_flood_height.left" desc="sinfo.flood_duration.absolute.height.left"> + <fields> + </fields> + </theme> + + <theme name="sinfo_facet_flood_height.right" desc="sinfo.flood_duration.absolute.height.right"> + <fields> + </fields> + </theme> + + <theme name="fix_events_wqkms" desc="fix.vollmer.wq.events"> <fields>
--- a/artifacts/doc/conf/themes/second.xml Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/doc/conf/themes/second.xml Thu Oct 10 15:29:02 2019 +0200 @@ -2,36 +2,36 @@ <themegroup name="second"> <theme name="MainValuesQ"> <inherits> - <inherit from="Lines"/> + <inherit from="Lines" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="200, 0, 15"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" display="Farbe" default="200, 0, 15" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="MainValuesW"> <inherits> - <inherit from="Lines"/> + <inherit from="Lines" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="0, 215, 0"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" display="Farbe" default="0, 215, 0" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="RelativePoint"> <inherits> - <inherit from="Points"/> + <inherit from="Points" /> </inherits> </theme> <theme name="Annotations"> <inherits> - <inherit from="Lines"/> - <inherit from="Text"/> + <inherit from="Lines" /> + <inherit from="Text" /> </inherits> <fields> </fields> @@ -39,126 +39,126 @@ <theme name="ManualPoints"> <inherits> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3" hints="hidden"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" hints="hidden" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> </fields> </theme> <theme name="WKms"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> </fields> </theme> <theme name="WKmsAnnotation"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> - <field name="pointsize" type="int" display="Punktdicke" default="3" hints="hidden"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" hints="hidden" /> </fields> </theme> <theme name="WQKms"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> </fields> </theme> <theme name="WQKmsHorizontal"> <inherits> - <inherit from="WQKms"/> + <inherit from="WQKms" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> </fields> </theme> <theme name="WQPoints"> <inherits> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Linienfarbe" default="204, 0, 0"/> + <field name="pointcolor" type="Color" display="Linienfarbe" default="204, 0, 0" /> </fields> </theme> <theme name="heightmarks_points"> <inherits> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="pointcolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="Area"> <inherits> - <inherit from="Areas"/> + <inherit from="Areas" /> </inherits> <fields> - <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden"/> - <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden"/> - <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden"/> - <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden"/> - <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false"/> + <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" /> + <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" /> + <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" /> + <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" /> + <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" /> </fields> </theme> <!-- top level classes defining additional attributes --> <theme name="LongitudinalSection"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="MinMaxPoints"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="MinMaxPoints" /> + <inherit from="Label" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="LongitudinalSectionW"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="bandwidth" type="double" display="Bandbreite" default="0"/> - <field name="bandwidthcolor" type="Color" display="Bandbreitenfarbe" default="104, 104, 104"/> - <field name="transparency" type="int" default="20" display="Transparenz"/> - <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden"/> + <field name="bandwidth" type="double" display="Bandbreite" default="0" /> + <field name="bandwidthcolor" type="Color" display="Bandbreitenfarbe" default="104, 104, 104" /> + <field name="transparency" type="int" default="20" display="Transparenz" /> + <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" /> </fields> </theme> <theme name="LongitudinalSectionPoints"> <inherits> - <inherit from="Points"/> + <inherit from="Points" /> </inherits> <fields> </fields> @@ -166,14 +166,14 @@ <theme name="Differences"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> </fields> </theme> @@ -181,1301 +181,1301 @@ <!-- Classes defining special values --> <theme name="LongitudinalSectionW_HQ1"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ2"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ5"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ10"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ20"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ25"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ50"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ100"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ200"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ300"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 100"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 100" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ500"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ1000"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQRZ"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HSQ"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_MHQ"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_MNQ"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_MQ"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" /> </fields> </theme> <theme name="LongitudinalSectionW_NQ"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_HQExtrem"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ1_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ2_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ5_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 153, 51"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 153, 51" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ10_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 204, 204"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 204, 204" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ20_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 153, 0"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 153, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ25_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 51, 0"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 51, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ50_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 153, 153"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 153, 153" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ100_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 51"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 51" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ200_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ300_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 100, 255"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 100, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ500_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HQ1000_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_HQRZ_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_HSQ_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="253, 153, 0"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="253, 153, 0" /> </fields> </theme> <theme name="LongitudinalSectionW_MHQ_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 255, 102"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="102, 255, 102" /> </fields> </theme> <theme name="LongitudinalSectionW_MNQ_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 255"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_MQ_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 51, 204"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 51, 204" /> </fields> </theme> <theme name="LongitudinalSectionW_NQ_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 204, 255"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 204, 255" /> </fields> </theme> <theme name="LongitudinalSectionW_HQExtrem_Points"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ1"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ2"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ5"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 153, 51" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ10"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ20"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 153, 0" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ25"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 51, 0" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ50"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 153"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 153, 153" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ100"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 51"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 51" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ200"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ300"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 255" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ500"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQ1000"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQRZ"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 0, 102" /> </fields> </theme> <theme name="LongitudinalSectionQ_HSQ"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="253, 153, 0" /> </fields> </theme> <theme name="LongitudinalSectionQ_MHQ"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" /> </fields> </theme> <theme name="LongitudinalSectionQ_MNQ"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 255" /> </fields> </theme> <theme name="LongitudinalSectionQ_MQ"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 51, 204" /> </fields> </theme> <theme name="LongitudinalSectionQ_NQ"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 204, 255" /> </fields> </theme> <theme name="LongitudinalSectionQ_HQExtrem"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="DischargeLongitudinalSectionW"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> </fields> </theme> <theme name="DischargeLongitudinalSectionC"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0 , 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0 , 0" /> </fields> </theme> <theme name="DischargeLongitudinalSectionQ"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> </fields> </theme> <theme name="LongitudinalSectionQInfoldCut"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 102, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 102, 102" /> </fields> </theme> <theme name="LongitudinalSectionQInfolding"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="51, 51, 51"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="51, 51, 51" /> </fields> </theme> <!-- MEAN BED LEVEL --> <theme name="MiddleBedHeightSingle"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="MinMaxPoints"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="MinMaxPoints" /> + <inherit from="Label" /> </inherits> <fields> - <field name="showlines" type="boolean" display="Linie anzeigen" default="true"/> - <field name="linesize" type="int" display="Liniendicke" default="1"/> - <field name="linetype" type="Dash" display="Linienart" default="10"/> - <field name="linecolor" type="Color" display="Linienfarbe"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="showlines" type="boolean" display="Linie anzeigen" default="true" /> + <field name="linesize" type="int" display="Liniendicke" default="1" /> + <field name="linetype" type="Dash" display="Linienart" default="10" /> + <field name="linecolor" type="Color" display="Linienfarbe" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <!-- Bed Quality --> <theme name="PorosityTopPoints"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="PorositySubPoints"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="DensityTopPoints"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102" /> </fields> </theme> <theme name="DensitySubPoints"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="153, 99, 102" /> </fields> </theme> <theme name="BedDiameterTopPoints"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="BedDiameterSubPoints"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="BedLoadDiameterPoints"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" /> </fields> </theme> <theme name="PorosityTopLines"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="PorositySubLines"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="DensityTopLines"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" /> </fields> </theme> <theme name="DensitySubLines"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="153, 99, 102" /> </fields> </theme> <theme name="BedDiameterTopLines"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="BedDiameterSubLines"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="BedLoadDiameterLines"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" /> </fields> </theme> <theme name="BedDiameterDataTop"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="2"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100"/> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="2" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" /> </fields> </theme> <theme name="BedDiameterDataSub"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="2"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100"/> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="2" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 100" /> </fields> </theme> <theme name="BedloadDiameterData"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="showlines" type="boolean" display="Linie anzeigen" default="false"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="2"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="100, 0, 0"/> + <field name="showlines" type="boolean" display="Linie anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="2" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="100, 0, 0" /> </fields> </theme> <!-- Bedheight differences --> <theme name="BedheightDiffYear"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" /> </fields> </theme> <theme name="BedheightDiffMorphWidth"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 0" /> </fields> </theme> <theme name="BedheightDiffEpoch"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" /> </fields> </theme> <theme name="BedheightDiffAbsHeight1"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 204" /> </fields> </theme> <theme name="BedheightDiffAbsHeight2"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 100"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 100, 100" /> </fields> </theme> <theme name="BedheightDiffHeightYear"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 0, 0" /> </fields> </theme> <theme name="MorphologicWidth"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 100, 200"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" default="0, 100, 200" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <!-- Flow velocity --> <theme name="FlowVelocityVMainChannel"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> </fields> </theme> <theme name="FlowVelocityVTotalChannel"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 102" /> </fields> </theme> <theme name="FlowVelocityTau"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 204" /> </fields> </theme> <theme name="FlowVelocityDischarge"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 0" /> </fields> </theme> <!-- Sediment load longitudinal sections, M^3/A --> <theme name="SedimentLoadLSM3A"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linesize" type="int" default="2"/> + <field name="linesize" type="int" default="2" /> </fields> </theme> <theme name="SedimentLoadLSM3ACoarse"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 255"/> + <field name="linecolor" type="Color" default="255, 0, 255" /> </fields> </theme> <theme name="SedimentLoadLSM3AFineMid"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 0"/> + <field name="linecolor" type="Color" default="255, 0, 0" /> </fields> </theme> <theme name="SedimentLoadLSM3ASand"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 0, 255"/> + <field name="linecolor" type="Color" default="0, 0, 255" /> </fields> </theme> <theme name="SedimentLoadLSM3ASuspSand"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 255, 0"/> + <field name="linecolor" type="Color" default="255, 255, 0" /> </fields> </theme> <theme name="SedimentLoadLSM3ASediment"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 255"/> + <field name="linecolor" type="Color" default="0, 255, 255" /> </fields> </theme> <theme name="SedimentLoadLSM3ASuspSandBed"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 0"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" default="0, 255, 0" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="SedimentLoadLSM3ATotal"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 100, 200"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" default="0, 100, 200" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="SedimentLoadLSM3ABed"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="200, 200, 200"/> + <field name="linecolor" type="Color" default="200, 200, 200" /> </fields> </theme> <theme name="SedimentLoadLSM3ABedSusp"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="150, 255, 150"/> + <field name="linecolor" type="Color" default="150, 255, 150" /> </fields> </theme> <theme name="SedimentLoadLSM3ASusp"> <inherits> - <inherit from="SedimentLoadLSM3A"/> + <inherit from="SedimentLoadLSM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="85, 255, 0"/> + <field name="linecolor" type="Color" default="85, 255, 0" /> </fields> </theme> <!-- Sediment load longitudinal sections, T/A --> <theme name="SedimentLoadLSTACoarse"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 255"/> + <field name="linecolor" type="Color" default="255, 0, 255" /> </fields> </theme> <theme name="SedimentLoadLSTAFineMid"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 0"/> + <field name="linecolor" type="Color" default="255, 0, 0" /> </fields> </theme> <theme name="SedimentLoadLSTASand"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 0, 255"/> + <field name="linecolor" type="Color" default="0, 0, 255" /> </fields> </theme> <theme name="SedimentLoadLSTASuspSand"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 255, 0"/> + <field name="linecolor" type="Color" default="255, 255, 0" /> </fields> </theme> <theme name="SedimentLoadLSTASediment"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 255"/> + <field name="linecolor" type="Color" default="0, 255, 255" /> </fields> </theme> <theme name="SedimentLoadLSTASuspSandBed"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 0"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" default="0, 255, 0" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="SedimentLoadLSTATotal"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 100, 200"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" default="0, 100, 200" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="SedimentLoadLSTABed"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="200, 200, 200"/> + <field name="linecolor" type="Color" default="200, 200, 200" /> </fields> </theme> <theme name="SedimentLoadLSTABedSusp"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="150, 255, 150"/> + <field name="linecolor" type="Color" default="150, 255, 150" /> </fields> </theme> <theme name="SedimentLoadLSTASusp"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" default="85, 255, 0"/> + <field name="linecolor" type="Color" default="85, 255, 0" /> </fields> </theme> <!-- Sediment load at measurement stations, T/A --> <theme name="SedimentLoad"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linetype" type="Dash" default="10,5"/> - <field name="showpoints" type="boolean" default="true"/> - <field name="pointsize" type="int" default="3"/> + <field name="linetype" type="Dash" default="10,5" /> + <field name="showpoints" type="boolean" default="true" /> + <field name="pointsize" type="int" default="3" /> </fields> </theme> <theme name="SedimentLoadTACoarse"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 255"/> - <field name="pointcolor" type="Color" default="255, 0, 255"/> + <field name="linecolor" type="Color" default="255, 0, 255" /> + <field name="pointcolor" type="Color" default="255, 0, 255" /> </fields> </theme> <theme name="SedimentLoadTAFineMid"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 0"/> - <field name="pointcolor" type="Color" default="255, 0, 0"/> + <field name="linecolor" type="Color" default="255, 0, 0" /> + <field name="pointcolor" type="Color" default="255, 0, 0" /> </fields> </theme> <theme name="SedimentLoadTASand"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 0, 255"/> - <field name="pointcolor" type="Color" default="0, 0, 255"/> + <field name="linecolor" type="Color" default="0, 0, 255" /> + <field name="pointcolor" type="Color" default="0, 0, 255" /> </fields> </theme> <theme name="SedimentLoadTASuspSand"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 255, 0"/> - <field name="pointcolor" type="Color" default="255, 255, 0"/> + <field name="linecolor" type="Color" default="255, 255, 0" /> + <field name="pointcolor" type="Color" default="255, 255, 0" /> </fields> </theme> <theme name="SedimentLoadTASediment"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 255"/> - <field name="pointcolor" type="Color" default="0, 255, 255"/> + <field name="linecolor" type="Color" default="0, 255, 255" /> + <field name="pointcolor" type="Color" default="0, 255, 255" /> </fields> </theme> <theme name="SedimentLoadTASuspSandBed"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 0"/> - <field name="pointcolor" type="Color" default="0, 255, 0"/> + <field name="linecolor" type="Color" default="0, 255, 0" /> + <field name="pointcolor" type="Color" default="0, 255, 0" /> </fields> </theme> <theme name="SedimentLoadTATotal"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 100, 200"/> - <field name="pointcolor" type="Color" default="0, 100, 200"/> + <field name="linecolor" type="Color" default="0, 100, 200" /> + <field name="pointcolor" type="Color" default="0, 100, 200" /> </fields> </theme> <theme name="SedimentLoadTABed"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="200, 200, 200"/> - <field name="pointcolor" type="Color" default="200, 200, 200"/> + <field name="linecolor" type="Color" default="200, 200, 200" /> + <field name="pointcolor" type="Color" default="200, 200, 200" /> </fields> </theme> <theme name="SedimentLoadTABedSusp"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="150, 255, 150"/> - <field name="pointcolor" type="Color" default="150, 255, 150"/> + <field name="linecolor" type="Color" default="150, 255, 150" /> + <field name="pointcolor" type="Color" default="150, 255, 150" /> </fields> </theme> <theme name="SedimentLoadTASusp"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linecolor" type="Color" default="85, 255, 0"/> - <field name="pointcolor" type="Color" default="85, 255, 0"/> + <field name="linecolor" type="Color" default="85, 255, 0" /> + <field name="pointcolor" type="Color" default="85, 255, 0" /> </fields> </theme> <!-- Sediment load at measurement stations, M3/A --> <theme name="SedimentLoadM3A"> <inherits> - <inherit from="SedimentLoad"/> + <inherit from="SedimentLoad" /> </inherits> <fields> - <field name="linesize" type="int" default="2"/> + <field name="linesize" type="int" default="2" /> </fields> </theme> <theme name="SedimentLoadM3ACoarse"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 255"/> - <field name="pointcolor" type="Color" default="255, 0, 255"/> + <field name="linecolor" type="Color" default="255, 0, 255" /> + <field name="pointcolor" type="Color" default="255, 0, 255" /> </fields> </theme> <theme name="SedimentLoadM3AFineMid"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 0"/> - <field name="pointcolor" type="Color" default="255, 0, 0"/> + <field name="linecolor" type="Color" default="255, 0, 0" /> + <field name="pointcolor" type="Color" default="255, 0, 0" /> </fields> </theme> <theme name="SedimentLoadM3ASand"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 0, 255"/> - <field name="pointcolor" type="Color" default="0, 0, 255"/> + <field name="linecolor" type="Color" default="0, 0, 255" /> + <field name="pointcolor" type="Color" default="0, 0, 255" /> </fields> </theme> <theme name="SedimentLoadM3ASuspSand"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 255, 0"/> - <field name="pointcolor" type="Color" default="255, 255, 0"/> + <field name="linecolor" type="Color" default="255, 255, 0" /> + <field name="pointcolor" type="Color" default="255, 255, 0" /> </fields> </theme> <theme name="SedimentLoadM3ASediment"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 255"/> - <field name="pointcolor" type="Color" default="0, 255, 255"/> + <field name="linecolor" type="Color" default="0, 255, 255" /> + <field name="pointcolor" type="Color" default="0, 255, 255" /> </fields> </theme> <theme name="SedimentLoadM3ASuspSandBed"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 0"/> - <field name="pointcolor" type="Color" default="0, 255, 0"/> + <field name="linecolor" type="Color" default="0, 255, 0" /> + <field name="pointcolor" type="Color" default="0, 255, 0" /> </fields> </theme> <theme name="SedimentLoadM3ATotal"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 100, 200"/> - <field name="pointcolor" type="Color" default="0, 100, 200"/> + <field name="linecolor" type="Color" default="0, 100, 200" /> + <field name="pointcolor" type="Color" default="0, 100, 200" /> </fields> </theme> <theme name="SedimentLoadM3ABed"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="200, 200, 200"/> - <field name="pointcolor" type="Color" default="200, 200, 200"/> + <field name="linecolor" type="Color" default="200, 200, 200" /> + <field name="pointcolor" type="Color" default="200, 200, 200" /> </fields> </theme> <theme name="SedimentLoadM3ABedSusp"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="150, 255, 150"/> - <field name="pointcolor" type="Color" default="150, 255, 150"/> + <field name="linecolor" type="Color" default="150, 255, 150" /> + <field name="pointcolor" type="Color" default="150, 255, 150" /> </fields> </theme> <theme name="SedimentLoadM3ASusp"> <inherits> - <inherit from="SedimentLoadM3A"/> + <inherit from="SedimentLoadM3A" /> </inherits> <fields> - <field name="linecolor" type="Color" default="85, 255, 0"/> - <field name="pointcolor" type="Color" default="85, 255, 0"/> + <field name="linecolor" type="Color" default="85, 255, 0" /> + <field name="pointcolor" type="Color" default="85, 255, 0" /> </fields> </theme> <theme name="LongitudinalSectionArea"> <inherits> - <inherit from="Areas"/> + <inherit from="Areas" /> </inherits> <fields> - <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden"/> - <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden"/> - <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden"/> - <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden"/> - <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false"/> + <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" /> + <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" /> + <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" /> + <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" /> + <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" /> </fields> </theme> @@ -1483,53 +1483,53 @@ <theme name="CrossSection"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="CrossSectionWaterLine"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="linecolor" type="Color" display="Linienfarbe" default="0,0,153"/> - <field name="showwidth" type="boolean" display="Breite anzeigen" default="false"/> - <field name="showlevel" type="boolean" display="Wasserstand anzeigen" default="true"/> - <field name="showlinelabel" type="boolean" default="true" display="Beschriftung anzeigen"/> - <field name="showmiddleheight" type="boolean" display="Wasserstand anzeigen" default="false"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="linecolor" type="Color" display="Linienfarbe" default="0,0,153" /> + <field name="showwidth" type="boolean" display="Breite anzeigen" default="false" /> + <field name="showlevel" type="boolean" display="Wasserstand anzeigen" default="true" /> + <field name="showlinelabel" type="boolean" default="true" display="Beschriftung anzeigen" /> + <field name="showmiddleheight" type="boolean" display="Wasserstand anzeigen" default="false" /> </fields> </theme> <theme name="Hyk"> <inherits> - <inherit from="Text"/> + <inherit from="Text" /> </inherits> <fields> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> </fields> </theme> <theme name="CrossSectionArea"> <inherits> - <inherit from="Areas"/> + <inherit from="Areas" /> </inherits> <fields> - <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden"/> - <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden"/> - <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden"/> - <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden"/> - <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="true"/> + <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" /> + <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" /> + <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" /> + <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" /> + <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="true" /> </fields> </theme> @@ -1537,38 +1537,38 @@ <theme name="DischargeCurve"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Label" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153"/> - <field name="linesize" type="int" display="Liniendicke" default="2"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153" /> + <field name="linesize" type="int" display="Liniendicke" default="2" /> </fields> </theme> <theme name="ExtremeWQCurve"> <inherits> - <inherit from="Lines"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde" default="true"/> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153"/> - <field name="linesize" type="int" display="Liniendicke" default="2"/> - <field name="showlinelabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde" default="true" /> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153" /> + <field name="linesize" type="int" display="Liniendicke" default="2" /> + <field name="showlinelabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="ExtremeWQBaseCurve"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> + <inherit from="Lines" /> + <inherit from="Points" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="2"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="showlinelabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="pointsize" type="int" display="Punktdicke" default="2" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="showlinelabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> @@ -1576,33 +1576,33 @@ <theme name="DurationCurve"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="linesize" type="int" display="Liniendicke" default="2"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="linesize" type="int" display="Liniendicke" default="2" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="DurationCurveW"> <inherits> - <inherit from="DurationCurve"/> + <inherit from="DurationCurve" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0,51,204"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0,51,204" /> </fields> </theme> <theme name="DurationCurveQ"> <inherits> - <inherit from="DurationCurve"/> + <inherit from="DurationCurve" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0,204,0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0,204,0" /> </fields> </theme> @@ -1610,320 +1610,320 @@ <theme name="FixPoints"> <inherits> - <inherit from="ColorfulPoints"/> - <inherit from="Label"/> + <inherit from="ColorfulPoints" /> + <inherit from="Label" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden" /> </fields> </theme> <theme name="FixLines"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> - <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" hints="hidden"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> + <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> + <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" hints="hidden" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> </fields> </theme> <theme name="FixAreas"> <inherits> - <inherit from="Areas"/> + <inherit from="Areas" /> </inherits> <fields> - <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden"/> - <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden"/> - <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden"/> - <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden"/> - <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false"/> + <field name="areashowbg" type="boolean" display="Hintergrund anzeigen" default="true" hints="hidden" /> + <field name="areashowborder" type="boolean" display="Begrenzung" default="false" hints="hidden" /> + <field name="areabordercolor" type="Color" default="0, 0, 0" display="Begrenzungslinienfarbe" hints="hidden" /> + <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" hints="hidden" /> + <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="FixingCalculatedPoint"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0"/> - <field name="pointsize" type="int" display="Punktdicke" default="5"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 0" /> + <field name="pointsize" type="int" display="Punktdicke" default="5" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="FixingWQCurve"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="227, 27, 162"/> + <field name="linecolor" type="Color" default="227, 27, 162" /> </fields> </theme> <theme name="FixingDerivedCurve"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="227, 27, 162"/> - <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" hints="hidden" hidden="true"/> - <field name="pointsize" type="int" display="Punktdicke" default="5" hints="hidden"/> + <field name="linecolor" type="Color" default="227, 27, 162" /> + <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" hints="hidden" hidden="true" /> + <field name="pointsize" type="int" display="Punktdicke" default="5" hints="hidden" /> </fields> </theme> <theme name="FixingSectorAverageWQ0"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 128, 0"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 128, 0" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="FixingSectorAverageWQ1"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 255"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 0, 255" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="FixingSectorAverageWQ2"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 255" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="FixingSectorAverageWQ3"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="255, 0, 0" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="FixingAnalysisEventsWQ"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="FixingReferenceEvents"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 80, 160"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 80, 160" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="FixingDeltaWtAverage"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" /> </fields> </theme> <theme name="FixingDeltaWtAverage0"> <inherits> - <inherit from="FixingDeltaWtAverage"/> + <inherit from="FixingDeltaWtAverage" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" /> </fields> </theme> <theme name="FixingDeltaWtAverage1"> <inherits> - <inherit from="FixingDeltaWtAverage"/> + <inherit from="FixingDeltaWtAverage" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="FixingDeltaWtAverage2"> <inherits> - <inherit from="FixingDeltaWtAverage"/> + <inherit from="FixingDeltaWtAverage" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" /> </fields> </theme> <theme name="FixingDeltaWtAverage3"> <inherits> - <inherit from="FixingDeltaWtAverage"/> + <inherit from="FixingDeltaWtAverage" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="FixingDeltaWtAnalysis"> <inherits> - <inherit from="FixPoints"/> + <inherit from="FixPoints" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" /> </fields> </theme> <theme name="FixingLSAverage0"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 128, 0"/> + <field name="linecolor" type="Color" default="0, 128, 0" /> </fields> </theme> <theme name="FixingLSAverage1"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 0, 255"/> + <field name="linecolor" type="Color" default="0, 0, 255" /> </fields> </theme> <theme name="FixingLSAverage2"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 255"/> + <field name="linecolor" type="Color" default="255, 0, 255" /> </fields> </theme> <theme name="FixingLSAverage3"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="255, 0, 0"/> + <field name="linecolor" type="Color" default="255, 0, 0" /> </fields> </theme> <theme name="FixingSectorDeviationLS0"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 128, 0"/> + <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 128, 0" /> </fields> </theme> <theme name="FixingSectorDeviationLS1"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 0, 255"/> + <field name="areabgcolor" type="Color" display="Fuellfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="FixingSectorDeviationLS2"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 255"/> + <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 255" /> </fields> </theme> <theme name="FixingSectorDeviationLS3"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 0"/> + <field name="areabgcolor" type="Color" display="Fuellfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="FixLSDeviation"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" display="Fuellfarbe" default="100, 100, 100"/> + <field name="areabgcolor" type="Color" display="Fuellfarbe" default="100, 100, 100" /> </fields> </theme> <theme name="FixLSAnalysis"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 255, 0"/> + <field name="linecolor" type="Color" default="0, 255, 0" /> </fields> </theme> <theme name="FixLSReference"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="linecolor" type="Color" default="0, 80, 160"/> + <field name="linecolor" type="Color" default="0, 80, 160" /> </fields> </theme> <theme name="FixDeltaWtDeviation"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/> + <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe" /> </fields> </theme> <theme name="FixingDeltaWtAnalysisPeriods"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe"/> + <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" /> </fields> </theme> <theme name="FixingReferencePeriod"> <inherits> - <inherit from="FixAreas"/> + <inherit from="FixAreas" /> </inherits> <fields> - <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe"/> + <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" /> </fields> </theme> <theme name="QSectors"> <inherits> - <inherit from="FixLines"/> + <inherit from="FixLines" /> </inherits> <fields> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden"/> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="true" hints="hidden" /> </fields> </theme> @@ -1931,44 +1931,44 @@ <theme name="MapLines"> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 205"/> - <field name="linesize" type="int" display="Liniendicke" default="3" hints="hidden"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 205" /> + <field name="linesize" type="int" display="Liniendicke" default="3" hints="hidden" /> </fields> </theme> <theme name="Floodmaps"> <inherits> - <inherit from="Map"/> + <inherit from="Map" /> </inherits> </theme> <theme name="Floodplains"> <inherits> - <inherit from="Map"/> + <inherit from="Map" /> </inherits> </theme> <theme name="Floodmarks"> <inherits> - <inherit from="MapLines"/> - <inherit from="Symbol"/> + <inherit from="MapLines" /> + <inherit from="Symbol" /> </inherits> </theme> <theme name="WSPLGEN"> <inherits> - <inherit from="Uesk"/> + <inherit from="Uesk" /> </inherits> <fields> - <field name="startcolor" type="Color" display="Farbverlauf Startfarbe" default="178, 201, 215"/> - <field name="endcolor" type="Color" display="Farbverlauf Endfarbe" default="2, 27, 42"/> - <field name="numclasses" type="int" display="Anzahl Klassen" default="6"/> + <field name="startcolor" type="Color" display="Farbverlauf Startfarbe" default="178, 201, 215" /> + <field name="endcolor" type="Color" display="Farbverlauf Endfarbe" default="2, 27, 42" /> + <field name="numclasses" type="int" display="Anzahl Klassen" default="6" /> </fields> </theme> <theme name="RiverAxis"> <inherits> - <inherit from="MapLines"/> + <inherit from="MapLines" /> </inherits> <fields> </fields> @@ -1976,93 +1976,93 @@ <theme name="Kms"> <inherits> - <inherit from="MapLines"/> - <inherit from="Label"/> - <inherit from="Symbol"/> + <inherit from="MapLines" /> + <inherit from="Label" /> + <inherit from="Symbol" /> </inherits> </theme> <theme name="Fixpoints"> <inherits> - <inherit from="MapLines"/> - <inherit from="Symbol"/> + <inherit from="MapLines" /> + <inherit from="Symbol" /> </inherits> </theme> <theme name="Floodmarks"> <inherits> - <inherit from="MapLines"/> - <inherit from="Symbol"/> + <inherit from="MapLines" /> + <inherit from="Symbol" /> </inherits> </theme> <theme name="GaugeLocation"> <inherits> - <inherit from="MapLines"/> - <inherit from="Symbol"/> + <inherit from="MapLines" /> + <inherit from="Symbol" /> </inherits> </theme> <theme name="Qps"> <inherits> - <inherit from="MapLines"/> + <inherit from="MapLines" /> </inherits> </theme> <theme name="Hws"> <inherits> - <inherit from="MapLines"/> + <inherit from="MapLines" /> </inherits> </theme> <theme name="HwsPoints"> <inherits> - <inherit from="MapLines"/> - <inherit from="Label"/> - <inherit from="Symbol"/> + <inherit from="MapLines" /> + <inherit from="Label" /> + <inherit from="Symbol" /> </inherits> </theme> <theme name="Catchment"> <inherits> - <inherit from="Map"/> + <inherit from="Map" /> </inherits> </theme> <theme name="FloodmapLines"> <inherits> - <inherit from="MapLines"/> + <inherit from="MapLines" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="140, 200, 130" /> </fields> </theme> <theme name="Buildings"> <inherits> - <inherit from="MapLines"/> + <inherit from="MapLines" /> </inherits> </theme> <theme name="HydrBoundariesLines"> <inherits> - <inherit from="MapLines"/> + <inherit from="MapLines" /> </inherits> </theme> <theme name="HydrBoundariesPolys"> <inherits> - <inherit from="Map"/> + <inherit from="Map" /> </inherits> </theme> <theme name="Jetties"> <inherits> - <inherit from="MapLines"/> - <inherit from="Label"/> - <inherit from="Symbol"/> + <inherit from="MapLines" /> + <inherit from="Label" /> + <inherit from="Symbol" /> </inherits> </theme> @@ -2070,59 +2070,59 @@ <theme name="HistoricalDischargeCurve"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> + <inherit from="Lines" /> + <inherit from="Points" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153"/> - <field name="linesize" type="int" display="Liniendicke" default="2"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 153" /> + <field name="linesize" type="int" display="Liniendicke" default="2" /> </fields> </theme> <theme name="HistoricalDischargeCurveQ"> <inherits> - <inherit from="HistoricalDischargeCurve"/> - <inherit from="MinMaxPoints"/> + <inherit from="HistoricalDischargeCurve" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> - <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> + <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="HistoricalDischargeCurveQDiff"> <inherits> - <inherit from="HistoricalDischargeCurve"/> - <inherit from="MinMaxPoints"/> + <inherit from="HistoricalDischargeCurve" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> - <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> + <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="HistoricalDischargeCurveW"> <inherits> - <inherit from="HistoricalDischargeCurve"/> - <inherit from="MinMaxPoints"/> + <inherit from="HistoricalDischargeCurve" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="100, 100, 153"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> - <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="100, 100, 153" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> + <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="HistoricalDischargeCurveWDiff"> <inherits> - <inherit from="HistoricalDischargeCurve"/> - <inherit from="MinMaxPoints"/> + <inherit from="HistoricalDischargeCurve" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="250, 250, 204"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> - <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="250, 250, 204" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> + <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> @@ -2154,18 +2154,18 @@ <theme name="HistoricalDischargeWQQ"> <inherits> - <inherit from="HistoricalDischargeCurve"/> - <inherit from="Label"/> + <inherit from="HistoricalDischargeCurve" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> - <field name="linesize" type="int" display="Liniendicke" default="1"/> - <field name="linetype" type="Dash" display="Linienart" default="10"/> - <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden"/> - <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false"/> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> + <field name="linesize" type="int" display="Liniendicke" default="1" /> + <field name="linetype" type="Dash" display="Linienart" default="10" /> + <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden" /> + <field name="showpoints" type="boolean" display="Datenpunkte anzeigen" default="false" /> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> @@ -2173,21 +2173,21 @@ <theme name="ReferenceCurve"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="linecolor" type="Color" display="Linienfarbe" default="204, 204, 204" /> </fields> </theme> <theme name="ReferenceCurveNormalized"> <inherits> - <inherit from="ReferenceCurve"/> + <inherit from="ReferenceCurve" /> </inherits> <fields> </fields> @@ -2197,921 +2197,961 @@ <theme name="SQMeasurements"> <inherits> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="pointcolor" type="Color" default="0, 153, 255"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" default="0, 153, 255" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="SQMeasurementsOverview"> <inherits> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQOutliers"> <inherits> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="pointcolor" type="Color" default="204, 0, 0"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true"/> + <field name="pointcolor" type="Color" default="204, 0, 0" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="SQCurve"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> - <field name="linecolor" type="Color" default="0, 0, 0"/> - <field name="linesize" type="int" display="Liniendicke" default="2"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> + <field name="linecolor" type="Color" default="0, 0, 0" /> + <field name="linesize" type="int" display="Liniendicke" default="2" /> </fields> </theme> <theme name="SQMeasurementsA"> <inherits> - <inherit from="SQMeasurements"/> + <inherit from="SQMeasurements" /> </inherits> <fields> - <field name="pointcolor" type="color" default="0, 0, 255"/> + <field name="pointcolor" type="color" default="0, 0, 255" /> </fields> </theme> <theme name="SQMeasurementsB"> <inherits> - <inherit from="SQMeasurements"/> + <inherit from="SQMeasurements" /> </inherits> <fields> - <field name="pointcolor" type="color" default="0, 255, 255"/> + <field name="pointcolor" type="color" default="0, 255, 255" /> </fields> </theme> <theme name="SQMeasurementsC"> <inherits> - <inherit from="SQMeasurements"/> + <inherit from="SQMeasurements" /> </inherits> <fields> - <field name="pointcolor" type="color" default="0, 255, 0"/> + <field name="pointcolor" type="color" default="0, 255, 0" /> </fields> </theme> <theme name="SQMeasurementsD"> <inherits> - <inherit from="SQMeasurements"/> + <inherit from="SQMeasurements" /> </inherits> <fields> - <field name="pointcolor" type="color" default="255, 0, 255"/> + <field name="pointcolor" type="color" default="255, 0, 255" /> </fields> </theme> <theme name="SQMeasurementsE"> <inherits> - <inherit from="SQMeasurements"/> + <inherit from="SQMeasurements" /> </inherits> <fields> - <field name="pointcolor" type="color" default="255, 255, 0"/> + <field name="pointcolor" type="color" default="255, 255, 0" /> </fields> </theme> <theme name="SQMeasurementsF"> <inherits> - <inherit from="SQMeasurements"/> + <inherit from="SQMeasurements" /> </inherits> <fields> - <field name="pointcolor" type="color" default="255, 0, 0"/> + <field name="pointcolor" type="color" default="255, 0, 0" /> </fields> </theme> <theme name="SQMeasurementsG"> <inherits> - <inherit from="SQMeasurements"/> + <inherit from="SQMeasurements" /> </inherits> <fields> - <field name="pointcolor" type="color" default="0, 0, 0"/> + <field name="pointcolor" type="color" default="0, 0, 0" /> </fields> </theme> <theme name="SQMeasurementsOverviewA"> <inherits> - <inherit from="SQMeasurementsOverview"/> + <inherit from="SQMeasurementsOverview" /> </inherits> <fields> - <field name="pointsize" type="int" default="4"/> - <field name="pointcolor" type="color" default="0, 0, 255"/> + <field name="pointsize" type="int" default="4" /> + <field name="pointcolor" type="color" default="0, 0, 255" /> </fields> </theme> <theme name="SQMeasurementsOverviewB"> <inherits> - <inherit from="SQMeasurementsOverview"/> + <inherit from="SQMeasurementsOverview" /> </inherits> <fields> - <field name="pointsize" type="int" default="4"/> - <field name="pointcolor" type="color" default="0, 255, 255"/> + <field name="pointsize" type="int" default="4" /> + <field name="pointcolor" type="color" default="0, 255, 255" /> </fields> </theme> <theme name="SQMeasurementsOverviewC"> <inherits> - <inherit from="SQMeasurementsOverview"/> + <inherit from="SQMeasurementsOverview" /> </inherits> <fields> - <field name="pointsize" type="int" default="4"/> - <field name="pointcolor" type="color" default="0, 255, 0"/> + <field name="pointsize" type="int" default="4" /> + <field name="pointcolor" type="color" default="0, 255, 0" /> </fields> </theme> <theme name="SQMeasurementsOverviewD"> <inherits> - <inherit from="SQMeasurementsOverview"/> + <inherit from="SQMeasurementsOverview" /> </inherits> <fields> - <field name="pointsize" type="int" default="4"/> - <field name="pointcolor" type="color" default="255, 0, 255"/> + <field name="pointsize" type="int" default="4" /> + <field name="pointcolor" type="color" default="255, 0, 255" /> </fields> </theme> <theme name="SQMeasurementsOverviewE"> <inherits> - <inherit from="SQMeasurementsOverview"/> + <inherit from="SQMeasurementsOverview" /> </inherits> <fields> - <field name="pointsize" type="int" default="4"/> - <field name="pointcolor" type="color" default="255, 255, 0"/> + <field name="pointsize" type="int" default="4" /> + <field name="pointcolor" type="color" default="255, 255, 0" /> </fields> </theme> <theme name="SQMeasurementsOverviewF"> <inherits> - <inherit from="SQMeasurementsOverview"/> + <inherit from="SQMeasurementsOverview" /> </inherits> <fields> - <field name="pointsize" type="int" default="4"/> - <field name="pointcolor" type="color" default="255, 0, 0"/> + <field name="pointsize" type="int" default="4" /> + <field name="pointcolor" type="color" default="255, 0, 0" /> </fields> </theme> <theme name="SQMeasurementsOverviewG"> <inherits> - <inherit from="SQMeasurementsOverview"/> + <inherit from="SQMeasurementsOverview" /> </inherits> <fields> - <field name="pointsize" type="int" default="4"/> - <field name="pointcolor" type="color" default="0, 0, 0"/> + <field name="pointsize" type="int" default="4" /> + <field name="pointcolor" type="color" default="0, 0, 0" /> </fields> </theme> <theme name="SQOutliersA"> <inherits> - <inherit from="SQOutliers"/> + <inherit from="SQOutliers" /> </inherits> <fields> - <field name="pointcolor" type="color" default="100, 100, 255"/> + <field name="pointcolor" type="color" default="100, 100, 255" /> </fields> </theme> <theme name="SQOutliersB"> <inherits> - <inherit from="SQOutliers"/> + <inherit from="SQOutliers" /> </inherits> <fields> - <field name="pointcolor" type="color" default="100, 255, 255"/> + <field name="pointcolor" type="color" default="100, 255, 255" /> </fields> </theme> <theme name="SQOutliersC"> <inherits> - <inherit from="SQOutliers"/> + <inherit from="SQOutliers" /> </inherits> <fields> - <field name="pointcolor" type="color" default="100, 255, 100"/> + <field name="pointcolor" type="color" default="100, 255, 100" /> </fields> </theme> <theme name="SQOutliersD"> <inherits> - <inherit from="SQOutliers"/> + <inherit from="SQOutliers" /> </inherits> <fields> - <field name="pointcolor" type="color" default="255, 100, 255"/> + <field name="pointcolor" type="color" default="255, 100, 255" /> </fields> </theme> <theme name="SQOutliersE"> <inherits> - <inherit from="SQOutliers"/> + <inherit from="SQOutliers" /> </inherits> <fields> - <field name="pointcolor" type="color" default="255, 255, 100"/> + <field name="pointcolor" type="color" default="255, 255, 100" /> </fields> </theme> <theme name="SQOutliersF"> <inherits> - <inherit from="SQOutliers"/> + <inherit from="SQOutliers" /> </inherits> <fields> - <field name="pointcolor" type="color" default="255, 100, 100"/> + <field name="pointcolor" type="color" default="255, 100, 100" /> </fields> </theme> <theme name="SQOutliersG"> <inherits> - <inherit from="SQOutliers"/> + <inherit from="SQOutliers" /> </inherits> <fields> - <field name="pointcolor" type="color" default="100, 100, 100"/> + <field name="pointcolor" type="color" default="100, 100, 100" /> </fields> </theme> <theme name="SQOutliersOverviewA"> <inherits> - <inherit from="SQOutliersA"/> + <inherit from="SQOutliersA" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQOutliersOverviewB"> <inherits> - <inherit from="SQOutliersB"/> + <inherit from="SQOutliersB" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQOutliersOverviewC"> <inherits> - <inherit from="SQOutliersC"/> + <inherit from="SQOutliersC" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQOutliersOverviewD"> <inherits> - <inherit from="SQOutliersD"/> + <inherit from="SQOutliersD" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQOutliersOverviewE"> <inherits> - <inherit from="SQOutliersE"/> + <inherit from="SQOutliersE" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQOutliersOverviewF"> <inherits> - <inherit from="SQOutliersF"/> + <inherit from="SQOutliersF" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQOutliersOverviewG"> <inherits> - <inherit from="SQOutliersG"/> + <inherit from="SQOutliersG" /> </inherits> <fields> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false"/> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" /> </fields> </theme> <theme name="SQCurveA"> <inherits> - <inherit from="SQCurve"/> + <inherit from="SQCurve" /> </inherits> <fields> - <field name="linecolor" type="color" default="0, 0, 175"/> + <field name="linecolor" type="color" default="0, 0, 175" /> </fields> </theme> <theme name="SQCurveB"> <inherits> - <inherit from="SQCurve"/> + <inherit from="SQCurve" /> </inherits> <fields> - <field name="linecolor" type="color" default="0, 175, 175"/> + <field name="linecolor" type="color" default="0, 175, 175" /> </fields> </theme> <theme name="SQCurveC"> <inherits> - <inherit from="SQCurve"/> + <inherit from="SQCurve" /> </inherits> <fields> - <field name="linecolor" type="color" default="0, 175, 0"/> + <field name="linecolor" type="color" default="0, 175, 0" /> </fields> </theme> <theme name="SQCurveD"> <inherits> - <inherit from="SQCurve"/> + <inherit from="SQCurve" /> </inherits> <fields> - <field name="linecolor" type="color" default="175, 0, 175"/> + <field name="linecolor" type="color" default="175, 0, 175" /> </fields> </theme> <theme name="SQCurveE"> <inherits> - <inherit from="SQCurve"/> + <inherit from="SQCurve" /> </inherits> <fields> - <field name="linecolor" type="color" default="175, 175, 0"/> + <field name="linecolor" type="color" default="175, 175, 0" /> </fields> </theme> <theme name="SQCurveF"> <inherits> - <inherit from="SQCurve"/> + <inherit from="SQCurve" /> </inherits> <fields> - <field name="linecolor" type="color" default="175, 0, 0"/> + <field name="linecolor" type="color" default="175, 0, 0" /> </fields> </theme> <theme name="SQCurveG"> <inherits> - <inherit from="SQCurve"/> + <inherit from="SQCurve" /> </inherits> <fields> - <field name="linecolor" type="color" default="175, 175, 175"/> + <field name="linecolor" type="color" default="175, 175, 175" /> </fields> </theme> <theme name="SQOutlierCurveA"> <inherits> - <inherit from="SQCurveA"/> + <inherit from="SQCurveA" /> </inherits> <fields> - <field name="linesize" type="int" display="Liniendicke" default="1"/> + <field name="linesize" type="int" display="Liniendicke" default="1" /> </fields> </theme> <theme name="SQOutlierCurveB"> <inherits> - <inherit from="SQCurveB"/> + <inherit from="SQCurveB" /> </inherits> <fields> - <field name="linesize" type="int" display="Liniendicke" default="1"/> + <field name="linesize" type="int" display="Liniendicke" default="1" /> </fields> </theme> <theme name="SQOutlierCurveC"> <inherits> - <inherit from="SQCurveC"/> + <inherit from="SQCurveC" /> </inherits> <fields> - <field name="linesize" type="int" display="Liniendicke" default="1"/> + <field name="linesize" type="int" display="Liniendicke" default="1" /> </fields> </theme> <theme name="SQOutlierCurveD"> <inherits> - <inherit from="SQCurveD"/> + <inherit from="SQCurveD" /> </inherits> <fields> - <field name="linesize" type="int" display="Liniendicke" default="1"/> + <field name="linesize" type="int" display="Liniendicke" default="1" /> </fields> </theme> <theme name="SQOutlierCurveE"> <inherits> - <inherit from="SQCurveE"/> + <inherit from="SQCurveE" /> </inherits> <fields> - <field name="linesize" type="int" display="Liniendicke" default="1"/> + <field name="linesize" type="int" display="Liniendicke" default="1" /> </fields> </theme> <theme name="SQOutlierCurveF"> <inherits> - <inherit from="SQCurveF"/> + <inherit from="SQCurveF" /> </inherits> <fields> - <field name="linesize" type="int" display="Liniendicke" default="1"/> + <field name="linesize" type="int" display="Liniendicke" default="1" /> </fields> </theme> <theme name="SQOutlierCurveG"> <inherits> - <inherit from="SQCurveG"/> + <inherit from="SQCurveG" /> </inherits> <fields> - <field name="linesize" type="int" display="Liniendicke" default="1"/> + <field name="linesize" type="int" display="Liniendicke" default="1" /> </fields> </theme> <theme name="Porosity"> <inherits> - <inherit from="LongitudinalSection"/> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="color" default="175, 175, 175"/> + <field name="linecolor" type="color" default="175, 175, 175" /> </fields> </theme> <!-- S-INFO Data-Themes --> <theme name="SInfoBedHeightMin"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 255, 0" /> </fields> </theme> <theme name="SInfoBedHeightMax"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" /> </fields> </theme> <!-- S-INFO Flow-Depth Themes --> - <theme name="SInfoFlowDepth"> - <inherits> - <inherit from="LongitudinalSectionW"/> + <theme name="SInfoFlowDepthBedheightMax"> + <inherits> + <inherit from="LongitudinalSection" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 128, 0" /> + </fields> + </theme> + <theme name="SInfoFlowDepthBedheightMin"> + <inherits> + <inherit from="LongitudinalSection" /> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="128,128, 0" /> + </fields> + </theme> + <theme name="SInfoFlowDepthBedheight"> + <inherits> + <inherit from="LongitudinalSection" /> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> + </fields> + </theme> + <theme name="SInfoFlowDepthDischarge"> + <inherits> + <inherit from="LongitudinalSection" /> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 0" /> + </fields> + </theme> + <theme name="SInfoFlowDepthWaterlevel"> + <inherits> + <inherit from="LongitudinalSection" /> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128" /> + </fields> + </theme> + <theme name="SInfoFlowDepth"> + <inherits> + <inherit from="LongitudinalSectionW" /> + </inherits> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="SInfoFlowDepthWithTkh"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" /> </fields> </theme> <theme name="SInfoFlowDepthMin"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" /> </fields> </theme> <theme name="SInfoFlowDepthMax"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="SInfoFlowDepthCurrent"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128" /> </fields> </theme> <theme name="SInfoFlowDepthHistorical"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="51, 102, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="51, 102, 255" /> </fields> </theme> <theme name="SInfoTkh"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> </inherits> <fields> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> - <field name="calculateRange" type="boolean" display="Ausdehnung berechnen" default="true" hints="hidden"/> + <field name="calculateRange" type="boolean" display="Ausdehnung berechnen" default="true" hints="hidden" /> <!-- Areas use 'showborder' instead of showlines (but inconsistently uses 'linecolor' and 'linesize'), so we hide 'showline' and replace it with 'showbordder' --> - <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden"/> - <field name="showborder" type="boolean" display="Linien anzeigen" default="true"/> - <field name="linecolor" type="Color" display="Linienfarbe" default="228, 108, 10"/> - <field name="linesize" type="int" display="Liniendicke" default="1"/> - - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false"/> + <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden" /> + <field name="showborder" type="boolean" display="Linien anzeigen" default="true" /> + <field name="linecolor" type="Color" display="Linienfarbe" default="228, 108, 10" /> + <field name="linesize" type="int" display="Liniendicke" default="1" /> - <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true"/> - <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe"/> - <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp"/> - <field name="areatransparency" type="int" default="20"/> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="false" /> - <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" /> + <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe" /> + <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" /> + <field name="areatransparency" type="int" default="20" /> - <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false"/> + <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hints="hidden" /> - <field name="baselineColor" type="Color" display="Farbe der 0-Linie" default="0, 0, 0" hints="hidden"/> + <field name="showmaximum" type="boolean" display="Maximum anzeigen" default="false" /> + + <field name="baselineColor" type="Color" display="Farbe der 0-Linie" default="0, 0, 0" hints="hidden" /> </fields> </theme> <theme name="SInfoFlowDepthDevelopment"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="SInfoFlowDepthDevelopmentPerYear"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="SInfoWaterlevelDifference"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="102, 255, 102" /> </fields> </theme> <theme name="SInfoBedHeightDifference"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="SInfoPredefinedChannelWidth"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 0" /> </fields> </theme> <theme name="SInfoPredefinedChannelDepth"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 64" /> </fields> </theme> <theme name="SInfoPredefinedTkh"> <inherits> - <inherit from="SInfoTkh"/> + <inherit from="SInfoTkh" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 10"/> - <field name="areabgcolor" type="Color" default="255, 240, 224" display="Füllfarbe"/> - <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp"/> - <field name="areatransparency" type="int" default="20"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 64, 10" /> + <field name="areabgcolor" type="Color" default="255, 240, 224" display="Füllfarbe" /> + <field name="areabgpattern" type="areapattern" default="patternFill" display="Flächentyp" /> + <field name="areatransparency" type="int" default="20" /> </fields> </theme> <theme name="SInfoPredefinedDepthEvol"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 192" /> </fields> </theme> <theme name="SInfoPredefinedDepthEvolPerYear"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 128" /> </fields> </theme> <theme name="SInfoPredefinedFlowDepth"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="96, 128, 192" /> </fields> </theme> <theme name="SInfoInfrastructureHeight"> <inherits> - <inherit from="LongitudinalSectionPoints"/> - <inherit from="Label"/> + <inherit from="LongitudinalSectionPoints" /> + <inherit from="Label" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 192, 0"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 192, 0" /> </fields> </theme> <theme name="SInfoInfrastructureHeightLeft"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40" /> </fields> </theme> <theme name="SInfoInfrastructureHeightRight"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" /> </fields> </theme> <theme name="SInfoCollisionCount"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="64, 192, 64"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="64, 192, 64" /> </fields> </theme> <theme name="SInfoCollisionCount2"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" /> </fields> </theme> <theme name="SInfoCollisionCount3"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="48, 96, 255" /> </fields> </theme> <theme name="SInfoFloodDurationLeft"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="68, 216, 40" /> </fields> </theme> <theme name="SInfoFloodDurationRight"> <inherits> - <inherit from="LongitudinalSectionPoints"/> + <inherit from="LongitudinalSectionPoints" /> </inherits> <fields> - <field name="pointsize" type="int" display="Punktdicke" default="3"/> - <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0"/> + <field name="pointsize" type="int" display="Punktdicke" default="3" /> + <field name="pointcolor" type="Color" display="Punktfarbe" default="192, 0, 0" /> </fields> </theme> <theme name="SInfoMainValues"> <inherits> - <inherit from="Lines"/> - <inherit from="Points"/> - <inherit from="Label"/> - <inherit from="MinMaxPoints"/> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="Label" /> + <inherit from="MinMaxPoints" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="0, 96, 192"/> - <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false"/> - <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden"/> + <field name="linecolor" type="Color" display="Farbe" default="0, 96, 192" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" default="false" /> + <field name="showpointlabel" type="boolean" display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme> <theme name="SInfoMainValuesQ"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="51, 204, 0"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/> + <field name="linecolor" type="Color" display="Farbe" default="51, 204, 0" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="SInfoMainValuesW"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="0, 102, 204"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/> + <field name="linecolor" type="Color" display="Farbe" default="0, 102, 204" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="InfrastructureWLeft"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/> + <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="InfrastructureWRight"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/> + <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="InfrastructureQLeft"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/> + <field name="linecolor" type="Color" display="Farbe" default="68, 216, 40" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="InfrastructureQRight"> <inherits> - <inherit from="Lines"/> - <inherit from="Label"/> + <inherit from="Lines" /> + <inherit from="Label" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0"/> - <field name="textorientation" type="boolean" display="Textausrichtung" default="true"/> - <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true"/> + <field name="linecolor" type="Color" display="Farbe" default="192, 0, 0" /> + <field name="textorientation" type="boolean" display="Textausrichtung" default="true" /> + <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" /> </fields> </theme> <theme name="UInfoSalixLine"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 64"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 64" /> </fields> </theme> <theme name="UInfoSalixMnwMw"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 64, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 64, 255" /> </fields> </theme> <theme name="UInfoSalixScenario"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="UInfoSalixRank"> - <fields> - <field name="areatransparency" type="int" default="50" display="Transparenz" /> - </fields> - </theme> - <theme name="VegetationZonesCrossSection"> - <fields> - <field name="areatransparency" type="int" default="50" display="Transparenz" /> - </fields> -</theme> + <fields> + <field name="areatransparency" type="int" default="50" display="Transparenz" /> + </fields> + </theme> + <theme name="VegetationZonesCrossSection"> + <fields> + <field name="areatransparency" type="int" default="50" display="Transparenz" /> + </fields> + </theme> <theme name="UInfoSalixCrossSectionWaterLine"> <inherits> - <inherit from="CrossSectionWaterLine"/> + <inherit from="CrossSectionWaterLine" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="38,138,62"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="38,138,62" /> </fields> </theme> <theme name="UInfoSalixScenarioCrossSectionWaterLine"> <inherits> - <inherit from="CrossSectionWaterLine"/> + <inherit from="CrossSectionWaterLine" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 0" /> </fields> </theme> <theme name="UInfoSalixMNWCrossSectionWaterLine"> <inherits> - <inherit from="CrossSectionWaterLine"/> + <inherit from="CrossSectionWaterLine" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 192, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 192, 0" /> </fields> </theme> <theme name="UInfoSalixMWCrossSectionWaterLine"> <inherits> - <inherit from="CrossSectionWaterLine"/> + <inherit from="CrossSectionWaterLine" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="UInfoSalixMHWCrossSectionWaterLine"> <inherits> - <inherit from="CrossSectionWaterLine"/> + <inherit from="CrossSectionWaterLine" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="247, 150, 70"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="247, 150, 70" /> </fields> </theme> <theme name="UInfoSalixMH5CrossSectionWaterLine"> <inherits> - <inherit from="CrossSectionWaterLine"/> + <inherit from="CrossSectionWaterLine" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> </fields> </theme> <theme name="BunduChannel"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="0, 192, 32"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 192, 32" /> </fields> </theme> <theme name="BunduBed"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="224, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="224, 0, 0" /> </fields> </theme> <theme name="BunduBed01"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed02"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed03"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed04"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed05"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed06"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed07"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed08"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed09"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> <theme name="BunduBed10"> <inherits> - <inherit from="LongitudinalSectionW"/> + <inherit from="LongitudinalSectionW" /> </inherits> <fields> - <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0"/> + <field name="linecolor" type="Color" display="Linienfarbe" default="128, 0, 0" /> </fields> </theme> </themegroup> \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -229,4 +229,10 @@ final String facetFlowDepthFilteredDescription = Resources.getMsg(context.getMeta(), description, description, result.getLabel()); return new ResultFacet(resultIndex, facetId, facetFlowDepthFilteredDescription, axisLabel, ComputeType.ADVANCE, id, hash); } + + protected static final Facet createFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int resultIndex, final String axisLabel, final String facetId, final String description, final String resultLabel) { + final String facetFlowDepthFilteredDescription = Resources.getMsg(context.getMeta(), description, description, resultLabel); + return new ResultFacet(resultIndex, facetId, facetFlowDepthFilteredDescription, axisLabel, ComputeType.ADVANCE, id, hash); + } } \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QWDDateRange.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QWDDateRange.java Thu Oct 10 15:29:02 2019 +0200 @@ -8,25 +8,22 @@ package org.dive4elements.river.artifacts.model; - import java.io.Serializable; import org.dive4elements.river.artifacts.model.fixings.QWD; -public class QWDDateRange -implements Serializable -{ +public class QWDDateRange implements Serializable { - public QWD qwd; public DateRange dateRange; + public QWD qwd; - public QWDDateRange(QWD qwd, DateRange dr) { + public QWDDateRange(final QWD qwd, final DateRange dr) { this.qwd = qwd; this.dateRange = dr; } public QWD getQWD() { - return qwd; + return this.qwd; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Thu Oct 10 15:29:02 2019 +0200 @@ -14,20 +14,19 @@ import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.D4EArtifact; -import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.access.BedHeightAccess; import org.dive4elements.river.artifacts.model.BlackboardDataFacet; import org.dive4elements.river.artifacts.model.FacetTypes; +import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.model.BedHeight; import org.dive4elements.river.model.BedHeightValue; -public class BedHeightFacet -extends BlackboardDataFacet -implements FacetTypes { +public class BedHeightFacet extends BlackboardDataFacet implements FacetTypes { + private static final long serialVersionUID = 1L; private static final Logger log = Logger.getLogger(BedHeightFacet.class); - public BedHeightFacet(String name, String description) { + public BedHeightFacet(final String name, final String description) { this.name = name; this.description = description; this.index = 0; @@ -38,53 +37,43 @@ /** * Returns the data this facet requires. * - * @param artifact the owner artifact. - * @param context the CallContext (ignored). + * @param artifact + * the owner artifact. + * @param context + * the CallContext (ignored). * * @return the data. */ @Override - public Object getData(Artifact artifact, CallContext context) { - BedHeightAccess access = new BedHeightAccess((D4EArtifact)artifact); - BedHeight single = BedHeight.getBedHeightById(access.getHeightId()); - List<BedHeightValue> bedheightValues = - BedHeightValue.getBedHeightValues( - single, - access.getFrom(true), - access.getTo(true)); - double[][] values = new double[2][bedheightValues.size()]; + public Object getData(final Artifact artifact, final CallContext context) { + final BedHeightAccess access = new BedHeightAccess((D4EArtifact) artifact); + final BedHeight single = BedHeight.getBedHeightById(access.getHeightId()); + final List<BedHeightValue> bedheightValues = BedHeightValue.getBedHeightValues(single, access.getFrom(true), access.getTo(true)); + final double[][] values = new double[2][bedheightValues.size()]; int i = 0; - for (BedHeightValue bedheightValue : bedheightValues) { + for (final BedHeightValue bedheightValue : bedheightValues) { values[0][i] = bedheightValue.getStation(); values[1][i] = bedheightValue.getHeight(); i++; } - this.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.cur.elevation"), - single.getCurElevationModel().getName()); + this.addMetaData(Resources.getMsg(context.getMeta(), "meta.bedheight.cur.elevation"), single.getCurElevationModel().getName()); if (single.getOldElevationModel() != null) { - this.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.old.elevation"), - single.getOldElevationModel().getName()); + this.addMetaData(Resources.getMsg(context.getMeta(), "meta.bedheight.old.elevation"), single.getOldElevationModel().getName()); } - this.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.river.elevation"), - access.getRiver().getWstUnit().getName()); + this.addMetaData(Resources.getMsg(context.getMeta(), "meta.bedheight.river.elevation"), access.getRiver().getWstUnit().getName()); return values; } /** * Create a deep copy of this Facet. + * * @return a deep copy. */ @Override public BedHeightFacet deepCopy() { - BedHeightFacet copy = new BedHeightFacet(name, description); + final BedHeightFacet copy = new BedHeightFacet(this.name, this.description); copy.set(this); return copy; }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/SINFOArtifact.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/SINFOArtifact.java Thu Oct 10 15:29:02 2019 +0200 @@ -17,7 +17,9 @@ import org.dive4elements.river.artifacts.sinfo.common.D50Processor; import org.dive4elements.river.artifacts.sinfo.common.FlowDepthDevelopmentPerYearProcessor; import org.dive4elements.river.artifacts.sinfo.common.FlowDepthDevelopmentProcessor; +import org.dive4elements.river.artifacts.sinfo.common.FlowDepthDischargeProcessor; import org.dive4elements.river.artifacts.sinfo.common.FlowDepthProcessor; +import org.dive4elements.river.artifacts.sinfo.common.FlowDepthWaterlevelProcessor; import org.dive4elements.river.artifacts.sinfo.common.TauProcessor; import org.dive4elements.river.artifacts.sinfo.common.VelocityProcessor; @@ -73,10 +75,24 @@ return Boolean.FALSE; if (FlowDepthDevelopmentProcessor.FACET_WATERLEVEL_DIFFERENCE_FILTERED.equals(name)) return Boolean.FALSE; + if (FlowDepthDevelopmentProcessor.FACET_WATERLEVEL_DIFFERENCE_RAW.equals(name)) + return Boolean.FALSE; if (FlowDepthDevelopmentProcessor.FACET_BEDHEIGHT_DIFFERENCE_FILTERED.equals(name)) return Boolean.FALSE; + if (FlowDepthDevelopmentProcessor.FACET_BEDHEIGHT_DIFFERENCE_RAW.equals(name)) + return Boolean.FALSE; } + if (FlowDepthDischargeProcessor.FACET_FLOW_DEPTH_DISCHARGE.equals(name)) + return Boolean.FALSE; + if (FlowDepthWaterlevelProcessor.FACET_FLOW_DEPTH_WATER_LEVEL.equals(name)) + return Boolean.FALSE; + if (FlowDepthWaterlevelProcessor.FACET_FLOW_DEPTH_BEDHEIGHT.equals(name)) + return Boolean.FALSE; + if (FlowDepthWaterlevelProcessor.FACET_FLOW_DEPTH_BEDHEIGHT_MIN.equals(name)) + return Boolean.FALSE; + if (FlowDepthWaterlevelProcessor.FACET_FLOW_DEPTH_BEDHEIGHT_MAX.equals(name)) + return Boolean.FALSE; if (FlowDepthProcessor.FACET_FLOW_DEPTH_RAW.equals(name)) return Boolean.FALSE; if (FlowDepthProcessor.FACET_FLOW_DEPTH_TKH_RAW.equals(name))
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -69,15 +69,15 @@ } public static final Facet createFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, - final int resultIndex, final int year, final int themeCount) { + final int resultIndex, final int themeCount, final int rangeIndex) { // REMARK: we are using themeCount as facet index, because we get several lines (with the same facet name) for the same // result index; however name and index are used on client side as unique id. final CollisionCalcOverviewResult ccoResult = (CollisionCalcOverviewResult) result; - final String years = CollisionCalculation.yearsToString(ccoResult.getIsEpochs(), ccoResult.getYears().get(themeCount)); + final String years = CollisionCalculation.yearsToString(ccoResult.getIsEpochs(), ccoResult.getYears().get(rangeIndex)); final String facetDescription = Resources.getMsg(context.getMeta(), I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, years); - return new CollisionCalcFacet(themeCount, resultIndex, years, COLLISION_FACETS[themeCount % 3], facetDescription, I18N_AXIS_LABEL, - ComputeType.ADVANCE, hash, id); + return new CollisionCalcFacet(themeCount, resultIndex, years, COLLISION_FACETS[themeCount % 3], facetDescription, I18N_AXIS_LABEL, ComputeType.ADVANCE, + hash, id); } } \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalculation.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalculation.java Thu Oct 10 15:29:02 2019 +0200 @@ -1,7 +1,7 @@ -/* Copyright (C) 2017 by Bundesanstalt für Gewässerkunde +/* 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 + * 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 @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -48,12 +49,6 @@ private final CallContext context; - private CollisionAccess access; - private River river; - private List<DateRange> years; - private Calculation problems; - private int qfinderProblemCount; - public CollisionCalculation(final CallContext context) { this.context = context; } @@ -62,50 +57,71 @@ final String user = CalculationUtils.findArtifactUser(this.context, sinfo); + final int qfinderProblemCount = 0; + // access input data - this.access = new CollisionAccess(sinfo); - this.river = this.access.getRiver(); - final RiverInfo riverInfo = new RiverInfo(this.river); - final DoubleRange calcRange = this.access.getRange(); + final CollisionAccess access = new CollisionAccess(sinfo); + final River river = access.getRiver(); + final RiverInfo riverInfo = new RiverInfo(river); + + final DoubleRange calcRange = access.getRange(); // calculate results for each year or epoch - this.problems = new Calculation(); - this.qfinderProblemCount = 0; + final Calculation problems = new Calculation(); + final String calcModeLabel = Resources.getMsg(this.context.getMeta(), sinfo.getCalculationMode().name()); - final CollisionCalculationResults results = new CollisionCalculationResults(calcModeLabel, user, riverInfo, calcRange, this.access.getYearsHeader()); + final CollisionCalculationResults results = new CollisionCalculationResults(calcModeLabel, user, riverInfo, calcRange, access.getYearsHeader()); final Collection<ResultRow> overViewRows = new ArrayList<>(); - this.years = new ArrayList<>(); + final List<DateRange> years = new ArrayList<>(); final NavigableSet<Integer> detailYears = new TreeSet<>(); - if (this.access.getYears() != null) { - for (final int year : this.access.getYears()) { - calculateOverview(overViewRows, year, year, false); - this.years.add(new DateRange(DateUtil.getStartDateFromYear(year), DateUtil.getEndDateFromYear(year))); + final List<CollisionCalcOverviewResult> singleYearResults = new ArrayList<>(); + if (access.getYears() != null) { + for (final int year : access.getYears()) { + calculateOverview(overViewRows, river, access.getLowerKm(), access.getUpperKm(), year, year, false); + years.add(new DateRange(DateUtil.getStartDateFromYear(year), DateUtil.getEndDateFromYear(year))); detailYears.add(Integer.valueOf(year)); } } else { - for (final DateRange dr : this.access.getEpochs()) { - calculateOverview(overViewRows, dr.getFromYear(), dr.getToYear(), true); - this.years.add(dr); + for (final DateRange dr : access.getEpochs()) { + calculateOverview(overViewRows, river, access.getLowerKm(), access.getUpperKm(), dr.getFromYear(), dr.getToYear(), true); + years.add(dr); detailYearsAdd(detailYears, dr); } + + for (final Integer year : detailYears) { + + final Collection<ResultRow> yearRows = new ArrayList<>(); + calculateOverview(yearRows, river, access.getLowerKm(), access.getUpperKm(), year, year, false); + + if (!yearRows.isEmpty()) { + final DateRange yearRange = new DateRange(DateUtil.getStartDateFromYear(year), DateUtil.getEndDateFromYear(year)); + final CollisionCalcOverviewResult yearResult = new CollisionCalcOverviewResult(Integer.toString(year), false, + Collections.singleton(yearRange), yearRows); + singleYearResults.add(yearResult); + } + } } - final CollisionCalcOverviewResult overviewResult = new CollisionCalcOverviewResult(this.access.getYearsHeader(), (this.access.getYears() == null), - this.years, overViewRows); - results.addResult(overviewResult, this.problems); + final CollisionCalcOverviewResult overviewResult = new CollisionCalcOverviewResult(access.getYearsHeader(), (access.getYears() == null), years, + overViewRows); + results.addResult(overviewResult, problems); + + /* add the single year from epochs, after the epochs, so they will be exported at the end of the table etc. */ + for (final CollisionCalcOverviewResult result : singleYearResults) + results.addResult(result, problems); // calculate secondary results for each year final Map<String, TreeMap<Date, GaugeDischargeValuesFinder>> qFinders = new HashMap<>(); final Map<String, GaugeMainValueFinder> zoneFinders = new HashMap<>(); final Collection<ResultRow> detailsRows = new ArrayList<>(); for (final Integer year : detailYears) - calculateDetails(detailsRows, year, qFinders, zoneFinders); + calculateDetails(detailsRows, river, access, year, qFinders, zoneFinders, problems, years, qfinderProblemCount); final CollisionCalcDetailResult detailResult = new CollisionCalcDetailResult("Details", detailsRows); - results.addResult(detailResult, this.problems); + results.addResult(detailResult, problems); - return new CalculationResult(results, this.problems); + return new CalculationResult(results, problems); } /** @@ -120,9 +136,9 @@ * Calculates the collision counts for a km range of a river and a year or year range (epoch), * and adds them to a ResultRow collection */ - private void calculateOverview(final Collection<ResultRow> rows, final int fromYear, final int toYear, final boolean isEpoch) { - for (final CollisionAggregateValue aggregate : CollisionAggregateValue.getValuesByKm(this.river, this.access.getLowerKm(), this.access.getUpperKm(), - fromYear, toYear)) { + private void calculateOverview(final Collection<ResultRow> rows, final River river, final double fromKm, final double toKm, final int fromYear, + final int toYear, final boolean isEpoch) { + for (final CollisionAggregateValue aggregate : CollisionAggregateValue.getValuesByKm(river, fromKm, toKm, fromYear, toYear)) { rows.add(ResultRow.create().putValue(GeneralResultType.station, aggregate.getStation()) .putValue(SInfoResultType.years, yearsToString(isEpoch, fromYear, toYear)).putValue(SInfoResultType.collisionCount, aggregate.getCount())); } @@ -144,16 +160,23 @@ /** * Calculates the collision details for a km range of a river and a year, and adds them to a ResultRow collection + * + * @param qfinderProblemCount */ - private void calculateDetails(final Collection<ResultRow> rows, final int year, final Map<String, TreeMap<Date, GaugeDischargeValuesFinder>> qFinders, - final Map<String, GaugeMainValueFinder> zoneFinders) { + private void calculateDetails(final Collection<ResultRow> rows, final River river, final CollisionAccess access, final int year, + final Map<String, TreeMap<Date, GaugeDischargeValuesFinder>> qFinders, final Map<String, GaugeMainValueFinder> zoneFinders, + final Calculation problems, final List<DateRange> years, final int qfinderProblemCount) { - for (final CollisionValue collision : CollisionValue.getValues(this.river, this.access.getLowerKm(), this.access.getUpperKm(), - DateUtil.getStartDateFromYear(year), DateUtil.getEndDateFromYear(year))) { + final double fromKm = access.getLowerKm(); + final double toKm = access.getUpperKm(); + + for (final CollisionValue collision : CollisionValue.getValues(river, fromKm, toKm, DateUtil.getStartDateFromYear(year), + DateUtil.getEndDateFromYear(year))) { final String gaugeName = collision.getGaugeName(); - final double q = getQ(qFinders, gaugeName, collision.getGaugeW().doubleValue(), collision.getEventDate()); + final double q = getQ(qFinders, gaugeName, collision.getGaugeW().doubleValue(), collision.getEventDate(), river, problems, years, + qfinderProblemCount); final double qOut = Double.isInfinite(q) ? Double.NaN : q; - final String zone = getZone(zoneFinders, gaugeName, q); + final String zone = getZone(zoneFinders, gaugeName, q, river, problems); rows.add(ResultRow.create().putValue(GeneralResultType.station, collision.getStation()) .putValue(GeneralResultType.dateShort, collision.getEventDate()).putValue(SInfoResultType.collisionGaugeW, collision.getGaugeW()) .putValue(GeneralResultType.gaugeLabel, gaugeName).putValue(SInfoResultType.dischargeLong, qOut) @@ -163,18 +186,24 @@ /** * Gets the discharge of a gauge and a W + * + * @param years + * @param qfinderProblemCount */ - private double getQ(final Map<String, TreeMap<Date, GaugeDischargeValuesFinder>> qFinders, final String gaugeName, final double w, final Date when) { + private double getQ(final Map<String, TreeMap<Date, GaugeDischargeValuesFinder>> qFinders, final String gaugeName, final double w, final Date when, + final River river, final Calculation problems, final List<DateRange> years, int qfinderProblemCount) { // Find the gauge and load its discharge table, if not already in the map final String gnKey = gaugeName.toLowerCase(); if (!qFinders.containsKey(gnKey)) - addQFinders(qFinders, gaugeName); + addQFinders(qFinders, gaugeName, problems, river, years); + + // Interpolate W. // Interpolate W. final GaugeDischargeValuesFinder qFinder = getQFinder(qFinders.get(gnKey), when); if (qFinder == null) { - this.qfinderProblemCount++; - if (this.qfinderProblemCount == 1) - this.problems.addProblem("gauge_discharge_table.missing", gaugeName); + qfinderProblemCount++; + if (qfinderProblemCount == 1) + problems.addProblem("gauge_discharge_table.missing", gaugeName); return Double.NaN; } return qFinder.getDischarge(w); @@ -183,19 +212,18 @@ /** * Add the discharge finders for a gauge and the active time period */ - private void addQFinders(final Map<String, TreeMap<Date, GaugeDischargeValuesFinder>> qFinders, final String gaugeName) { + private void addQFinders(final Map<String, TreeMap<Date, GaugeDischargeValuesFinder>> qFinders, final String gaugeName, final Calculation problems, + final River river, final List<DateRange> years) { final String gnKey = gaugeName.toLowerCase(); - final Gauge gauge = this.river.determineGaugeByName(gaugeName); + final Gauge gauge = river.determineGaugeByName(gaugeName); if (gauge == null) { qFinders.put(gnKey, new TreeMap<Date, GaugeDischargeValuesFinder>()); return; } - final List<DischargeTable> qtables = DischargeTable.fetchHistoricalDischargeTables(gauge, this.years.get(0).getFrom(), - this.years.get(this.years.size() - 1).getTo()); + final List<DischargeTable> qtables = DischargeTable.fetchHistoricalDischargeTables(gauge, years.get(0).getFrom(), years.get(years.size() - 1).getTo()); qFinders.put(gnKey, new TreeMap<Date, GaugeDischargeValuesFinder>()); for (final DischargeTable qtable : qtables) - qFinders.get(gnKey).put(qtable.getTimeInterval().getStartTime(), - GaugeDischargeValuesFinder.loadValues(qtable, this.river, gaugeName, this.problems)); + qFinders.get(gnKey).put(qtable.getTimeInterval().getStartTime(), GaugeDischargeValuesFinder.loadValues(qtable, river, gaugeName, problems)); } /** @@ -215,11 +243,12 @@ /** * Gets the main value zone name of a gauge and a Q */ - private String getZone(final Map<String, GaugeMainValueFinder> zoneFinders, final String gaugeName, final double q) { + private String getZone(final Map<String, GaugeMainValueFinder> zoneFinders, final String gaugeName, final double q, final River river, + final Calculation problems) { // Find the gauge and load its main value list, if not already in the map final String gnKey = gaugeName.toLowerCase(); if (!zoneFinders.containsKey(gnKey)) - zoneFinders.put(gnKey, GaugeMainValueFinder.loadValues(MainValueTypeKey.Q, this.river, gaugeName, this.problems, "GLQ")); + zoneFinders.put(gnKey, GaugeMainValueFinder.loadValues(MainValueTypeKey.Q, river, gaugeName, problems, "GLQ")); // Build the zone name if (zoneFinders.get(gnKey) == null) return "";
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionState.java Thu Oct 10 15:29:02 2019 +0200 @@ -78,12 +78,18 @@ /* add themes for chart, for each result */ final List<AbstractCalculationExportableResult> resultList = results.getResults(); + int themeCount = 0; + for (int index = 0; index < resultList.size(); index++) { if (resultList.get(index) instanceof CollisionCalcOverviewResult) { final CollisionCalcOverviewResult result = (CollisionCalcOverviewResult) resultList.get(index); - for (final DateRange dr : result.getYears()) - facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index, dr.getFromYear(), themeCount++)); + + final List<DateRange> yearRanges = result.getYears(); + for (int rangeIndex = 0; rangeIndex < yearRanges.size(); rangeIndex++) { + final DateRange dr = yearRanges.get(rangeIndex); + facets.add(CollisionCalcProcessor.createFacet(context, hash, this.id, result, index, themeCount++, rangeIndex)); + } } }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractTkhCalculationResult.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractTkhCalculationResult.java Thu Oct 10 15:29:02 2019 +0200 @@ -112,4 +112,8 @@ public final WstInfo getWst() { return this.wst; // TODO: Meta-Data export hier hin } + + public final String getWstLabel() { + return this.wst.getLabel(); + } } \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDevelopmentPerYearProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDevelopmentPerYearProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -65,7 +65,7 @@ public static Facet createFlowDepthDevelopmentFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, final int index) { return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_YAXIS_LABEL, - FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED, FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED_DESCRIPTION); + FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED, FACET_FLOW_DEPTH_DEVELOPMENT_PER_YEAR_FILTERED_DESCRIPTION, result.getLabel()); } public static Facet createFlowDepthDevelopmentRawFacet(final CallContext context, final String hash, final String id,
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDevelopmentProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDevelopmentProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -42,12 +42,16 @@ private static final String FACET_FLOW_DEPTH_DEVELOPMENT_RAW_DESCRIPTION = "sinfo.facet.flow_depth_development.raw.description"; public static final String FACET_WATERLEVEL_DIFFERENCE_FILTERED = "sinfo_facet_waterlevel_difference.filtered"; + public static final String FACET_WATERLEVEL_DIFFERENCE_RAW = "sinfo_facet_waterlevel_difference"; private static final String FACET_WATERLEVEL_DIFFERENCE_FILTERED_DESCRIPTION = "sinfo.facet.waterlevel_difference.filtered.description"; + private static final String FACET_WATERLEVEL_DIFFERENCE_RAW_DESCRIPTION = "sinfo.facet.waterlevel_difference.raw.description"; // TODO public static final String FACET_BEDHEIGHT_DIFFERENCE_FILTERED = "sinfo_facet_bedheight_difference.filtered"; + public static final String FACET_BEDHEIGHT_DIFFERENCE_RAW = "sinfo_facet_bedheight_difference"; private static final String FACET_BEDHEIGHT_DIFFERENCE_FILTERED_DESCRIPTION = "sinfo.facet.bedheight_difference.filtered.description"; + private static final String FACET_BEDHEIGHT_DIFFERENCE_RAW_DESCRIPTION = "sinfo.facet.bedheight_difference.raw.description"; private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>(); @@ -55,7 +59,9 @@ HANDLED_FACET_TYPES.add(FACET_FLOW_DEPTH_DEVELOPMENT_FILTERED); HANDLED_FACET_TYPES.add(FACET_FLOW_DEPTH_DEVELOPMENT_RAW); HANDLED_FACET_TYPES.add(FACET_WATERLEVEL_DIFFERENCE_FILTERED); + HANDLED_FACET_TYPES.add(FACET_WATERLEVEL_DIFFERENCE_RAW); HANDLED_FACET_TYPES.add(FACET_BEDHEIGHT_DIFFERENCE_FILTERED); + HANDLED_FACET_TYPES.add(FACET_BEDHEIGHT_DIFFERENCE_RAW); } public FlowDepthDevelopmentProcessor() { @@ -71,9 +77,13 @@ if (FACET_WATERLEVEL_DIFFERENCE_FILTERED.contentEquals(facetName)) return SInfoResultType.waterlevelDifference; + if (FACET_WATERLEVEL_DIFFERENCE_RAW.contentEquals(facetName)) + return SInfoResultType.waterlevelDifference; if (FACET_BEDHEIGHT_DIFFERENCE_FILTERED.contentEquals(facetName)) return SInfoResultType.bedHeightDifference; + if (FACET_BEDHEIGHT_DIFFERENCE_RAW.contentEquals(facetName)) + return SInfoResultType.bedHeightDifference; final String error = String.format("Unknown facet name: %s", facetName); throw new UnsupportedOperationException(error); @@ -87,25 +97,45 @@ public static Facet createFlowDepthDevelopmentRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, final int index) { - return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, - FACET_FLOW_DEPTH_DEVELOPMENT_RAW, FACET_FLOW_DEPTH_DEVELOPMENT_RAW_DESCRIPTION); + return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, FACET_FLOW_DEPTH_DEVELOPMENT_RAW, + FACET_FLOW_DEPTH_DEVELOPMENT_RAW_DESCRIPTION); } - public static Facet createWaterlevelDifferenceFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, - final int index) { - final String facetFlowDepthTkhFilteredDescription = Resources.getMsg(context.getMeta(), FACET_WATERLEVEL_DIFFERENCE_FILTERED_DESCRIPTION, - FACET_WATERLEVEL_DIFFERENCE_FILTERED_DESCRIPTION, result.getLabel()); - return new ResultFacet(index, FACET_WATERLEVEL_DIFFERENCE_FILTERED, facetFlowDepthTkhFilteredDescription, - SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, ComputeType.ADVANCE, id, hash); + public static Facet createWaterlevelDifferenceFacetRaw(final CallContext context, final String hash, final String id, + final AbstractCalculationResult result, final int index) { + return createWaterlevelDifferenceFacet(context, hash, id, result, index, FACET_WATERLEVEL_DIFFERENCE_RAW, FACET_WATERLEVEL_DIFFERENCE_RAW_DESCRIPTION); } - public static Facet createBedHeightDifferenceFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + public static Facet createBedHeightDifferenceFacetRaw(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, final int index) { + return createBedHeightDifferenceFacet(context, hash, id, result, index, FACET_BEDHEIGHT_DIFFERENCE_RAW, FACET_BEDHEIGHT_DIFFERENCE_RAW_DESCRIPTION); + } - final String facetFlowDepthFilteredDescription = Resources.getMsg(context.getMeta(), FACET_BEDHEIGHT_DIFFERENCE_FILTERED_DESCRIPTION, - FACET_BEDHEIGHT_DIFFERENCE_FILTERED_DESCRIPTION, result.getLabel()); - return new ResultFacet(index, FACET_BEDHEIGHT_DIFFERENCE_FILTERED, facetFlowDepthFilteredDescription, - SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, ComputeType.ADVANCE, id, hash); + public static Facet createWaterlevelDifferenceFacetFiltered(final CallContext context, final String hash, final String id, + final AbstractCalculationResult result, final int index) { + return createWaterlevelDifferenceFacet(context, hash, id, result, index, FACET_WATERLEVEL_DIFFERENCE_FILTERED, + FACET_WATERLEVEL_DIFFERENCE_FILTERED_DESCRIPTION); + } + + public static Facet createBedHeightDifferenceFacetFiltered(final CallContext context, final String hash, final String id, + final AbstractCalculationResult result, final int index) { + return createBedHeightDifferenceFacet(context, hash, id, result, index, FACET_BEDHEIGHT_DIFFERENCE_FILTERED, + FACET_BEDHEIGHT_DIFFERENCE_FILTERED_DESCRIPTION); + } + + private static Facet createWaterlevelDifferenceFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String facetName, final String description) { + final String facetFlowDepthTkhFilteredDescription = Resources.getMsg(context.getMeta(), description, description, result.getLabel()); + return new ResultFacet(index, facetName, facetFlowDepthTkhFilteredDescription, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, ComputeType.ADVANCE, id, + hash); + } + + private static Facet createBedHeightDifferenceFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String facetName, final String description) { + + final String facetFlowDepthFilteredDescription = Resources.getMsg(context.getMeta(), description, description, result.getLabel()); + return new ResultFacet(index, facetName, facetFlowDepthFilteredDescription, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, ComputeType.ADVANCE, id, + hash); } @Override
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDischargeProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -0,0 +1,65 @@ +/* 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.sinfo.common; + +import java.util.HashSet; +import java.util.Set; + +import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; +import org.dive4elements.artifactdatabase.state.Facet; +import org.dive4elements.artifacts.CallContext; +import org.dive4elements.artifacts.CallMeta; +import org.dive4elements.river.artifacts.common.AbstractCalculationResult; +import org.dive4elements.river.artifacts.common.AbstractProcessor; +import org.dive4elements.river.artifacts.resources.Resources; +import org.dive4elements.river.exports.DiagramGenerator; +import org.dive4elements.river.themes.ThemeDocument; + +public final class FlowDepthDischargeProcessor extends AbstractProcessor { + + /* discharge */ + public static final String FACET_FLOW_DEPTH_DISCHARGE = "sinfo_facet_flow_depth_discharge"; + public static final String FACET_FLOW_DEPTH_DISCHARGE_Y_AXIS_LABEL = "common.export.csv.header.q"; + public static final String FACET_FLOW_DEPTH_DISCHARGE_DESCRIPTION = "facet.flow_depth.discharge"; + + private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>(); + + static { + HANDLED_FACET_TYPES.add(FACET_FLOW_DEPTH_DISCHARGE); + } + + public FlowDepthDischargeProcessor() { + super(FACET_FLOW_DEPTH_DISCHARGE_Y_AXIS_LABEL, HANDLED_FACET_TYPES); + } + + protected SInfoResultType doGetType(final String facetName) { + + if (FACET_FLOW_DEPTH_DISCHARGE.contentEquals(facetName)) + return SInfoResultType.discharge; + + final String error = String.format("Unknown facet name: %s", facetName); + throw new UnsupportedOperationException(error); + } + + public static Facet createFlowDepthDischargeFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String wstLabel) { + final CallMeta meta = context.getMeta(); + final String yAxisLabel = Resources.getMsg(meta, FACET_FLOW_DEPTH_DISCHARGE_Y_AXIS_LABEL, FACET_FLOW_DEPTH_DISCHARGE_Y_AXIS_LABEL); + return AbstractProcessor.createFacet(context, hash, id, result, index, yAxisLabel, FACET_FLOW_DEPTH_DISCHARGE, FACET_FLOW_DEPTH_DISCHARGE_DESCRIPTION, + wstLabel); + } + + @Override + protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) { + + return buildSeriesForType(generator, bundle, theme, visible, doGetType(bundle.getFacetName()), GAP_DISTANCE); + } +} \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -16,8 +16,10 @@ import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.CallContext; +import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.common.AbstractCalculationResult; import org.dive4elements.river.artifacts.common.AbstractProcessor; +import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.exports.DiagramGenerator; import org.dive4elements.river.themes.ThemeDocument; @@ -32,6 +34,7 @@ // changes depending on zoom state /* flow depth */ + public static final String FACET_FLOW_DEPTH_FILTERED = "sinfo_facet_flow_depth.filtered"; private static final String FACET_FLOW_DEPTH_FILTERED_DESCRIPTION = "sinfo.facet.flow_depth.filtered.description"; @@ -144,14 +147,16 @@ public static Facet createFlowDepthFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, final int index) { - return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_FILTERED, - FACET_FLOW_DEPTH_FILTERED_DESCRIPTION); + final CallMeta meta = context.getMeta(); + final String yAxisLabel = Resources.getMsg(meta, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL); + return AbstractProcessor.createFacet(context, hash, id, result, index, yAxisLabel, FACET_FLOW_DEPTH_FILTERED, FACET_FLOW_DEPTH_FILTERED_DESCRIPTION); } public static Facet createFlowDepthRawFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, final int index) { - return AbstractProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, FACET_FLOW_DEPTH_RAW, - FACET_FLOW_DEPTH_RAW_DESCRIPTION); + final CallMeta meta = context.getMeta(); + final String yAxisLabel = Resources.getMsg(meta, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL, SINFO_CHART_FLOW_DEPTH_YAXIS_LABEL); + return AbstractProcessor.createFacet(context, hash, id, result, index, yAxisLabel, FACET_FLOW_DEPTH_RAW, FACET_FLOW_DEPTH_RAW_DESCRIPTION); } public static Facet createFlowDepthTkhFilteredFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthWaterlevelProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -0,0 +1,106 @@ +/* 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.sinfo.common; + +import java.util.HashSet; +import java.util.Set; + +import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; +import org.dive4elements.artifactdatabase.state.Facet; +import org.dive4elements.artifacts.CallContext; +import org.dive4elements.artifacts.CallMeta; +import org.dive4elements.river.artifacts.common.AbstractCalculationResult; +import org.dive4elements.river.artifacts.common.AbstractProcessor; +import org.dive4elements.river.artifacts.resources.Resources; +import org.dive4elements.river.exports.DiagramGenerator; +import org.dive4elements.river.themes.ThemeDocument; + +public final class FlowDepthWaterlevelProcessor extends AbstractProcessor { + + /* waterlevel */ + public static final String FACET_FLOW_DEPTH_BEDHEIGHT_MIN = "sinfo_facet_flow_depth_bedheight_min"; + public static final String FACET_FLOW_DEPTH_BEDHEIGHT_MAX = "sinfo_facet_flow_depth_bedheight_max"; + public static final String FACET_FLOW_DEPTH_BEDHEIGHT = "sinfo_facet_flow_depth_bedheight"; + public static final String FACET_FLOW_DEPTH_WATER_LEVEL = "sinfo_facet_flow_depth_waterlevel"; + public static final String FACET_FLOW_DEPTH_WATER_LEVEL_Y_AXIS_LABEL = "chart.longitudinal.section.yaxis.label"; + public static final String FACET_FLOW_DEPTH_WATER_LEVEL_DESCRIPTION = "facet.flow_depth.waterlevel"; + public static final String FACET_FLOW_DEPTH_BEDHEIGHT_DESCRIPTION = "facet.flow_depth.bedheight"; + public static final String FACET_FLOW_DEPTH_BEDHEIGHT_DESCRIPTION_MIN = "facet.flow_depth.bedheight.min"; + public static final String FACET_FLOW_DEPTH_BEDHEIGHT_DESCRIPTION_MAX = "facet.flow_depth.bedheight.max"; + + private static final Set<String> HANDLED_FACET_TYPES = new HashSet<>(); + + static { + HANDLED_FACET_TYPES.add(FACET_FLOW_DEPTH_WATER_LEVEL); + HANDLED_FACET_TYPES.add(FACET_FLOW_DEPTH_BEDHEIGHT); + HANDLED_FACET_TYPES.add(FACET_FLOW_DEPTH_BEDHEIGHT_MIN); + HANDLED_FACET_TYPES.add(FACET_FLOW_DEPTH_BEDHEIGHT_MAX); + } + + public FlowDepthWaterlevelProcessor() { + super(FACET_FLOW_DEPTH_WATER_LEVEL_Y_AXIS_LABEL, HANDLED_FACET_TYPES); + } + + protected SInfoResultType doGetType(final String facetName) { + + if (FACET_FLOW_DEPTH_WATER_LEVEL.contentEquals(facetName)) + return SInfoResultType.waterlevel; + if (FACET_FLOW_DEPTH_BEDHEIGHT.contentEquals(facetName)) + return SInfoResultType.meanBedHeight; + if (FACET_FLOW_DEPTH_BEDHEIGHT_MIN.contentEquals(facetName)) + return SInfoResultType.minBedHeight; + if (FACET_FLOW_DEPTH_BEDHEIGHT_MAX.contentEquals(facetName)) + return SInfoResultType.maxBedHeight; + + final String error = String.format("Unknown facet name: %s", facetName); + throw new UnsupportedOperationException(error); + } + + private static Facet createFlowDepthBedheightFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String unit, final String facetLabel, final String facetName, final String description) { + final CallMeta meta = context.getMeta(); + final String yAxisLabel = Resources.getMsg(meta, FACET_FLOW_DEPTH_WATER_LEVEL_Y_AXIS_LABEL, FACET_FLOW_DEPTH_WATER_LEVEL_Y_AXIS_LABEL, unit); + + return AbstractProcessor.createFacet(context, hash, id, result, index, yAxisLabel, facetName, description, facetLabel); + } + + public static Facet createFlowDepthMeanBedheightFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String unit, final String facetLabel) { + return FlowDepthWaterlevelProcessor.createFlowDepthBedheightFacet(context, hash, id, result, index, unit, facetLabel, FACET_FLOW_DEPTH_BEDHEIGHT, + FACET_FLOW_DEPTH_BEDHEIGHT_DESCRIPTION); + } + + public static Facet createFlowDepthMinBedheightFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String unit, final String facetLabel) { + return FlowDepthWaterlevelProcessor.createFlowDepthBedheightFacet(context, hash, id, result, index, unit, facetLabel, FACET_FLOW_DEPTH_BEDHEIGHT_MIN, + FACET_FLOW_DEPTH_BEDHEIGHT_DESCRIPTION_MIN); + } + + public static Facet createFlowDepthMaxBedheightFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String unit, final String facetLabel) { + return FlowDepthWaterlevelProcessor.createFlowDepthBedheightFacet(context, hash, id, result, index, unit, facetLabel, FACET_FLOW_DEPTH_BEDHEIGHT_MAX, + FACET_FLOW_DEPTH_BEDHEIGHT_DESCRIPTION_MAX); + } + + public static Facet createFlowDepthWaterlevelFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, + final int index, final String unit, final String wstLabel) { + final CallMeta meta = context.getMeta(); + final String yAxisLabel = Resources.getMsg(meta, FACET_FLOW_DEPTH_WATER_LEVEL_Y_AXIS_LABEL, FACET_FLOW_DEPTH_WATER_LEVEL_Y_AXIS_LABEL, unit); + return AbstractProcessor.createFacet(context, hash, id, result, index, yAxisLabel, FACET_FLOW_DEPTH_WATER_LEVEL, + FACET_FLOW_DEPTH_WATER_LEVEL_DESCRIPTION, wstLabel); + } + + @Override + protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) { + + return buildSeriesForType(generator, bundle, theme, visible, doGetType(bundle.getFacetName()), GAP_DISTANCE); + } +} \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java Thu Oct 10 15:29:02 2019 +0200 @@ -47,7 +47,6 @@ super(label, wst, hasTkh, rows); this.sounding = sounding; - } public BedHeightInfo getSounding() { @@ -160,4 +159,8 @@ return lines.toArray(new String[lines.size()]); } + public String getSoundingLabel() { + return this.sounding.getDescription(); + } + } \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthState.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthState.java Thu Oct 10 15:29:02 2019 +0200 @@ -21,7 +21,9 @@ import org.dive4elements.river.artifacts.model.FacetTypes; import org.dive4elements.river.artifacts.model.ReportFacet; import org.dive4elements.river.artifacts.sinfo.SINFOArtifact; +import org.dive4elements.river.artifacts.sinfo.common.FlowDepthDischargeProcessor; import org.dive4elements.river.artifacts.sinfo.common.FlowDepthProcessor; +import org.dive4elements.river.artifacts.sinfo.common.FlowDepthWaterlevelProcessor; import org.dive4elements.river.artifacts.sinfo.common.TkhProcessor; import org.dive4elements.river.artifacts.states.DefaultState; @@ -81,6 +83,12 @@ final FlowDepthCalculationResult result = resultList.get(index); + /* Discharge */ + facets.add(FlowDepthDischargeProcessor.createFlowDepthDischargeFacet(context, hash, this.id, result, index, result.getWstLabel())); + /* Result Type Wasserspiegellage, Mittl. Sohlhöhe */ + final String unit = results.getRiver().getWstUnit(); + facets.add(FlowDepthWaterlevelProcessor.createFlowDepthWaterlevelFacet(context, hash, this.id, result, index, unit, result.getWstLabel())); + facets.add(FlowDepthWaterlevelProcessor.createFlowDepthMeanBedheightFacet(context, hash, this.id, result, index, unit, result.getSoundingLabel())); /* filtered (zoom dependent mean) flow depth */ facets.add(FlowDepthProcessor.createFlowDepthFilteredFacet(context, hash, this.id, result, index)); facets.add(FlowDepthProcessor.createFlowDepthRawFacet(context, hash, this.id, result, index));
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentState.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentState.java Thu Oct 10 15:29:02 2019 +0200 @@ -89,8 +89,10 @@ facets.add(FlowDepthDevelopmentPerYearProcessor.createFlowDepthDevelopmentFilteredFacet(context, hash, this.id, result, index)); facets.add(FlowDepthDevelopmentPerYearProcessor.createFlowDepthDevelopmentRawFacet(context, hash, this.id, result, index)); - facets.add(FlowDepthDevelopmentProcessor.createWaterlevelDifferenceFacet(context, hash, this.id, result, index)); - facets.add(FlowDepthDevelopmentProcessor.createBedHeightDifferenceFacet(context, hash, this.id, result, index)); + facets.add(FlowDepthDevelopmentProcessor.createWaterlevelDifferenceFacetFiltered(context, hash, this.id, result, index)); + facets.add(FlowDepthDevelopmentProcessor.createWaterlevelDifferenceFacetRaw(context, hash, this.id, result, index)); + facets.add(FlowDepthDevelopmentProcessor.createBedHeightDifferenceFacetFiltered(context, hash, this.id, result, index)); + facets.add(FlowDepthDevelopmentProcessor.createBedHeightDifferenceFacetRaw(context, hash, this.id, result, index)); facets.add(FlowDepthProcessor.createFlowDepthCurrentFilteredFacet(context, hash, this.id, result, index)); facets.add(FlowDepthProcessor.createFlowDepthCurrentRawFacet(context, hash, this.id, result, index));
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculation.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculation.java Thu Oct 10 15:29:02 2019 +0200 @@ -155,6 +155,8 @@ putValue(SInfoResultType.discharge, discharge). // putValue(GeneralResultType.waterlevelLabel, waterlevelLabel). // putValue(GeneralResultType.gaugeLabel, gaugeLabel). // + putValue(SInfoResultType.minBedHeight, minBedHeightValue). // + putValue(SInfoResultType.maxBedHeight, maxBedHeightValue). // putValue(SInfoResultType.meanBedHeight, meanBedHeight). // putValue(SInfoResultType.soundingLabel, soundingLabel). // putValue(GeneralResultType.location, location);
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculationResult.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculationResult.java Thu Oct 10 15:29:02 2019 +0200 @@ -136,4 +136,12 @@ return lines.toArray(new String[lines.size()]); } + + public String getSoundingLabel() { + return this.sounding.getDescription(); + } + + public String getWstLabel() { + return this.wst.getLabel(); + } } \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxState.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxState.java Thu Oct 10 15:29:02 2019 +0200 @@ -21,7 +21,9 @@ import org.dive4elements.river.artifacts.model.FacetTypes; import org.dive4elements.river.artifacts.model.ReportFacet; import org.dive4elements.river.artifacts.sinfo.SINFOArtifact; +import org.dive4elements.river.artifacts.sinfo.common.FlowDepthDischargeProcessor; import org.dive4elements.river.artifacts.sinfo.common.FlowDepthProcessor; +import org.dive4elements.river.artifacts.sinfo.common.FlowDepthWaterlevelProcessor; import org.dive4elements.river.artifacts.states.DefaultState; /** State in which a waterlevel has been calculated. */ @@ -81,6 +83,15 @@ final FlowDepthMinMaxCalculationResult result = resultList.get(index); + final String unit = results.getRiver().getWstUnit(); + + final String wstLabel = result.getWstLabel(); + facets.add(FlowDepthWaterlevelProcessor.createFlowDepthMinBedheightFacet(context, hash, this.id, result, index, unit, result.getSoundingLabel())); + facets.add(FlowDepthWaterlevelProcessor.createFlowDepthMaxBedheightFacet(context, hash, this.id, result, index, unit, result.getSoundingLabel())); + + facets.add(FlowDepthWaterlevelProcessor.createFlowDepthWaterlevelFacet(context, hash, this.id, result, index, unit, wstLabel)); + /* Discharge */ + facets.add(FlowDepthDischargeProcessor.createFlowDepthDischargeFacet(context, hash, this.id, result, index, wstLabel)); /* filtered (zoom dependent mean) flow depth */ facets.add(FlowDepthProcessor.createFlowDepthMinFilteredFacet(context, hash, this.id, result, index)); facets.add(FlowDepthProcessor.createFlowDepthMinRawFacet(context, hash, this.id, result, index));
--- a/artifacts/src/main/java/org/dive4elements/river/exports/StyledSeriesBuilder.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/StyledSeriesBuilder.java Thu Oct 10 15:29:02 2019 +0200 @@ -9,12 +9,10 @@ package org.dive4elements.river.exports; import org.apache.log4j.Logger; - -import org.jfree.data.xy.XYSeries; - import org.dive4elements.river.artifacts.model.WKms; import org.dive4elements.river.artifacts.model.WQKms; import org.dive4elements.river.artifacts.model.WWQQ; +import org.jfree.data.xy.XYSeries; /** * Helper to create and modify StyledXYSeries. @@ -28,9 +26,7 @@ */ final static double BIG_DOUBLE_VALUE = 1234567d; - private static final Logger log = Logger.getLogger - (StyledSeriesBuilder.class); - + private static final Logger log = Logger.getLogger(StyledSeriesBuilder.class); /** * Trivial, hidden constructor. @@ -38,51 +34,48 @@ private StyledSeriesBuilder() { } - /** * Add points to series, create gaps if certain distance * between points is met. * - * @param series Series to add points to. - * @param points Points to add to series, points[0] to 1st dim, points[1] - * to 2nd dim. - * @param skipNANs if true, skip NAN values in points parameter. Otherwise, - * the NaNs lead to gaps in graph. - * @param distance if two consecutive entries in points[0] are more - * than distance apart, create a NaN value to skip - * in display. + * @param series + * Series to add points to. + * @param points + * Points to add to series, points[0] to 1st dim, points[1] + * to 2nd dim. + * @param skipNANs + * if true, skip NAN values in points parameter. Otherwise, + * the NaNs lead to gaps in graph. + * @param distance + * if two consecutive entries in points[0] are more + * than distance apart, create a NaN value to skip + * in display. */ - public static void addPoints( - XYSeries series, - double[][] points, - boolean skipNANs, - double distance - ) { + public static void addPoints(final XYSeries series, final double[][] points, final boolean skipNANs, final double distance) { if (points == null || points.length <= 1) { return; } - double [] xPoints = points[0]; - double [] yPoints = points[1]; - + final double[] xPoints = points[0]; + final double[] yPoints = points[1]; + Integer lastNonNaNIndex = null; - + for (int i = 0; i < xPoints.length; i++) { - if (skipNANs && - (Double.isNaN(xPoints[i]) || Double.isNaN(yPoints[i]))) { + if (skipNANs && (Double.isNaN(xPoints[i]) || Double.isNaN(yPoints[i]))) { continue; } // Create gap if distance between points > distance. - if (i > 0 && lastNonNaNIndex != null) - { - double distanceToLastNonNan = Math.abs(xPoints[lastNonNaNIndex] - xPoints[i] ); + if (i > 0 && lastNonNaNIndex != null) { + final double distanceToLastNonNan = Math.abs(xPoints[lastNonNaNIndex] - xPoints[i]); if (distanceToLastNonNan > distance && !Double.isNaN(yPoints[lastNonNaNIndex]) && !Double.isNaN(yPoints[i])) - series.add((xPoints[i-1] + xPoints[i])/2, Double.NaN, false); + series.add((xPoints[i - 1] + xPoints[i]) / 2, Double.NaN, false); } series.add(xPoints[i], yPoints[i], false); - + // if (skipNANs && !Double.isNaN(xPoints[i]) && !Double.isNaN(yPoints[i])) - if (!Double.isNaN(xPoints[i]) && !Double.isNaN(yPoints[i])) // skipNaN-State irrelevant, since lastNonNaNIndex is used for interpolation after gap-distance-comparison + if (!Double.isNaN(xPoints[i]) && !Double.isNaN(yPoints[i])) // skipNaN-State irrelevant, since lastNonNaNIndex is used for interpolation + // after gap-distance-comparison lastNonNaNIndex = i; } } @@ -90,15 +83,19 @@ /** * Add points to series. * - * @param series Series to add points to. - * @param points Points to add to series, points[0] to 1st dim, points[1] - * to 2nd dim. - * @param skipNANs if true, skip NAN values in points parameter. - * @param transY translate y-values by this value (before scale). - * @param factorY scale y-values by this value (after translation). + * @param series + * Series to add points to. + * @param points + * Points to add to series, points[0] to 1st dim, points[1] + * to 2nd dim. + * @param skipNANs + * if true, skip NAN values in points parameter. + * @param transY + * translate y-values by this value (before scale). + * @param factorY + * scale y-values by this value (after translation). */ - public static void addPoints(XYSeries series, double[][] points, - boolean skipNANs, double transY, double factorY) { + public static void addPoints(final XYSeries series, final double[][] points, final boolean skipNANs, final double transY, final double factorY) { if (transY == 0d && factorY == 1d) { addPoints(series, points, skipNANs); return; @@ -106,167 +103,176 @@ if (points == null || points.length <= 1) { return; } - double [] xPoints = points[0]; - double [] yPoints = points[1]; + final double[] xPoints = points[0]; + final double[] yPoints = points[1]; for (int i = 0; i < xPoints.length; i++) { - if (skipNANs && - (Double.isNaN(xPoints[i]) || Double.isNaN(yPoints[i]))) { + if (skipNANs && (Double.isNaN(xPoints[i]) || Double.isNaN(yPoints[i]))) { continue; } - series.add(xPoints[i], factorY * (transY+yPoints[i]), false); + series.add(xPoints[i], factorY * (transY + yPoints[i]), false); } } /** * Add points to series. * - * @param series Series to add points to. - * @param points Points to add to series, points[0] to 1st dim, points[1] - * to 2nd dim. - * @param skipNANs if true, skip NAN values in points parameter. + * @param series + * Series to add points to. + * @param points + * Points to add to series, points[0] to 1st dim, points[1] + * to 2nd dim. + * @param skipNANs + * if true, skip NAN values in points parameter. */ - public static void addPoints( - XYSeries series, - double[][] points, - boolean skipNANs - ) { + public static void addPoints(final XYSeries series, final double[][] points, final boolean skipNANs) { if (points == null || points.length <= 1) { return; } - double [] xPoints = points[0]; - double [] yPoints = points[1]; + final double[] xPoints = points[0]; + final double[] yPoints = points[1]; for (int i = 0; i < xPoints.length; i++) { - if (skipNANs && - (Double.isNaN(xPoints[i]) || Double.isNaN(yPoints[i]))) { + if (skipNANs && (Double.isNaN(xPoints[i]) || Double.isNaN(yPoints[i]))) { continue; } series.add(xPoints[i], yPoints[i], false); } } - /** * Add points to series (km to 1st dim, w to 2nd dim). * - * @param series Series to add points to. - * @param wkms WKms to add to series. + * @param series + * Series to add points to. + * @param wkms + * WKms to add to series. */ - public static void addPoints(XYSeries series, WKms wkms) { + public static void addPoints(final XYSeries series, final WKms wkms) { if (wkms == null) { return; } - int size = wkms.size(); + final int size = wkms.size(); for (int i = 0; i < size; i++) { series.add(wkms.getKm(i), wkms.getW(i), false); } } - /** * Add points to dataset with an offset (shift all points by given amount). - * @param series series to add data to. - * @param wkms WKms of which the Ws will be shifted. - * @param off the offset. + * + * @param series + * series to add data to. + * @param wkms + * WKms of which the Ws will be shifted. + * @param off + * the offset. */ - public static void addUpperBand(XYSeries series, WKms wkms, double off) { + public static void addUpperBand(final XYSeries series, final WKms wkms, final double off) { if (wkms == null) { return; } - int size = wkms.size(); + final int size = wkms.size(); for (int i = 0; i < size; i++) { - series.add(wkms.getKm(i), wkms.getW(i)+off, false); + series.add(wkms.getKm(i), wkms.getW(i) + off, false); } } - /** * Add points to dataset with an offset (shift all points 'down' by given * amount). - * @param series series to add data to. - * @param wkms WKms of which the Ws will be shifted. - * @param off the offset. + * + * @param series + * series to add data to. + * @param wkms + * WKms of which the Ws will be shifted. + * @param off + * the offset. */ - public static void addLowerBand(XYSeries series, WKms wkms, double off) { + public static void addLowerBand(final XYSeries series, final WKms wkms, final double off) { addUpperBand(series, wkms, -off); } - /** * Add points to series (km to 1st dim, q to 2nd dim). * - * @param series Series to add points to. - * @param wqkms WQKms to add to series. + * @param series + * Series to add points to. + * @param wqkms + * WQKms to add to series. */ - public static void addPointsKmQ(XYSeries series, WQKms wqkms) { + public static void addPointsKmQ(final XYSeries series, final WQKms wqkms) { if (wqkms == null) { return; } - int size = wqkms.size(); + final int size = wqkms.size(); for (int i = 0; i < size; i++) { series.add(wqkms.getKm(i), wqkms.getQ(i), false); } } - /** * Add points to series (km to 1st dim, q to 2nd dim), adding points * to achieve a step-like curve. * - * @param series Series to add points to. - * @param wqkms WQKms to add to series. + * @param series + * Series to add points to. + * @param wqkms + * WQKms to add to series. */ - public static void addStepPointsKmQ(XYSeries series, WQKms wqkms) { + public static void addStepPointsKmQ(final XYSeries series, final WQKms wqkms) { if (wqkms == null) { return; } - int size = wqkms.size(); + final int size = wqkms.size(); for (int i = 0; i < size; i++) { - if (i==0) { + if (i == 0) { series.add(wqkms.getKm(i), wqkms.getQ(i), false); - } else if (i == size-1) { + } else if (i == size - 1) { series.add(wqkms.getKm(i), wqkms.getQ(i), false); } else { - //Add two points. + // Add two points. double prevX; double prevQ; if (wqkms.getKm(i + 1) < wqkms.getKm(i)) { - /* Depending on the data direction the previous km / q + /* + * Depending on the data direction the previous km / q * might have a larger index when we draw - * right to left data. */ + * right to left data. + */ prevX = wqkms.getKm(i + 1); prevQ = wqkms.getQ(i + 1); } else { prevX = wqkms.getKm(i - 1); prevQ = wqkms.getQ(i - 1); } - double halveX = (prevX + wqkms.getKm(i)) / 2d; + final double halveX = (prevX + wqkms.getKm(i)) / 2d; series.add(halveX, prevQ, false); series.add(halveX, wqkms.getQ(i), false); } } } - /** * Add points to series (q to 1st dim, w to 2nd dim). * - * @param series Series to add points to. - * @param wqkms WQKms to add to series. + * @param series + * Series to add points to. + * @param wqkms + * WQKms to add to series. */ - public static void addPointsQW(XYSeries series, WQKms wqkms) { + public static void addPointsQW(final XYSeries series, final WQKms wqkms) { if (wqkms == null) { return; } - int size = wqkms.size(); + final int size = wqkms.size(); for (int i = 0; i < size; i++) { series.add(wqkms.getQ(i), wqkms.getW(i), false); @@ -277,48 +283,47 @@ * Add points to series (q to 1st dim, w to 2nd dim), adding wTrans to the * W values and scaling it with wScale. * - * @param series Series to add points to. - * @param qws to add to series. - * @param wAdd Value to add to each Q while adding to series. - * @param wScale multiply with + * @param series + * Series to add points to. + * @param qws + * to add to series. + * @param wAdd + * Value to add to each Q while adding to series. + * @param wScale + * multiply with */ - public static void addPointsQW( - XYSeries series, - double[][] qws, - double wTrans, - double wScale - ) { + public static void addPointsQW(final XYSeries series, final double[][] qws, final double wTrans, final double wScale) { if (qws == null || qws.length == 0) { return; } - double x[] = qws[0]; - double y[] = qws[1]; + final double x[] = qws[0]; + final double y[] = qws[1]; for (int i = 0; i < x.length; i++) { series.add(x[i], wScale * (y[i] + wTrans), false); } } + /** * Add points to series (q to 1st dim, w to 2nd dim), adding wTrans to the * W values and scaling it with wScale. * - * @param series Series to add points to. - * @param wqkms WQKms to add to series. - * @param wAdd Value to add to each Q while adding to series. - * @param wScale multiply with + * @param series + * Series to add points to. + * @param wqkms + * WQKms to add to series. + * @param wAdd + * Value to add to each Q while adding to series. + * @param wScale + * multiply with */ - public static void addPointsQW( - XYSeries series, - WQKms wqkms, - double wTrans, - double wScale - ) { + public static void addPointsQW(final XYSeries series, final WQKms wqkms, final double wTrans, final double wScale) { if (wqkms == null) { return; } - int size = wqkms.size(); + final int size = wqkms.size(); for (int i = 0; i < size; i++) { series.add(wqkms.getQ(i), wScale * (wqkms.getW(i) + wTrans), false); @@ -328,16 +333,19 @@ /** * Add points to series (q to 1st dim, w to 2nd dim). * - * @param series Series to add points to. - * @param qs the Qs to add, assumed same length than ws. - * @param ws the Ws to add, assumed same length than qs. + * @param series + * Series to add points to. + * @param qs + * the Qs to add, assumed same length than ws. + * @param ws + * the Ws to add, assumed same length than qs. */ - public static void addPointsQW(XYSeries series, double[] qs, double ws[]) { + public static void addPointsQW(final XYSeries series, final double[] qs, final double ws[]) { if (ws == null || qs == null) { return; } - int size = qs.length; + final int size = qs.length; for (int i = 0; i < size; i++) { series.add(qs[i], ws[i], false); @@ -348,76 +356,75 @@ * Add points to series (q to 1st dim, w to 2nd dim), with * scaling and translation. * - * @param series Series to add points to. - * @param qs the Qs to add, assumed same length than ws. - * @param ws the Ws to add, assumed same length than qs. + * @param series + * Series to add points to. + * @param qs + * the Qs to add, assumed same length than ws. + * @param ws + * the Ws to add, assumed same length than qs. */ - public static void addPointsQW(XYSeries series, double[] qs, double ws[], - double wTrans, double wScale) { + public static void addPointsQW(final XYSeries series, final double[] qs, final double ws[], final double wTrans, final double wScale) { if (ws == null || qs == null) { return; } - int size = qs.length; + final int size = qs.length; for (int i = 0; i < size; i++) { - series.add(qs[i], wScale * (ws[i]+wTrans), false); + series.add(qs[i], wScale * (ws[i] + wTrans), false); } } - - /** * Add points to series (q to 1st dim, w to 2nd dim). * - * @param series Series to add points to. - * @param wwqq WWQQ to add to series. + * @param series + * Series to add points to. + * @param wwqq + * WWQQ to add to series. */ - public static void addPoints(XYSeries series, WWQQ wwqq) { + public static void addPoints(final XYSeries series, final WWQQ wwqq) { if (wwqq == null) { return; } - int size = wwqq.size(); + final int size = wwqq.size(); for (int i = 0; i < size; i++) { series.add(wwqq.getW1(i), wwqq.getW2(i), false); } } - /** * Create a Series such that an infinitely big area can be filled * between the newly created and the given series. */ - public static XYSeries createGroundAtInfinity(XYSeries series) { - XYSeries ground = - new XYSeries(series.getKey() + /** TODO rand + */ "INF"); + public static XYSeries createGroundAtInfinity(final XYSeries series) { + final XYSeries ground = new XYSeries(series.getKey() + /** TODO rand + */ + "INF"); ground.add(series.getMinX(), -BIG_DOUBLE_VALUE); ground.add(series.getMaxX(), -BIG_DOUBLE_VALUE); return ground; } - /** * Create a Series such that an infinitely big area can be filled * between the newly created and the given series. */ - public static XYSeries createCeilingAtInfinity(XYSeries series) { - XYSeries ground = - new XYSeries(series.getKey() + /** TODO rand + */ "INF"); + public static XYSeries createCeilingAtInfinity(final XYSeries series) { + final XYSeries ground = new XYSeries(series.getKey() + /** TODO rand + */ + "INF"); ground.add(series.getMinX(), BIG_DOUBLE_VALUE); ground.add(series.getMaxX(), BIG_DOUBLE_VALUE); return ground; } + /** Checks if a given value is the BIG_DOUBLE_VALUE */ + public static boolean isBigDoubleValue(final Number value) { + if (value == null) + return false; - /** Checks if a given value is the BIG_DOUBLE_VALUE */ - public static boolean isBigDoubleValue(Number value) { - if( value == null ) - return false; - - return Math.abs( BIG_DOUBLE_VALUE - Math.abs(value.doubleValue()) ) < 0.1; + return Math.abs(BIG_DOUBLE_VALUE - Math.abs(value.doubleValue())) < 0.1; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -11,80 +11,58 @@ import java.util.Map; import org.apache.log4j.Logger; -import org.jfree.data.xy.XYSeries; - import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; - -import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.exports.XYChartGenerator; +import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.exports.DiagramGenerator; import org.dive4elements.river.exports.StyledSeriesBuilder; +import org.dive4elements.river.exports.XYChartGenerator; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; +import org.jfree.data.xy.XYSeries; public class BedHeightProcessor extends DefaultProcessor { - private final static Logger log = - Logger.getLogger(BedHeightProcessor.class); + private final static Logger log = Logger.getLogger(BedHeightProcessor.class); - public static final String I18N_AXIS_LABEL = - "chart.bedheight_middle.section.yaxis.label"; + public static final String I18N_AXIS_LABEL = "chart.bedheight_middle.section.yaxis.label"; public final static String FACET_BED_HEIGHTS_MIN = "bedheight_min"; public final static String FACET_BED_HEIGHTS_MAX = "bedheight_min"; - + protected static final double GAP_TOLERANCE = 0.101d; protected String yAxisLabel; @Override - public void doOut( - DiagramGenerator generator, - ArtifactAndFacet bundle, - ThemeDocument theme, - boolean visible) { - XYSeries series = prepareSeries( - bundle, theme, generator.getContext()); + public void doOut(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) { + final XYSeries series = prepareSeries(bundle, theme, generator.getContext()); if (series != null) { - generator.addAxisSeries(series, axisName, visible); + generator.addAxisSeries(series, this.axisName, visible); } } @Override - public void doOut( - XYChartGenerator generator, - ArtifactAndFacet bundle, - ThemeDocument theme, - boolean visible, - int index - ) { - XYSeries series = prepareSeries( - bundle, theme, generator.getContext()); + public void doOut(final XYChartGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible, final int index) { + final XYSeries series = prepareSeries(bundle, theme, generator.getContext()); if (series != null) { generator.addAxisSeries(series, index, visible); } } /** Prepare an series, independent of axis. */ - private XYSeries prepareSeries( - ArtifactAndFacet bundle, - ThemeDocument theme, - CallContext context - ) { - Map<String, String> metaData = bundle.getFacet().getMetaData( - bundle.getArtifact(), context); - StyledXYSeries series = new StyledXYSeries(bundle.getFacetName(), bundle.getFacetDescription(), - theme); + private XYSeries prepareSeries(final ArtifactAndFacet bundle, final ThemeDocument theme, final CallContext context) { + final Map<String, String> metaData = bundle.getFacet().getMetaData(bundle.getArtifact(), context); + final StyledXYSeries series = new StyledXYSeries(bundle.getFacetName(), bundle.getFacetDescription(), theme); series.putMetaData(metaData, bundle.getArtifact(), context); - yAxisLabel = metaData.get("Y"); + this.yAxisLabel = metaData.get("Y"); - Object raw = bundle.getData(context); + final Object raw = bundle.getData(context); if (raw == null) { return null; } @@ -93,44 +71,28 @@ return null; } - double[][] data = (double[][])raw; - StyledSeriesBuilder.addPoints(series, - data, - false, - GAP_TOLERANCE); + final double[][] data = (double[][]) raw; + StyledSeriesBuilder.addPoints(series, data, false, GAP_TOLERANCE); return series; } - @Override - public boolean canHandle(String facetType) { - return FacetTypes.BEDHEIGHT.equals(facetType) - || FACET_BED_HEIGHTS_MIN.equals(facetType) - || FACET_BED_HEIGHTS_MAX.equals(facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1.equals(facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2.equals(facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED.equals( - facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED.equals( - facetType); + public boolean canHandle(final String facetType) { + return FacetTypes.BEDHEIGHT.equals(facetType) || FACET_BED_HEIGHTS_MIN.equals(facetType) || FACET_BED_HEIGHTS_MAX.equals(facetType) + || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1.equals(facetType) || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2.equals(facetType) + || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED.equals(facetType) || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED.equals(facetType); } @Override - public String getAxisLabel(DiagramGenerator generator) { - D4EArtifact flys = (D4EArtifact) generator.getMaster(); - String unit = new RiverAccess(flys).getRiver().getWstUnit().getName(); - - CallMeta meta = generator.getContext().getMeta(); + public String getAxisLabel(final DiagramGenerator generator) { + final D4EArtifact flys = (D4EArtifact) generator.getMaster(); + final String unit = new RiverAccess(flys).getRiver().getWstUnit().getName(); - if (yAxisLabel != null && !yAxisLabel.isEmpty()) { - return Resources.getMsg( - meta, - yAxisLabel, - new Object[] {unit}); + final CallMeta meta = generator.getContext().getMeta(); + + if (this.yAxisLabel != null && !this.yAxisLabel.isEmpty()) { + return Resources.getMsg(meta, this.yAxisLabel, new Object[] { unit }); } - return Resources.getMsg( - meta, - I18N_AXIS_LABEL, - new Object[] { unit }); + return Resources.getMsg(meta, I18N_AXIS_LABEL, new Object[] { unit }); } } \ No newline at end of file