blob42
/
nvd3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merging in Pull Request #51

Browse Source
master-patched
Bob Monteverde 12 years ago
parent 8cc955c29c c9717f0427
commit 2634e157cf
8 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File

29
nv.d3.js
Unescape Escape View File

@ -2426,7 +2426,8 @@ nv.models.line = function() {
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point
clipEdge = false, // if true, masks lines within x and y scale
x, y; //can be accessed via chart.scatter.[x/y]Scale()
x, y, //can be accessed via chart.scatter.[x/y]Scale()
interpolate = "linear"; // controls the line interpolation
//============================================================
@ -2516,16 +2517,19 @@ nv.models.line = function() {
paths.enter().append('path')
.attr('class', 'line')
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x0(getX(d,i)) })
.y(function(d,i) { return y0(getY(d,i)) })
);
d3.transition(groups.exit().selectAll('path'))
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x(getX(d,i)) })
.y(function(d,i) { return y(getY(d,i)) })
);
d3.transition(paths)
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x(getX(d,i)) })
.y(function(d,i) { return y(getY(d,i)) })
);
@ -2600,7 +2604,12 @@ nv.models.line = function() {
return chart;
};
chart.interpolate = function(_) {
if (!arguments.length) return interpolate;
interpolate = _;
return chart;
};
return chart;
}
@ -3089,7 +3098,7 @@ nv.models.lineChart = function() {
chart.xAxis = xAxis;
chart.yAxis = yAxis;
d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id');
d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'interpolate');
chart.margin = function(_) {
@ -3135,7 +3144,6 @@ nv.models.lineChart = function() {
return chart;
};
return chart;
}
@ -3378,7 +3386,7 @@ nv.models.linePlusBarChart = function() {
chart.yAxis1 = yAxis1;
chart.yAxis2 = yAxis2;
d3.rebind(chart, lines, 'size', 'clipVoronoi');
d3.rebind(chart, lines, 'size', 'clipVoronoi', 'interpolate');
//d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id');
//d3.rebind(chart, lines, 'interactive');
@ -3442,8 +3450,7 @@ nv.models.linePlusBarChart = function() {
tooltip = _;
return chart;
};
return chart;
}
@ -3781,7 +3788,13 @@ nv.models.lineWithFocusChart = function() {
tooltip = _;
return chart;
};
chart.interpolate = function(_) {
if (!arguments.length) return lines.interpolate();
lines.interpolate(_);
lines2.interpolate(_);
return chart;
};
return chart;
}

8
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
src/models/line.js
Unescape Escape View File

@ -13,7 +13,8 @@ nv.models.line = function() {
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point
clipEdge = false, // if true, masks lines within x and y scale
x, y; //can be accessed via chart.scatter.[x/y]Scale()
x, y, //can be accessed via chart.scatter.[x/y]Scale()
interpolate = "linear"; // controls the line interpolation
//============================================================
@ -103,16 +104,19 @@ nv.models.line = function() {
paths.enter().append('path')
.attr('class', 'line')
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x0(getX(d,i)) })
.y(function(d,i) { return y0(getY(d,i)) })
);
d3.transition(groups.exit().selectAll('path'))
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x(getX(d,i)) })
.y(function(d,i) { return y(getY(d,i)) })
);
d3.transition(paths)
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x(getX(d,i)) })
.y(function(d,i) { return y(getY(d,i)) })
);
@ -187,6 +191,11 @@ nv.models.line = function() {
return chart;
};
chart.interpolate = function(_) {
if (!arguments.length) return interpolate;
interpolate = _;
return chart;
};
return chart;
}

3
src/models/lineChart.js
Unescape Escape View File

@ -197,7 +197,7 @@ nv.models.lineChart = function() {
chart.xAxis = xAxis;
chart.yAxis = yAxis;
d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id');
d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'interpolate');
chart.margin = function(_) {
@ -243,6 +243,5 @@ nv.models.lineChart = function() {
return chart;
};
return chart;
}

5
src/models/linePlusBarChart.js
Unescape Escape View File

@ -238,7 +238,7 @@ nv.models.linePlusBarChart = function() {
chart.yAxis1 = yAxis1;
chart.yAxis2 = yAxis2;
d3.rebind(chart, lines, 'size', 'clipVoronoi');
d3.rebind(chart, lines, 'size', 'clipVoronoi', 'interpolate');
//d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id');
//d3.rebind(chart, lines, 'interactive');
@ -302,7 +302,6 @@ nv.models.linePlusBarChart = function() {
tooltip = _;
return chart;
};
return chart;
}

13
src/models/lineWithFisheye.js
Unescape Escape View File

@ -8,7 +8,8 @@ nv.models.line = function() {
id = Math.floor(Math.random() * 10000), //Create semi-unique ID incase user doesn't select one
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point
clipEdge = false; // if true, masks lines within x and y scale
clipEdge = false, // if true, masks lines within x and y scale
interpolate = "linear"; // controls the line interpolation
var scatter = nv.models.scatter()
@ -96,17 +97,20 @@ nv.models.line = function() {
paths.enter().append('path')
.attr('class', 'line')
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x0(getX(d,i)) })
.y(function(d,i) { return y0(getY(d,i)) })
);
d3.transition(groups.exit().selectAll('path'))
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x(getX(d,i)) })
.y(function(d,i) { return y(getY(d,i)) })
)
.remove(); // redundant? line is already being removed
d3.transition(paths)
.attr('d', d3.svg.line()
.interpolate(interpolate)
.x(function(d,i) { return x(getX(d,i)) })
.y(function(d,i) { return y(getY(d,i)) })
);
@ -176,7 +180,12 @@ nv.models.line = function() {
id = _;
return chart;
};
chart.interpolate = function(_) {
if (!arguments.length) return interpolate;
interpolate = _;
return chart;
};
return chart;
}

5
src/models/lineWithFisheyeChart.js
Unescape Escape View File

@ -246,7 +246,7 @@ nv.models.lineChart = function() {
chart.xAxis = xAxis;
chart.yAxis = yAxis;
d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id');
d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'interpolate');
chart.margin = function(_) {
@ -291,7 +291,6 @@ nv.models.lineChart = function() {
tooltip = _;
return chart;
};
return chart;
}

8
src/models/lineWithFocusChart.js
Unescape Escape View File

@ -333,7 +333,13 @@ nv.models.lineWithFocusChart = function() {
tooltip = _;
return chart;
};
chart.interpolate = function(_) {
if (!arguments.length) return lines.interpolate();
lines.interpolate(_);
lines2.interpolate(_);
return chart;
};
return chart;
}

Write Preview
Loading…
Cancel
Save