almost there

master
Tyler Wolf 11 years ago
parent fb5897eb52
commit a6c18a730a

@ -80,7 +80,7 @@ nv.addGraph(function() {
nv.utils.windowResize(chart.update); nv.utils.windowResize(chart.update);
chart.dispatch.on('stateChange', function(e) { nv.log('New State:', JSON.stringify(e)); }); chart.dispatch.on('stateChange', function(e) { ('New State:', JSON.stringify(e)); });
return chart; return chart;
}); });

@ -666,7 +666,7 @@ nv.models.axis = function() {
//highlight zero line ... Maybe should not be an option and should just be in CSS? //highlight zero line ... Maybe should not be an option and should just be in CSS?
if (highlightZero) if (highlightZero)
g.selectAll('.tick') g.selectAll('.tick')
.filter(function(d) { return !parseFloat(Math.round(d*100000)/1000000) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique .filter(function(d) { return !parseFloat(Math.round(d.__data__*100000)/1000000) && (d.__data__ !== undefined) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique
.classed('zero', true); .classed('zero', true);
//store old scales for use in transitions on update //store old scales for use in transitions on update
@ -10206,6 +10206,7 @@ nv.models.scatterChart = function() {
} }
wrap.select('.nv-scatterWrap') wrap.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }))
.call(scatter); .call(scatter);
//------------------------------------------------------------ //------------------------------------------------------------
@ -10366,7 +10367,7 @@ nv.models.scatterChart = function() {
scatter.dispatch.on('elementMouseover.tooltip', function(e) { scatter.dispatch.on('elementMouseover.tooltip', function(e) {
d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex)
.attr('y1', e.pos[1] - availableHeight); .attr('y1', function(d,i) { return e.pos[1] - availableHeight;});
d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex)
.attr('x2', e.pos[0] + distX.size()); .attr('x2', e.pos[0] + distX.size());

8
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -296,7 +296,7 @@ nv.models.axis = function() {
//highlight zero line ... Maybe should not be an option and should just be in CSS? //highlight zero line ... Maybe should not be an option and should just be in CSS?
if (highlightZero) if (highlightZero)
g.selectAll('.tick') g.selectAll('.tick')
.filter(function(d) { console.log(d); return !parseFloat(Math.round(d.__data__*100000)/1000000) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique .filter(function(d) { return !parseFloat(Math.round(d.__data__*100000)/1000000) && (d.__data__ !== undefined) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique
.classed('zero', true); .classed('zero', true);
//store old scales for use in transitions on update //store old scales for use in transitions on update

@ -244,6 +244,7 @@ nv.models.scatterChart = function() {
} }
wrap.select('.nv-scatterWrap') wrap.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }))
.call(scatter); .call(scatter);
//------------------------------------------------------------ //------------------------------------------------------------
@ -404,7 +405,7 @@ nv.models.scatterChart = function() {
scatter.dispatch.on('elementMouseover.tooltip', function(e) { scatter.dispatch.on('elementMouseover.tooltip', function(e) {
d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex) d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-distx-' + e.pointIndex)
.attr('y1', e.pos[1] - availableHeight); .attr('y1', function(d,i) { return e.pos[1] - availableHeight;});
d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex) d3.select('.nv-chart-' + scatter.id() + ' .nv-series-' + e.seriesIndex + ' .nv-disty-' + e.pointIndex)
.attr('x2', e.pos[0] + distX.size()); .attr('x2', e.pos[0] + distX.size());

Loading…
Cancel
Save