Merge pull request #59 from patrickleotardif/y_axis_format

Adding y-axis format option
apache · Nov 10, 2015 · 3c5867c · 3c5867c
2 parents 774ca9f + 93c660f
commit 3c5867c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/panoramix/forms.py b/panoramix/forms.py
@@ -130,6 +130,10 @@ def __init__(self, viz):
                 description="Based on granularity, number of time periods to compare against"),
             'compare_suffix': TextField('Comparison suffix',
                 description="Suffix to apply after the percentage display"),
+            'y_axis_format': TextField('Y axis format',
+                description="D3 format syntax for y axis "
+                            "https://github.com/mbostock/\n"
+                            "d3/wiki/Formatting"),
             'markup_type': SelectField(
                 "Markup Type",
                 choices=self.choicify(['markdown', 'html']),

diff --git a/panoramix/static/widgets/viz_nvd3.js b/panoramix/static/widgets/viz_nvd3.js
@@ -137,6 +137,13 @@ function viz_nvd3(data_attribute) {
         if (viz.form_data.x_log_scale) {
           chart.xScale(d3.scale.log());
         }
+        if (viz.form_data.y_axis_format) {
+          chart.yAxis.tickFormat(d3.format(viz.form_data.y_axis_format));
+
+          if (chart.y2Axis != undefined) {
+            chart.y2Axis.tickFormat(d3.format(viz.form_data.y_axis_format));
+          }
+        }
 
         chart.duration(0);
 

diff --git a/panoramix/viz.py b/panoramix/viz.py
@@ -420,6 +420,7 @@ class NVD3TimeSeriesViz(NVD3Viz):
         ('show_brush', 'show_legend'),
         ('rich_tooltip', 'y_axis_zero'),
         ('y_log_scale', 'contribution'),
+        ('y_axis_format', None)
     ]
 
     def get_df(self, query_obj=None):