diff --git a/pdb-js/src/app/plot.service.ts b/pdb-js/src/app/plot.service.ts index 9f93370..a11ea16 100644 --- a/pdb-js/src/app/plot.service.ts +++ b/pdb-js/src/app/plot.service.ts @@ -202,6 +202,7 @@ export class PlotRequest { generateThumbnail : boolean; intervalUnit: string; intervalValue: number; + renderBarChartTickLabels: boolean = false; copy(): PlotRequest { return JSON.parse(JSON.stringify(this)); diff --git a/pdb-js/src/app/visualization-page/visualization-page.component.html b/pdb-js/src/app/visualization-page/visualization-page.component.html index 193daeb..cd209a7 100644 --- a/pdb-js/src/app/visualization-page/visualization-page.component.html +++ b/pdb-js/src/app/visualization-page/visualization-page.component.html @@ -46,6 +46,9 @@ +
+ Show Tic Labels (bar chart) +
diff --git a/pdb-js/src/app/visualization-page/visualization-page.component.ts b/pdb-js/src/app/visualization-page/visualization-page.component.ts index 75eefdc..13fc208 100644 --- a/pdb-js/src/app/visualization-page/visualization-page.component.ts +++ b/pdb-js/src/app/visualization-page/visualization-page.component.ts @@ -53,6 +53,7 @@ export class VisualizationPageComponent implements OnInit { intervalUnit = 'NO_INTERVAL'; intervalValue = 1; + renderBarChartTickLabels = false; constructor(private plotService: PlotService, private snackBar: MatSnackBar) { } @@ -172,6 +173,7 @@ export class VisualizationPageComponent implements OnInit { request.generateThumbnail = this.enableGallery; request.intervalUnit = this.intervalUnit; request.intervalValue = this.intervalValue; + request.renderBarChartTickLabels = this.renderBarChartTickLabels; return request; } 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 8169917..dd25e02 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 @@ -56,7 +56,7 @@ public class BarChartHandler extends AggregateHandler { appendln(result, barAggregator.asCsv(settings.isRenderLabels())); appendln(result, "EOD"); - if (settings.isRenderLabels()) { + if (settings.isRenderLabels() && settings.isRenderBarChartTickLabels()) { appendfln(result, barAggregator.renderLabels(getxAxis())); } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/PlotSettings.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/PlotSettings.java index 4b1552f..e0e22ce 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/PlotSettings.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/PlotSettings.java @@ -45,6 +45,8 @@ public class PlotSettings { private Interval interval; + private boolean renderBarChartTickLabels; + public String getQuery() { return query; } @@ -197,4 +199,12 @@ public class PlotSettings { this.interval = interval; } + public boolean isRenderBarChartTickLabels() { + return renderBarChartTickLabels; + } + + public void setRenderBarChartTickLabels(final boolean renderBarChartTickLabels) { + this.renderBarChartTickLabels = renderBarChartTickLabels; + } + } diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java index 6a53893..d12e35f 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java @@ -35,6 +35,7 @@ public class GnuplotSettings { private AxisSettings xAxisSettings = new AxisSettings(); private boolean renderLabels = true; private DateTimeRange dateTimeRange; + private boolean renderBarChartTickLabels; public GnuplotSettings(final Path output) { this.output = output; @@ -151,6 +152,14 @@ public class GnuplotSettings { } } + public boolean isRenderBarChartTickLabels() { + return renderBarChartTickLabels; + } + + public void setRenderBarChartTickLabels(final boolean renderBarChartTickLabels) { + this.renderBarChartTickLabels = renderBarChartTickLabels; + } + // plot 'sample.txt' using 1:2 title 'Bytes' with linespoints 2 } diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java index a6cec0f..1c62c63 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java @@ -113,6 +113,7 @@ public class Plotter { gnuplotSettings.setAggregates(plotSettings.getAggregates()); gnuplotSettings.setKeyOutside(plotSettings.isKeyOutside()); + gnuplotSettings.setRenderBarChartTickLabels(plotSettings.isRenderBarChartTickLabels()); gnuplot.plot(gnuplotSettings, dataSeries); } diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java b/pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java index 8f3bf08..da47781 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java @@ -35,6 +35,7 @@ class PlotSettingsTransformer { result.setY2(request.getY2()); result.setAggregates(toAggregateInternal(request.getY1(), request.getY2(), request.getAggregates())); result.setInterval(Interval.create(request.getIntervalUnit(), request.getIntervalValue(), result.dateRange())); + result.setRenderBarChartTickLabels(request.isRenderBarChartTickLabels()); return result; } diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java b/pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java index d4d8a8c..aa55c8c 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java @@ -37,6 +37,8 @@ public class PlotRequest { private String intervalUnit; private int intervalValue; + private boolean renderBarChartTickLabels; + public String getQuery() { return query; } @@ -169,4 +171,12 @@ public class PlotRequest { public void setIntervalValue(final int intervalValue) { this.intervalValue = intervalValue; } + + public boolean isRenderBarChartTickLabels() { + return renderBarChartTickLabels; + } + + public void setRenderBarChartTickLabels(final boolean renderBarChartTickLabels) { + this.renderBarChartTickLabels = renderBarChartTickLabels; + } }