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 65d941b..8779dad 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 @@ -41,6 +41,7 @@ public class BarChartHandler extends AggregateHandler { result.setAxis(getxAxis()); result.setTicsEnabled(true); result.setFrom("0"); + result.setShowGrid(false); return result; } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java index 6c24455..a82479c 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java @@ -46,6 +46,7 @@ public class CumulativeDistributionHandler extends AggregateHandler { result.setTicIncrement(computeTicIncrement(settings)); result.setFrom("0"); result.setTo("100"); + result.setShowGrid(getxAxis() == GnuplotAxis.X1); return result; } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java index 99c158d..e6c0e30 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java @@ -40,6 +40,7 @@ public class HistogramHandler extends AggregateHandler { result.setAxis(getxAxis()); result.setTicsEnabled(true); result.setFrom("0"); + result.setShowGrid(false); return result; } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java index 0e962bd..7c7018b 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java @@ -33,6 +33,7 @@ public class ParallelRequestsAggregate extends AggregateHandler { public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection dataSeries) { final AxisSettings result = AxisTime.createXAxis(settings); result.setAxis(getxAxis()); + result.setShowGrid(getxAxis() == GnuplotAxis.X1); return result; } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ScatterAggregateHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ScatterAggregateHandler.java index 3027f18..425b62a 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ScatterAggregateHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ScatterAggregateHandler.java @@ -33,6 +33,7 @@ public class ScatterAggregateHandler extends AggregateHandler { public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection dataSeries) { final AxisSettings result = AxisTime.createXAxis(settings); result.setAxis(getxAxis()); + result.setShowGrid(getxAxis() == GnuplotAxis.X1); return result; } diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisSettings.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisSettings.java index 1c755d4..876ebc2 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisSettings.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisSettings.java @@ -29,6 +29,8 @@ public class AxisSettings { private boolean logscale; + private boolean showGrid = true; + private List ticsLabels; public String getFormat() { @@ -119,6 +121,14 @@ public class AxisSettings { return ticsLabels; } + public void setShowGrid(final boolean showGrid) { + this.showGrid = showGrid; + } + + public boolean isShowGrid() { + return showGrid; + } + public String toGnuplotDefinition(final boolean renderLabels) { final StringBuilder result = new StringBuilder(); if (type == Type.Time) { @@ -159,6 +169,9 @@ public class AxisSettings { if (logscale) { appendfln(result, "set logscale %s", axis); } + + appendfln(result, "set grid %s%stics", showGrid ? "" : "no", axis); + return result.toString(); } diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisTime.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisTime.java index 4eafe00..90ae53b 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisTime.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisTime.java @@ -63,6 +63,7 @@ public class AxisTime { result.setLogscale(yAxisDefinition.isLogscale()); result.setTics(YAxisTicks.computeYTicks(settings, yAxis, dataSeries)); + result.setShowGrid(yAxis == GnuplotAxis.Y1); return result; } diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java index 05de256..4067807 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java @@ -22,6 +22,7 @@ public class GnuplotFileGenerator implements Appender { appendfln(result, "set datafile separator \"%s\"", settings.getDatafileSeparator()); appendfln(result, "set timefmt '%s'", settings.getTimefmt()); + appendfln(result, "set grid"); final List xAxisDefinitions = settings.getAggregates().getXAxisDefinitions(settings, dataSeries); for (final AxisSettings axisSettings : xAxisDefinitions) { @@ -40,7 +41,6 @@ public class GnuplotFileGenerator implements Appender { appendln(result, axisSettings.toGnuplotDefinition(settings.isRenderLabels())); } - appendfln(result, "set grid"); appendfln(result, "set output \"%s\"", settings.getOutput().toAbsolutePath().toString().replace("\\", "/")); appendfln(result, "set key font \",%d\"", KEY_FONT_SIZE);