From 0a9600d994dc2bdfffcb6fd3f5ada93df0cba880 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Thu, 24 Dec 2015 22:54:42 -0800 Subject: [PATCH] Minor improvements on the bubble plot --- TODO.md | 2 ++ panoramix/static/widgets/viz_nvd3.js | 2 +- panoramix/viz.py | 13 ++++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/TODO.md b/TODO.md index 4355b2f20ab62..b3e174868d7f0 100644 --- a/TODO.md +++ b/TODO.md @@ -3,6 +3,8 @@ List of TODO items for Panoramix ## Improvments * Table description is markdown +* Animated scatter plots +* Filter widget * Default slice instead of default endpoint * dashboard controller + filters * Color hash in JS diff --git a/panoramix/static/widgets/viz_nvd3.js b/panoramix/static/widgets/viz_nvd3.js index ce7f3db2e3a7e..42cef7c387d95 100644 --- a/panoramix/static/widgets/viz_nvd3.js +++ b/panoramix/static/widgets/viz_nvd3.js @@ -127,7 +127,7 @@ function viz_nvd3(slice) { s += ""; return s; }); - chart.pointRange([5, 5000]); + chart.pointRange([5, fd.max_bubble_size * fd.max_bubble_size]); } else if (viz_type === 'area') { chart = nv.models.stackedAreaChart(); diff --git a/panoramix/viz.py b/panoramix/viz.py index f0cdf719519ac..1fed212c5faa9 100644 --- a/panoramix/viz.py +++ b/panoramix/viz.py @@ -476,12 +476,19 @@ class BubbleViz(NVD3Viz): { 'label': None, 'fields': ( + 'granularity', ('since', 'until'), - ('series', 'entity'), - 'x', 'y', 'size', - 'limit', + 'series', 'entity', + 'x', 'y', + 'size', 'limit', + ) + }, + { + 'label': 'Chart Options', + 'fields': ( ('x_log_scale', 'y_log_scale'), ('show_legend', None), + 'max_bubble_size', ) },)