From 5f57633987ae8dcfcd62180739a79e7a041fa1f9 Mon Sep 17 00:00:00 2001 From: Jordi Sanfeliu Date: Tue, 3 Feb 2015 16:18:30 +0100 Subject: [PATCH] Zoomed graphs in 'raspberrypi.pm' now honour the 'global_zoom' option, and they also use the function RRDs::graphv to fit better in the browser pop up window (only for RRDtool v1.3+) --- lib/raspberrypi.pm | 52 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/lib/raspberrypi.pm b/lib/raspberrypi.pm index 5d0cc32..aa65c84 100644 --- a/lib/raspberrypi.pm +++ b/lib/raspberrypi.pm @@ -213,6 +213,15 @@ sub raspberrypi_cgi { my $graph = $cgi->{graph}; my $silent = $cgi->{silent}; my $zoom = "--zoom=" . $config->{global_zoom}; + my %rrd = ( + 'new' => \&RRDs::graphv, + 'old' => \&RRDs::graph, + ); + my $version = "new"; + my $pic; + my $picz; + my $picz_width; + my $picz_height; my $u = ""; my $width; @@ -236,6 +245,7 @@ sub raspberrypi_cgi { "#444444", ); + $version = "old" if $RRDs::VERSION < 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $PNG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -391,7 +401,7 @@ sub raspberrypi_cgi { push(@tmp, "COMMENT: \\n"); push(@tmp, "COMMENT: \\n"); } - RRDs::graph("$PNG_DIR" . "$PNG1", + $pic = $rrd{$version}->("$PNG_DIR" . "$PNG1", "--title=$config->{graphs}->{_raspberrypi1} ($tf->{nwhen}$tf->{twhen})", "--start=-$tf->{nwhen}$tf->{twhen}", "--imgformat=PNG", @@ -418,7 +428,7 @@ sub raspberrypi_cgi { print("ERROR: while graphing $PNG_DIR" . "$PNG1: $err\n") if $err; if(lc($config->{enable_zoom}) eq "y") { ($width, $height) = split('x', $config->{graph_size}->{zoom}); - RRDs::graph("$PNG_DIR" . "$PNG1z", + $picz = $rrd{$version}->("$PNG_DIR" . "$PNG1z", "--title=$config->{graphs}->{_raspberrypi1} ($tf->{nwhen}$tf->{twhen})", "--start=-$tf->{nwhen}$tf->{twhen}", "--imgformat=PNG", @@ -426,6 +436,7 @@ sub raspberrypi_cgi { "--width=$width", "--height=$height", @riglim, + $zoom, @{$cgi->{version12}}, @{$colors->{graph_colors}}, "DEF:clock0=$rrd:rpi_clock0:AVERAGE", @@ -449,7 +460,14 @@ sub raspberrypi_cgi { print(" {url} . "/" . $config->{imgs_dir} . $PNG1z . "\">\n"); } else { - print(" {url} . "/" . $config->{imgs_dir} . $PNG1z . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\">\n"); + if($version eq "new") { + $picz_width = $picz->{image_width} * $config->{global_zoom}; + $picz_height = $picz->{image_height} * $config->{global_zoom}; + } else { + $picz_width = $width + 115; + $picz_height = $height + 100; + } + print(" {url} . "/" . $config->{imgs_dir} . $PNG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); } } else { print(" \n"); @@ -487,7 +505,7 @@ sub raspberrypi_cgi { push(@tmp, "COMMENT: \\n"); push(@tmp, "COMMENT: \\n"); } - RRDs::graph("$PNG_DIR" . "$PNG2", + $pic = $rrd{$version}->("$PNG_DIR" . "$PNG2", "--title=$config->{graphs}->{_raspberrypi2} ($tf->{nwhen}$tf->{twhen})", "--start=-$tf->{nwhen}$tf->{twhen}", "--imgformat=PNG", @@ -507,7 +525,7 @@ sub raspberrypi_cgi { print("ERROR: while graphing $PNG_DIR" . "$PNG2: $err\n") if $err; if(lc($config->{enable_zoom}) eq "y") { ($width, $height) = split('x', $config->{graph_size}->{zoom}); - RRDs::graph("$PNG_DIR" . "$PNG2z", + $picz = $rrd{$version}->("$PNG_DIR" . "$PNG2z", "--title=$config->{graphs}->{_raspberrypi2} ($tf->{nwhen}$tf->{twhen})", "--start=-$tf->{nwhen}$tf->{twhen}", "--imgformat=PNG", @@ -515,6 +533,7 @@ sub raspberrypi_cgi { "--width=$width", "--height=$height", @riglim, + $zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -531,7 +550,14 @@ sub raspberrypi_cgi { print(" {url} . "/" . $config->{imgs_dir} . $PNG2z . "\">\n"); } else { - print(" {url} . "/" . $config->{imgs_dir} . $PNG2z . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\">\n"); + if($version eq "new") { + $picz_width = $picz->{image_width} * $config->{global_zoom}; + $picz_height = $picz->{image_height} * $config->{global_zoom}; + } else { + $picz_width = $width + 115; + $picz_height = $height + 100; + } + print(" {url} . "/" . $config->{imgs_dir} . $PNG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); } } else { print(" \n"); @@ -568,7 +594,7 @@ sub raspberrypi_cgi { push(@tmp, "COMMENT: \\n"); push(@tmp, "COMMENT: \\n"); } - RRDs::graph("$PNG_DIR" . "$PNG3", + $pic = $rrd{$version}->("$PNG_DIR" . "$PNG3", "--title=$config->{graphs}->{_raspberrypi3} ($tf->{nwhen}$tf->{twhen})", "--start=-$tf->{nwhen}$tf->{twhen}", "--imgformat=PNG", @@ -591,7 +617,7 @@ sub raspberrypi_cgi { print("ERROR: while graphing $PNG_DIR" . "$PNG3: $err\n") if $err; if(lc($config->{enable_zoom}) eq "y") { ($width, $height) = split('x', $config->{graph_size}->{zoom}); - RRDs::graph("$PNG_DIR" . "$PNG3z", + $picz = $rrd{$version}->("$PNG_DIR" . "$PNG3z", "--title=$config->{graphs}->{_raspberrypi3} ($tf->{nwhen}$tf->{twhen})", "--start=-$tf->{nwhen}$tf->{twhen}", "--imgformat=PNG", @@ -599,6 +625,7 @@ sub raspberrypi_cgi { "--width=$width", "--height=$height", @riglim, + $zoom, @{$cgi->{version12}}, @{$cgi->{version12_small}}, @{$colors->{graph_colors}}, @@ -618,7 +645,14 @@ sub raspberrypi_cgi { print(" {url} . "/" . $config->{imgs_dir} . $PNG3z . "\">\n"); } else { - print(" {url} . "/" . $config->{imgs_dir} . $PNG3z . "','','width=" . ($width + 115) . ",height=" . ($height + 100) . ",scrollbars=0,resizable=0'))\">\n"); + if($version eq "new") { + $picz_width = $picz->{image_width} * $config->{global_zoom}; + $picz_height = $picz->{image_height} * $config->{global_zoom}; + } else { + $picz_width = $width + 115; + $picz_height = $height + 100; + } + print(" {url} . "/" . $config->{imgs_dir} . $PNG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); } } else { print(" \n");