Updated historical bar chart so that the xAxis.ticks property must be set by the user of the chart. Also changed is so that the y-axis has 0 transition.

master
Robin Hu 11 years ago
parent 62edb49ab8
commit 319520513f

@ -41,7 +41,7 @@ nv.addGraph({
.axisLabel('Voltage (v)')
.tickFormat(d3.format(',.2f'));
chart.showXAxis(false).showYAxis(true);
chart.showXAxis(true).showYAxis(true);
d3.select("#test1")
.attr('width', width)

@ -3409,12 +3409,12 @@ nv.models.historicalBarChart = function() {
if (showXAxis) {
xAxis
.scale(x)
.ticks( availableWidth / 100 )
.tickSize(-availableHeight, 0);
g.select('.nv-x.nv-axis')
.attr('transform', 'translate(0,' + y.range()[0] + ')');
d3.transition(g.select('.nv-x.nv-axis'))
g.select('.nv-x.nv-axis')
.transition()
.call(xAxis);
}
@ -3424,7 +3424,8 @@ nv.models.historicalBarChart = function() {
.ticks( availableHeight / 36 )
.tickSize( -availableWidth, 0);
d3.transition(g.select('.nv-y.nv-axis'))
g.select('.nv-y.nv-axis')
.transition().duration(0)
.call(yAxis);
}
//------------------------------------------------------------

4
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -199,12 +199,12 @@ nv.models.historicalBarChart = function() {
if (showXAxis) {
xAxis
.scale(x)
.ticks( availableWidth / 100 )
.tickSize(-availableHeight, 0);
g.select('.nv-x.nv-axis')
.attr('transform', 'translate(0,' + y.range()[0] + ')');
d3.transition(g.select('.nv-x.nv-axis'))
g.select('.nv-x.nv-axis')
.transition()
.call(xAxis);
}
@ -214,7 +214,8 @@ nv.models.historicalBarChart = function() {
.ticks( availableHeight / 36 )
.tickSize( -availableWidth, 0);
d3.transition(g.select('.nv-y.nv-axis'))
g.select('.nv-y.nv-axis')
.transition().duration(0)
.call(yAxis);
}
//------------------------------------------------------------

Loading…
Cancel
Save