Working on historicalStock model, fixed minor issue with axis now lets you set the width for positioning the axislabel

master-patched
Bob Monteverde 12 years ago
parent 57988c2769
commit 93066940b7

@ -16,7 +16,6 @@ text {
svg {
display: block;
height: 500px;
margin: 10px;
}
</style>
@ -43,7 +42,7 @@ svg {
</div>
<h1><span id="stockName"></span> (<span id="stockSymbol"></span>)</h1>
<h2><span id="stockValue"></span> <span id="stockChange"></span> (<span id="stockChangePercent"></span>) </h2>
<h2><span id="stockValue"></span> <span id="stockChange"></span> (<span id="stockChangePercent"></span>) <span id="stockDate"></span></h2>
<div id="chart1">
<svg></svg>
@ -58,7 +57,8 @@ svg {
<script src="../src/models/scatter.js"></script>
<script src="../src/models/line.js"></script>
<script src="../src/models/historicalBar.js"></script>
<script src="../src/models/linePlusBarChart.js"></script>
<script src="../src/models/historicalStock.js"></script>
<script src="../src/models/historicalStockChart.js"></script>
<script>
@ -90,7 +90,11 @@ function getStockInfo(symbol) {
d3.select('#stockChange')
.text(info.Change)
.style('color', parseFloat(info.Change) > 0 ? 'green' : 'red' );
d3.select('#stockChangePercent').text(d3.format('.2%')(parseInt(info.Change) / info.StockValue));
d3.select('#stockChangePercent')
.text(d3.format('.2%')(parseInt(info.Change) / info.StockValue))
.style('color', parseFloat(info.Change) > 0 ? 'green' : 'red' );
d3.select('#stockDate')
.text(d3.time.format('%b %e %Y')(new Date(info.Date)));
});
}
@ -123,7 +127,11 @@ function getHistoricalStockData(symbol, startDate, endDate, frequency) {
"values": data.map(function(d) {
return {
'x': Date.parse(d.Date),
'y': d.Close
'y': d.Close,
'open': d.Open,
'close': d.Close,
'high': d.High,
'low': d.Low
}
})
}
@ -135,13 +143,21 @@ function getHistoricalStockData(symbol, startDate, endDate, frequency) {
d3.selectAll('#chart1 svg *').remove();
nv.addGraph(function() {
var chart = nv.models.linePlusBarChart()
.margin({top: 30, right: 70, bottom: 50, left: 55})
var chart = nv.models.historicalStockChart()
//.margin({top: 30, right: 70, bottom: 50, left: 55})
.x(function(d,i) { return i })
.color(d3.scale.category10().range());
// Use if we are removing weekends/holidays
chart.xAxis
//.tickPadding(7)
.tickFormat(function(d) {
return '';
var dx = lineData[0].values[d] && lineData[0].values[d].x || 0;
return d3.time.format('%x')(new Date(dx))
});
chart.xAxis2
.tickPadding(7)
.tickFormat(function(d) {
var dx = lineData[0].values[d] && lineData[0].values[d].x || 0;
@ -154,10 +170,12 @@ function getHistoricalStockData(symbol, startDate, endDate, frequency) {
//});
chart.yAxis1
.tickFormat(function(d) { return d3.format(',f')(d) + 'K' });
.tickFormat(d3.format(',f'));
//.tickFormat(function(d) { return d3.format(',f')(d) + 'K' });
chart.yAxis2
.tickFormat(function(d) { return '$' + d3.format(',.2f')(d) });
.tickFormat(d3.format(',.2f'));
//.tickFormat(function(d) { return '$' + d3.format(',.2f')(d) });
chart.bars.forceY([0]);

@ -256,7 +256,9 @@ nv.utils.windowResize = function(fun){
nv.models.axis = function() {
//Default Settings
var scale = d3.scale.linear(),
var width = 60, //only used for tickLabel currently
height = 60, //only used for tickLabel currently
scale = d3.scale.linear(),
axisLabelText = null,
showMaxMin = true, //TODO: showMaxMin should be disabled on all ordinal scaled axes
highlightZero = true;
@ -296,9 +298,9 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('y', 0);
var width = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
axisLabel
.attr('x', width/2);
.attr('x', w/2);
if (showMaxMin) {
var axisMaxMin = wrap.selectAll('g.axisMaxMin')
.data(scale.domain());
@ -325,9 +327,9 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('y', 30);
var width = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
axisLabel
.attr('x', width/2);
.attr('x', w/2);
if (showMaxMin) {
var axisMaxMin = wrap.selectAll('g.axisMaxMin')
.data(scale.domain());
@ -354,7 +356,7 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('transform', 'rotate(90)')
.attr('y', -40); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
.attr('y', -width + 12); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
axisLabel
.attr('x', -scale.range()[0] / 2);
if (showMaxMin) {
@ -387,7 +389,7 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('transform', 'rotate(-90)')
.attr('y', -40); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
.attr('y', -width + 12); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
axisLabel
.attr('x', -scale.range()[0] / 2);
if (showMaxMin) {
@ -473,6 +475,18 @@ nv.models.axis = function() {
d3.rebind(chart, axis, 'orient', 'ticks', 'tickValues', 'tickSubdivide', 'tickSize', 'tickPadding', 'tickFormat');
d3.rebind(chart, scale, 'domain', 'range', 'rangeBand', 'rangeBands'); //these are also accessible by chart.scale(), but added common ones directly for ease of use
chart.width = function(_) {
if (!arguments.length) return width;
width = _;
return chart;
};
chart.height = function(_) {
if (!arguments.length) return height;
height = _;
return chart;
};
chart.axisLabel = function(_) {
if (!arguments.length) return axisLabelText;
axisLabelText = _;

8
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -1,7 +1,9 @@
nv.models.axis = function() {
//Default Settings
var scale = d3.scale.linear(),
var width = 60, //only used for tickLabel currently
height = 60, //only used for tickLabel currently
scale = d3.scale.linear(),
axisLabelText = null,
showMaxMin = true, //TODO: showMaxMin should be disabled on all ordinal scaled axes
highlightZero = true;
@ -41,9 +43,9 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('y', 0);
var width = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
axisLabel
.attr('x', width/2);
.attr('x', w/2);
if (showMaxMin) {
var axisMaxMin = wrap.selectAll('g.axisMaxMin')
.data(scale.domain());
@ -70,9 +72,9 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('y', 30);
var width = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
axisLabel
.attr('x', width/2);
.attr('x', w/2);
if (showMaxMin) {
var axisMaxMin = wrap.selectAll('g.axisMaxMin')
.data(scale.domain());
@ -99,7 +101,7 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('transform', 'rotate(90)')
.attr('y', -40); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
.attr('y', -width + 12); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
axisLabel
.attr('x', -scale.range()[0] / 2);
if (showMaxMin) {
@ -132,7 +134,7 @@ nv.models.axis = function() {
axisLabel.enter().append('text').attr('class', 'axislabel')
.attr('text-anchor', 'middle')
.attr('transform', 'rotate(-90)')
.attr('y', -40); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
.attr('y', -width + 12); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
axisLabel
.attr('x', -scale.range()[0] / 2);
if (showMaxMin) {
@ -218,6 +220,18 @@ nv.models.axis = function() {
d3.rebind(chart, axis, 'orient', 'ticks', 'tickValues', 'tickSubdivide', 'tickSize', 'tickPadding', 'tickFormat');
d3.rebind(chart, scale, 'domain', 'range', 'rangeBand', 'rangeBands'); //these are also accessible by chart.scale(), but added common ones directly for ease of use
chart.width = function(_) {
if (!arguments.length) return width;
width = _;
return chart;
};
chart.height = function(_) {
if (!arguments.length) return height;
height = _;
return chart;
};
chart.axisLabel = function(_) {
if (!arguments.length) return axisLabelText;
axisLabelText = _;

@ -0,0 +1,285 @@
//TODO: eitehr drastically clean up or deprecate this model
nv.models.historicalStock = function() {
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
height = 500,
id = Math.floor(Math.random() * 10000), //Create semi-unique ID in case user doesn't select one
getX = function(d) { return d.x },
getY = function(d) { return d.y },
getOpen = function(d) { return d.open },
getClose = function(d) { return d.close },
getHigh = function(d) { return d.high },
getLow = function(d) { return d.low },
forceX = [],
forceY = [],
clipEdge = true,
color = d3.scale.category20().range(),
xDomain, yDomain;
var x = d3.scale.linear(),
y = d3.scale.linear(),
xAxis = d3.svg.axis().scale(x).orient('bottom'),
yAxis = d3.svg.axis().scale(y).orient('left'),
dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout');
function chart(selection) {
selection.each(function(data) {
var availableWidth = width - margin.left - margin.right,
availableHeight = height - margin.top - margin.bottom;
x .domain(xDomain || d3.extent(data[0].values.map(getX).concat(forceX) ))
.range([0, availableWidth]);
y .domain(yDomain || d3.extent(data[0].values.map(getY).concat(forceY) ))
.range([availableHeight, 0]);
// If scale's domain don't have a range, slightly adjust to make one... so a chart can show a single data point
if (x.domain()[0] === x.domain()[1] || y.domain()[0] === y.domain()[1]) singlePoint = true;
if (x.domain()[0] === x.domain()[1])
x.domain()[0] ?
x.domain([x.domain()[0] - x.domain()[0] * 0.01, x.domain()[1] + x.domain()[1] * 0.01])
: x.domain([-1,1]);
if (y.domain()[0] === y.domain()[1])
y.domain()[0] ?
y.domain([y.domain()[0] + y.domain()[0] * 0.01, y.domain()[1] - y.domain()[1] * 0.01])
: y.domain([-1,1]);
var parent = d3.select(this)
.on('click', function(d,i) {
dispatch.chartClick({
data: d,
index: i,
pos: d3.event,
id: id
});
});
var wrap = d3.select(this).selectAll('g.wrap.historicalStock').data([data[0].values]);
var wrapEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 historicalStock');
var gEnter = wrapEnter.append('g');
gEnter.append('g').attr('class', 'ticks');
wrap.attr('width', width)
.attr('height', height);
var g = wrap.select('g')
.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
wrapEnter.append('defs').append('clipPath')
.attr('id', 'chart-clip-path-' + id)
.append('rect');
wrap.select('#chart-clip-path-' + id + ' rect')
.attr('width', availableWidth)
.attr('height', availableHeight);
gEnter
.attr('clip-path', clipEdge ? 'url(#chart-clip-path-' + id + ')' : '');
var shiftWrap = gEnter.append('g').attr('class', 'shiftWrap');
var ticks = wrap.select('.ticks').selectAll('.tick')
.data(function(d) { return d });
ticks.exit().remove();
var ticksEnter = ticks.enter().append('path')
.attr('class', function(d,i) { return getOpen(d,i) > getClose(d,i) ? 'tick negative' : 'tick positive'})
//.attr('fill', function(d,i) { return color[0]; })
//.attr('stroke', function(d,i) { return color[0]; })
//.attr('x', 0 )
//.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) })
//.attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) })
.attr('d', function(d,i) {
var w = (availableWidth / data[0].values.length) * .9;
//nv.log(this, getOpen(d,i), getClose(d,i), y(getOpen(d,i)), y(getClose(d,i)));
return 'm0,0l0,' + (y(getOpen(d,i)) - y(getHigh(d,i))) + 'l' + (-w/2) + ',0l' + (w/2) + ',0l0,' + (y(getLow(d,i)) - y(getOpen(d,i))) +'l0,'+ (y(getClose(d,i)) - y(getLow(d,i))) +',l' + (w/2) + ',0l' + (-w/2) + ',0z';
})
.on('mouseover', function(d,i) {
d3.select(this).classed('hover', true);
dispatch.elementMouseover({
point: d,
series: data[0],
pos: [x(getX(d,i)), y(getY(d,i))], // TODO: Figure out why the value appears to be shifted
pointIndex: i,
seriesIndex: 0,
e: d3.event
});
})
.on('mouseout', function(d,i) {
d3.select(this).classed('hover', false);
dispatch.elementMouseout({
point: d,
series: data[0],
pointIndex: i,
seriesIndex: 0,
e: d3.event
});
})
.on('click', function(d,i) {
dispatch.elementClick({
//label: d[label],
value: getY(d,i),
data: d,
index: i,
pos: [x(getX(d,i)), y(getY(d,i))],
e: d3.event,
id: id
});
d3.event.stopPropagation();
})
.on('dblclick', function(d,i) {
dispatch.elementDblClick({
//label: d[label],
value: getY(d,i),
data: d,
index: i,
pos: [x(getX(d,i)), y(getY(d,i))],
e: d3.event,
id: id
});
d3.event.stopPropagation();
});
ticks
.attr('class', function(d,i) { return getOpen(d,i) > getClose(d,i) ? 'tick negative' : 'tick positive'})
.attr('transform', function(d,i) { return 'translate(' + x(getX(d,i)) + ',' + y(getHigh(d,i)) + ')'; })
//.attr('width', (availableWidth / data[0].values.length) * .9 )
//d3.transition(ticks)
//.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) })
//.attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) });
//.order(); // not sure if this makes any sense for this model
});
return chart;
}
chart.dispatch = dispatch;
chart.x = function(_) {
if (!arguments.length) return getX;
getX = _;
return chart;
};
chart.y = function(_) {
if (!arguments.length) return getY;
getY = _;
return chart;
};
chart.open = function(_) {
if (!arguments.length) return getOpen;
getOpen = _;
return chart;
};
chart.close = function(_) {
if (!arguments.length) return getClose;
getClose = _;
return chart;
};
chart.high = function(_) {
if (!arguments.length) return getHigh;
getHigh = _;
return chart;
};
chart.low = function(_) {
if (!arguments.length) return getLow;
getLow = _;
return chart;
};
chart.margin = function(_) {
if (!arguments.length) return margin;
margin = _;
return chart;
};
chart.width = function(_) {
if (!arguments.length) return width;
width = _;
return chart;
};
chart.height = function(_) {
if (!arguments.length) return height;
height = _;
return chart;
};
chart.xScale = function(_) {
if (!arguments.length) return x;
x = _;
return chart;
};
chart.yScale = function(_) {
if (!arguments.length) return y;
y = _;
return chart;
};
chart.xDomain = function(_) {
if (!arguments.length) return xDomain;
xDomain = _;
return chart;
};
chart.yDomain = function(_) {
if (!arguments.length) return yDomain;
yDomain = _;
return chart;
};
chart.forceX = function(_) {
if (!arguments.length) return forceX;
forceX = _;
return chart;
};
chart.forceY = function(_) {
if (!arguments.length) return forceY;
forceY = _;
return chart;
};
chart.clipEdge = function(_) {
if (!arguments.length) return clipEdge;
clipEdge = _;
return chart;
};
chart.color = function(_) {
if (!arguments.length) return color;
color = _;
return chart;
};
chart.id = function(_) {
if (!arguments.length) return id;
id = _;
return chart;
};
return chart;
}

@ -0,0 +1,340 @@
nv.models.historicalStockChart = function() {
var margin = {top: 10, right: 30, bottom: 25, left: 80},
margin2 = {top: 0, right: 30, bottom: 20, left: 80},
width = null,
height = null,
height2 = 120,
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category20().range(),
showLegend = false,
tooltips = true,
tooltip = function(key, x, y, e, graph) {
return '<h3>' + key + '</h3>' +
'<p>Closed at ' + y + ' on ' + x + '</p>'
};
//var lines = nv.models.line(),
var lines = nv.models.historicalStock(),
bars = nv.models.historicalBar(),
x = d3.scale.linear(), // needs to be both line and historicalBar x Axis
y1 = bars.yScale(),
y2 = lines.yScale(),
xAxis = nv.models.axis().scale(x).orient('bottom').tickPadding(5),
xAxis2 = nv.models.axis().scale(x).orient('bottom').tickPadding(5),
yAxis1 = nv.models.axis().scale(y1).orient('left'),
yAxis2 = nv.models.axis().scale(y2).orient('left'),
legend = nv.models.legend().height(30),
dispatch = d3.dispatch('tooltipShow', 'tooltipHide');
var showTooltip = function(e, offsetElement) {
var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ),
top = e.pos[1] + ( offsetElement.offsetTop || 0),
x = xAxis2.tickFormat()(lines.x()(e.point, e.pointIndex)),
y = (e.series.bar ? yAxis1 : yAxis2).tickFormat()(lines.y()(e.point, e.pointIndex)),
content = tooltip(e.series.key, x, y, e, chart);
nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's');
};
function chart(selection) {
selection.each(function(data) {
var container = d3.select(this),
that = this;
var availableWidth = (width || parseInt(container.style('width')) || 960)
- margin.left - margin.right,
availableHeight = (height || parseInt(container.style('height')) || 400)
- margin.top - margin.bottom - height2,
availableHeight2 = height2 - margin2.top - margin2.bottom;
var dataBars = data.filter(function(d) { return !d.disabled && d.bar });
var dataLines = data.filter(function(d) { return !d.disabled && !d.bar });
//TODO: try to remove x scale computation from this layer
var series1 = data.filter(function(d) { return !d.disabled && d.bar })
.map(function(d) {
return d.values.map(function(d,i) {
return { x: getX(d,i), y: getY(d,i) }
})
});
var series2 = data.filter(function(d) { return !d.disabled && !d.bar })
.map(function(d) {
return d.values.map(function(d,i) {
return { x: getX(d,i), y: getY(d,i) }
})
});
x .domain(d3.extent(d3.merge(series1.concat(series2)), function(d) { return d.x } ))
.range([0, availableWidth]);
/*
x .domain(d3.extent(d3.merge(data.map(function(d) { return d.values })), getX ))
.range([0, availableWidth]);
y1 .domain(d3.extent(d3.merge(dataBars), function(d) { return d.y } ))
.range([availableHeight, 0]);
y2 .domain(d3.extent(d3.merge(dataLines), function(d) { return d.y } ))
.range([availableHeight, 0]);
*/
var wrap = d3.select(this).selectAll('g.wrap.historicalStockChart').data([data]);
var gEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 historicalStockChart').append('g');
gEnter.append('g').attr('class', 'x axis');
gEnter.append('g').attr('class', 'x2 axis');
gEnter.append('g').attr('class', 'y1 axis');
gEnter.append('g').attr('class', 'y2 axis');
gEnter.append('g').attr('class', 'barsWrap');
gEnter.append('g').attr('class', 'linesWrap');
gEnter.append('g').attr('class', 'legendWrap');
var g = wrap.select('g');
if (showLegend) {
legend.width( availableWidth / 2 );
g.select('.legendWrap')
.datum(data.map(function(series) {
series.originalKey = series.originalKey === undefined ? series.key : series.originalKey;
series.key = series.originalKey;
return series;
}))
.call(legend);
if ( margin.top != legend.height()) {
margin.top = legend.height();
availableHeight = (height || parseInt(container.style('height')) || 400)
- margin.top - margin.bottom;
}
g.select('.legendWrap')
.attr('transform', 'translate(' + ( availableWidth / 2 ) + ',' + (-margin.top) +')');
}
lines
.width(availableWidth)
.height(availableHeight)
.color(data.map(function(d,i) {
return d.color || color[i % color.length];
}).filter(function(d,i) { return !data[i].disabled && !data[i].bar }))
bars
.width(availableWidth)
.height(availableHeight2)
.color(data.map(function(d,i) {
return d.color || color[i % color.length];
}).filter(function(d,i) { return !data[i].disabled && data[i].bar }))
var barsWrap = g.select('.barsWrap')
.attr('transform', 'translate(0,' + (availableHeight + margin.bottom) + ')')
.datum(dataBars.length ? dataBars : [{values:[]}])
var linesWrap = g.select('.linesWrap')
.datum(dataLines.length ? dataLines : [{values:[]}])
d3.transition(barsWrap).call(bars);
d3.transition(linesWrap).call(lines);
g.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
xAxis
.ticks( availableWidth / 100 )
.tickSize(-availableHeight2, 0);
g.select('.x.axis')
.attr('transform', 'translate(0,' + (availableHeight + margin.bottom + availableHeight2 + margin2.top) + ')');
d3.transition(g.select('.x.axis'))
.call(xAxis);
xAxis2
.ticks( availableWidth / 100 )
.tickSize(-availableHeight, 0);
g.select('.x2.axis')
.attr('transform', 'translate(0,' + availableHeight + ')');
d3.transition(g.select('.x2.axis'))
.call(xAxis2);
yAxis1
.ticks( availableHeight2 / 36 )
.tickSize(-availableWidth, 0)
.width(margin2.left)
.axisLabel('Volume (K)');
g.select('.y1.axis')
.attr('transform', 'translate(0,' + (availableHeight + margin.bottom) + ')');
d3.transition(g.select('.y1.axis'))
.style('opacity', dataBars.length ? 1 : 0)
.call(yAxis1);
yAxis2
.ticks( availableHeight / 36 )
.tickSize(-availableWidth, 0) // Show the y2 rules only if y1 has none
.width(margin.left)
.axisLabel('Price ($)');
g.select('.y2.axis')
.style('opacity', dataLines.length ? 1 : 0)
//.attr('transform', 'translate(' + x.range()[1] + ',0)');
d3.transition(g.select('.y2.axis'))
.call(yAxis2);
legend.dispatch.on('legendClick', function(d,i) {
d.disabled = !d.disabled;
if (!data.filter(function(d) { return !d.disabled }).length) {
data.map(function(d) {
d.disabled = false;
wrap.selectAll('.series').classed('disabled', false);
return d;
});
}
selection.transition().call(chart);
});
lines.dispatch.on('elementMouseover.tooltip', function(e) {
e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top];
dispatch.tooltipShow(e);
});
if (tooltips) dispatch.on('tooltipShow', function(e) { showTooltip(e, that.parentNode) } ); // TODO: maybe merge with above?
lines.dispatch.on('elementMouseout.tooltip', function(e) {
dispatch.tooltipHide(e);
});
if (tooltips) dispatch.on('tooltipHide', nv.tooltip.cleanup);
bars.dispatch.on('elementMouseover.tooltip', function(e) {
//e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top];
e.pos = [e.pos[0] + margin2.left, e.pos[1] + availableHeight + margin.top + margin.bottom + margin2.top];
dispatch.tooltipShow(e);
});
if (tooltips) dispatch.on('tooltipShow', function(e) { showTooltip(e, that.parentNode) } ); // TODO: maybe merge with above?
bars.dispatch.on('elementMouseout.tooltip', function(e) {
dispatch.tooltipHide(e);
});
if (tooltips) dispatch.on('tooltipHide', nv.tooltip.cleanup);
chart.update = function() { selection.transition().call(chart) };
chart.container = this; // I need a reference to the container in order to have outside code check if the chart is visible or not
});
return chart;
}
chart.dispatch = dispatch;
chart.legend = legend;
chart.lines = lines;
chart.bars = bars;
chart.xAxis = xAxis;
chart.xAxis2 = xAxis2;
chart.yAxis1 = yAxis1;
chart.yAxis2 = yAxis2;
//d3.rebind(chart, lines, 'defined', 'size', 'clipVoronoi', 'interpolate');
d3.rebind(chart, lines, 'getOpen', 'getClose', 'getHigh', 'getLow');
//TODO: consider rebinding x, y and some other stuff, and simply do soemthign lile bars.x(lines.x()), etc.
//d3.rebind(chart, lines, 'x', 'y', 'size', 'xDomain', 'yDomain', 'forceX', 'forceY', 'interactive', 'clipEdge', 'clipVoronoi', 'id');
//d3.rebind(chart, lines, 'interactive');
//consider rebinding x and y as well
chart.x = function(_) {
if (!arguments.length) return getX;
getX = _;
lines.x(_);
bars.x(_);
return chart;
};
chart.y = function(_) {
if (!arguments.length) return getY;
getY = _;
lines.y(_);
bars.y(_);
return chart;
};
chart.margin = function(_) {
if (!arguments.length) return margin;
margin = _;
return chart;
};
chart.width = function(_) {
if (!arguments.length) return width;
width = _;
return chart;
};
chart.height = function(_) {
if (!arguments.length) return height;
height = _;
return chart;
};
chart.color = function(_) {
if (!arguments.length) return color;
color = _;
legend.color(_);
return chart;
};
chart.showLegend = function(_) {
if (!arguments.length) return showLegend;
showLegend = _;
return chart;
};
chart.tooltips = function(_) {
if (!arguments.length) return tooltips;
tooltips = _;
return chart;
};
chart.tooltipContent = function(_) {
if (!arguments.length) return tooltip;
tooltip = _;
return chart;
};
return chart;
}

@ -490,6 +490,30 @@ svg .title {
}
/**********
* historical stock
*/
.nvd3.historicalStock .ticks .tick {
stroke-width: 2px;
}
.nvd3.historicalStock .ticks .tick.hover {
stroke-width: 4px;
}
.nvd3.historicalStock .ticks .tick.positive {
stroke: #2ca02c;
}
.nvd3.historicalStock .ticks .tick.negative {
stroke: #d62728;
}
.nvd3.historicalStockChart .axis .axislabel {
font-weight: bold;
}
/**********
* Indented Tree

Loading…
Cancel
Save