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

make the legend movable

Browse Source 
The legend ("key" in Gnuplot speak) is no longer part of the image.
Instead it is a floating&movable overlay.

In the gallery we still use the legend/key in the image.
This commit is contained in:
Andreas Huber
2023-09-30 17:12:49 +02:00
parent f8a199fd6a
commit 43e13b53b1
12 changed files with 138 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/RenderOptions.java
View File

@@ -3,7 +3,7 @@ package org.lucares.pdb.plot.api;
public class RenderOptions {
private int height;
private int width;
private boolean keyOutside;
private boolean showKey;
private boolean renderLabels;
public int getHeight() {
@@ -22,12 +22,12 @@ public class RenderOptions {
this.width = width;
}
public boolean isKeyOutside() {
return keyOutside;
public boolean isShowKey() {
return showKey;
}
public void setKeyOutside(final boolean keyOutside) {
this.keyOutside = keyOutside;
public void setShowKey(final boolean showKey) {
this.showKey = showKey;
}
public boolean isRenderLabels() {

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

@@ -50,18 +50,16 @@ public class GnuplotFileGenerator implements Appender {
appendln(result, "set nokey");
} else {
if (settings.isKeyOutside()) {
appendfln(result, "set key outside");
} else {
// make sure left and right margins are always the same
// this is need to be able to zoom in by selecting a region
// (horizontal: 1 unit = 10px; vertical: 1 unit = 19px)
appendln(result, "set lmargin 11"); // margin 11 -> 110px
appendln(result, "set rmargin 11"); // margin 11 -> 110px
appendln(result, "set tmargin 3"); // margin 3 -> 57px - marker (1)
appendln(result, "set bmargin 4"); // margin 4 -> 76
if (!settings.isShowKey()) {
appendfln(result, "set nokey");
}
// make sure left and right margins are always the same
// this is need to be able to zoom in by selecting a region
// (horizontal: 1 unit = 10px; vertical: 1 unit = 19px)
appendln(result, "set lmargin 11"); // margin 11 -> 110px
appendln(result, "set rmargin 11"); // margin 11 -> 110px
appendln(result, "set tmargin 3"); // margin 3 -> 57px - marker (1)
appendln(result, "set bmargin 4"); // margin 4 -> 76
}
// appendfln(result, "set xrange [-1:1]");

10
pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java
View File

@@ -30,7 +30,7 @@ public class GnuplotSettings {
private YAxisDefinition y1;
private YAxisDefinition y2;
private AggregateHandlerCollection aggregates;
private boolean keyOutside = false;
private boolean showKey = false;
private AxisSettings xAxisSettings = new AxisSettings();
private boolean renderLabels = true;
@@ -101,12 +101,12 @@ public class GnuplotSettings {
return aggregates;
}
public void setKeyOutside(final boolean keyOutside) {
this.keyOutside = keyOutside;
public void setShowKey(final boolean showKey) {
this.showKey = showKey;
}
public boolean isKeyOutside() {
return keyOutside;
public boolean isShowKey() {
return showKey;
}
public void renderLabels(final boolean renderLabels) {

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

@@ -126,7 +126,7 @@ public class Plotter {
gnuplotSettings.setY1(plotSettings.getY1());
gnuplotSettings.setY2(plotSettings.getY2());
gnuplotSettings.setAggregates(plotSettings.getAggregates());
gnuplotSettings.setKeyOutside(renderOptions.isKeyOutside());
gnuplotSettings.setShowKey(renderOptions.isShowKey());
gnuplotSettings.renderLabels(renderOptions.isRenderLabels());
gnuplot.plot(gnuplotSettings, dataSeries);
}