From 242c83e5901333597c000deaf3619f77cf450770 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sun, 8 Sep 2019 08:34:14 +0200 Subject: [PATCH] extract constants for gnuplot margins in px --- .../org/lucares/recommind/logs/GnuplotFileGenerator.java | 9 ++------- .../java/org/lucares/recommind/logs/GnuplotSettings.java | 7 +++++++ 2 files changed, 9 insertions(+), 7 deletions(-) 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 9ec413d..58cf889 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 @@ -197,17 +197,12 @@ public class GnuplotFileGenerator { final StringBuilder result = new StringBuilder(); appendfln(result, "set ylabel \"%s\"", "Duration"); - final long plotHeight = height - 133; // sum of top/bottom margin, see marker (1) + final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN; // sum of top/bottom margin, see + // marker (1) final long maxLabels = plotHeight / (TICKS_FONT_SIZE * 5); - System.out.println("labels: " + maxLabels); final long range = yRangeMax - yRangeMin; final long msPerLabel = roundToLinearLabelSteps(range / maxLabels); - final long digits = (long) Math.ceil(Math.log10(msPerLabel)); - - System.out.println("range: " + range); - System.out.println("msPerLabel: " + msPerLabel); - System.out.println("digits: " + digits); final List ticsLabels = new ArrayList<>(); for (long i = yRangeMin; i <= yRangeMax; i += msPerLabel) { diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java index 33e9973..fb7cd07 100644 --- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java +++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java @@ -6,6 +6,13 @@ import org.lucares.pdb.plot.api.AggregateHandler; import org.lucares.pdb.plot.api.AxisScale; public class GnuplotSettings { + + public final static int GNUPLOT_LEFT_MARGIN = 110; // The left margin configured for gnuplot + public final static int GNUPLOT_RIGHT_MARGIN = 110; // The right margin configured for gnuplot + public final static int GNUPLOT_TOP_MARGIN = 57; // The top margin configured for gnuplot + public final static int GNUPLOT_BOTTOM_MARGIN = 76; // The bottom margin configured for gnuplot + public final static int GNUPLOT_TOP_BOTTOM_MARGIN = GNUPLOT_TOP_MARGIN + GNUPLOT_BOTTOM_MARGIN; + private String terminal = "png"; private int height = 1200; private int width = 1600;