lots of changes

master
Tyler Wolf 11 years ago
parent 1ac80d87c8
commit bd0aab25ca

@ -89,7 +89,8 @@ nv.addGraph(function() {
chart.xAxis.tickFormat(function(d) {
var dx = testdata[0].values[d] && testdata[0].values[d].x || 0;
return dx ? d3.time.format('%x')(new Date(dx)) : '';
});
})
.showMaxMin(false);
chart.y1Axis
.tickFormat(d3.format(',f'));
@ -97,7 +98,7 @@ nv.addGraph(function() {
chart.y2Axis
.tickFormat(function(d) { return '$' + d3.format(',.2f')(d) });
chart.bars.forceY([0]);
chart.bars.forceY([0]).padData(false);
//chart.lines.forceY([0]);
d3.select('#chart1 svg')

@ -2842,7 +2842,7 @@ nv.models.discreteBarChart = function() {
- margin.top - margin.bottom;
chart.update = function() { dispatch.beforeUpdate(); selection.transition().call(chart); };
chart.update = function() { dispatch.beforeUpdate(); container.transition().call(chart); };
chart.container = this;
@ -4282,7 +4282,7 @@ nv.models.lineChart = function() {
state.disabled = e.disabled;
}
selection.call(chart);
chart.update();
});
//============================================================
@ -4483,7 +4483,7 @@ nv.models.linePlusBarChart = function() {
- margin.top - margin.bottom;
chart.update = function() { container.transition().call(chart); };
chart.container = this;
// chart.container = this;
//set state.disabled
state.disabled = data.map(function(d) { return !!d.disabled });
@ -9529,13 +9529,13 @@ nv.models.scatter = function() {
}
// if(vertices.length < 3) {
if(vertices.length) {
// Issue #283 - Adding 2 dummy points to the voronoi b/c voronoi requires min 3 points to work
vertices.push([x.range()[0] - 20, y.range()[0] - 20, null, null]);
vertices.push([x.range()[1] + 20, y.range()[1] + 20, null, null]);
vertices.push([x.range()[0] - 20, y.range()[0] + 20, null, null]);
vertices.push([x.range()[1] + 20, y.range()[1] - 20, null, null]);
// }
}
var bounds = d3.geom.polygon([
[-10,-10],
@ -9553,7 +9553,6 @@ nv.models.scatter = function() {
});
var pointPaths = wrap.select('.nv-point-paths').selectAll('path')
.data(voronoi);
pointPaths.enter().append('path')

8
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -68,7 +68,7 @@ nv.models.discreteBarChart = function() {
- margin.top - margin.bottom;
chart.update = function() { dispatch.beforeUpdate(); selection.transition().call(chart); };
chart.update = function() { dispatch.beforeUpdate(); container.transition().call(chart); };
chart.container = this;

@ -265,7 +265,7 @@ nv.models.lineChart = function() {
state.disabled = e.disabled;
}
selection.call(chart);
chart.update();
});
//============================================================

@ -86,7 +86,7 @@ nv.models.linePlusBarChart = function() {
- margin.top - margin.bottom;
chart.update = function() { container.transition().call(chart); };
chart.container = this;
// chart.container = this;
//set state.disabled
state.disabled = data.map(function(d) { return !!d.disabled });

@ -205,13 +205,13 @@ nv.models.scatter = function() {
}
// if(vertices.length < 3) {
if(vertices.length) {
// Issue #283 - Adding 2 dummy points to the voronoi b/c voronoi requires min 3 points to work
vertices.push([x.range()[0] - 20, y.range()[0] - 20, null, null]);
vertices.push([x.range()[1] + 20, y.range()[1] + 20, null, null]);
vertices.push([x.range()[0] - 20, y.range()[0] + 20, null, null]);
vertices.push([x.range()[1] + 20, y.range()[1] - 20, null, null]);
// }
}
var bounds = d3.geom.polygon([
[-10,-10],
@ -229,7 +229,6 @@ nv.models.scatter = function() {
});
var pointPaths = wrap.select('.nv-point-paths').selectAll('path')
.data(voronoi);
pointPaths.enter().append('path')

Loading…
Cancel
Save