Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/MiscDischargeProcessor.java @ 9123:1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
| author | gernotbelger |
|---|---|
| date | Tue, 05 Jun 2018 19:21:16 +0200 |
| parents | 5e38e2924c07 |
| children | 9b8e8fc1f408 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/MiscDischargeProcessor.java Tue Jun 05 19:10:38 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/MiscDischargeProcessor.java Tue Jun 05 19:21:16 2018 +0200 @@ -66,7 +66,7 @@ ArtifactAndFacet bundle, ThemeDocument theme, boolean visible) { - CallContext context = generator.getCallContext(); + CallContext context = generator.getContext(); Object data = bundle.getData(context); if (HISTORICAL_DISCHARGE_WQ_Q.equals(bundle.getFacetName())) { doHistoricalDischargeOutQ(generator, bundle, theme, visible); @@ -108,7 +108,7 @@ boolean visible, int axisIndex ) { - CallContext context = generator.getCallContext(); + CallContext context = generator.getContext(); Object data = bundle.getData(context); /* TODO: Remove the first case.*/ if (bundle.getFacetName().equals(STATIC_WQ)) { @@ -145,7 +145,7 @@ ) { XYSeries series = new StyledXYSeries( bundle.getFacetDescription(), theme); - Object wq = bundle.getData(generator.getCallContext()); + Object wq = bundle.getData(generator.getContext()); if (wq instanceof double[][]) { double [][] data = (double [][]) wq; StyledSeriesBuilder.addPoints(series, data, true); @@ -278,7 +278,7 @@ boolean visible ) { double value = Double.valueOf( - bundle.getData(generator.getCallContext()).toString()); + bundle.getData(generator.getContext()).toString()); generator.addDomainMarker( new StyledValueMarker(value, theme), visible); } @@ -290,7 +290,7 @@ boolean visible ) { double value = Double.valueOf( - bundle.getData(generator.getCallContext()).toString()); + bundle.getData(generator.getContext()).toString()); generator.addValueMarker( new StyledValueMarker(value, theme), visible); } @@ -373,7 +373,7 @@ @Override public String getAxisLabel(DiagramGenerator generator) { - CallMeta meta = generator.getCallContext().getMeta(); + CallMeta meta = generator.getContext().getMeta(); RiverAccess access = new RiverAccess((D4EArtifact)generator .getMaster()); String unit = access.getRiver().getWstUnit().getName();