diff --git a/panoramix/forms.py b/panoramix/forms.py
index 69d001927559c..e2358ce4182a3 100644
--- a/panoramix/forms.py
+++ b/panoramix/forms.py
@@ -90,13 +90,27 @@ def form_factory(viz):
choices=[(s, s) for s in ['markdown', 'html']],
default="markdown",
description="Pick your favorite markup language"),
+ 'rotation': SelectField(
+ "Rotation",
+ choices=[(s, s) for s in ['random', 'flat', 'square']],
+ default="random",
+ description="Rotation to apply to words in the cloud"),
'code': TextAreaField("Code", description="Put your code here"),
+ 'size_from': TextField(
+ "Font Size From",
+ default="20",
+ description="Font size for the smallest value in the list"),
+ 'size_to': TextField(
+ "Font Size To",
+ default="150",
+ description="Font size for the biggest value in the list"),
}
field_css_classes = {k: ['form-control'] for k in px_form_fields.keys()}
select2 = [
'viz_type', 'metrics', 'groupby',
'row_limit', 'rolling_type', 'series',
- 'entity', 'x', 'y', 'size']
+ 'entity', 'x', 'y', 'size', 'rotation', 'metric', 'limit',
+ 'markup_type',]
field_css_classes['since'] += ['select2_free_since']
field_css_classes['until'] += ['select2_free_until']
field_css_classes['granularity'] += ['select2_free_granularity']
diff --git a/panoramix/static/d3.layout.cloud.js b/panoramix/static/d3.layout.cloud.js
new file mode 100644
index 0000000000000..2a5956caf2b4b
--- /dev/null
+++ b/panoramix/static/d3.layout.cloud.js
@@ -0,0 +1,387 @@
+// Word cloud layout by Jason Davies, http://www.jasondavies.com/word-cloud/
+// Algorithm due to Jonathan Feinberg, http://static.mrfeinberg.com/bv_ch03.pdf
+(function() {
+
+if (typeof define === "function" && define.amd) define(["d3"], cloud);
+else cloud(this.d3);
+
+function cloud(d3) {
+ d3.layout.cloud = function cloud() {
+ var size = [256, 256],
+ text = cloudText,
+ font = cloudFont,
+ fontSize = cloudFontSize,
+ fontStyle = cloudFontNormal,
+ fontWeight = cloudFontNormal,
+ rotate = cloudRotate,
+ padding = cloudPadding,
+ spiral = archimedeanSpiral,
+ words = [],
+ timeInterval = Infinity,
+ event = d3.dispatch("word", "end"),
+ timer = null,
+ random = Math.random,
+ cloud = {};
+
+ cloud.start = function() {
+ var board = zeroArray((size[0] >> 5) * size[1]),
+ bounds = null,
+ n = words.length,
+ i = -1,
+ tags = [],
+ data = words.map(function(d, i) {
+ d.text = text.call(this, d, i);
+ d.font = font.call(this, d, i);
+ d.style = fontStyle.call(this, d, i);
+ d.weight = fontWeight.call(this, d, i);
+ d.rotate = rotate.call(this, d, i);
+ d.size = ~~fontSize.call(this, d, i);
+ d.padding = padding.call(this, d, i);
+ return d;
+ }).sort(function(a, b) { return b.size - a.size; });
+
+ if (timer) clearInterval(timer);
+ timer = setInterval(step, 0);
+ step();
+
+ return cloud;
+
+ function step() {
+ var start = Date.now();
+ while (Date.now() - start < timeInterval && ++i < n && timer) {
+ var d = data[i];
+ d.x = (size[0] * (random() + .5)) >> 1;
+ d.y = (size[1] * (random() + .5)) >> 1;
+ cloudSprite(d, data, i);
+ if (d.hasText && place(board, d, bounds)) {
+ tags.push(d);
+ event.word(d);
+ if (bounds) cloudBounds(bounds, d);
+ else bounds = [{x: d.x + d.x0, y: d.y + d.y0}, {x: d.x + d.x1, y: d.y + d.y1}];
+ // Temporary hack
+ d.x -= size[0] >> 1;
+ d.y -= size[1] >> 1;
+ }
+ }
+ if (i >= n) {
+ cloud.stop();
+ event.end(tags, bounds);
+ }
+ }
+ }
+
+ cloud.stop = function() {
+ if (timer) {
+ clearInterval(timer);
+ timer = null;
+ }
+ return cloud;
+ };
+
+ function place(board, tag, bounds) {
+ var perimeter = [{x: 0, y: 0}, {x: size[0], y: size[1]}],
+ startX = tag.x,
+ startY = tag.y,
+ maxDelta = Math.sqrt(size[0] * size[0] + size[1] * size[1]),
+ s = spiral(size),
+ dt = random() < .5 ? 1 : -1,
+ t = -dt,
+ dxdy,
+ dx,
+ dy;
+
+ while (dxdy = s(t += dt)) {
+ dx = ~~dxdy[0];
+ dy = ~~dxdy[1];
+
+ if (Math.min(Math.abs(dx), Math.abs(dy)) >= maxDelta) break;
+
+ tag.x = startX + dx;
+ tag.y = startY + dy;
+
+ if (tag.x + tag.x0 < 0 || tag.y + tag.y0 < 0 ||
+ tag.x + tag.x1 > size[0] || tag.y + tag.y1 > size[1]) continue;
+ // TODO only check for collisions within current bounds.
+ if (!bounds || !cloudCollide(tag, board, size[0])) {
+ if (!bounds || collideRects(tag, bounds)) {
+ var sprite = tag.sprite,
+ w = tag.width >> 5,
+ sw = size[0] >> 5,
+ lx = tag.x - (w << 4),
+ sx = lx & 0x7f,
+ msx = 32 - sx,
+ h = tag.y1 - tag.y0,
+ x = (tag.y + tag.y0) * sw + (lx >> 5),
+ last;
+ for (var j = 0; j < h; j++) {
+ last = 0;
+ for (var i = 0; i <= w; i++) {
+ board[x + i] |= (last << msx) | (i < w ? (last = sprite[j * w + i]) >>> sx : 0);
+ }
+ x += sw;
+ }
+ delete tag.sprite;
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ cloud.timeInterval = function(_) {
+ return arguments.length ? (timeInterval = _ == null ? Infinity : _, cloud) : timeInterval;
+ };
+
+ cloud.words = function(_) {
+ return arguments.length ? (words = _, cloud) : words;
+ };
+
+ cloud.size = function(_) {
+ return arguments.length ? (size = [+_[0], +_[1]], cloud) : size;
+ };
+
+ cloud.font = function(_) {
+ return arguments.length ? (font = d3.functor(_), cloud) : font;
+ };
+
+ cloud.fontStyle = function(_) {
+ return arguments.length ? (fontStyle = d3.functor(_), cloud) : fontStyle;
+ };
+
+ cloud.fontWeight = function(_) {
+ return arguments.length ? (fontWeight = d3.functor(_), cloud) : fontWeight;
+ };
+
+ cloud.rotate = function(_) {
+ return arguments.length ? (rotate = d3.functor(_), cloud) : rotate;
+ };
+
+ cloud.text = function(_) {
+ return arguments.length ? (text = d3.functor(_), cloud) : text;
+ };
+
+ cloud.spiral = function(_) {
+ return arguments.length ? (spiral = spirals[_] || _, cloud) : spiral;
+ };
+
+ cloud.fontSize = function(_) {
+ return arguments.length ? (fontSize = d3.functor(_), cloud) : fontSize;
+ };
+
+ cloud.padding = function(_) {
+ return arguments.length ? (padding = d3.functor(_), cloud) : padding;
+ };
+
+ cloud.random = function(_) {
+ return arguments.length ? (random = _, cloud) : random;
+ };
+
+ return d3.rebind(cloud, event, "on");
+ };
+
+ function cloudText(d) {
+ return d.text;
+ }
+
+ function cloudFont() {
+ return "serif";
+ }
+
+ function cloudFontNormal() {
+ return "normal";
+ }
+
+ function cloudFontSize(d) {
+ return Math.sqrt(d.value);
+ }
+
+ function cloudRotate() {
+ return (~~(Math.random() * 6) - 3) * 30;
+ }
+
+ function cloudPadding() {
+ return 1;
+ }
+
+ // Fetches a monochrome sprite bitmap for the specified text.
+ // Load in batches for speed.
+ function cloudSprite(d, data, di) {
+ if (d.sprite) return;
+ c.clearRect(0, 0, (cw << 5) / ratio, ch / ratio);
+ var x = 0,
+ y = 0,
+ maxh = 0,
+ n = data.length;
+ --di;
+ while (++di < n) {
+ d = data[di];
+ c.save();
+ c.font = d.style + " " + d.weight + " " + ~~((d.size + 1) / ratio) + "px " + d.font;
+ var w = c.measureText(d.text + "m").width * ratio,
+ h = d.size << 1;
+ if (d.rotate) {
+ var sr = Math.sin(d.rotate * cloudRadians),
+ cr = Math.cos(d.rotate * cloudRadians),
+ wcr = w * cr,
+ wsr = w * sr,
+ hcr = h * cr,
+ hsr = h * sr;
+ w = (Math.max(Math.abs(wcr + hsr), Math.abs(wcr - hsr)) + 0x1f) >> 5 << 5;
+ h = ~~Math.max(Math.abs(wsr + hcr), Math.abs(wsr - hcr));
+ } else {
+ w = (w + 0x1f) >> 5 << 5;
+ }
+ if (h > maxh) maxh = h;
+ if (x + w >= (cw << 5)) {
+ x = 0;
+ y += maxh;
+ maxh = 0;
+ }
+ if (y + h >= ch) break;
+ c.translate((x + (w >> 1)) / ratio, (y + (h >> 1)) / ratio);
+ if (d.rotate) c.rotate(d.rotate * cloudRadians);
+ c.fillText(d.text, 0, 0);
+ if (d.padding) c.lineWidth = 2 * d.padding, c.strokeText(d.text, 0, 0);
+ c.restore();
+ d.width = w;
+ d.height = h;
+ d.xoff = x;
+ d.yoff = y;
+ d.x1 = w >> 1;
+ d.y1 = h >> 1;
+ d.x0 = -d.x1;
+ d.y0 = -d.y1;
+ d.hasText = true;
+ x += w;
+ }
+ var pixels = c.getImageData(0, 0, (cw << 5) / ratio, ch / ratio).data,
+ sprite = [];
+ while (--di >= 0) {
+ d = data[di];
+ if (!d.hasText) continue;
+ var w = d.width,
+ w32 = w >> 5,
+ h = d.y1 - d.y0;
+ // Zero the buffer
+ for (var i = 0; i < h * w32; i++) sprite[i] = 0;
+ x = d.xoff;
+ if (x == null) return;
+ y = d.yoff;
+ var seen = 0,
+ seenRow = -1;
+ for (var j = 0; j < h; j++) {
+ for (var i = 0; i < w; i++) {
+ var k = w32 * j + (i >> 5),
+ m = pixels[((y + j) * (cw << 5) + (x + i)) << 2] ? 1 << (31 - (i % 32)) : 0;
+ sprite[k] |= m;
+ seen |= m;
+ }
+ if (seen) seenRow = j;
+ else {
+ d.y0++;
+ h--;
+ j--;
+ y++;
+ }
+ }
+ d.y1 = d.y0 + seenRow;
+ d.sprite = sprite.slice(0, (d.y1 - d.y0) * w32);
+ }
+ }
+
+ // Use mask-based collision detection.
+ function cloudCollide(tag, board, sw) {
+ sw >>= 5;
+ var sprite = tag.sprite,
+ w = tag.width >> 5,
+ lx = tag.x - (w << 4),
+ sx = lx & 0x7f,
+ msx = 32 - sx,
+ h = tag.y1 - tag.y0,
+ x = (tag.y + tag.y0) * sw + (lx >> 5),
+ last;
+ for (var j = 0; j < h; j++) {
+ last = 0;
+ for (var i = 0; i <= w; i++) {
+ if (((last << msx) | (i < w ? (last = sprite[j * w + i]) >>> sx : 0))
+ & board[x + i]) return true;
+ }
+ x += sw;
+ }
+ return false;
+ }
+
+ function cloudBounds(bounds, d) {
+ var b0 = bounds[0],
+ b1 = bounds[1];
+ if (d.x + d.x0 < b0.x) b0.x = d.x + d.x0;
+ if (d.y + d.y0 < b0.y) b0.y = d.y + d.y0;
+ if (d.x + d.x1 > b1.x) b1.x = d.x + d.x1;
+ if (d.y + d.y1 > b1.y) b1.y = d.y + d.y1;
+ }
+
+ function collideRects(a, b) {
+ return a.x + a.x1 > b[0].x && a.x + a.x0 < b[1].x && a.y + a.y1 > b[0].y && a.y + a.y0 < b[1].y;
+ }
+
+ function archimedeanSpiral(size) {
+ var e = size[0] / size[1];
+ return function(t) {
+ return [e * (t *= .1) * Math.cos(t), t * Math.sin(t)];
+ };
+ }
+
+ function rectangularSpiral(size) {
+ var dy = 4,
+ dx = dy * size[0] / size[1],
+ x = 0,
+ y = 0;
+ return function(t) {
+ var sign = t < 0 ? -1 : 1;
+ // See triangular numbers: T_n = n * (n + 1) / 2.
+ switch ((Math.sqrt(1 + 4 * sign * t) - sign) & 3) {
+ case 0: x += dx; break;
+ case 1: y += dy; break;
+ case 2: x -= dx; break;
+ default: y -= dy; break;
+ }
+ return [x, y];
+ };
+ }
+
+ // TODO reuse arrays?
+ function zeroArray(n) {
+ var a = [],
+ i = -1;
+ while (++i < n) a[i] = 0;
+ return a;
+ }
+
+ var cloudRadians = Math.PI / 180,
+ cw = 1 << 11 >> 5,
+ ch = 1 << 11,
+ canvas,
+ ratio = 1;
+
+ if (typeof document !== "undefined") {
+ canvas = document.createElement("canvas");
+ canvas.width = 1;
+ canvas.height = 1;
+ ratio = Math.sqrt(canvas.getContext("2d").getImageData(0, 0, 1, 1).data.length >> 2);
+ canvas.width = (cw << 5) / ratio;
+ canvas.height = ch / ratio;
+ } else {
+ // Attempt to use node-canvas.
+ canvas = new Canvas(cw << 5, ch);
+ }
+
+ var c = canvas.getContext("2d"),
+ spirals = {
+ archimedean: archimedeanSpiral,
+ rectangular: rectangularSpiral
+ };
+ c.fillStyle = c.strokeStyle = "red";
+ c.textAlign = "center";
+}
+
+})();
diff --git a/panoramix/templates/panoramix/dashboard.html b/panoramix/templates/panoramix/dashboard.html
index 5ea3560ea6a23..593fe7a389871 100644
--- a/panoramix/templates/panoramix/dashboard.html
+++ b/panoramix/templates/panoramix/dashboard.html
@@ -135,7 +135,6 @@ <h2>
<script src="{{ url_for('static', filename=js) }}"></script>
{% endfor %}
<script src="{{ url_for("static", filename="jquery.gridster.with-extras.min.js") }}"></script>
- <script src="{{ url_for("static", filename="d3.min.js") }}"></script>
<script>
f = d3.format(".4s");
</script>
diff --git a/panoramix/templates/panoramix/viz_markup.html b/panoramix/templates/panoramix/viz_markup.html
new file mode 100644
index 0000000000000..31106b8587aaf
--- /dev/null
+++ b/panoramix/templates/panoramix/viz_markup.html
@@ -0,0 +1,9 @@
+{% macro viz_html(viz) %}
+<div style="padding: 10px;">{{ viz.rendered()|safe }}</div>
+{% endmacro %}
+
+{% macro viz_js(viz) %}
+{% endmacro %}
+
+{% macro viz_css(viz) %}
+{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_word_cloud.html b/panoramix/templates/panoramix/viz_word_cloud.html
new file mode 100644
index 0000000000000..2091c0aec1d79
--- /dev/null
+++ b/panoramix/templates/panoramix/viz_word_cloud.html
@@ -0,0 +1,71 @@
+{% macro viz_html(viz) %}
+<div id="{{ viz.token }}" style="height: 100%;">
+ <img src="{{ url_for("static", filename="loading.gif") }}" class="loading">
+</div>
+{% endmacro %}
+
+{% macro viz_js(viz) %}
+<script>
+$( document ).ready(function() {
+ var range = [
+ {{ viz.args.get('size_from') or 20 }},
+ {{ viz.args.get('size_to') or 100 }}
+ ];
+ var rotation = "{{ viz.args.get("rotation", "random") }}";
+ if (rotation == "square")
+ var f_rotation = function() { return ~~(Math.random() * 2) * 90; };
+ else if (rotation == "flat")
+ var f_rotation = function() { return 0};
+ else
+ var f_rotation = function() { return (~~(Math.random() * 6) - 3) * 30;};
+
+ var url = "{{ viz.get_url(json="true")|safe }}";
+ var token = d3.select("#{{ viz.token }}");
+ var box = token.node().getBoundingClientRect();
+ var size = [box.width, box.height-25];
+ d3.json(url, function(error, data){
+ if(error != null){
+ var err = '<div class="alert alert-danger">' + error.responseText + '</div>';
+ token.html(err);
+ return '';
+ }
+ scale = d3.scale.linear()
+ .range(range)
+ .domain(d3.extent(data, function(d) { return d.size; }));
+ var fill = d3.scale.category20();
+ var layout = d3.layout.cloud()
+ .size(size)
+ .words(data)
+ .padding(5)
+ .rotate(f_rotation)
+ .font("serif")
+ .fontSize(function(d) { return scale(d.size); })
+ .on("end", draw);
+ layout.start();
+ function draw(words) {
+ token.selectAll("*").remove();
+
+ token.append("svg")
+ .attr("width", layout.size()[0])
+ .attr("height", layout.size()[1])
+ .append("g")
+ .attr("transform", "translate(" + layout.size()[0] / 2 + "," + layout.size()[1] / 2 + ")")
+ .selectAll("text")
+ .data(words)
+ .enter().append("text")
+ .style("font-size", function(d) { return d.size + "px"; })
+ .style("font-family", "Impact")
+ .style("fill", function(d, i) { return fill(i); })
+ .attr("text-anchor", "middle")
+ .attr("transform", function(d) {
+ return "translate(" + [d.x, d.y] + ") rotate(" + d.rotate + ")";
+ })
+ .text(function(d) { return d.text; });
+ }
+ });
+});
+</script>
+{% endmacro %}
+
+{% macro viz_css(viz) %}
+{% endmacro %}
diff --git a/panoramix/viz.py b/panoramix/viz.py
index 457a2d315d853..b80e8322cd123 100644
--- a/panoramix/viz.py
+++ b/panoramix/viz.py
@@ -175,6 +175,38 @@ def rendered(self):
return code
+class WordCloudViz(BaseViz):
+ """
+ Integration with the nice library at:
+ https://github.com/jasondavies/d3-cloud
+ """
+ verbose_name = "Word Cloud"
+ template = 'panoramix/viz_word_cloud.html'
+ form_fields = [
+ 'viz_type',
+ ('since', 'until'),
+ 'groupby', 'metric', 'limit',
+ ('size_from', 'size_to'),
+ 'rotation',
+ ]
+ js_files = ['d3.layout.cloud.js']
+
+ def query_obj(self):
+ d = super(WordCloudViz, self).query_obj()
+ d['granularity'] = 'all'
+ metric = self.args.get('metric')
+ if not metric:
+ raise Exception("Pick a metric!")
+ d['metrics'] = [self.args.get('metric')]
+ d['groupby'] = [d['groupby'][0]]
+ return d
+
+ def get_json(self):
+ df = self.get_df()
+ df.columns = ['text', 'size']
+ return df.to_json(orient="records")
+
+
class HighchartsViz(BaseViz):
verbose_name = "Base Highcharts Viz"
template = 'panoramix/viz_highcharts.html'
@@ -390,4 +422,5 @@ class DistributionBarViz(DistributionPieViz):
['pie', DistributionPieViz],
['bubble', BubbleViz],
['markup', MarkupViz],
+ ['word_cloud', WordCloudViz],
])