diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandler.java index d084c5e..2f3cb76 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandler.java @@ -57,7 +57,7 @@ public abstract class AggregateHandler implements Appender { abstract CustomAggregator createCustomAggregator(Path tmpDir, PlotSettings plotSettings, long fromEpochMilli, long toEpochMilli); - String beforePlot(final CustomAggregator aggregator) { + String beforePlot(final CustomAggregator aggregator, final GnuplotSettings settings) { return ""; } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandlerCollection.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandlerCollection.java index 35af671..eaeea3e 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandlerCollection.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandlerCollection.java @@ -93,7 +93,8 @@ public class AggregateHandlerCollection { return new AggregatorCollection(aggregators); } - public void addPlots(final StringBuilder result, final Collection dataSeries) { + public void addPlots(final StringBuilder result, final Collection dataSeries, + final GnuplotSettings settings) { final StringBuilder plots = new StringBuilder(); final StringBuilder beforePlots = new StringBuilder(); @@ -116,7 +117,7 @@ public class AggregateHandlerCollection { index++; } - final String beforePlot = handler.beforePlot(aggregator); + final String beforePlot = handler.beforePlot(aggregator, settings); beforePlots.append(beforePlot); final String plot = handler.addPlot(aggregator, dataSerie.getStyle(), title); diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartAggregator.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartAggregator.java index ffd56c3..c0391fe 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartAggregator.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartAggregator.java @@ -37,6 +37,10 @@ public class BarChartAggregator implements CustomAggregator, IndexedAggregator { return this.index; } + public long getCount() { + return count; + } + @Override public void addValue(final boolean valueIsInYRange, final long epochMilli, final long value) { count++; @@ -45,7 +49,7 @@ public class BarChartAggregator implements CustomAggregator, IndexedAggregator { public String asCsv() { final StringBuilder csv = new StringBuilder(); - csv.append(index + 0.5); + csv.append(getIndex() + 0.5); csv.append(","); csv.append(""); csv.append(","); diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java index ba958aa..ca4b650 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java @@ -4,6 +4,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Optional; import org.lucares.recommind.logs.AxisSettings; @@ -68,7 +69,7 @@ public class BarChartHandler extends AggregateHandler { } @Override - String beforePlot(final CustomAggregator aggregator) { + String beforePlot(final CustomAggregator aggregator, final GnuplotSettings settings) { final StringBuilder result = new StringBuilder(); final BarChartAggregator barAggregator = (BarChartAggregator) aggregator; @@ -76,6 +77,14 @@ public class BarChartHandler extends AggregateHandler { appendfln(result, "%s <