From cc640c1c4f3c433eb0c8d90ed78f85b636df5e76 Mon Sep 17 00:00:00 2001 From: alanna scott Date: Tue, 4 Apr 2017 22:26:33 -0700 Subject: [PATCH] measure x axis labels too and use the longest to determine margins --- superset/assets/visualizations/big_number.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/superset/assets/visualizations/big_number.js b/superset/assets/visualizations/big_number.js index d0915a1616..9fe6505835 100644 --- a/superset/assets/visualizations/big_number.js +++ b/superset/assets/visualizations/big_number.js @@ -13,6 +13,20 @@ function getNumTicks(data, slice, margin) { return numTicks; } +function getMargin(valueExt, data, f) { + const yAxisLabelWidths = valueExt.map(value => getTextWidth(f(value), '10px Roboto')); + const xAxisLabelWidths = data.map(d => getTextWidth(formatDate(d[0]), '10px Roboto')); + const yAxisMaxWidth = Math.max(...yAxisLabelWidths); + const xAxisMaxWidth = Math.max(...xAxisLabelWidths); + let margin; + if (yAxisMaxWidth > xAxisMaxWidth) { + margin = yAxisMaxWidth + (yAxisMaxWidth / 2); + } else if (xAxisMaxWidth > yAxisMaxWidth) { + margin = xAxisMaxWidth + (xAxisMaxWidth / 2); + } + return margin; +} + function bigNumberVis(slice, payload) { const div = d3.select(slice.selector); // Define the percentage bounds that define color from red to green @@ -48,10 +62,7 @@ function bigNumberVis(slice, payload) { } const dateExt = d3.extent(data, (d) => d[0]); const valueExt = d3.extent(data, (d) => d[1]); - const yAxisLabelWidths = valueExt.map(value => getTextWidth(f(value), '10px Roboto')); - const yAxisMaxWidth = Math.max(...yAxisLabelWidths); - const margin = yAxisMaxWidth + (yAxisMaxWidth / 2); - + const margin = getMargin(valueExt, data, f); const scaleX = d3.time.scale.utc().domain(dateExt).range([margin, width - margin]); const scaleY = d3.scale.linear().domain(valueExt).range([height - (margin), margin]); const colorRange = [d3.hsl(0, 1, 0.3), d3.hsl(120, 1, 0.3)];