# HG changeset patch # User Andre Heinecke # Date 1380117682 -7200 # Node ID 8b4b9f00bc45f3b2fb4e44eb7dd0bd409c87d983 # Parent cde7db30847f81def6ad81704f908cb0187f9d08 Remove obsolete classes diff -r cde7db30847f -r 8b4b9f00bc45 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffYearInfoGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffYearInfoGenerator.java Wed Sep 25 15:57:50 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU AGPL (>=v3) - * and comes with ABSOLUTELY NO WARRANTY! Check out the - * documentation coming with Dive4Elements River for details. - */ - -package org.dive4elements.river.exports.minfo; - -import org.dive4elements.river.exports.ChartInfoGenerator; - - -public class BedDiffYearInfoGenerator -extends ChartInfoGenerator -{ - public BedDiffYearInfoGenerator() { - super(new BedDifferenceYearGenerator()); - } -} diff -r cde7db30847f -r 8b4b9f00bc45 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java Wed Sep 25 15:57:50 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java Wed Sep 25 16:01:22 2013 +0200 @@ -46,7 +46,7 @@ } /** The logger that is used in this generator. */ - private static Logger logger = Logger.getLogger(BedQualityGenerator.class); + private static Logger logger = Logger.getLogger(BedDifferenceEpochGenerator.class); public static final String I18N_CHART_TITLE = "chart.beddifference.epoch.title"; public static final String I18N_XAXIS_LABEL = "chart.beddifference.xaxis.label"; diff -r cde7db30847f -r 8b4b9f00bc45 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java Wed Sep 25 15:57:50 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,241 +0,0 @@ -/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU AGPL (>=v3) - * and comes with ABSOLUTELY NO WARRANTY! Check out the - * documentation coming with Dive4Elements River for details. - */ - -package org.dive4elements.river.exports.minfo; - -import org.apache.log4j.Logger; -import org.jfree.data.xy.XYSeries; - -import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; -import org.dive4elements.artifactdatabase.state.Facet; -import org.dive4elements.river.artifacts.D4EArtifact; -import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.WKms; -import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult; -import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult; -import org.dive4elements.river.artifacts.model.minfo.MorphologicWidth; -import org.dive4elements.river.exports.StyledSeriesBuilder; -import org.dive4elements.river.exports.process.BedDiffYearProcessor; -import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor; -import org.dive4elements.river.exports.process.KMIndexProcessor; -import org.dive4elements.river.exports.process.Processor; -import org.dive4elements.river.exports.process.WOutProcessor; -import org.dive4elements.river.jfree.RiverAnnotation; -import org.dive4elements.river.jfree.StyledXYSeries; -import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.RiverUtils; - - -public class BedDifferenceYearGenerator -extends BedDiffBaseGenerator -implements FacetTypes -{ - public enum YAXIS { - D(0), M(1), H(2), dW(3), W(4); - - protected int idx; - - private YAXIS(int c) { - idx = c; - } - } - - /** The logger that is used in this generator. */ - private static Logger logger = Logger.getLogger(BedDifferenceYearGenerator.class); - - public static final String I18N_CHART_TITLE = "chart.beddifference.year.title"; - public static final String I18N_XAXIS_LABEL = "chart.beddifference.xaxis.label"; - public static final String I18N_YAXIS_LABEL = "chart.beddifference.yaxis.label.diff"; - public static final String I18N_SECOND_YAXIS_LABEL = "chart.beddifference.yaxis.label.morph"; - public static final String I18N_THIRD_YAXIS_LABEL = "chart.beddifference.yaxis.label.heights"; - - public static final String I18N_CHART_TITLE_DEFAULT = "Sohlenhöhen Differenz"; - public static final String I18N_XAXIS_LABEL_DEFAULT = "Fluss-Km"; - public static final String I18N_YAXIS_LABEL_DEFAULT = "delta S [cm]"; - public static final String I18N_SECOND_YAXIS_LABEL_DEFAULT = "Breite [m]"; - public static final String I18N_THIRD_YAXIS_LABEL_DEFAULT = "Höhe [m]"; - public static final String I18N_DW_YAXIS_LABEL_DEFAULT = - "delta W [cm]"; - public static final String I18N_DW_YAXIS_LABEL = - "chart.fixings.longitudinalsection.yaxis.label"; - private static final String I18N_W_YAXIS_LABEL = - "chart.longitudinal.section.yaxis.label"; - private static final String I18N_W_YAXIS_LABEL_DEFAULT = "W [NN + m]"; - - @Override - protected YAxisWalker getYAxisWalker() { - return new YAxisWalker() { - - @Override - public int length() { - return YAXIS.values().length; - } - - @Override - public String getId(int idx) { - YAXIS[] yaxes = YAXIS.values(); - return yaxes[idx].toString(); - } - }; - } - - - @Override - public void doOut(ArtifactAndFacet bundle, ThemeDocument attr, boolean visible) { - String name = bundle.getFacetName(); - - logger.debug("doOut: " + name); - - if (name == null) { - logger.error("No facet name for doOut(). No output generated!"); - return; - } - - Facet facet = bundle.getFacet(); - - if (facet == null) { - return; - } - - if (bundle.getData(context) instanceof BedDifferencesResult) { - setContextBounds(bundle); - } - - Processor processor = new KMIndexProcessor(); - Processor woutp = new WOutProcessor(); - Processor bdhyProcessor = new BedDiffHeightYearProcessor(); - Processor bdyProcessor = new BedDiffYearProcessor(); - if (name.equals(BED_DIFFERENCE_MORPH_WIDTH)) { - doBedDifferenceMorphWidthOut( - (BedDiffYearResult) bundle.getData(context), - bundle, attr, visible); - } - else if (name.equals(MORPHOLOGIC_WIDTH)) { - doMorphologicWidthOut( - (MorphologicWidth)bundle.getData(context), - bundle, - attr, - visible, - 0); - } - else if (processor.canHandle(name)) { - processor.doOut(this, bundle, attr, visible, YAXIS.dW.idx); - } - else if (name.equals(LONGITUDINAL_ANNOTATION)) { - doAnnotations( - (RiverAnnotation) bundle.getData(context), - bundle, - attr, - visible); - } - else if (bdyProcessor.canHandle(name)) { - bdyProcessor.doOut(this, bundle, attr, visible, YAXIS.H.idx); - } - else if (bdhyProcessor.canHandle(name)) { - bdhyProcessor.doOut(this, bundle, attr, visible, YAXIS.D.idx); - } - else if (woutp.canHandle(name)) { - woutp.doOut(this, bundle, attr, visible, YAXIS.W.idx); - } - else if (name.equals(W_DIFFERENCES)) { - doWDifferencesOut( - (WKms) bundle.getData(context), - bundle, - attr, - visible); - } - else { - logger.warn("Unknown facet name " + name); - } - } - - private void doMorphologicWidthOut( - MorphologicWidth data, - ArtifactAndFacet bundle, - ThemeDocument attr, - boolean visible, - int i) { - XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), attr); - StyledSeriesBuilder.addPoints(series, data.getAsArray(), true); - - addAxisSeries(series, YAXIS.M.idx, visible); - } - - - @Override - protected String getDefaultChartTitle() { - return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT); - } - - @Override - protected String getDefaultXAxisLabel() { - return msg(I18N_XAXIS_LABEL, - I18N_XAXIS_LABEL_DEFAULT, - new Object[] { getRiverName() }); - } - - @Override - protected String getDefaultYAxisLabel(int pos) { - String label = "default"; - D4EArtifact flys = (D4EArtifact) master; - if (pos == YAXIS.D.idx) { - label = msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT); - } - else if (pos == YAXIS.M.idx) { - label = msg(I18N_SECOND_YAXIS_LABEL, I18N_SECOND_YAXIS_LABEL_DEFAULT); - } - else if (pos == YAXIS.H.idx) { - label = msg(I18N_THIRD_YAXIS_LABEL, - I18N_THIRD_YAXIS_LABEL_DEFAULT, - new Object[] - { RiverUtils.getRiver(flys).getWstUnit().getName() }); - } - else if (pos == YAXIS.dW.idx) { - label = msg(I18N_DW_YAXIS_LABEL, I18N_DW_YAXIS_LABEL_DEFAULT); - } - else if (pos == YAXIS.W.idx) { - return msg(I18N_W_YAXIS_LABEL, I18N_W_YAXIS_LABEL_DEFAULT, - new Object[] - { RiverUtils.getRiver(flys).getWstUnit().getName() }); - } - - return label; - } - - - protected void doBedDifferenceMorphWidthOut(BedDiffYearResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("doBedDifferencesMorphWidthOut()"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getMorphWidthData(), true); - - addAxisSeries(series, YAXIS.M.idx, visible); - } - - protected void doWDifferencesOut( - WKms wkms, - ArtifactAndFacet aandf, - ThemeDocument theme, - boolean visible - ) { - if (wkms == null) { - logger.warn("No data to add to WDifferencesChart."); - return; - } - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, wkms); - - addAxisSeries(series, YAXIS.D.idx, visible); - if (wkms.guessWaterIncreasing()) { - setInverted(true); - } - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r cde7db30847f -r 8b4b9f00bc45 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java Wed Sep 25 15:57:50 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,315 +0,0 @@ -/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU AGPL (>=v3) - * and comes with ABSOLUTELY NO WARRANTY! Check out the - * documentation coming with Dive4Elements River for details. - */ - -package org.dive4elements.river.exports.minfo; - -import org.apache.log4j.Logger; -import org.jfree.data.xy.XYSeries; - -import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; -import org.dive4elements.artifactdatabase.state.Facet; -import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.minfo.BedDiameterData; -import org.dive4elements.river.artifacts.model.minfo.BedDiameterResult; -import org.dive4elements.river.artifacts.model.minfo.BedParametersResult; -import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterResult; -import org.dive4elements.river.exports.StyledSeriesBuilder; -import org.dive4elements.river.exports.XYChartGenerator; -import org.dive4elements.river.jfree.RiverAnnotation; -import org.dive4elements.river.jfree.StyledXYSeries; -import org.dive4elements.river.themes.ThemeDocument; - - -/** - * An OutGenerator that generates bed quality charts. - * - * @author Ingo Weinzierl - */ -public class BedQualityGenerator extends XYChartGenerator implements FacetTypes { - - public enum YAXIS { - W(0), P(1), D(2); - - protected int idx; - - private YAXIS(int c) { - idx = c; - } - } - - /** The logger that is used in this generator. */ - private static Logger logger = Logger.getLogger(BedQualityGenerator.class); - - public static final String I18N_CHART_TITLE = "chart.bedquality.title"; - public static final String I18N_XAXIS_LABEL = "chart.bedquality.xaxis.label"; - public static final String I18N_YAXIS_LABEL = "chart.bedquality.yaxis.label"; - public static final String I18N_SECOND_YAXIS_LABEL = "chart.bedquality.yaxis.label.porosity"; - public static final String I18N_THIRD_YAXIS_LABEL = "chart.bedquality.yaxis.label.diameter"; - - public static final String I18N_CHART_TITLE_DEFAULT = "Sohlen Längsschnitt"; - public static final String I18N_XAXIS_LABEL_DEFAULT = "Fluss-Km"; - public static final String I18N_YAXIS_LABEL_DEFAULT = "Durchmesser [mm]"; - public static final String I18N_SECOND_YAXIS_LABEL_DEFAULT = "Porosität [%]"; - public static final String I18N_THIRD_YAXIS_LABEL_DEFAULT = "Dichte [t/m^3]"; - - @Override - protected YAxisWalker getYAxisWalker() { - return new YAxisWalker() { - - @Override - public int length() { - return YAXIS.values().length; - } - - @Override - public String getId(int idx) { - YAXIS[] yaxes = YAXIS.values(); - return yaxes[idx].toString(); - } - }; - } - - /** - * Returns the default title for this chart. - * - * @return the default title for this chart. - */ - @Override - public String getDefaultChartTitle() { - return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT); - } - - /** - * Get internationalized label for the x axis. - */ - @Override - protected String getDefaultXAxisLabel() { - return msg(I18N_XAXIS_LABEL, - I18N_XAXIS_LABEL_DEFAULT, - new Object[] {getRiverName()}); - } - - @Override - protected String getDefaultYAxisLabel(int index) { - String label = "default"; - - if (index == YAXIS.W.idx) { - label = getWAxisLabel(); - } - else if (index == YAXIS.P.idx) { - label = getPAxisLabel(); - } - else if (index == YAXIS.D.idx) { - label = getDAxisLabel(); - } - - return label; - } - - /** - * Get internationalized label for the y axis displaying the diameter. - */ - protected String getWAxisLabel() { - return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT); - } - - /** - * Get internationalized label for the y axis displaying the porosity. - */ - protected String getPAxisLabel() { - return msg(I18N_SECOND_YAXIS_LABEL, I18N_SECOND_YAXIS_LABEL_DEFAULT); - } - - /** - * Get internationalized label for the y axis displaying the density. - */ - protected String getDAxisLabel() { - return msg(I18N_THIRD_YAXIS_LABEL, I18N_THIRD_YAXIS_LABEL_DEFAULT); - } - - /** - * Produce output. - * - * @param artifactAndFacet - * current facet. - * @param attr - * theme for facet - */ - @Override - public void doOut( - ArtifactAndFacet artifactAndFacet, - ThemeDocument attr, - boolean visible - ) { - String name = artifactAndFacet.getFacetName(); - - logger.debug("BedQualityGenerator.doOut: " + name); - - if (name == null) { - logger.error("No facet name for doOut(). No output generated!"); - return; - } - - Facet facet = artifactAndFacet.getFacet(); - - if (facet == null) { - return; - } - - // TODO BED_QUALITY_BED_DIAMETER_TOPLAYER - if (name.equals(BED_QUALITY_BED_DIAMETER_TOPLAYER)) { - doBedDiameterTopLayerOut( - (BedDiameterResult) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - else if (name.equals(BED_QUALITY_BED_DIAMETER_SUBLAYER)) { - doBedDiameterSubLayerOut( - (BedDiameterResult) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - // TODO BED_QUALITY_BED_DIAMETER_SUBLAYER - else if (name.equals(BED_QUALITY_BEDLOAD_DIAMETER)) { - doBedLoadDiameterOut( - (BedloadDiameterResult) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - else if (name.equals(BED_QUALITY_POROSITY_TOPLAYER)) { - doPorosityTopLayerOut( - (BedParametersResult) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - else if (name.equals(BED_QUALITY_POROSITY_SUBLAYER)) { - doPorositySubLayerOut( - (BedParametersResult) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_TOPLAYER)) { - doDensityTopLayerOut( - (BedParametersResult) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - else if (name.equals(BED_QUALITY_SEDIMENT_DENSITY_SUBLAYER)) { - doDensitySubLayerOut( - (BedParametersResult) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - else if (name.equals(BED_DIAMETER_DATA_TOP) || - name.equals(BED_DIAMETER_DATA_SUB) || - name.equals(BEDLOAD_DIAMETER_DATA)) { - doBedDiameterDataOut( - (BedDiameterData) artifactAndFacet.getData(context), - artifactAndFacet, attr, visible); - } - else if (name.equals(LONGITUDINAL_ANNOTATION)) { - doAnnotations( - (RiverAnnotation) artifactAndFacet.getData(context), - artifactAndFacet, - attr, - visible); - } - else if (FacetTypes.IS.MANUALPOINTS(name)) { - doPoints(artifactAndFacet.getData(context), artifactAndFacet, attr, - visible, YAXIS.W.idx); - } - else { - logger.warn("Unknown facet name: " + name); - return; - } - } - - private void doBedDiameterDataOut( - BedDiameterData data, - ArtifactAndFacet aandf, - ThemeDocument theme, - boolean visible - ) { - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getDiameterData(), true); - - addAxisSeries(series, YAXIS.W.idx, visible); - } - - protected void doBedDiameterTopLayerOut(BedDiameterResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("BedQuality.doBedDiameterTopLayerOut"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getDiameterCapData(), true); - - addAxisSeries(series, YAXIS.W.idx, visible); - } - - protected void doBedDiameterSubLayerOut(BedDiameterResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("BedQuality.doBedDiameterSubLayerOut"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getDiameterSubData(), true); - - addAxisSeries(series, YAXIS.W.idx, visible); - } - - protected void doBedLoadDiameterOut(BedloadDiameterResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("BedQuality.doBedLoadDiameterOut"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data.getDiameterData(), true); - - addAxisSeries(series, YAXIS.W.idx, visible); - } - - protected void doPorosityTopLayerOut(BedParametersResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("BedQuality.doPorosityTopLayerOut"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - - StyledSeriesBuilder.addPoints(series, data.getPorosityCapData(), - true); - - addAxisSeries(series, YAXIS.P.idx, visible); - } - - protected void doPorositySubLayerOut(BedParametersResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("BedQuality.doPorositySubLayerOut"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - - StyledSeriesBuilder.addPoints(series, data.getPorositySubData(), - true); - - addAxisSeries(series, YAXIS.P.idx, visible); - } - - protected void doDensityTopLayerOut(BedParametersResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("BedQuality.doDensityOut"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - - StyledSeriesBuilder.addPoints(series, data.getDensityCapData(), - true); - - addAxisSeries(series, YAXIS.D.idx, visible); - } - - protected void doDensitySubLayerOut(BedParametersResult data, - ArtifactAndFacet aandf, ThemeDocument theme, boolean visible) { - logger.debug("BedQuality.doDensityOut"); - - XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); - - StyledSeriesBuilder.addPoints(series, data.getDensitySubData(), - true); - - addAxisSeries(series, YAXIS.D.idx, visible); - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r cde7db30847f -r 8b4b9f00bc45 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityInfoGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityInfoGenerator.java Wed Sep 25 15:57:50 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU AGPL (>=v3) - * and comes with ABSOLUTELY NO WARRANTY! Check out the - * documentation coming with Dive4Elements River for details. - */ - -package org.dive4elements.river.exports.minfo; - -import org.dive4elements.river.exports.ChartInfoGenerator; - - -/** - * A ChartInfoGenerator that generates meta information for specific computed - * bed quality curves. - * - * @author Ingo Weinzierl - */ -public class BedQualityInfoGenerator extends ChartInfoGenerator { - - public BedQualityInfoGenerator() { - super(new BedQualityGenerator()); - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :