|
|
|
@ -26,7 +26,7 @@ nv.models.line = function() {
|
|
|
|
|
.size(16) // default size
|
|
|
|
|
.sizeDomain([16,256]) //set to speed up calculation, needs to be unset if there is a custom size accessor
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//============================================================
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -108,11 +108,9 @@ nv.models.line = function() {
|
|
|
|
|
groups.enter().append('g')
|
|
|
|
|
.style('stroke-opacity', 1e-6)
|
|
|
|
|
.style('fill-opacity', 1e-6);
|
|
|
|
|
groups.exit()
|
|
|
|
|
.transition()
|
|
|
|
|
.style('stroke-opacity', 1e-6)
|
|
|
|
|
.style('fill-opacity', 1e-6)
|
|
|
|
|
.remove();
|
|
|
|
|
|
|
|
|
|
groups.exit().remove();
|
|
|
|
|
|
|
|
|
|
groups
|
|
|
|
|
.attr('class', function(d,i) { return 'nv-group nv-series-' + i })
|
|
|
|
|
.classed('hover', function(d) { return d.hover })
|
|
|
|
@ -141,7 +139,7 @@ nv.models.line = function() {
|
|
|
|
|
});
|
|
|
|
|
groups.exit().selectAll('path.nv-area')
|
|
|
|
|
.remove();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
areaPaths
|
|
|
|
|
.transition()
|
|
|
|
|
.attr('d', function(d) {
|
|
|
|
@ -168,15 +166,7 @@ nv.models.line = function() {
|
|
|
|
|
.x(function(d,i) { return nv.utils.NaNtoZero(x0(getX(d,i))) })
|
|
|
|
|
.y(function(d,i) { return nv.utils.NaNtoZero(y0(getY(d,i))) })
|
|
|
|
|
);
|
|
|
|
|
groups.exit().selectAll('path.nv-line')
|
|
|
|
|
.transition()
|
|
|
|
|
.attr('d',
|
|
|
|
|
d3.svg.line()
|
|
|
|
|
.interpolate(interpolate)
|
|
|
|
|
.defined(defined)
|
|
|
|
|
.x(function(d,i) { return nv.utils.NaNtoZero(x(getX(d,i))) })
|
|
|
|
|
.y(function(d,i) { return nv.utils.NaNtoZero(y(getY(d,i))) })
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
linePaths
|
|
|
|
|
.transition()
|
|
|
|
|
.attr('d',
|
|
|
|
@ -206,11 +196,11 @@ nv.models.line = function() {
|
|
|
|
|
chart.dispatch = scatter.dispatch;
|
|
|
|
|
chart.scatter = scatter;
|
|
|
|
|
|
|
|
|
|
d3.rebind(chart, scatter, 'id', 'interactive', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'xRange', 'yRange',
|
|
|
|
|
d3.rebind(chart, scatter, 'id', 'interactive', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'xRange', 'yRange',
|
|
|
|
|
'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'useVoronoi', 'clipRadius', 'padData','highlightPoint','clearHighlights');
|
|
|
|
|
|
|
|
|
|
chart.options = nv.utils.optionsFunc.bind(chart);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
chart.margin = function(_) {
|
|
|
|
|
if (!arguments.length) return margin;
|
|
|
|
|
margin.top = typeof _.top != 'undefined' ? _.top : margin.top;
|
|
|
|
|