From: Michael Tremer Date: Mon, 14 Dec 2015 00:11:58 +0000 (+0100) Subject: Allow generating thumbnails of graph images X-Git-Url: http://git.ipfire.org/?p=collecty.git;a=commitdiff_plain;h=edf268c75aa34fd8f816e19e06c91c610a65272d;hp=ca8a6cfa8410a3ea36d373124afb3b6cf731382f Allow generating thumbnails of graph images Signed-off-by: Michael Tremer --- diff --git a/src/collecty/constants.py b/src/collecty/constants.py index e07ce4c..bae6ed4 100644 --- a/src/collecty/constants.py +++ b/src/collecty/constants.py @@ -57,3 +57,6 @@ GRAPH_DEFAULT_ARGUMENTS = ( GRAPH_DEFAULT_WIDTH = 768 GRAPH_DEFAULT_HEIGHT = 480 + +THUMBNAIL_DEFAULT_WIDTH = 80 +THUMBNAIL_DEFAULT_HEIGHT = 20 diff --git a/src/collecty/plugins/base.py b/src/collecty/plugins/base.py index 7a61316..ec91599 100644 --- a/src/collecty/plugins/base.py +++ b/src/collecty/plugins/base.py @@ -516,15 +516,23 @@ class GraphTemplate(object): return self.plugin.log def _make_command_line(self, interval, format=DEFAULT_IMAGE_FORMAT, - width=None, height=None, with_title=True): - args = [] + width=None, height=None, with_title=True, thumbnail=False): + args = [e for e in GRAPH_DEFAULT_ARGUMENTS] - args += GRAPH_DEFAULT_ARGUMENTS + # Set the default dimensions + default_height, default_width = GRAPH_DEFAULT_HEIGHT, GRAPH_DEFAULT_WIDTH + + # A thumbnail doesn't have a legend and other labels + if thumbnail: + args.append("--only-graph") + + default_height = THUMBNAIL_DEFAULT_HEIGHT + default_width = THUMBNAIL_DEFAULT_WIDTH args += [ "--imgformat", format, - "--height", "%s" % (height or self.height), - "--width", "%s" % (width or self.width), + "--height", "%s" % (height or default_height), + "--width", "%s" % (width or default_width), ] args += self.rrd_graph_args