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

[Zack]

=== 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 @@
 deployment_settings.database.db_type = "mysql"
 deployment_settings.database.host = "localhost"
 deployment_settings.database.port = "" # use default
-#deployment_settings.database.database = "drrpp_blank"
-deployment_settings.database.database = "drrp_prod"
+deployment_settings.database.database = "drrpp_blank"
+#deployment_settings.database.database = "drrp_prod"
 deployment_settings.database.username = "root"
 deployment_settings.database.password = "1234"
 deployment_settings.database.pool_size = 5

=== 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 @@
                 bar.addGroup (f, valueList, sub_keys)
 
     if not noResults:
+        
+        caption_strings = map (' '.join, filter_strings)
+        bar.addCaption (caption_strings)
         if title:
             bar.setTitle (title)
         if xlabel:

=== 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 @@
                     sizes (child.height)
                     ticks.append (child.x + child.width / 2.0)
                     labels.append (child.xml['data'])
+            if self.settings.xinc:
+                xaxis.increment (self.settings.xinc)
             xaxis.createTicks (ticks)
             xaxis.setText (map (str, labels))
             xaxis.drawTicks ()

=== 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 @@
             incr -= 1
         elif len (ticks) < 5:
             div = 2
-        return float (pow (10, incr)) / div
+        inc = float (pow (10, incr)) / div
+        if inc < 1:
+            return float (pow (10, incr))
+        else:
+            return inc
 
     def setText (self, text=None):
         if text:

=== 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 @@
             self.canvas.move (deltaX, 0)
             self.canvas.changeSize (-deltaX, 0)
 
+    def addCaption (self, textList):
+        box = Canvas ()
+        current = 0
+        for text in textList:
+            t = Text (text = text, 
+                      y = current,
+                      textHeight = 6,
+                      lineLength = self.settings.width,
+                      direction = 'forward')
+            box.draw (t)
+            current  += t.height
+        box.y = self.settings.height - current - 10
+        canvasChange = -current - 10
+        self.canvas.move (0, -canvasChange)
+        self.canvas.changeSize (0, canvasChange)
+        self.draw (box)
+
     def addSubtitle (self, text):
         t = Text (text = text,
                   x = self.settings.width - 5,
@@ -386,6 +403,8 @@
         addAttr (settings, 'yAxisTextHeight', float, 6.0)
         addAttr (settings, 'y2AxisTextHeight', float, 6.0) 
 
+        addAttr (settings, 'xinc', float, False)
+
         addAttr (settings, 'bg', boolean, True)
         addAttr (settings, 'bgBarDir', str, 'horizontal')
         addAttr (settings, 'bgBars', int, 6)

=== 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 @@
       document.addEventListener ('mousemove', updateTooltipPos, false);
     }
     addHighlight (root);
-    root.addEventListener ('dblclick', function () { alert ("Click"); }, false);
   }, false);
 
   function Mouse () {