Author: eallen
Date: 2011-03-23 19:26:32 +0000 (Wed, 23 Mar 2011)
New Revision: 4660
Modified:
trunk/cumin/python/cumin/stat.py
Log:
Remove unused imports
Change the yellow color in the pie charts
Modified: trunk/cumin/python/cumin/stat.py
===================================================================
--- trunk/cumin/python/cumin/stat.py 2011-03-23 14:01:15 UTC (rev 4659)
+++ trunk/cumin/python/cumin/stat.py 2011-03-23 19:26:32 UTC (rev 4660)
@@ -1,20 +1,25 @@
import cStringIO
+import logging
+from datetime import datetime, timedelta
+from time import time
-from math import sqrt
-from mint import *
-from random import randint
-from wooly import *
-from wooly.widgets import *
+from wooly import Widget, Page, Parameter, Attribute
+from wooly.util import StringCatalog, escape_entity, Writer
+from wooly.widgets import ItemSet
+from wooly.pages import HtmlPage
+from wooly.parameters import IntegerParameter, ListParameter, StringParameter,\
+ BooleanParameter
-from widgets import *
-from parameters import *
-from util import *
-from formats import *
-from model import *
+from cumin.formats import fmt_bytes, fmt_duration_brief
+from cumin.model import CuminStatistic, SamplesSqlAdapter
+from cumin.widgets import StateSwitch
+from wooly.template import WidgetTemplate
+from cumin.charts import CuminPieChart, TimeSeriesChart, StackedValueChart
+from cumin.util import calc_rate, secs, nvl
+from cumin.OpenFlashChart import Element, Chart
-from OpenFlashChart import Chart, Element
-
strings = StringCatalog(__file__)
+log = logging.getLogger("cumin.stat")
class StatSet(ItemSet):
def __init__(self, app, name, object):
@@ -93,11 +98,11 @@
return zip(self.stats, self.get_values(session))
def render_item_title(self, session, item):
- stat, value = item
+ stat, _ = item
return stat.get_title(session)
def render_item_name(self, session, item):
- stat, value = item
+ stat, _ = item
return stat.name
def render_item_value(self, session, item):
@@ -270,10 +275,10 @@
"greens": [(0,1,0), (.9,1,.9), (.6,1,.6), (.3,.6,.3),
(0,.5,0)],
"blues": [(0,0,1), (.9,.9,1), (.6,.6,1), (.3,.3,.6),
(0,0,.5)],
"group2": [(0,0,1), (.6,.6,1),
- (1,1,0), (1,1,.6),
(1,0,1), (1,.6,1),
(0,1,1), (.6,1,1),
(1,0,0), (1,.6,.6),
+ (.6,.6,0), (.3,.3,0),
(0,1,0), (.6,1,.6)],
"blank": [(1,1,1), (1,1,1), (1,1,1), (1,1,1)]}