Mercurial > dive4elements > river
changeset 3917:1ff257ab38ca
Rename fix_derivate to fix_derivate_curve to enable manual points on it
flys-artifacts/trunk@5597 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Wed, 26 Sep 2012 07:36:28 +0000 |
| parents | ce1f62dbb69f |
| children | 2fdbe78a8fc2 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/fixanalysis.xml flys-artifacts/doc/conf/artifacts/manualpoints.xml flys-artifacts/doc/conf/themes.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java |
| diffstat | 8 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed Sep 26 07:36:28 2012 +0000 @@ -1,3 +1,14 @@ +2012-09-25 Christian Lins <christian.lins@intevation.de> + + * doc/conf/artifacts/fixanalysis.xml, + doc/conf/artifacts/manualpoints.xml, + doc/conf/themes.xml, + src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java, + src/main/java/de/intevation/flys/artifacts/FixationArtifact.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java, + src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java: + Rename fix_derivate facet to enable manual points in the derived curve chart. + 2012-09-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> * doc/conf/artifacts/manualpoints.xml: Re-enable manualpoints
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml Wed Sep 26 07:36:28 2012 +0000 @@ -194,8 +194,8 @@ </outputmode> <outputmode name="fix_derivate_curve" description="output.fix_derivate_curve" mine-type="image/png" type="chart"> <facets> - <facet name="fix_derivate" description="Derivate curve"/> - <facet name="fix_derivate.manualpoints" description="Manual points"/> + <facet name="fix_derivate_curve" description="Derivate curve"/> + <facet name="fix_derivate_curve.manualpoints" description="Manual points"/> </facets> </outputmode> <outputmode name="fix_report" description="output.fix_report.report" mime-type="text/plain" type="report">
--- a/flys-artifacts/doc/conf/artifacts/manualpoints.xml Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/manualpoints.xml Wed Sep 26 07:36:28 2012 +0000 @@ -22,7 +22,6 @@ <facet name="fix_deltawt_curve.manualpoints" description="Points provided by user." /> <facet name="fix_longitudinal_section_curve.manualpoints" description="Points provided by user." /> <facet name="fix_derivate_curve.manualpoints" description="Points provided by user." /> - <facet name="fix_derivate.manualpoints" description="Points provided by user." /> </facets> </outputmode> </outputmodes>
--- a/flys-artifacts/doc/conf/themes.xml Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/doc/conf/themes.xml Wed Sep 26 07:36:28 2012 +0000 @@ -263,8 +263,8 @@ <mapping from="fix_deviation_dwt" to="FixDeltaWtDeviation" /> <mapping from="fix_analysis_events_ls" to="FixLSAnalysis" /> <mapping from="fix_reference_events_ls" to="FixLSReference" /> - <mapping from="fix_derivate" to="FixingDerivedCurve" /> - <mapping from="fix_derivate.manualpoints" to="ManualPoints" /> + <mapping from="fix_derivate_curve" to="FixingDerivedCurve" /> + <mapping from="fix_derivate_curve.manualpoints" to="ManualPoints" /> <mapping from="qsectors" to="QSectors" /> </mappings> </themes>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifact.java Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifact.java Wed Sep 26 07:36:28 2012 +0000 @@ -20,6 +20,7 @@ * The default constructor. */ public FixationArtifact() { + logger.debug("ctor()"); } /**
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Wed Sep 26 07:36:28 2012 +0000 @@ -104,7 +104,7 @@ }; public enum ChartType { - FD("fix_derivate"), + FD("fix_derivate_curve"), LS("longitudinal_section"), CS("cross_section"), DLS("discharge_longitudinal_section"), @@ -300,7 +300,7 @@ String FIX_ANALYSIS_PERIODS_LS = "fix_analysis_periods_ls"; String FIX_ANALYSIS_PERIODS_WQ = "fix_analysis_periods_wq"; - String FIX_DERIVATE = "fix_derivate"; + String FIX_DERIVATE_CURVE = "fix_derivate_curve"; String FIX_DEVIATION_DWT = "fix_deviation_dwt"; String FIX_DEVIATION_LS = "fix_deviation_ls";
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java Wed Sep 26 07:36:28 2012 +0000 @@ -61,7 +61,6 @@ // Add Facet per Diagram type if data given. for (ChartType ct: ChartType.values()) { - logger.debug("compute(): points for " + ct); // Handle points. String pointData = points.getDataAsString(ct + "." + MANUALPOINTS + DOT_DATA); @@ -73,6 +72,7 @@ fName, Resources.getMsg(meta, "manualpoints", "Manual Points")); facets.add(facet); + logger.debug("compute(): ManualPointsFacet for " + ct + " created"); } else { logger.debug("compute(): No points for " + ct);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Tue Sep 25 11:54:31 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Wed Sep 26 07:36:28 2012 +0000 @@ -301,7 +301,7 @@ facets.add(new FixDerivateFacet( idg.next(), - FIX_DERIVATE, + FIX_DERIVATE_CURVE, Resources.getMsg( context.getMeta(), I18N_DERIVATIVE,