Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDiameterProcessor.java @ 7987:98ca61cb58fb facet-metadata
Split bed quality facets and updated processors and state.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Wed, 02 Jul 2014 09:31:14 +0200 |
parents | e844be34a606 |
children | 5277483044d9 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDiameterProcessor.java Wed Jul 02 09:29:39 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedQualityDiameterProcessor.java Wed Jul 02 09:31:14 2014 +0200 @@ -8,12 +8,9 @@ package org.dive4elements.river.exports.process; -import java.awt.Dialog.ModalExclusionType; import java.util.Map; import org.apache.log4j.Logger; -import org.jfree.data.xy.XYSeries; - import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.model.FacetTypes; @@ -22,10 +19,6 @@ import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.artifacts.model.minfo.BedDiameterData; -import org.dive4elements.river.artifacts.model.minfo.BedDiameterResult; -import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterResult; - public class BedQualityDiameterProcessor extends DefaultProcessor { private final static Logger logger = @@ -50,24 +43,12 @@ series.putMetaData(metaData, bundle.getArtifact(), context); yAxisLabel = metaData.get("Y"); Object data = bundle.getData(context); - String facetName = bundle.getFacetName(); - double [][] points; - - if (facetName.equals(FacetTypes.BED_QUALITY_BED_DIAMETER_TOPLAYER)) { - points = ((BedDiameterResult) data).getDiameterCapData(); - } else if (facetName.equals(FacetTypes.BED_QUALITY_BED_DIAMETER_SUBLAYER)) { - points = ((BedDiameterResult) data).getDiameterSubData(); - } else if (facetName.equals(FacetTypes.BED_QUALITY_BEDLOAD_DIAMETER)) { - points = ((BedloadDiameterResult) data).getDiameterData(); - } else if (facetName.equals(FacetTypes.BED_DIAMETER_DATA_TOP) || - facetName.equals(FacetTypes.BED_DIAMETER_DATA_SUB) || - facetName.equals(FacetTypes.BEDLOAD_DIAMETER_DATA)) { - points = ((BedDiameterData) data).getDiameterData(); - } else { - logger.error("Unknown facet name: " + facetName); + if (!(data instanceof double[][])) { + logger.error("Unknown data type: " + data.getClass().getName()); return; } - StyledSeriesBuilder.addPoints(series, points, true); + double[][] values = (double[][])data; + StyledSeriesBuilder.addPoints(series, values, true); generator.addAxisSeries(series, axisName, visible); }