Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java @ 7075:253d80af5b7f generator-refactoring
More Processor refactoring
- Unify aandf aaf and bundle variable names to bundle
- Factor out diagram inversion code
- Add function with new signature to BedDiffYear and QOut processors
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 20 Sep 2013 16:25:43 +0200 |
| parents | eb24d5203d17 |
| children | 3c4efd4b2c19 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java Fri Sep 20 15:44:39 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java Fri Sep 20 16:25:43 2013 +0200 @@ -37,15 +37,15 @@ @Override public void doOut( DiagramGenerator generator, - ArtifactAndFacet aaf, + ArtifactAndFacet bundle, ThemeDocument theme, boolean visible) { CallContext context = generator.getCallContext(); - WKms wkms = (WKms) aaf.getData(context); + WKms wkms = (WKms) bundle.getData(context); logger.debug("doOut"); - XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme); + XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); StyledSeriesBuilder.addPoints(series, wkms); generator.addAxisSeries(series, axisName, visible); @@ -54,9 +54,9 @@ double bandWidth = theme.parseBandWidth(); if (bandWidth > 0 ) { XYSeries seriesDown = new StyledXYSeries( - "band " + aaf.getFacetDescription(), false, theme); + "band " + bundle.getFacetDescription(), false, theme); XYSeries seriesUp = new StyledXYSeries( - aaf.getFacetDescription()+"+/-"+bandWidth, false, theme); + bundle.getFacetDescription()+"+/-"+bandWidth, false, theme); StyledSeriesBuilder.addUpperBand(seriesUp, wkms, bandWidth); StyledSeriesBuilder.addLowerBand(seriesDown, wkms, bandWidth); @@ -67,29 +67,29 @@ generator.addAreaSeries(area, axisName, visible); } - if (aaf.getFacetName().equals(FacetTypes.LONGITUDINAL_W) || - aaf.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_W) || - aaf.getFacetName().equals(FacetTypes.STATIC_WQKMS_W)) { + if (bundle.getFacetName().equals(FacetTypes.LONGITUDINAL_W) || + bundle.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_W) || + bundle.getFacetName().equals(FacetTypes.STATIC_WQKMS_W)) { /* Only use W values to check if the diagram should be inverted * see flys/issue1290 for details */ - invertAxis(generator, wkms); + generator.handleLTRWaterFlowInversion(wkms); } } @Override public void doOut( XYChartGenerator generator, - ArtifactAndFacet aaf, + ArtifactAndFacet bundle, ThemeDocument theme, boolean visible, int index) { CallContext context = generator.getCallContext(); - WKms wkms = (WKms) aaf.getData(context); + WKms wkms = (WKms) bundle.getData(context); logger.debug("doOut"); - XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme); + XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); StyledSeriesBuilder.addPoints(series, wkms); generator.addAxisSeries(series, index, visible); @@ -98,9 +98,9 @@ double bandWidth = theme.parseBandWidth(); if (bandWidth > 0 ) { XYSeries seriesDown = new StyledXYSeries( - "band " + aaf.getFacetDescription(), false, theme); + "band " + bundle.getFacetDescription(), false, theme); XYSeries seriesUp = new StyledXYSeries( - aaf.getFacetDescription()+"+/-"+bandWidth, false, theme); + bundle.getFacetDescription()+"+/-"+bandWidth, false, theme); StyledSeriesBuilder.addUpperBand(seriesUp, wkms, bandWidth); StyledSeriesBuilder.addLowerBand(seriesDown, wkms, bandWidth); @@ -111,9 +111,9 @@ generator.addAreaSeries(area, index, visible); } - if (aaf.getFacetName().equals(FacetTypes.LONGITUDINAL_W) || - aaf.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_W) || - aaf.getFacetName().equals(FacetTypes.STATIC_WQKMS_W)) { + if (bundle.getFacetName().equals(FacetTypes.LONGITUDINAL_W) || + bundle.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_W) || + bundle.getFacetName().equals(FacetTypes.STATIC_WQKMS_W)) { /* Only use W values to check if the diagram should be inverted * see flys/issue1290 for details */ invertAxis(generator, wkms); @@ -171,26 +171,5 @@ } generator.setInverted(inv); } - public void invertAxis(DiagramGenerator generator, WKms wkms) { - boolean wsUp = wkms.guessWaterIncreasing(); - boolean kmUp = DataUtil.guessWaterIncreasing(wkms.allKms()); - int size = wkms.size(); - boolean inv = ((wsUp && kmUp) || (!wsUp && !kmUp)) && size > 1; - - if (logger.isDebugEnabled()) { - logger.debug("(Wkms)Values : " + size); - if (size > 0) { - logger.debug("Start km: " + wkms.getKm(0)); - logger.debug("End km: " + wkms.getKm(size-1)); - } - logger.debug("wsUp: " + wsUp); - logger.debug("kmUp: " + kmUp); - if (size == 1) { - logger.debug("InvertAxis not inverting because we have just one km"); - } - logger.debug("inv: " + inv); - } - generator.setInverted(inv); - } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :