Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[big num] revert margin change #2550

Merged
merged 1 commit into from
Apr 5, 2017
Merged

[big num] revert margin change #2550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions superset/assets/visualizations/big_number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,6 @@ 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
Expand Down Expand Up @@ -62,7 +48,10 @@ function bigNumberVis(slice, payload) {
}
const dateExt = d3.extent(data, (d) => d[0]);
const valueExt = d3.extent(data, (d) => d[1]);
const margin = getMargin(valueExt, data, f);
const yAxisLabelWidths = valueExt.map(value => getTextWidth(f(value), '10px Roboto'));
const yAxisMaxWidth = Math.max(...yAxisLabelWidths);
const margin = yAxisMaxWidth + (yAxisMaxWidth / 2);

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)];
Expand Down