Merge lp:~zack-krejci/sahana-eden/adpc into lp:~michael-howden/sahana-eden/adpc

Proposed by Zack
Status: Merged
Merged at revision: 831
Proposed branch: lp:~zack-krejci/sahana-eden/adpc
Merge into: lp:~michael-howden/sahana-eden/adpc
Diff against target: 107 lines (+31/-4)
6 files modified
models/000_config.py (+2/-2)
models/drrpp.py (+3/-0)
modules/savage/graph/__init__.py (+2/-0)
modules/savage/graph/axes.py (+5/-1)
modules/savage/graph/base.py (+19/-0)
views/drrpp/savage.html (+0/-1)
To merge this branch: bzr merge lp:~zack-krejci/sahana-eden/adpc
Reviewer Review Type Date Requested Status
Michael Howden Pending
Review via email: mp+42066@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'models/000_config.py'
--- models/000_config.py 2010-11-16 07:12:00 +0000
+++ models/000_config.py 2010-11-28 23:01:42 +0000
@@ -14,8 +14,8 @@
14deployment_settings.database.db_type = "mysql"14deployment_settings.database.db_type = "mysql"
15deployment_settings.database.host = "localhost"15deployment_settings.database.host = "localhost"
16deployment_settings.database.port = "" # use default16deployment_settings.database.port = "" # use default
17#deployment_settings.database.database = "drrpp_blank"17deployment_settings.database.database = "drrpp_blank"
18deployment_settings.database.database = "drrp_prod"18#deployment_settings.database.database = "drrp_prod"
19deployment_settings.database.username = "root"19deployment_settings.database.username = "root"
20deployment_settings.database.password = "1234"20deployment_settings.database.password = "1234"
21deployment_settings.database.pool_size = 521deployment_settings.database.pool_size = 5
2222
=== modified file 'models/drrpp.py'
--- models/drrpp.py 2010-11-17 04:19:03 +0000
+++ models/drrpp.py 2010-11-28 23:01:42 +0000
@@ -2255,6 +2255,9 @@
2255 bar.addGroup (f, valueList, sub_keys)2255 bar.addGroup (f, valueList, sub_keys)
22562256
2257 if not noResults:2257 if not noResults:
2258
2259 caption_strings = map (' '.join, filter_strings)
2260 bar.addCaption (caption_strings)
2258 if title:2261 if title:
2259 bar.setTitle (title)2262 bar.setTitle (title)
2260 if xlabel:2263 if xlabel:
22612264
=== modified file 'modules/savage/graph/__init__.py'
--- modules/savage/graph/__init__.py 2010-10-28 13:29:12 +0000
+++ modules/savage/graph/__init__.py 2010-11-28 23:01:42 +0000
@@ -243,6 +243,8 @@
243 sizes (child.height)243 sizes (child.height)
244 ticks.append (child.x + child.width / 2.0)244 ticks.append (child.x + child.width / 2.0)
245 labels.append (child.xml['data'])245 labels.append (child.xml['data'])
246 if self.settings.xinc:
247 xaxis.increment (self.settings.xinc)
246 xaxis.createTicks (ticks)248 xaxis.createTicks (ticks)
247 xaxis.setText (map (str, labels))249 xaxis.setText (map (str, labels))
248 xaxis.drawTicks ()250 xaxis.drawTicks ()
249251
=== modified file 'modules/savage/graph/axes.py'
--- modules/savage/graph/axes.py 2010-10-20 06:28:05 +0000
+++ modules/savage/graph/axes.py 2010-11-28 23:01:42 +0000
@@ -65,7 +65,11 @@
65 incr -= 165 incr -= 1
66 elif len (ticks) < 5:66 elif len (ticks) < 5:
67 div = 267 div = 2
68 return float (pow (10, incr)) / div68 inc = float (pow (10, incr)) / div
69 if inc < 1:
70 return float (pow (10, incr))
71 else:
72 return inc
6973
70 def setText (self, text=None):74 def setText (self, text=None):
71 if text:75 if text:
7276
=== modified file 'modules/savage/graph/base.py'
--- modules/savage/graph/base.py 2010-10-29 21:38:42 +0000
+++ modules/savage/graph/base.py 2010-11-28 23:01:42 +0000
@@ -294,6 +294,23 @@
294 self.canvas.move (deltaX, 0)294 self.canvas.move (deltaX, 0)
295 self.canvas.changeSize (-deltaX, 0)295 self.canvas.changeSize (-deltaX, 0)
296296
297 def addCaption (self, textList):
298 box = Canvas ()
299 current = 0
300 for text in textList:
301 t = Text (text = text,
302 y = current,
303 textHeight = 6,
304 lineLength = self.settings.width,
305 direction = 'forward')
306 box.draw (t)
307 current += t.height
308 box.y = self.settings.height - current - 10
309 canvasChange = -current - 10
310 self.canvas.move (0, -canvasChange)
311 self.canvas.changeSize (0, canvasChange)
312 self.draw (box)
313
297 def addSubtitle (self, text):314 def addSubtitle (self, text):
298 t = Text (text = text,315 t = Text (text = text,
299 x = self.settings.width - 5,316 x = self.settings.width - 5,
@@ -386,6 +403,8 @@
386 addAttr (settings, 'yAxisTextHeight', float, 6.0)403 addAttr (settings, 'yAxisTextHeight', float, 6.0)
387 addAttr (settings, 'y2AxisTextHeight', float, 6.0) 404 addAttr (settings, 'y2AxisTextHeight', float, 6.0)
388405
406 addAttr (settings, 'xinc', float, False)
407
389 addAttr (settings, 'bg', boolean, True)408 addAttr (settings, 'bg', boolean, True)
390 addAttr (settings, 'bgBarDir', str, 'horizontal')409 addAttr (settings, 'bgBarDir', str, 'horizontal')
391 addAttr (settings, 'bgBars', int, 6)410 addAttr (settings, 'bgBars', int, 6)
392411
=== modified file 'views/drrpp/savage.html'
--- views/drrpp/savage.html 2010-11-02 19:15:31 +0000
+++ views/drrpp/savage.html 2010-11-28 23:01:42 +0000
@@ -257,7 +257,6 @@
257 document.addEventListener ('mousemove', updateTooltipPos, false);257 document.addEventListener ('mousemove', updateTooltipPos, false);
258 }258 }
259 addHighlight (root);259 addHighlight (root);
260 root.addEventListener ('dblclick', function () { alert ("Click"); }, false);
261 }, false);260 }, false);
262261
263 function Mouse () {262 function Mouse () {

Subscribers

People subscribed via source and target branches