Author: justi9 Date: 2007-10-22 11:49:12 -0400 (Mon, 22 Oct 2007) New Revision: 1136 Added: mgmt/cumin/python/cumin/measurement.py mgmt/cumin/python/cumin/measurement.strings Modified: mgmt/cumin/python/cumin/queue.py mgmt/cumin/python/cumin/queue.strings Log: Moves the measurement widgets to their own file so we can use them for exchange stats. Added: mgmt/cumin/python/cumin/measurement.py =================================================================== --- mgmt/cumin/python/cumin/measurement.py (rev 0) +++ mgmt/cumin/python/cumin/measurement.py 2007-10-22 15:49:12 UTC (rev 1136) @@ -0,0 +1,38 @@ +from wooly import * +from wooly.widgets import * + +from widgets import * +from parameters import * +from util import * + +strings = StringCatalog(__file__) + +class MeasurementSet(ItemSet): + def __init__(self, app, name, category): + super(MeasurementSet, self).__init__(app, name) + + self.category = category + + def get_items(self, session, queue): + measures = list(queue.measurements) + + for measure in queue.measurements: + if self.category not in measure.categories: + measures.remove(measure) + + return measures + + def render_item_title(self, session, measure): + return measure.title + + def render_item_value(self, session, measure): + return measure.get_value() + + def render_item_high(self, session, measure): + return measure.get_high() + + def render_item_low(self, session, measure): + return measure.get_low() + + def render_item_average(self, session, measure): + return "%0.2f" % (sum(measure.values) / float(len(measure.values))) Added: mgmt/cumin/python/cumin/measurement.strings =================================================================== --- mgmt/cumin/python/cumin/measurement.strings (rev 0) +++ mgmt/cumin/python/cumin/measurement.strings 2007-10-22 15:49:12 UTC (rev 1136) @@ -0,0 +1,33 @@ +[MeasurementSet.css] +table.MeasurementSet td, table.MeasurementSet th { + text-align: right; +} + +table.MeasurementSet th.label { + text-align: left; +} + +[MeasurementSet.html] +<table class="MeasurementSet mobjects"> + <col class="name"/> + <col class="data"/> + <col class="data"/> + <col class="data"/> + + <tr> + <th class="label">Statistic</th> + <th>Current</th> + <th>High</th> + <th>Low</th> + </tr> + + {items} +</table> + +[MeasurementSet.item_html] +<tr> + <th class="label">{item_title}</th> + <td>{item_value}</td> + <td>{item_high}</td> + <td>{item_low}</td> +</tr> Modified: mgmt/cumin/python/cumin/queue.py =================================================================== --- mgmt/cumin/python/cumin/queue.py 2007-10-22 15:24:17 UTC (rev 1135) +++ mgmt/cumin/python/cumin/queue.py 2007-10-22 15:49:12 UTC (rev 1136) @@ -4,6 +4,7 @@ from wooly.resources import * from exchange import ExchangeInputSet +from measurement import * from widgets import * from parameters import * from util import * @@ -340,36 +341,6 @@ def render_cancel_content(self, session, binding): return "No, Cancel" -class MeasurementSet(ItemSet): - def __init__(self, app, name, category): - super(MeasurementSet, self).__init__(app, name) - - self.category = category - - def get_items(self, session, queue): - measures = list(queue.measurements) - - for measure in queue.measurements: - if self.category not in measure.categories: - measures.remove(measure) - - return measures - - def render_item_title(self, session, measure): - return measure.title - - def render_item_value(self, session, measure): - return measure.get_value() - - def render_item_high(self, session, measure): - return measure.get_high() - - def render_item_low(self, session, measure): - return measure.get_low() - - def render_item_average(self, session, measure): - return "%0.2f" % (sum(measure.values) / float(len(measure.values))) - class QueueStatistics(TabSet): def __init__(self, app, name): super(QueueStatistics, self).__init__(app, name) Modified: mgmt/cumin/python/cumin/queue.strings =================================================================== --- mgmt/cumin/python/cumin/queue.strings 2007-10-22 15:24:17 UTC (rev 1135) +++ mgmt/cumin/python/cumin/queue.strings 2007-10-22 15:49:12 UTC (rev 1136) @@ -191,37 +191,3 @@ </td> </tr> </table> - -[MeasurementSet.css] -table.MeasurementSet td, table.MeasurementSet th { - text-align: right; -} - -table.MeasurementSet th.label { - text-align: left; -} - -[MeasurementSet.html] -<table class="MeasurementSet mobjects"> - <col class="name"/> - <col class="data"/> - <col class="data"/> - <col class="data"/> - - <tr> - <th class="label">Statistic</th> - <th>Current</th> - <th>High</th> - <th>Low</th> - </tr> - - {items} -</table> - -[MeasurementSet.item_html] -<tr> - <th class="label">{item_title}</th> - <td>{item_value}</td> - <td>{item_high}</td> - <td>{item_low}</td> -</tr> \ No newline at end of file