diff options
author | jim-p <jimp@pfsense.org> | 2010-10-11 17:10:35 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2010-10-11 17:10:35 -0400 |
commit | 9228de6c4d231ab1325014e8341f5d0f981a0af0 (patch) | |
tree | 58055cb0e6fa81e13f2bc837d67d711cb2826787 | |
parent | 719dcffb6e6bef6e911fe570067699917cccbc84 (diff) | |
download | pfsense-9228de6c4d231ab1325014e8341f5d0f981a0af0.zip pfsense-9228de6c4d231ab1325014e8341f5d0f981a0af0.tar.gz |
Fix graph staggering, the old method was causing the graphs to diverge in update intervals over time.
-rwxr-xr-x | usr/local/www/graph.php | 9 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/traffic_graphs.widget.php | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/usr/local/www/graph.php b/usr/local/www/graph.php index 964c2c7..14af862 100755 --- a/usr/local/www/graph.php +++ b/usr/local/www/graph.php @@ -61,6 +61,11 @@ if ($_GET["timeint"]) else $time_interval = 3; +if ($_GET["initdelay"]) + $init_delay = $_GET["initdelay"]; //Initial Delay +else + $init_delay = 3; + //SVG attributes $attribs['axis']='fill="black" stroke="black"'; $attribs['in']='fill="#FF0000" font-family="Tahoma, Verdana, Arial, Helvetica, sans-serif" font-size="7"'; @@ -229,13 +234,13 @@ function plot_data(obj) { last_ugmt = ugmt; last_ifin = ifin; last_ifout = ifout; - + var graphTimerId = 0; switch (plot_in.length) { case 0: SVGDoc.getElementById("collect_initial").setAttributeNS(null, 'visibility', 'visible'); plot_in[0] = diff_ifin / diff_ugmt; plot_out[0] = diff_ifout / diff_ugmt; - setTimeout('fetch_data()',<?=1000*$time_interval?>); + setTimeout('fetch_data()',<?=1000*($time_interval + $init_delay)?>); return; case 1: SVGDoc.getElementById("collect_initial").setAttributeNS(null, 'visibility', 'hidden'); diff --git a/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/usr/local/www/widgets/widgets/traffic_graphs.widget.php index 12e5196..bcc2298 100644 --- a/usr/local/www/widgets/widgets/traffic_graphs.widget.php +++ b/usr/local/www/widgets/widgets/traffic_graphs.widget.php @@ -80,7 +80,6 @@ Refresh Interval: </script> <?php - foreach ($ifdescrs as $ifdescr => $ifname) { $ifinfo = get_interface_info($ifdescr); $currentgraph = $showngraphlist[$graphcounter]; @@ -112,7 +111,6 @@ Refresh Interval: } } - if ($ifinfo['status'] != "down") { ?> <div id="<?=$ifname;?>trafficdiv" style="padding: 5px"> @@ -128,8 +126,7 @@ Refresh Interval: <div style="clear:both;"></div> </div> <div id="<?=$ifname;?>graphdiv" style="display:<?php echo $graphdisplay;?>"> - <?php $refreshInterval = $refreshInterval + 3 ?> - <embed id="graph" src="graph.php?ifnum=<?=$ifdescr;?>&ifname=<?=rawurlencode($ifname);?>&timeint=<?=$refreshInterval;?>" type="image/svg+xml" width="<? echo $width; ?>" height="<? echo $height; ?>" pluginspage="http://www.adobe.com/svg/viewer/install/auto" /> + <embed id="graph" src="graph.php?ifnum=<?=$ifdescr;?>&ifname=<?=rawurlencode($ifname);?>&timeint=<?=$refreshInterval;?>&initdelay=<?=($graphcounter+1) * 2;?>" type="image/svg+xml" width="<? echo $width; ?>" height="<? echo $height; ?>" pluginspage="http://www.adobe.com/svg/viewer/install/auto" /> </div> <? $firstgraphshown = true; $graphcounter++; ?> </div> |