hide grid for certain plot types
This commit is contained in:
@@ -41,6 +41,7 @@ public class BarChartHandler extends AggregateHandler {
|
|||||||
result.setAxis(getxAxis());
|
result.setAxis(getxAxis());
|
||||||
result.setTicsEnabled(true);
|
result.setTicsEnabled(true);
|
||||||
result.setFrom("0");
|
result.setFrom("0");
|
||||||
|
result.setShowGrid(false);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ public class CumulativeDistributionHandler extends AggregateHandler {
|
|||||||
result.setTicIncrement(computeTicIncrement(settings));
|
result.setTicIncrement(computeTicIncrement(settings));
|
||||||
result.setFrom("0");
|
result.setFrom("0");
|
||||||
result.setTo("100");
|
result.setTo("100");
|
||||||
|
result.setShowGrid(getxAxis() == GnuplotAxis.X1);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ public class HistogramHandler extends AggregateHandler {
|
|||||||
result.setAxis(getxAxis());
|
result.setAxis(getxAxis());
|
||||||
result.setTicsEnabled(true);
|
result.setTicsEnabled(true);
|
||||||
result.setFrom("0");
|
result.setFrom("0");
|
||||||
|
result.setShowGrid(false);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ public class ParallelRequestsAggregate extends AggregateHandler {
|
|||||||
public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
|
public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
|
||||||
final AxisSettings result = AxisTime.createXAxis(settings);
|
final AxisSettings result = AxisTime.createXAxis(settings);
|
||||||
result.setAxis(getxAxis());
|
result.setAxis(getxAxis());
|
||||||
|
result.setShowGrid(getxAxis() == GnuplotAxis.X1);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ public class ScatterAggregateHandler extends AggregateHandler {
|
|||||||
public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
|
public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
|
||||||
final AxisSettings result = AxisTime.createXAxis(settings);
|
final AxisSettings result = AxisTime.createXAxis(settings);
|
||||||
result.setAxis(getxAxis());
|
result.setAxis(getxAxis());
|
||||||
|
result.setShowGrid(getxAxis() == GnuplotAxis.X1);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ public class AxisSettings {
|
|||||||
|
|
||||||
private boolean logscale;
|
private boolean logscale;
|
||||||
|
|
||||||
|
private boolean showGrid = true;
|
||||||
|
|
||||||
private List<String> ticsLabels;
|
private List<String> ticsLabels;
|
||||||
|
|
||||||
public String getFormat() {
|
public String getFormat() {
|
||||||
@@ -119,6 +121,14 @@ public class AxisSettings {
|
|||||||
return ticsLabels;
|
return ticsLabels;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setShowGrid(final boolean showGrid) {
|
||||||
|
this.showGrid = showGrid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isShowGrid() {
|
||||||
|
return showGrid;
|
||||||
|
}
|
||||||
|
|
||||||
public String toGnuplotDefinition(final boolean renderLabels) {
|
public String toGnuplotDefinition(final boolean renderLabels) {
|
||||||
final StringBuilder result = new StringBuilder();
|
final StringBuilder result = new StringBuilder();
|
||||||
if (type == Type.Time) {
|
if (type == Type.Time) {
|
||||||
@@ -159,6 +169,9 @@ public class AxisSettings {
|
|||||||
if (logscale) {
|
if (logscale) {
|
||||||
appendfln(result, "set logscale %s", axis);
|
appendfln(result, "set logscale %s", axis);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
appendfln(result, "set grid %s%stics", showGrid ? "" : "no", axis);
|
||||||
|
|
||||||
return result.toString();
|
return result.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ public class AxisTime {
|
|||||||
result.setLogscale(yAxisDefinition.isLogscale());
|
result.setLogscale(yAxisDefinition.isLogscale());
|
||||||
|
|
||||||
result.setTics(YAxisTicks.computeYTicks(settings, yAxis, dataSeries));
|
result.setTics(YAxisTicks.computeYTicks(settings, yAxis, dataSeries));
|
||||||
|
result.setShowGrid(yAxis == GnuplotAxis.Y1);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public class GnuplotFileGenerator implements Appender {
|
|||||||
|
|
||||||
appendfln(result, "set datafile separator \"%s\"", settings.getDatafileSeparator());
|
appendfln(result, "set datafile separator \"%s\"", settings.getDatafileSeparator());
|
||||||
appendfln(result, "set timefmt '%s'", settings.getTimefmt());
|
appendfln(result, "set timefmt '%s'", settings.getTimefmt());
|
||||||
|
appendfln(result, "set grid");
|
||||||
|
|
||||||
final List<AxisSettings> xAxisDefinitions = settings.getAggregates().getXAxisDefinitions(settings, dataSeries);
|
final List<AxisSettings> xAxisDefinitions = settings.getAggregates().getXAxisDefinitions(settings, dataSeries);
|
||||||
for (final AxisSettings axisSettings : xAxisDefinitions) {
|
for (final AxisSettings axisSettings : xAxisDefinitions) {
|
||||||
@@ -40,7 +41,6 @@ public class GnuplotFileGenerator implements Appender {
|
|||||||
appendln(result, axisSettings.toGnuplotDefinition(settings.isRenderLabels()));
|
appendln(result, axisSettings.toGnuplotDefinition(settings.isRenderLabels()));
|
||||||
}
|
}
|
||||||
|
|
||||||
appendfln(result, "set grid");
|
|
||||||
appendfln(result, "set output \"%s\"", settings.getOutput().toAbsolutePath().toString().replace("\\", "/"));
|
appendfln(result, "set output \"%s\"", settings.getOutput().toAbsolutePath().toString().replace("\\", "/"));
|
||||||
|
|
||||||
appendfln(result, "set key font \",%d\"", KEY_FONT_SIZE);
|
appendfln(result, "set key font \",%d\"", KEY_FONT_SIZE);
|
||||||
|
|||||||
Reference in New Issue
Block a user