Mercurial > dive4elements > river
changeset 5852:8c777c044025
merge
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Fri, 26 Apr 2013 13:13:23 +0200 |
| parents | d5e95f926d13 (current diff) df5d29987df8 (diff) |
| children | 774d25915eb1 |
| files | |
| diffstat | 5 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Apr 26 13:12:29 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Fri Apr 26 13:13:23 2013 +0200 @@ -251,7 +251,7 @@ <dc:for-each> <column name="{$prot_column_name}" ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}" - factory="staticwkms" + factory="staticwqkms" info="{$info} [km {$deffrom} - {$defto}]"/> </dc:for-each> </dc:context>
--- a/artifacts/doc/conf/themes.xml Fri Apr 26 13:12:29 2013 +0200 +++ b/artifacts/doc/conf/themes.xml Fri Apr 26 13:13:23 2013 +0200 @@ -336,6 +336,7 @@ <mapping from="fix_derivate_curve" to="FixingDerivedCurve" /> <mapping from="fix_derivate_curve.manualpoints" to="ManualPoints" /> <mapping from="fix_deltawt_curve.manualpoints" to="ManualPoints" /> + <mapping from="fix_events_wqkms" to="FixPoints" /> <mapping from="qsectors" to="QSectors" /> <mapping from="gauge_discharge_curve" to="GaugeDischargeCurve" /> <mapping from="extreme_wq_curve" to="ExtremeWQCurve" />
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Fri Apr 26 13:12:29 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Fri Apr 26 13:13:23 2013 +0200 @@ -87,7 +87,8 @@ LONGITUDINAL_Q, DURATION_Q, HISTORICAL_DISCHARGE_MAINVALUES_W, - HISTORICAL_DISCHARGE_MAINVALUES_Q + HISTORICAL_DISCHARGE_MAINVALUES_Q, + STATIC_WQKMS_Q }; static {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Fri Apr 26 13:12:29 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Fri Apr 26 13:13:23 2013 +0200 @@ -155,10 +155,13 @@ FIX_REFERENCE_EVENTS_WQ, Resources.getMsg(meta, I18N_WQ_EVENTS, I18N_WQ_EVENTS))); - facets.add(new FixOutlierFacet( - 0, - FIX_OUTLIER, - Resources.getMsg(meta, I18N_WQ_OUTLIER, I18N_WQ_OUTLIER))); + + if (access.getPreprocessing()) { + facets.add(new FixOutlierFacet( + 0, + FIX_OUTLIER, + Resources.getMsg(meta, I18N_WQ_OUTLIER, I18N_WQ_OUTLIER))); + } return res; }
--- a/backend/src/main/java/org/dive4elements/river/model/Wst.java Fri Apr 26 13:12:29 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/Wst.java Fri Apr 26 13:13:23 2013 +0200 @@ -185,6 +185,11 @@ return null; } + if (results.get(0)[0] == null || results.get(0)[1] == null) { + logger.warn("Could not process result from min/maxQ query."); + return null; + } + Object [] result = results.get(0); return new double [] {