QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix] Y bounds in line chart (#3353)

Browse Source 
Also fixing tick labels showing NaN in the `dist_bar` viz
This commit is contained in:
Maxime Beauchemin
2017-08-22 16:10:42 -07:00
committed by GitHub
parent 1fda6f0745
commit 64c91ec9e3
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
superset/assets/javascripts/explore/stores/visTypes.js
View File

@@ -151,8 +151,7 @@ export const visTypes = {
label: 'X Axis',
controlSetRows: [
['x_axis_label', 'bottom_margin'],
['x_axis_showminmax', 'x_log_scale'],
['x_axis_format', null],
['x_axis_showminmax', 'x_axis_format'],
],
},
{

30
superset/assets/visualizations/nvd3_vis.js
View File

@@ -126,9 +126,7 @@ function nvd3Vis(slice, payload) {
if (fd.show_brush) {
chart = nv.models.lineWithFocusChart();
chart.focus.xScale(d3.time.scale.utc());
chart.x2Axis
.showMaxMin(fd.x_axis_showminmax)
.staggerLabels(false);
chart.x2Axis.staggerLabels(false);
} else {
chart = nv.models.lineChart();
}
@@ -136,9 +134,7 @@ function nvd3Vis(slice, payload) {
// chart.interactiveLayer.tooltip.headerFormatter(function(){return '';});
chart.xScale(d3.time.scale.utc());
chart.interpolate(fd.line_interpolation);
chart.xAxis
.showMaxMin(fd.x_axis_showminmax)
.staggerLabels(false);
chart.xAxis.staggerLabels(false);
break;
case 'dual_line':
@@ -176,8 +172,7 @@ function nvd3Vis(slice, payload) {
.rotateLabels(45)
.groupSpacing(0.1); // Distance between each group of bars.
chart.xAxis
.showMaxMin(false);
chart.xAxis.showMaxMin(false);
stacked = fd.bar_stacked;
chart.stacked(stacked);
@@ -252,8 +247,6 @@ function nvd3Vis(slice, payload) {
});
chart.pointRange([5, fd.max_bubble_size ** 2]);
chart.pointDomain([0, d3.max(payload.data, d => d3.max(d.values, v => v.size))]);
chart.xAxis.showMaxMin(fd.x_axis_showminmax);
chart.yAxis.showMaxMin(fd.y_axis_showminmax);
break;
case 'area':
@@ -261,9 +254,7 @@ function nvd3Vis(slice, payload) {
chart.showControls(fd.show_controls);
chart.style(fd.stacked_style);
chart.xScale(d3.time.scale.utc());
chart.xAxis
.showMaxMin(fd.x_axis_showminmax)
.staggerLabels(true);
chart.xAxis.staggerLabels(true);
break;
case 'box_plot':
@@ -326,7 +317,7 @@ function nvd3Vis(slice, payload) {
chart.x2Axis.tickFormat(xAxisFormatter);
height += 30;
}
if (chart.xAxis && chart.xAxis.tickFormat) {
if (vizType !== 'dist_bar' && chart.xAxis && chart.xAxis.tickFormat) {
chart.xAxis.tickFormat(xAxisFormatter);
}
@@ -338,6 +329,17 @@ function nvd3Vis(slice, payload) {
chart.y2Axis.tickFormat(yAxisFormatter);
}
// Set showMaxMin for all axis
function setAxisShowMaxMin(axis, showminmax) {
if (axis && axis.showMaxMin && showminmax !== undefined) {
axis.showMaxMin(showminmax);
}
}
setAxisShowMaxMin(chart.xAxis, fd.x_axis_showminmax);
setAxisShowMaxMin(chart.yAxis, fd.y_axis_showminmax);
setAxisShowMaxMin(chart.y2Axis, fd.y_axis_showminmax);
if (vizType !== 'bullet') {
chart.color(d => getColorFromScheme(d[colorKey], fd.color_scheme));
}