Mercurial > dive4elements > river

changeset 9305:8b3ecb1a7e16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Zusammenführen
author gernotbelger
date Wed, 25 Jul 2018 16:20:27 +0200
parents 06a581ffdd3f (diff) 517b93254995 (current diff)
children 8024e51e828a
files
diffstat 7 files changed, 40 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/manualpoints.xml	Wed Jul 25 14:59:48 2018 +0200
+++ b/artifacts/doc/conf/artifacts/manualpoints.xml	Wed Jul 25 16:20:27 2018 +0200
@@ -42,7 +42,10 @@
             <facet name="sinfo_flow_depth_development_peryear.manualpoints" />
             <facet name="sinfo_tkk.manualpoints" />
             <facet name="sinfo_collision.manualpoints" />
+
             <facet name="sinfo_flood_duration.manualpoints" />
+            <facet name="sinfo_flood_height.manualpoints" />
+            <facet name="sinfo_floodduration_curve.manualpoints" />
           </facets>
         </outputmode>
       </outputmodes>
--- a/artifacts/doc/conf/artifacts/sinfo.xml	Wed Jul 25 14:59:48 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Wed Jul 25 16:20:27 2018 +0200
@@ -362,6 +362,8 @@
             <facet name="sinfo_facet_flood_duration.left" description="flood duration of the heights of the left bank infrastructures (points)"/>
             <facet name="sinfo_facet_flood_duration.right" description="flood duration of the heights of the right bank infrastructures (points)"/>
             <facet name="mainvalue.duration" description="flood duration of W main value"/>
+
+            <facet name="sinfo_flood_duration.manualpoints" description="Manual Points" />
           </facets>
         </outputmode>
         <outputmode name="sinfo_flood_height" description="output.sinfo_flood_height" mime-type="image/png" type="chart">
@@ -369,6 +371,8 @@
             <facet name="sinfo_facet_flood_height.left" description="flood heights of the left bank infrastructures (points)"/>
             <facet name="sinfo_facet_flood_height.right" description="flood heights of the right bank infrastructures (points)"/>
             <facet name="mainvalue.w" description="W of main value"/>
+            
+            <facet name="sinfo_flood_height.manualpoints" description="Manual Points" />
        
           </facets>
         </outputmode>
@@ -379,7 +383,8 @@
             <facet name="infrastructure.wq" description="w and q of the infrastructure"/>
             <facet name="sinfo.mainvalues.w" description="W Main Values"/>
             <facet name="sinfo.mainvalues.q" description="Q Main Values at optional second axis"/>
-            <facet name="duration_curve.manualpoints" description="Manuelle Punkte"/>
+
+            <facet name="sinfo_floodduration_curve.manualpoints" description="Manuelle Punkte"/>
           </facets>
         </outputmode>
 
--- a/artifacts/doc/conf/generators/longitudinal-diagrams.xml	Wed Jul 25 14:59:48 2018 +0200
+++ b/artifacts/doc/conf/generators/longitudinal-diagrams.xml	Wed Jul 25 16:20:27 2018 +0200
@@ -172,8 +172,7 @@
         converter="org.dive4elements.river.exports.DiagramAttributes">
         <title key="sinfo.chart.flood_duration.section.title" default="Überflutungsdauer Infrastruktur BWaStr (DEFAULT)"/>
         &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="durationAxis"/>
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="durationAxis"/>
         <subtitle key="chart.w_differences.subtitle" default="-">
             <arg expr="artifact.river"/>
         </subtitle>
@@ -185,8 +184,7 @@
         converter="org.dive4elements.river.exports.DiagramAttributes">
         <title key="sinfo.chart.flood_duration.height.section.title" default="Überflutung Infrastruktur BWaStr (DEFAULT)"/>
         &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="W"/>
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
         <subtitle key="chart.w_differences.subtitle" default="-">
             <arg expr="artifact.river"/>
         </subtitle>
@@ -198,8 +196,7 @@
         converter="org.dive4elements.river.exports.DiagramAttributes">
         <title key="uinfo.chart.salix_line.section.title" default="Salix-Linie (DEFAULT)"/>
         &longitudinal-defaults;
-        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor"
-            axis="W"/>
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
         <subtitle key="chart.w_differences.subtitle" default="-">
             <arg expr="artifact.river"/>
         </subtitle>
--- a/artifacts/doc/conf/themes.xml	Wed Jul 25 14:59:48 2018 +0200
+++ b/artifacts/doc/conf/themes.xml	Wed Jul 25 16:20:27 2018 +0200
@@ -470,7 +470,10 @@
         <mapping from="sinfo_flow_depth_development_peryear.manualpoints" to="ManualPoints" />
         <mapping from="sinfo_tkk.manualpoints" to="ManualPoints" />
         <mapping from="sinfo_collision.manualpoints" to="ManualPoints" />
+
         <mapping from="sinfo_flood_duration.manualpoints" to="ManualPoints" />
+        <mapping from="sinfo_flood_height.manualpoints" to="ManualPoints" />
+        <mapping from="sinfo_floodduration_curve.manualpoints" to="ManualPoints" />
         
         <mapping from="uinfo_facet_salix_line" to="UInfoSalixLine" />
         <mapping from="uinfo_facet_salix_mnwmw" to="UInfoSalixMnwMw" />
--- a/artifacts/doc/conf/themes/default.xml	Wed Jul 25 14:59:48 2018 +0200
+++ b/artifacts/doc/conf/themes/default.xml	Wed Jul 25 16:20:27 2018 +0200
@@ -2877,40 +2877,48 @@
   </theme>
   <theme name="SInfoMainValues">
     <inherits>
-      <inherit from="MainValuesW" />
+      <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" />
     </fields>
   </theme>
   <theme name="SInfoMainValuesQ">
     <inherits>
       <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" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
     </fields>
   </theme>
   <theme name="SInfoMainValuesW">
     <inherits>
       <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" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
     </fields>
   </theme>
   <theme name="InfrastructureWQ">
     <inherits>
       <inherit from="Lines" />
+      <inherit from="Label" />      
     </inherits>
     <fields>
       <field name="linecolor" type="Color" display="Farbe" default="144, 48, 96" />
       <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
     </fields>
   </theme>
   <theme name="UInfoSalixLine">
--- a/artifacts/doc/conf/themes/second.xml	Wed Jul 25 14:59:48 2018 +0200
+++ b/artifacts/doc/conf/themes/second.xml	Wed Jul 25 16:20:27 2018 +0200
@@ -2865,40 +2865,48 @@
   </theme>
   <theme name="SInfoMainValues">
     <inherits>
-      <inherit from="MainValuesW" />
+      <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" />
     </fields>
   </theme>
   <theme name="SInfoMainValuesQ">
     <inherits>
       <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" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
     </fields>
   </theme>
   <theme name="SInfoMainValuesW">
     <inherits>
       <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" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
     </fields>
   </theme>
   <theme name="InfrastructureWQ">
     <inherits>
       <inherit from="Lines" />
+      <inherit from="Label" />      
     </inherits>
     <fields>
       <field name="linecolor" type="Color" display="Farbe" default="144, 48, 96" />
       <field name="textorientation" type="boolean" display="Textausrichtung" default="true" />
-      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" hints="hidden" />
+      <field name="showlinelabel" type="boolean" display="Linienbeschriftung anzeigen" default="true" />
     </fields>
   </theme>
   <theme name="UInfoSalixLine">
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationMainValuesWFacet.java	Wed Jul 25 14:59:48 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationMainValuesWFacet.java	Wed Jul 25 16:20:27 2018 +0200
@@ -33,9 +33,7 @@
 
     /** Trivial Constructor. */
     public FloodDurationMainValuesWFacet(final String name, final String description) {
-        this.description = description;
-        this.name = name;
-        this.index = 0;
+        super(0, name, description);
     }
 
     /**
@@ -60,7 +58,6 @@
         return new RiverAnnotation(this.description, annotations);
     }
 
-
     /**
      * Create a deep copy of this Facet.
      * @return a deep copy.
@@ -72,4 +69,3 @@
         return copy;
     }
 }
-
http://dive4elements.wald.intevation.org