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

minifying src, forgot to in last commit

Browse Source
master-patched
Bob Monteverde 12 years ago
parent e1aa54f7d5
commit 9a57039cd3
2 changed files with 42 additions and 80 deletions
Show Stats Download Patch File Download Diff File

118
nv.d3.js
Unescape Escape View File

@ -3669,68 +3669,63 @@ nv.models.scatter = function() {
nv.models.scatterWithLegend = function() {
var margin = {top: 30, right: 20, bottom: 50, left: 60},
width = function() { return 960 },
width = function() { return 960 }, //TODO: should probably make this consistent... or maybe constant in the models, closure in the charts
height = function() { return 500 },
xAxisRender = true,
yAxisRender = true,
xAxisLabelText = false,
yAxisLabelText = false,
showDistX = false,
showDistY = false,
color = d3.scale.category20().range(),
forceX = [],
forceY = [];
color = d3.scale.category20().range();
var x = d3.scale.linear(),
y = d3.scale.linear(),
xAxis = nv.models.axis().scale(x).orient('bottom').tickPadding(10),
yAxis = nv.models.axis().scale(y).orient('left').tickPadding(10),
var xAxis = nv.models.axis().orient('bottom').tickPadding(10),
yAxis = nv.models.axis().orient('left').tickPadding(10),
legend = nv.models.legend().height(30),
scatter = nv.models.scatter(),
dispatch = d3.dispatch('tooltipShow', 'tooltipHide'),
x0, y0;
x, y, x0, y0;
function chart(selection) {
selection.each(function(data) {
var seriesData = data.filter(function(d) { return !d.disabled })
.map(function(d) {
return d.values.map(function(d,i) {
return { x: scatter.x()(d,i), y: scatter.y()(d,i) }
})
}),
availableWidth = width() - margin.left - margin.right,
var availableWidth = width() - margin.left - margin.right,
availableHeight = height() - margin.top - margin.bottom;
x0 = x0 || x;
y0 = y0 || y;
x0 = x0 || scatter.xScale();
y0 = y0 || scatter.yScale();
var wrap = d3.select(this).selectAll('g.wrap').data([data]);
var gEnter = wrap.enter().append('g').attr('class', 'wrap d3scatterWithLegend').append('g');
gEnter.append('g').attr('class', 'legendWrap');
gEnter.append('g').attr('class', 'x axis');
gEnter.append('g').attr('class', 'y axis');
gEnter.append('g').attr('class', 'scatterWrap');
//gEnter.append('g').attr('class', 'distWrap');
x .domain(d3.extent(d3.merge(seriesData).map(function(d) { return d.x }).concat(scatter.forceX) ))
.range([0, availableWidth]);
y .domain(d3.extent(d3.merge(seriesData).map(function(d) { return d.y }).concat(scatter.forceY) ))
.range([availableHeight, 0]);
scatter
.width(availableWidth)
.height(availableHeight)
.xDomain(x.domain())
.yDomain(y.domain())
//.xDomain(x.domain())
//.yDomain(y.domain())
.color(data.map(function(d,i) {
return d.color || color[i % 20];
}).filter(function(d,i) { return !data[i].disabled }))
var scatterWrap = wrap.select('.scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }));
d3.transition(scatterWrap).call(scatter);
var wrap = d3.select(this).selectAll('g.wrap').data([data]);
var gEnter = wrap.enter().append('g').attr('class', 'wrap d3scatterWithLegend').append('g');
gEnter.append('g').attr('class', 'legendWrap');
gEnter.append('g').attr('class', 'x axis');
gEnter.append('g').attr('class', 'y axis');
gEnter.append('g').attr('class', 'scatterWrap');
//gEnter.append('g').attr('class', 'distWrap');
x = scatter.xScale();
y = scatter.yScale();
xAxis.scale(x);
yAxis.scale(y);
//TODO: margins should be adjusted based on what components are used: axes, axis labels, legend
@ -3749,11 +3744,6 @@ nv.models.scatterWithLegend = function() {
.call(legend);
var scatterWrap = wrap.select('.scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }));
d3.transition(scatterWrap).call(scatter);
if ( showDistX || showDistY) {
@ -3807,10 +3797,8 @@ nv.models.scatterWithLegend = function() {
xAxis
.domain(x.domain())
.range(x.range())
.ticks( availableWidth / 100 )
.tickSize(-availableHeight, 0);
.tickSize( -availableHeight , 0);
g.select('.x.axis')
.attr('transform', 'translate(0,' + y.range()[0] + ')');
@ -3820,8 +3808,6 @@ nv.models.scatterWithLegend = function() {
yAxis
.domain(y.domain())
.range(y.range())
.ticks( availableHeight / 36 )
.tickSize( -availableWidth, 0);
@ -3866,24 +3852,20 @@ nv.models.scatterWithLegend = function() {
seriesIndex: e.seriesIndex,
pointIndex: e.pointIndex
});
scatterWrap.select('.series-' + e.seriesIndex + ' .distX-' + e.pointIndex)
.attr('y1', e.pos[1]);
scatterWrap.select('.series-' + e.seriesIndex + ' .distY-' + e.pointIndex)
.attr('x1', e.pos[0]);
});
scatter.dispatch.on('elementMouseout.tooltip', function(e) {
dispatch.tooltipHide(e);
});
scatter.dispatch.on('elementMouseover.dist', function(d) {
scatterWrap.select('.series-' + d.seriesIndex + ' .distX-' + d.pointIndex)
.attr('y1', d.pos[1]);
scatterWrap.select('.series-' + d.seriesIndex + ' .distY-' + d.pointIndex)
.attr('x1', d.pos[0]);
});
scatter.dispatch.on('elementMouseout.dist', function(d) {
scatterWrap.select('.series-' + d.seriesIndex + ' .distX-' + d.pointIndex)
.attr('y1', y.range()[0]);
scatterWrap.select('.series-' + d.seriesIndex + ' .distY-' + d.pointIndex)
.attr('x1', x.range()[0]);
scatterWrap.select('.series-' + e.seriesIndex + ' .distX-' + e.pointIndex)
.attr('y1', y.range()[0]);
scatterWrap.select('.series-' + e.seriesIndex + ' .distY-' + e.pointIndex)
.attr('x1', x.range()[0]);
});
@ -3902,7 +3884,7 @@ nv.models.scatterWithLegend = function() {
chart.xAxis = xAxis;
chart.yAxis = yAxis;
d3.rebind(chart, scatter, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id', 'showDistX', 'showDistY');
d3.rebind(chart, scatter, 'interactive', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius');
chart.margin = function(_) {
@ -4231,8 +4213,7 @@ nv.models.stackedArea = function() {
style = 'stack',
offset = 'zero',
order = 'default',
clipEdge = false, // if true, masks lines within x and y scale
xDomain, yDomain; // Used to manually set the x and y domain, good to save time if calculation has already been made
clipEdge = false; // if true, masks lines within x and y scale
/************************************
* offset:
@ -4249,8 +4230,6 @@ nv.models.stackedArea = function() {
var scatter= nv.models.scatter()
.size(2.2) // default size
.sizeDomain([2.5]), //set to speed up calculation, needs to be unset if there is a cstom size accessor
x2 = d3.scale.linear(),
y2 = d3.scale.linear(),
dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'areaClick', 'areaMouseover', 'areaMouseout');
function chart(selection) {
@ -4273,23 +4252,6 @@ nv.models.stackedArea = function() {
/*
var seriesData = dataCopy.map(function(d) { //TODO: series data is barely used, can probably remove this pretty easily
return d.values.map(function(d,i) {
return { x: getX(d,i), y: getY(d,i) }
})
});
x2 .domain(xDomain || d3.extent(d3.merge(seriesData), function(d) { return d.x } ))
.range([0, availableWidth]);
y2 .domain(yDomain || [0, d3.max(dataCopy, function(d) { //TODO; if dataCopy not fed {x, y} (custom getX or getY), this will probably cause an error
return d3.max(d.values, function(d) { return d.y0 + d.y })
}) ])
.range([availableHeight, 0]);
*/
var wrap = d3.select(this).selectAll('g.d3stackedarea').data([dataCopy]);
var wrapEnter = wrap.enter().append('g').attr('class', 'd3stackedarea');
var defsEnter = wrapEnter.append('defs');

4
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save