Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java @ 3762:0c978a80726a
Splitted up facets for porosity and density into two facets: a toplayer and a sublayer facet for each. BedQualityState will now create facets based on the calculation result.
flys-artifacts/trunk@5464 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 14 Sep 2012 07:12:08 +0000 |
| parents | e8a90a5ce624 |
| children | d29cebf371ba |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java Thu Sep 13 20:58:24 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java Fri Sep 14 07:12:08 2012 +0000 @@ -6,15 +6,11 @@ import de.intevation.artifactdatabase.state.ArtifactAndFacet; import de.intevation.artifactdatabase.state.Facet; -import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.model.FacetTypes; -import de.intevation.flys.artifacts.model.MiddleBedHeightData; -import de.intevation.flys.exports.ChartGenerator.YAxisWalker; -import de.intevation.flys.exports.StyledSeriesBuilder; +import de.intevation.flys.artifacts.model.minfo.BedBedQualityResult; +import de.intevation.flys.artifacts.model.minfo.BedLoadBedQualityResult; import de.intevation.flys.exports.XYChartGenerator; -import de.intevation.flys.jfree.FLYSAnnotation; import de.intevation.flys.jfree.StyledXYSeries; -import de.intevation.flys.utils.FLYSUtils; /** @@ -148,26 +144,25 @@ } if (name.equals(BED_QUALITY_BED_DIAMETER)) { - doBedDiameterOut(artifactAndFacet.getData(context), // TODO CAST TO - // SPECIFIC - // CLASS + doBedDiameterOut( + (BedBedQualityResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (name.equals(BED_QUALITY_BEDLOAD_DIAMETER)) { - doBedloadDiameterOut(artifactAndFacet.getData(context), // TODO CAST - // TO - // SPECIFIC - // CLASS + doBedloadDiameterOut( + (BedLoadBedQualityResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } - else if (name.equals(BED_QUALITY_POROSITY)) { - doPorosityOut(artifactAndFacet.getData(context), // TODO CAST TO - // SPECIFIC CLASS + else if (name.equals(BED_QUALITY_POROSITY_TOPLAYER) + || name.equals(BED_QUALITY_POROSITY_SUBLAYER)) { + doPorosityOut( + (BedBedQualityResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } - else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY)) { - doDensityOut(artifactAndFacet.getData(context), // TODO CAST TO - // SPECIFIC CLASS + else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER) + || name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER)) { + doDensityOut( + (BedBedQualityResult) artifactAndFacet.getData(context), artifactAndFacet, attr, visible); } else if (FacetTypes.IS.MANUALPOINTS(name)) { @@ -180,8 +175,8 @@ } } - protected void doBedDiameterOut(Object data, ArtifactAndFacet aandf, - Document theme, boolean visible) { + protected void doBedDiameterOut(BedBedQualityResult data, + ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doBedDiameterOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); @@ -192,8 +187,8 @@ addAxisSeries(series, YAXIS.W.idx, visible); } - protected void doBedloadDiameterOut(Object data, ArtifactAndFacet aandf, - Document theme, boolean visible) { + protected void doBedloadDiameterOut(BedLoadBedQualityResult data, + ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doBedloadDiameterOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); @@ -204,8 +199,8 @@ addAxisSeries(series, YAXIS.W.idx, visible); } - protected void doPorosityOut(Object data, ArtifactAndFacet aandf, - Document theme, boolean visible) { + protected void doPorosityOut(BedBedQualityResult data, + ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doPorosityOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); @@ -216,8 +211,8 @@ addAxisSeries(series, YAXIS.P.idx, visible); } - protected void doDensityOut(Object data, ArtifactAndFacet aandf, - Document theme, boolean visible) { + protected void doDensityOut(BedBedQualityResult data, + ArtifactAndFacet aandf, Document theme, boolean visible) { logger.debug("BedQuality.doDensityOut"); XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);