changeset 3888:44a071455709

improve manual points in fix. charts. flys-artifacts/trunk@5539 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 20 Sep 2012 09:35:31 +0000
parents a1c79d84e3cd
children 940cd2ef149f
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/fixanalysis.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java
diffstat 3 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Thu Sep 20 09:34:48 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Sep 20 09:35:31 2012 +0000
@@ -1,3 +1,12 @@
+2012-09-20	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Improvements for manual points in fixation diags.
+
+	* doc/conf/artifacts/fixanalysis.xml: Add LS-manual points.
+
+	* src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java:
+	  Add missing ChartTypes.
+
 2012-09-20  Raimund Renkert <raimund.renkert@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiffCalculation.java:
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Thu Sep 20 09:34:48 2012 +0000
+++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Thu Sep 20 09:35:31 2012 +0000
@@ -251,6 +251,7 @@
                         <facet name="other.wqkms" description="facet.other.wqkms"/>
                         <facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
                         <facet name="w_differences.manualpoints" description="Manuelle Punkte"/>
+                        <facet name="longitudinal_section.manualpoints" description="Manuelle Punkte"/>
                         <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
                     </facets>
                 </outputmode>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Thu Sep 20 09:34:48 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Thu Sep 20 09:35:31 2012 +0000
@@ -114,6 +114,10 @@
         RC("reference_curve"),
         RCN("reference_curve_normalized"),
         WD("wdifferences"),
+        FWQC("fix_wq_curve"),
+        FDWC("fix_deltawt_curve"),
+        FLSC("fix_longitudinal_section_curve"),
+        FDC("fix_derivate_curve"),
         HD("historical_discharge");
 
         private String chartTypeString;
@@ -273,6 +277,7 @@
     String FIX_REFERENCE_EVENTS_LS = "fix_reference_events_ls";
     String FIX_REFERENCE_EVENTS_WQ = "fix_reference_events_wq";
 
+    // Note that AVERAGE_DWT will get a postfix (e.g. ..._dwt_1)
     String FIX_SECTOR_AVERAGE_DWT = "fix_sector_average_dwt";
     String FIX_SECTOR_AVERAGE_LS = "fix_sector_average_ls";
     String FIX_SECTOR_AVERAGE_WQ = "fix_sector_average_wq";

http://dive4elements.wald.intevation.org