Mercurial > dive4elements > river
changeset 7683:28758f51f1b2
issue1594/issue1603: Put bed_differences to correct axis.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 11 Dec 2013 11:20:10 +0100 |
| parents | 2f7a01fdb093 |
| children | 0141908fafe0 |
| files | artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java Wed Dec 11 10:39:11 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java Wed Dec 11 11:20:10 2013 +0100 @@ -85,8 +85,7 @@ public boolean canHandle(String facetType) { return BED_DIFFERENCE_HEIGHT_YEAR.equals(facetType) // from BedDiffYearHeight || BED_DIFFERENCE_HEIGHT_YEAR_FILTERED.equals(facetType) // from BedDiffYearHeight - || BED_DIFFERENCE_YEAR.equals(facetType) // from BedDifferencesYear - || BED_DIFFERENCE_YEAR_FILTERED.equals(facetType); // from BedDifferencesYear + ; }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java Wed Dec 11 10:39:11 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java Wed Dec 11 11:20:10 2013 +0100 @@ -82,7 +82,11 @@ BedDiffYearResult bData = (BedDiffYearResult) data; double[][] points; - if (BED_DIFFERENCE_YEAR_HEIGHT1.equals(facetType)) { + if (BED_DIFFERENCE_YEAR.equals(facetType) + || BED_DIFFERENCE_YEAR_FILTERED.equals(facetType)) { + points = bData.getHeightPerYearData(); + } + else if (BED_DIFFERENCE_YEAR_HEIGHT1.equals(facetType)) { points = bData.getHeights1Data(); } else { points = bData.getHeights2Data(); @@ -107,7 +111,9 @@ BED_DIFFERENCE_YEAR_HEIGHT1.equals(facetType) || BED_DIFFERENCE_YEAR_HEIGHT2.equals(facetType) || BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED.equals(facetType) - || BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED.equals(facetType); + || BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED.equals(facetType) + || BED_DIFFERENCE_YEAR.equals(facetType) // from BedDifferencesYear + || BED_DIFFERENCE_YEAR_FILTERED.equals(facetType); // from BedDifferencesYear } @Override