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

Updates to linePlusBarChart

Browse Source
master-patched
Bob Monteverde 12 years ago
parent 04c11e3bde
commit b35a9e6f64
3 changed files with 78 additions and 127 deletions
Show Stats Download Patch File Download Diff File

95
examples/linePlusBarChart.html
Unescape Escape View File

@ -29,6 +29,7 @@ text {
<body>
<div id="chart1">
<svg> </svg>
</div>
<script src="../lib/d3.v2.js"></script>
@ -44,7 +45,7 @@ text {
var valueVsQuantity = [
var testdata = [
{
"key" : "Quantity" ,
"bar": true,
@ -62,104 +63,30 @@ var valueVsQuantity = [
var selector = '#chart1',
chart = nv.models.linePlusBarChart(),
//data = sinAndCos(),
data = valueVsQuantity,
xTickFormat = d3.format(',r'),
y1TickFormat = d3.format(',f'),
y2TickFormat = function(d) { return '$' + d3.format(',f')(d) },
duration = 500;
nv.addGraph({
generate: function() {
var container = d3.select(selector),
svg = container.append('svg');
chart
nv.addGraph(function() {
var chart = nv.models.linePlusBarChart()
.x(function(d,i) { return i })
.color(d3.scale.category10().range());
chart.xAxis.tickFormat(function(d) {
var dx = data[0].values[d] && data[0].values[d].x || 0;
var dx = testdata[0].values[d] && testdata[0].values[d].x || 0;
return d3.time.format('%x')(new Date(dx))
//return d3.time.format('%x')(new Date(data[0].values[d].x))
});
chart.yAxis1
.tickFormat(y1TickFormat)
.tickFormat(d3.format(',f'));
chart.yAxis2
.tickFormat(y2TickFormat)
.tickFormat(function(d) { return '$' + d3.format(',f')(d) });
chart.bars.forceY([0]);
//chart.lines.forceY([0]);
svg
.datum(data)
.transition().duration(duration).call(chart);
d3.select('#chart1 svg')
.datum(testdata)
.transition().duration(500).call(chart);
return chart;
},
callback: function(chart) {
var showTooltip = function(e) {
var offsetElement = document.getElementById(selector.substr(1)),
left = e.pos[0] + offsetElement.offsetLeft,
top = e.pos[1] + offsetElement.offsetTop,
formatY1 = chart.yAxis1.tickFormat(), //Assumes using same format as axis, can customize to show higher precision, etc.
formatY2 = chart.yAxis2.tickFormat(), //Assumes using same format as axis, can customize to show higher precision, etc.
formatX = chart.xAxis.tickFormat(),
x = formatX(chart.x()(e, e.pointIndex)),
y = e.series.bar ? formatY1(chart.y()(e.point)) : formatY2(chart.y()(e.point));
// uses the chart's getX and getY, you may customize if x position is not the same as the value you want
// ex. daily data without weekends, x is the index, while you want the date
var content = '<h3>' + e.series.key.replace(/\s*\(.*\)/, '') + '</h3>' + //removing the (left/right axis) note from series label in tooltip
'<p>' +
y + ' at ' + x +
'</p>';
nv.tooltip.show([left, top], content, chart.y()(e.point) < 0 ? 'n' : 's' );
};
chart.dispatch.on('tooltipShow', showTooltip);
chart.dispatch.on('tooltipHide', nv.tooltip.cleanup);
window.onresize= function() {
// now that width and height are functions, should be automatic..of course you can always override them
d3.select('#chart1 svg')
.call(chart);
};
}
});
function sinAndCos() {
var sin = [],
cos = [];
for (var i = 0; i < 100; i++) {
sin.push({x: i, y: Math.sin(i/10) + 1});
cos.push({x: i, y: .5 * Math.cos(i/10) + .5});
}
return [
{
values: sin,
key: "Sine Wave",
bar: true
},
{
values: cos,
key: "Cosine Wave"
}
];
}
</script>

27
src/models/historicalBar.js
Unescape Escape View File

@ -1,9 +1,4 @@
/***
* multiBar will likely be used instead of this, wherever this would have been useful,
* multiBar lets you view 1 or more bars per an x value, either grouped (side by side)
* or stacked (layered on top of each other).
*/
nv.models.historicalBar = function() {
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
@ -174,19 +169,25 @@ nv.models.historicalBar = function() {
chart.width = function(_) {
if (!arguments.length) return width;
if (margin.left + margin.right + 20 > _)
width = margin.left + margin.right + 20; // Min width.... while this is a good idea, I may move this somewhere else.. OR need to implement in all other logical spots
else
width = _;
width = _;
return chart;
};
chart.height = function(_) {
if (!arguments.length) return height;
if (margin.top + margin.bottom + 20 > _)
height = margin.top + margin.bottom + 20; // Min height
else
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;
};

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

@ -17,15 +17,31 @@ nv.models.linePlusBarChart = function() {
var lines = nv.models.line(),
bars = nv.models.historicalBar(),
x = d3.scale.linear(),
y1 = d3.scale.linear(),
y2 = d3.scale.linear(),
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'),
yAxis1 = nv.models.axis().scale(y1).orient('left'),
yAxis2 = nv.models.axis().scale(y2).orient('right'),
legend = nv.models.legend().height(30),
dispatch = d3.dispatch('tooltipShow', 'tooltipHide');
var showTooltip = function(e, offsetElement) {
//console.log('left: ' + offsetElement.offsetLeft);
//console.log('top: ' + offsetElement.offsetLeft);
//TODO: FIX offsetLeft and offSet top do not work if container is shifted anywhere
//var offsetElement = document.getElementById(selector.substr(1)),
var left = e.pos[0] + ( offsetElement.offsetLeft || 0 ),
top = e.pos[1] + ( offsetElement.offsetTop || 0),
x = xAxis.tickFormat()(lines.x()(e.point)),
y = yAxis1.tickFormat()(lines.y()(e.point)),
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) {
@ -37,21 +53,35 @@ nv.models.linePlusBarChart = function() {
- margin.top - margin.bottom;
var dataBars = data.filter(function(d) { return !d.disabled && d.bar })
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 dataLines = data.filter(function(d) { return !d.disabled && !d.bar })
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(dataBars.concat(dataLines)), function(d) { return d.x } ))
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 } ))
@ -59,6 +89,8 @@ nv.models.linePlusBarChart = function() {
y2 .domain(d3.extent(d3.merge(dataLines), function(d) { return d.y } ))
.range([availableHeight, 0]);
*/
lines
.width(availableWidth)
@ -87,12 +119,7 @@ nv.models.linePlusBarChart = function() {
//TODO: margins should be adjusted based on what components are used: axes, axis labels, legend
margin.top = legend.height();
var g = wrap.select('g')
.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
var g = wrap.select('g');
if (showLegend) {
@ -116,23 +143,22 @@ nv.models.linePlusBarChart = function() {
}
var barsData = data.filter(function(d) { return !d.disabled && d.bar });
var barsWrap = g.select('.barsWrap')
.datum(barsData.length ? barsData : [{values:[]}])
//.datum(data.filter(function(d) { return !d.disabled && d.bar }))
.datum(dataBars.length ? dataBars : [{values:[]}])
var linesWrap = g.select('.linesWrap')
.datum(data.filter(function(d) { return !d.disabled && !d.bar }))
.datum(dataLines.length ? dataLines : [{values:[]}])
d3.transition(barsWrap).call(bars);
d3.transition(linesWrap).call(lines);
g.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
xAxis
.domain(x.domain())
.range(x.range())
.ticks( availableWidth / 100 )
.tickSize(-availableHeight, 0);
@ -141,18 +167,16 @@ nv.models.linePlusBarChart = function() {
d3.transition(g.select('.x.axis'))
.call(xAxis);
yAxis1
.domain(y1.domain())
.range(y1.range())
.ticks( availableHeight / 36 )
.tickSize(-availableWidth, 0);
d3.transition(g.select('.y1.axis'))
.call(yAxis1);
yAxis2
.domain(y2.domain())
.range(y2.range())
.ticks( availableHeight / 36 )
.tickSize(dataBars.length ? 0 : -availableWidth, 0); // Show the y2 rules only if y1 has none
@ -180,31 +204,30 @@ nv.models.linePlusBarChart = function() {
lines.dispatch.on('elementMouseover.tooltip', function(e) {
dispatch.tooltipShow({
point: e.point,
series: e.series,
pos: [e.pos[0] + margin.left, e.pos[1] + margin.top],
seriesIndex: e.seriesIndex,
pointIndex: e.pointIndex
});
e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top];
dispatch.tooltipShow(e);
});
if (tooltips) dispatch.on('tooltipShow', function(e) { showTooltip(e, container[0][0]) } ); // 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];
dispatch.tooltipShow(e);
});
if (tooltips) dispatch.on('tooltipShow', function(e) { showTooltip(e, container[0][0]) } ); // 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) };
});

Write Preview
Loading…
Cancel
Save