andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

hide grid for certain plot types

Browse Source
This commit is contained in:
Andreas Huber
2020-04-17 14:46:42 +00:00
parent 03accc1828
commit bfc5d9e3d8
8 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartHandler.java
View File

@@ -41,6 +41,7 @@ public class BarChartHandler extends AggregateHandler {
result.setAxis(getxAxis());
result.setTicsEnabled(true);
result.setFrom("0");
result.setShowGrid(false);
return result;
}

1
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java
View File

@@ -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;
}

1
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/HistogramHandler.java
View File

@@ -40,6 +40,7 @@ public class HistogramHandler extends AggregateHandler {
result.setAxis(getxAxis());
result.setTicsEnabled(true);
result.setFrom("0");
result.setShowGrid(false);
return result;
}

1
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java
View File

@@ -33,6 +33,7 @@ public class ParallelRequestsAggregate extends AggregateHandler {
public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
final AxisSettings result = AxisTime.createXAxis(settings);
result.setAxis(getxAxis());
result.setShowGrid(getxAxis() == GnuplotAxis.X1);
return result;
}

1
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ScatterAggregateHandler.java
View File

@@ -33,6 +33,7 @@ public class ScatterAggregateHandler extends AggregateHandler {
public AxisSettings createXAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
final AxisSettings result = AxisTime.createXAxis(settings);
result.setAxis(getxAxis());
result.setShowGrid(getxAxis() == GnuplotAxis.X1);
return result;
}

13
pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisSettings.java
View File

@@ -29,6 +29,8 @@ public class AxisSettings {
private boolean logscale;
private boolean showGrid = true;
private List<String> 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();
}

1
pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisTime.java
View File

@@ -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;
}

2
pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java
View File

@@ -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<AxisSettings> 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);