Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java @ 5645:696d710470f5
flys/issue1077: Show loads as step line, therefore transform data in
SedimentLoadFacet to stretch as in the measurement stations bounds.
Deal with this new kind of data in the Generator.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 10 Apr 2013 09:35:07 +0200 |
parents | ca4b6263996c |
children | 04687db03218 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java Wed Apr 10 09:32:47 2013 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java Wed Apr 10 09:35:07 2013 +0200 @@ -128,56 +128,56 @@ } if (name.equals(SEDIMENT_LOAD_COARSE)) { doSedimentLoadCoarseOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); } else if (name.equals(SEDIMENT_LOAD_SAND)) { doSedimentLoadSandOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); } else if (name.equals(SEDIMENT_LOAD_FINEMIDDLE)) { doSedimentLoadFineMiddleOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); } else if (name.equals(SEDIMENT_LOAD_SUSP_SAND)) { doSedimentLoadSuspSandOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); } else if (name.equals(SEDIMENT_LOAD_SUSP_SAND_BED)) { doSedimentLoadSuspSandBedOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); } else if (name.equals(SEDIMENT_LOAD_SUSP_SEDIMENT)) { doSedimentLoadSuspSedimentOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); } else if (name.equals(SEDIMENT_LOAD_TOTAL_LOAD)) { doSedimentLoadTotalLoadOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); } else if (name.equals(SEDIMENT_LOAD_TOTAL)) { doSedimentLoadTotalOut( - (SedimentLoadResult) bundle.getData(context), + (double[][]) bundle.getData(context), bundle, attr, visible); @@ -290,78 +290,78 @@ return label; } - protected void doSedimentLoadCoarseOut(SedimentLoadResult data, + // TODO all double[][] eating *Out() can be subsumed. + protected void doSedimentLoadCoarseOut(double[][] data, ArtifactAndFacet aandf, Document theme, boolean visible) { XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getCoarseData(), true); - - addAxisSeries(series, YAXIS.L.idx, visible); - } - - protected void doSedimentLoadSandOut(SedimentLoadResult data, - ArtifactAndFacet aandf, Document theme, boolean visible) { - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getSandData(), true); - - addAxisSeries(series, YAXIS.L.idx, visible); - } - - protected void doSedimentLoadFineMiddleOut(SedimentLoadResult data, - ArtifactAndFacet aandf, Document theme, boolean visible) { - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getFineMiddleData(), true); + StyledSeriesBuilder.addPoints(series, data, true); addAxisSeries(series, YAXIS.L.idx, visible); } - protected void doSedimentLoadSuspSandOut(SedimentLoadResult data, + protected void doSedimentLoadSandOut(double[][] data, ArtifactAndFacet aandf, Document theme, boolean visible) { XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getSuspSandData(), true); - - addAxisSeries(series, YAXIS.L.idx, visible); - } - - protected void doSedimentLoadSuspSandBedOut(SedimentLoadResult data, - ArtifactAndFacet aandf, Document theme, boolean visible) { - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getSuspSandBedData(), true); + StyledSeriesBuilder.addPoints(series, data, true); addAxisSeries(series, YAXIS.L.idx, visible); } - protected void doSedimentLoadSuspSedimentOut(SedimentLoadResult data, + protected void doSedimentLoadFineMiddleOut(double[][] data, ArtifactAndFacet aandf, Document theme, boolean visible) { XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getSuspSedimentData(), true); + StyledSeriesBuilder.addPoints(series, data, true); addAxisSeries(series, YAXIS.L.idx, visible); } - protected void doSedimentLoadTotalLoadOut(SedimentLoadResult data, + protected void doSedimentLoadSuspSandOut(double[][] data, ArtifactAndFacet aandf, Document theme, boolean visible) { XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getTotalLoadData(), true); + StyledSeriesBuilder.addPoints(series, data, true); addAxisSeries(series, YAXIS.L.idx, visible); } - protected void doSedimentLoadTotalOut(SedimentLoadResult data, + protected void doSedimentLoadSuspSandBedOut(double[][] data, ArtifactAndFacet aandf, Document theme, boolean visible) { XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getTotalData(), true); + StyledSeriesBuilder.addPoints(series, data, true); addAxisSeries(series, YAXIS.L.idx, visible); } + protected void doSedimentLoadSuspSedimentOut(double[][] data, + ArtifactAndFacet aandf, Document theme, boolean visible) { + + XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); + StyledSeriesBuilder.addPoints(series, data, true); + + addAxisSeries(series, YAXIS.L.idx, visible); + } + + protected void doSedimentLoadTotalLoadOut(double[][] data, + ArtifactAndFacet aandf, Document theme, boolean visible) { + + XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); + StyledSeriesBuilder.addPoints(series, data, true); + + addAxisSeries(series, YAXIS.L.idx, visible); + } + + protected void doSedimentLoadTotalOut(double[][] data, + ArtifactAndFacet aandf, Document theme, boolean visible) { + + XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); + StyledSeriesBuilder.addPoints(series, data, true); + + addAxisSeries(series, YAXIS.L.idx, visible); + protected void doFlowVelocityMainOut( FlowVelocityData data, ArtifactAndFacet aandf,