QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-06-07 16:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102 from bradmbaker/brad_baker_adding_two_x_axis_rescaling_to_nvd3_file

Browse Source 
Fix for 2-axis charts where it shrinks them a little bit
This commit is contained in:
Maxime Beauchemin
2016-01-08 14:27:20 -08:00
parent 897d519b1b 7e827da3b1
commit e36ebfe640
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
panoramix/static/panoramix.js
View File

@@ -327,13 +327,6 @@ var px = (function() {
current_col = $(this).attr('data-col');
$( this ).css('z-index', 100 - current_col);
});
// this makes the whole chart fit within the dashboard div
$(".slice_container > svg").each(function(index){
w = $( this ).width();
h = $( this ).height();
$( this ).get(0).setAttribute('viewBox', '0 0 '+w+' '+(h+30));
});
}
// Export public functions

21
panoramix/static/widgets/viz_nvd3.js
View File

@@ -33,13 +33,13 @@ function viz_nvd3(slice) {
nv.addGraph(function() {
if (viz_type === 'line') {
if (viz.form_data.show_brush) {
chart = nv.models.lineWithFocusChart()
//chart.lines2.xScale( d3.time.scale.utc());
chart.lines2.xScale(d3.time.scale.utc());
chart.x2Axis
.showMaxMin(viz.form_data.x_axis_showminmax)
.tickFormat(formatDate)
.staggerLabels(true);
chart = nv.models.lineWithFocusChart();
//chart.lines2.xScale( d3.time.scale.utc());
chart.lines2.xScale(d3.time.scale.utc());
chart.x2Axis
.showMaxMin(viz.form_data.x_axis_showminmax)
.tickFormat(formatDate)
.staggerLabels(true);
} else {
chart = nv.models.lineChart()
}
@@ -167,6 +167,13 @@ function viz_nvd3(slice) {
.datum(data.chart_data)
.transition().duration(500)
.call(chart);
// if it is a two axis chart, rescale it down just a little so it fits in the div.
if(chart.hasOwnProperty("x2Axis")) {
two_axis_chart = $(slice.selector + " > svg");
w = two_axis_chart.width();
h = two_axis_chart.height();
two_axis_chart.get(0).setAttribute('viewBox', '0 0 '+w+' '+(h+30));
}
return chart;
});