Mercurial > dive4elements > river

changeset 8158:ecd84d8b908a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved more generator stuff in reguarding sub directory.
author Sascha L. Teichmann <teichmann@intevation.de>
date Fri, 29 Aug 2014 11:43:15 +0200
parents 1ccbd7f81c7d
children 87161da4b444
files artifacts/doc/conf/conf.xml artifacts/doc/conf/generators/generators.xml artifacts/doc/conf/generators/longitudinal-diagrams.xml artifacts/doc/conf/generators/sqrelation-diagram-defaults.xml artifacts/doc/conf/sqrelation-diagram-defaults.xml
diffstat 5 files changed, 99 insertions(+), 93 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/conf.xml	Fri Aug 29 11:31:17 2014 +0200
+++ b/artifacts/doc/conf/conf.xml	Fri Aug 29 11:43:15 2014 +0200
@@ -8,7 +8,6 @@
     <!ENTITY floodmap    SYSTEM "floodmap.xml">
     <!ENTITY rivermap	 SYSTEM "rivermap.xml">
     <!ENTITY generators  SYSTEM "generators/generators.xml">
-    <!ENTITY sqrelation-defaults SYSTEM "sqrelation-diagram-defaults.xml">
     <!ENTITY zoom-scales SYSTEM "zoom-scales.xml">
     <!ENTITY modules SYSTEM "modules.xml">
     <!ENTITY porosity-artifact  SYSTEM "artifacts/porosity.xml">
--- a/artifacts/doc/conf/generators/generators.xml	Fri Aug 29 11:31:17 2014 +0200
+++ b/artifacts/doc/conf/generators/generators.xml	Fri Aug 29 11:43:15 2014 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE output-generators [
-    <!ENTITY longitudinal-defaults SYSTEM "longitudinal-diagram-defaults.xml">
+  <!ENTITY sqrelation-defaults SYSTEM "sqrelation-diagram-defaults.xml">
 ]>
 <output-generators>
     <output-generator names="discharge_curve" class="org.dive4elements.river.exports.DischargeCurveGenerator"/>
@@ -9,84 +9,6 @@
     <output-generator names="cross_section_chartinfo" class="org.dive4elements.river.exports.CrossSectionInfoGenerator"/>
     <output-generator names="computed_discharge_curve" class="org.dive4elements.river.exports.ComputedDischargeCurveGenerator"/>
     <output-generator names="computed_discharge_curve_chartinfo" class="org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator"/>
-    <output-generator
-        names="longitudinal_section,longitudinal_section_chartinfo,discharge_longitudinal_section,discharge_longitudinal_section_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.longitudinal.section.title" default="W-Längsschnitt"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
-    </output-generator>
-    <output-generator
-        names="w_differences,w_differences_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.w_differences.title" default="Differences"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
-        <subtitle key="chart.w_differences.subtitle" default="-">
-            <arg expr="artifact.river"/>
-        </subtitle>
-    </output-generator>
-    <output-generator
-        names="fix_longitudinal_section_curve,fix_longitudinal_section_curve_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.fixings.longitudinalsection.title" default="Fixierungsanalyse"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="deltaW"/>
-    </output-generator>
-    <output-generator
-        names="bedheight_middle,bedheight_middle_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.bedheight_middle.section.title" default="Mittlere Sohlhöhe"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="BedHeight"/>
-    </output-generator>
-    <output-generator
-        names="bed_difference_height_year,bed_difference_height_year_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.beddifference.height.title" default="Sohlenhöhen Differenz"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="diffBed/Y"/>
-    </output-generator>
-    <output-generator names="bed_difference_year,bed_difference_year_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.beddifference.year.title" default="Sohlenhöhen Differenz"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="diffBed"/>
-    </output-generator>
-    <output-generator names="bed_longitudinal_section,bed_longitudinal_section_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.bedquality.title" default="Sohlen Längsschnitt"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="diffBed"/>
-    </output-generator>
-    <output-generator
-        names="sedimentload_ls,sedimentload_ls_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.sedimentload.ls.title" default="Sedimentfracht"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="SedimentLoad"/>
-    </output-generator>
-    <output-generator
-        names="flow_velocity,flow_velocity_chartinfo"
-        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
-        converter="org.dive4elements.river.exports.DiagramAttributes">
-        <title key="chart.flow_velocity.section.title" default="Geschwindigkeit- und Schubspannung"/>
-        &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="Velocity"/>
-    </output-generator>
     <output-generator names="sq_relation_a,sq_relation_a_chartinfo"
       class="org.dive4elements.river.exports.DiagramGenerator"
       converter="org.dive4elements.river.exports.DiagramAttributes">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/generators/longitudinal-diagrams.xml	Fri Aug 29 11:43:15 2014 +0200
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE longitudinal-diagrams [
+    <!ENTITY longitudinal-defaults SYSTEM "longitudinal-diagram-defaults.xml">
+]>
+<longitudinal-diagrams>
+    <output-generator
+        names="longitudinal_section,longitudinal_section_chartinfo,discharge_longitudinal_section,discharge_longitudinal_section_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.longitudinal.section.title" default="W-Längsschnitt"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
+    </output-generator>
+    <output-generator
+        names="w_differences,w_differences_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.w_differences.title" default="Differences"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
+        <subtitle key="chart.w_differences.subtitle" default="-">
+            <arg expr="artifact.river"/>
+        </subtitle>
+    </output-generator>
+    <output-generator
+        names="fix_longitudinal_section_curve,fix_longitudinal_section_curve_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.fixings.longitudinalsection.title" default="Fixierungsanalyse"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="deltaW"/>
+    </output-generator>
+    <output-generator
+        names="bedheight_middle,bedheight_middle_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.bedheight_middle.section.title" default="Mittlere Sohlhöhe"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="BedHeight"/>
+    </output-generator>
+    <output-generator
+        names="bed_difference_height_year,bed_difference_height_year_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.beddifference.height.title" default="Sohlenhöhen Differenz"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+            axis="diffBed/Y"/>
+    </output-generator>
+    <output-generator names="bed_difference_year,bed_difference_year_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.beddifference.year.title" default="Sohlenhöhen Differenz"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+            axis="diffBed"/>
+    </output-generator>
+    <output-generator names="bed_longitudinal_section,bed_longitudinal_section_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.bedquality.title" default="Sohlen Längsschnitt"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+            axis="diffBed"/>
+    </output-generator>
+    <output-generator
+        names="sedimentload_ls,sedimentload_ls_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.sedimentload.ls.title" default="Sedimentfracht"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+            axis="SedimentLoad"/>
+    </output-generator>
+    <output-generator
+        names="flow_velocity,flow_velocity_chartinfo"
+        class="org.dive4elements.river.exports.LongitudinalSectionGenerator2"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <title key="chart.flow_velocity.section.title" default="Geschwindigkeit- und Schubspannung"/>
+        &longitudinal-defaults;
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+            axis="Velocity"/>
+    </output-generator>
+</longitudinal-diagrams>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/generators/sqrelation-diagram-defaults.xml	Fri Aug 29 11:43:15 2014 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<longitudinal-defaults>
+    <axis name="Transport" logarithmic="true"/>
+    <domain-axis key="chart.sq_relation.xaxis.label" default="" logarithmic="true"/>
+    <processor class="org.dive4elements.river.exports.process.SQRelationProcessor" axis="Transport"/>
+    <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
+        axis="Transport"/>
+    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
+      <arg expr="artifact.river"/>
+      <arg expr="artifact.ld_locations" type="double"/>
+    </subtitle>
+</longitudinal-defaults>
+
--- a/artifacts/doc/conf/sqrelation-diagram-defaults.xml	Fri Aug 29 11:31:17 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<longitudinal-defaults>
-    <axis name="Transport" logarithmic="true"/>
-    <domain-axis key="chart.sq_relation.xaxis.label" default="" logarithmic="true"/>
-    <processor class="org.dive4elements.river.exports.process.SQRelationProcessor" axis="Transport"/>
-    <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-        axis="Transport"/>
-    <subtitle key="chart.computed.discharge.curve.subtitle" default="-">
-      <arg expr="artifact.river"/>
-      <arg expr="artifact.ld_locations" type="double"/>
-    </subtitle>
-</longitudinal-defaults>
-
http://dive4elements.wald.intevation.org