Author: tmckay
Date: 2011-07-22 19:26:57 +0000 (Fri, 22 Jul 2011)
New Revision: 4887
Modified:
branches/clarity/cumin/python/cumin/stat.py
Log:
Merge fixes from trunk
BZ709477
BZ724946
(svn merge -r 4881:4883
svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .)
Modified: branches/clarity/cumin/python/cumin/stat.py
===================================================================
--- branches/clarity/cumin/python/cumin/stat.py 2011-07-22 19:10:33 UTC (rev 4886)
+++ branches/clarity/cumin/python/cumin/stat.py 2011-07-22 19:26:57 UTC (rev 4887)
@@ -1183,7 +1183,7 @@
self.alpha = 1
- def get_max_min(self, session, stats, samples):
+ def get_max_min(self, session, stats, samples, time_span, end_seconds_ago):
max_value = 0
min_value = 0
points = dict()
@@ -1321,8 +1321,8 @@
return chart_obj
class PercentAreaChart(AreaChart):
- def get_max_min(self, session, stats, samples):
- max_val, min_val = super(PercentAreaChart, self).get_max_min(session, stats,
samples)
+ def get_max_min(self, session, stats, samples, time_span, end_seconds_ago):
+ max_val, min_val = super(PercentAreaChart, self).get_max_min(session, stats,
samples, time_span, end_seconds_ago)
percent = self.page.percent_property.get(session)
total = self.page.get_object_property(session, percent)