Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java @ 3784:9f9d5ada96ca
Merged revisions 5498-5499 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r5498 | rrenkert | 2012-09-17 16:38:47 +0200 (Mo, 17 Sep 2012) | 3 lines
Refactor MINFO bed quality resultsets and facets.
........
r5499 | rrenkert | 2012-09-17 16:47:05 +0200 (Mo, 17 Sep 2012) | 2 lines
Fixed date range in minfo bed quality result.
........
flys-artifacts/tags/2.9.1@5530 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 19 Sep 2012 14:56:13 +0000 |
parents | 5a8f8fd5310c |
children | a5f65e8983be |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java Mon Sep 17 10:12:32 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java Wed Sep 19 14:56:13 2012 +0000 @@ -7,9 +7,10 @@ import de.intevation.artifactdatabase.state.ArtifactAndFacet; import de.intevation.artifactdatabase.state.Facet; import de.intevation.flys.artifacts.model.FacetTypes; -import de.intevation.flys.artifacts.model.minfo.BedBedQualityResult; -import de.intevation.flys.artifacts.model.minfo.BedLoadBedQualityResult; +import de.intevation.flys.artifacts.model.minfo.BedDiameterResult; +import de.intevation.flys.artifacts.model.minfo.BedParametersResult; import de.intevation.flys.artifacts.model.minfo.BedQualityResult; +import de.intevation.flys.artifacts.model.minfo.BedloadDiameterResult; import de.intevation.flys.exports.StyledSeriesBuilder; import de.intevation.flys.exports.XYChartGenerator; import de.intevation.flys.jfree.StyledXYSeries; @@ -148,38 +149,38 @@ // TODO BED_QUALITY_BED_DIAMETER_TOPLAYER if (name.equals(BED_QUALITY_BED_DIAMETER_TOPLAYER)) { doBedDiameterTopLayerOut( - (BedBedQualityResult) artifactAndFacet.getData(context), + (BedDiameterResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (name.equals(BED_QUALITY_BED_DIAMETER_SUBLAYER)) { doBedDiameterSubLayerOut( - (BedBedQualityResult) artifactAndFacet.getData(context), + (BedDiameterResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } // TODO BED_QUALITY_BED_DIAMETER_SUBLAYER else if (name.equals(BED_QUALITY_BEDLOAD_DIAMETER)) { doBedLoadDiameterOut( - (BedLoadBedQualityResult) artifactAndFacet.getData(context), + (BedloadDiameterResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (name.equals(BED_QUALITY_POROSITY_TOPLAYER)) { doPorosityTopLayerOut( - (BedBedQualityResult) artifactAndFacet.getData(context), + (BedParametersResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (name.equals(BED_QUALITY_POROSITY_SUBLAYER)) { doPorositySubLayerOut( - (BedBedQualityResult) artifactAndFacet.getData(context), + (BedParametersResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER)) { doDensityTopLayerOut( - (BedBedQualityResult) artifactAndFacet.getData(context), + (BedParametersResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER)) { doDensitySubLayerOut( - (BedBedQualityResult) artifactAndFacet.getData(context), + (BedParametersResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (FacetTypes.IS.MANUALPOINTS(name)) { @@ -192,7 +193,7 @@ } } - protected void doBedDiameterTopLayerOut(BedBedQualityResult data, + protected void doBedDiameterTopLayerOut(BedDiameterResult data, ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doBedDiameterTopLayerOut"); @@ -202,7 +203,7 @@ addAxisSeries(series, YAXIS.W.idx, visible); } - protected void doBedDiameterSubLayerOut(BedBedQualityResult data, + protected void doBedDiameterSubLayerOut(BedDiameterResult data, ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doBedDiameterSubLayerOut"); @@ -212,7 +213,7 @@ addAxisSeries(series, YAXIS.W.idx, visible); } - protected void doBedLoadDiameterOut(BedQualityResult data, + protected void doBedLoadDiameterOut(BedloadDiameterResult data, ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doBedLoadDiameterOut"); @@ -222,49 +223,49 @@ addAxisSeries(series, YAXIS.W.idx, visible); } - protected void doPorosityTopLayerOut(BedBedQualityResult data, + protected void doPorosityTopLayerOut(BedParametersResult data, ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doPorosityTopLayerOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getPorosityTopLayerData(), + StyledSeriesBuilder.addPoints(series, data.getPorosityCapData(), true); addAxisSeries(series, YAXIS.P.idx, visible); } - protected void doPorositySubLayerOut(BedBedQualityResult data, + protected void doPorositySubLayerOut(BedParametersResult data, ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doPorositySubLayerOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getPorositySubLayerData(), + StyledSeriesBuilder.addPoints(series, data.getPorositySubData(), true); addAxisSeries(series, YAXIS.P.idx, visible); } - protected void doDensityTopLayerOut(BedBedQualityResult data, + protected void doDensityTopLayerOut(BedParametersResult data, ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doDensityOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getDensityTopLayerData(), + StyledSeriesBuilder.addPoints(series, data.getDensityCapData(), true); addAxisSeries(series, YAXIS.D.idx, visible); } - protected void doDensitySubLayerOut(BedBedQualityResult data, + protected void doDensitySubLayerOut(BedParametersResult data, ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doDensityOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getDensitySubLayerData(), + StyledSeriesBuilder.addPoints(series, data.getDensitySubData(), true); addAxisSeries(series, YAXIS.D.idx, visible);