Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New style options #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

New style options #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b18ecc8
Added colorization option + gnuplot styling
Jan 21, 2013
d9d874d
Added Cairo as an option instead of hard-coded
Jan 21, 2013
1708e22
Added fontscale, removed enhanced
Jan 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 51 additions & 8 deletions src/graph/Plot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,23 @@ private void writeGnuplotScript(final String basepath,
final String script_path = basepath + ".gnuplot";
final PrintWriter gp = new PrintWriter(script_path);
try {
// XXX don't hardcode all those settings. At least not like that.
gp.append("set term png small size ")
// Why the fuck didn't they also add methods for numbers?
.append(Short.toString(width)).append(",")
.append(Short.toString(height));
final String smooth = params.remove("smooth");
final String brewer = params.remove("brewer");
final String fgcolor = params.remove("fgcolor");
String bgcolor = params.remove("bgcolor");
String cairo = params.remove("cairo");
if (cairo != null) {
// XXX don't hardcode all those settings. At least not like that.
gp.append("set term pngcairo fontscale 0.5 rounded size ")
// Why the fuck didn't they also add methods for numbers?
.append(Short.toString(width)).append(",")
.append(Short.toString(height));
} else {
gp.append("set term png small size ")
.append(Short.toString(width)).append(",")
.append(Short.toString(height));
}

if (fgcolor != null && bgcolor == null) {
// We can't specify a fgcolor without specifying a bgcolor.
bgcolor = "xFFFFFF"; // So use a default.
Expand All @@ -259,7 +268,17 @@ private void writeGnuplotScript(final String basepath,
if (fgcolor != null) {
gp.append(' ').append(fgcolor);
}

if (cairo != null) {
// Beautifications - Jeremy
gp.append("\n"
+ "set font \"Sans,14\"\n"
+ "set style line 80 lt rgb \"#808080\"\n"
+ "set style line 81 lt 0\n"
+ "set style line 81 lt rgb \"#808080\"\n"
+ "set border 3 back linestyle 80\n"
+ "set xtics nomirror\n"
+ "set ytics nomirror\n");
}
gp.append("\n"
+ "set xdata time\n"
+ "set timefmt \"%s\"\n"
Expand All @@ -275,8 +294,12 @@ private void writeGnuplotScript(final String basepath,
}
final int nseries = datapoints.size();
if (nseries > 0) {
gp.write("set grid\n"
+ "set style data linespoints\n");
if (cairo != null) {
gp.write("set grid back linestyle 81\n");
} else {
gp.write("set grid\n");
}
gp.write("set style data linespoints\n");
if (!params.containsKey("key")) {
gp.write("set key right box\n");
}
Expand Down Expand Up @@ -306,6 +329,26 @@ private void writeGnuplotScript(final String basepath,
break;
}
}
if (brewer != null) {
gp.append("set style line 1 linecolor rgbcolor \"#7297E6\" linewidth 1 pt 7\n");
gp.append("set style line 2 linecolor rgbcolor \"#67EB84\" linewidth 1 pt 5\n");
gp.append("set style line 3 linecolor rgbcolor \"#F97A6D\" linewidth 1 pt 9\n");
gp.append("set style line 4 linecolor rgbcolor \"#F9C96D\" linewidth 1 pt 13\n");
gp.append("set style line 5 linecolor rgbcolor \"#1D4599\" linewidth 1 pt 11\n");
gp.append("set style line 6 linecolor rgbcolor \"#11AD34\" linewidth 1 pt 7\n");
gp.append("set style line 7 linecolor rgbcolor \"#E62B17\" linewidth 1 pt 5\n");
gp.append("set style line 8 linecolor rgbcolor \"#E69F17\" linewidth 1 pt 9\n");
gp.append("set style line 9 linecolor rgbcolor \"#2F3F60\" linewidth 1 pt 13\n");
gp.append("set style line 10 linecolor rgbcolor \"#2F6C3D\" linewidth 1 pt 11\n");
gp.append("set style line 11 linecolor rgbcolor \"#8F463F\" linewidth 1 pt 7\n");
gp.append("set style line 12 linecolor rgbcolor \"#8F743F\" linewidth 1 pt 5\n");
gp.append("set style line 13 linecolor rgbcolor \"#031A49\" linewidth 1 pt 9\n");
gp.append("set style line 14 linecolor rgbcolor \"#025214\" linewidth 1 pt 13\n");
gp.append("set style line 15 linecolor rgbcolor \"#6D0D03\" linewidth 1 pt 11\n");
gp.append("set style line 16 linecolor rgbcolor \"#6D4903\" linewidth 1 pt 7\n");
gp.append("set style line 17 linecolor rgbcolor \"#224499\" linewidth 1 pt 5\n");
gp.append("set style increment user\n");
}

gp.write("plot ");
for (int i = 0; i < nseries; i++) {
Expand Down
6 changes: 6 additions & 0 deletions src/tsd/GraphHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,12 @@ static void setPlotParams(final HttpQuery query, final Plot plot) {
if ((value = popParam(querystring, "smooth")) != null) {
params.put("smooth", value);
}
if ((value = popParam(querystring, "brewer")) != null) {
params.put("brewer", value);
}
if ((value = popParam(querystring, "cairo")) != null) {
params.put("cairo", value);
}
// This must remain after the previous `if' in order to properly override
// any previous `key' parameter if a `nokey' parameter is given.
if ((value = popParam(querystring, "nokey")) != null) {
Expand Down
16 changes: 16 additions & 0 deletions src/tsd/client/QueryUi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ public class QueryUi implements EntryPoint, HistoryListener {

// Styling options.
private final CheckBox smooth = new CheckBox();
private final CheckBox brewer = new CheckBox();
private final CheckBox cairo = new CheckBox();

/**
* Handles every change to the query form and gets a new graph.
Expand Down Expand Up @@ -255,6 +257,8 @@ public void onValueChange(final ValueChangeEvent<Date> event) {
keybox.addClickHandler(refreshgraph);
nokey.addClickHandler(refreshgraph);
smooth.addClickHandler(refreshgraph);
brewer.addClickHandler(refreshgraph);
cairo.addClickHandler(refreshgraph);

yrange.setValidationRegexp("^(" // Nothing or
+ "|\\[([-+.0-9eE]+|\\*)?" // "[start
Expand Down Expand Up @@ -441,6 +445,10 @@ private Grid makeStylePanel() {
final Grid grid = new Grid(5, 3);
grid.setText(0, 1, "Smooth");
grid.setWidget(0, 2, smooth);
grid.setText(1, 1, "Brewer");
grid.setWidget(1, 2, brewer);
grid.setText(2, 1, "Cairo");
grid.setWidget(2, 2, cairo);
return grid;
}

Expand Down Expand Up @@ -793,6 +801,8 @@ private void refreshFromQueryString() {
}
nokey.setValue(qs.containsKey("nokey"));
smooth.setValue(qs.containsKey("smooth"));
brewer.setValue(qs.containsKey("brewer"));
cairo.setValue(qs.containsKey("cairo"));
}

private void refreshGraph() {
Expand Down Expand Up @@ -848,6 +858,12 @@ private void refreshGraph() {
if (smooth.getValue()) {
url.append("&smooth=csplines");
}
if (brewer.getValue()) {
url.append("&brewer=true");
}
if (cairo.getValue()) {
url.append("&cairo=true");
}
final String uri = url.toString();
if (uri.equals(lastgraphuri)) {
return; // Don't re-request the same graph.
Expand Down