Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java @ 3761:066e2b4d69ca
Fix missing import
flys-artifacts/trunk@5462 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Thu, 13 Sep 2012 20:58:24 +0000 |
parents | 3732e1bab0aa |
children | 8bbb9e173297 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java Thu Sep 13 13:51:00 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java Thu Sep 13 20:58:24 2012 +0000 @@ -1,5 +1,8 @@ package de.intevation.flys.exports.fixings; +import org.apache.log4j.Logger; +import org.w3c.dom.Document; + import de.intevation.artifactdatabase.state.ArtifactAndFacet; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.fixings.FixDerivateFacet; @@ -9,9 +12,6 @@ import de.intevation.flys.jfree.JFreeUtil; import de.intevation.flys.jfree.StyledXYSeries; -import org.apache.log4j.Logger; -import org.w3c.dom.Document; - /** * Generator for fixation derived function curve. * @@ -22,28 +22,28 @@ implements FacetTypes { private static Logger logger = - Logger.getLogger(FixDerivedCurveGenerator.class); + Logger.getLogger(FixDerivedCurveGenerator.class); public static final String I18N_CHART_TITLE = - "chart.fixings.derivedcurve.title"; + "chart.fixings.derivedcurve.title"; public static final String I18N_CHART_SUBTITLE = - "chart.fixings.derivedcurve.subtitle"; + "chart.fixings.derivedcurve.subtitle"; public static final String I18N_XAXIS_LABEL = - "chart.fixings.derivedcurve.xaxis.label"; + "chart.fixings.derivedcurve.xaxis.label"; public static final String I18N_YAXIS_LABEL = - "chart.fixings.derivedcurve.yaxis.label"; + "chart.fixings.derivedcurve.yaxis.label"; public static final String I18N_CHART_TITLE_DEFAULT = - "Ableitungskurve"; + "Ableitungskurve"; public static final String I18N_XAXIS_LABEL_DEFAULT = - "Q [m\u00B3/s]"; + "Q [m\u00B3/s]"; public static final String I18N_YAXIS_LABEL_DEFAULT = - "W [NN + m]"; + "W [NN + m]"; public static enum YAXIS { W(0), @@ -59,26 +59,33 @@ public void doOut(ArtifactAndFacet aaf, Document doc, boolean visible) { logger.debug("doOut"); - FixDerivateFacet facet = (FixDerivateFacet)aaf.getFacet(); - FixFunction func = (FixFunction)facet.getData( - aaf.getArtifact(), context); - - if (func == null) { - logger.warn("doOut: Facet does not contain FixFunction"); - return; + if (FacetTypes.IS.MANUALPOINTS(aaf.getFacetName())) { + doPoints(aaf.getData(context), + aaf, + doc, visible, YAXIS.W.idx); } + else { + FixDerivateFacet facet = (FixDerivateFacet)aaf.getFacet(); + FixFunction func = (FixFunction)facet.getData( + aaf.getArtifact(), context); - double maxQ = func.getMaxQ(); + if (func == null) { + logger.warn("doOut: Facet does not contain FixFunction"); + return; + } - if (maxQ > 0) { - StyledXYSeries series = JFreeUtil.sampleFunction2D( - func.getFunction(), - doc, - aaf.getFacetDescription(), - 500, // number of samples - 0.0 , // start - maxQ); // end - addAxisSeries(series, 0, visible); + double maxQ = func.getMaxQ(); + + if (maxQ > 0) { + StyledXYSeries series = JFreeUtil.sampleFunction2D( + func.getFunction(), + doc, + aaf.getFacetDescription(), + 500, // number of samples + 0.0 , // start + maxQ); // end + addAxisSeries(series, 0, visible); + } } } @@ -120,7 +127,7 @@ } @Override - public String getId(int idx) { + public String getId(int idx) { YAXIS[] yaxes = YAXIS.values(); return yaxes[idx].toString(); }