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

Merge branch 'changes' of https://github.com/pfeffer/nvd3 into pfeffer-changes

Browse Source
master-patched
Tyler Wolf 11 years ago
parent 1327ca3f86 80f02aff8c
commit 2572a1ed21
3 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File

34
nv.d3.js
Unescape Escape View File

@ -7798,10 +7798,12 @@ nv.models.pie = function() {
, getValues = function(d) { return d.values }
, getX = function(d) { return d.x }
, getY = function(d) { return d.y }
, getDescription = function(d) { return d.description }
, id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one
, color = nv.utils.defaultColor()
, valueFormat = d3.format(',.2f')
, showLabels = true
, pieLabelsOutside = true
, donutLabelsOutside = false
, labelThreshold = .02 //if slice percentage is under this, don't show label
, donut = false
@ -7925,9 +7927,15 @@ nv.models.pie = function() {
if (showLabels) {
// This does the normal label
var labelsArc = arc;
var labelsArc
if (pieLabelsOutside){
labelsArc = arc;
}else{
labelsArc = d3.svg.arc().innerRadius(0);
}
//var labelsArc = arc;
if (donutLabelsOutside) {
labelsArc = d3.svg.arc().outerRadius(arc.outerRadius())
labelsArc = d3.svg.arc().outerRadius(arc.outerRadius());
}
ae.append("g").classed("nv-label", true)
@ -8080,6 +8088,12 @@ nv.models.pie = function() {
getY = d3.functor(_);
return chart;
};
chart.description = function(_) {
if (!arguments.length) return getDescription;
getDescription = _;
return chart;
};
chart.showLabels = function(_) {
if (!arguments.length) return showLabels;
@ -8098,6 +8112,12 @@ nv.models.pie = function() {
donutLabelsOutside = _;
return chart;
};
chart.pieLabelsOutside = function(_) {
if (!arguments.length) return pieLabelsOutside;
pieLabelsOutside = _;
return chart;
};
chart.donut = function(_) {
if (!arguments.length) return donut;
@ -8128,7 +8148,6 @@ nv.models.pie = function() {
labelThreshold = _;
return chart;
};
//============================================================
@ -8168,10 +8187,11 @@ nv.models.pieChart = function() {
//------------------------------------------------------------
var showTooltip = function(e, offsetElement) {
var tooltipLabel = pie.description()(e.point) || pie.x()(e.point)
var left = e.pos[0] + ( (offsetElement && offsetElement.offsetLeft) || 0 ),
top = e.pos[1] + ( (offsetElement && offsetElement.offsetTop) || 0),
y = pie.valueFormat()(pie.y()(e.point)),
content = tooltip(pie.x()(e.point), y, e, chart);
content = tooltip(tooltipLabel, y, e, chart);
nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement);
};
@ -8184,9 +8204,9 @@ nv.models.pieChart = function() {
var container = d3.select(this),
that = this;
var availableWidth = (width || parseInt(container.style('width')) || 960)
var availableWidth = (width || parseInt(container.style('width')) || 960) + 40 //to keep the size of the chart but reduce svg area, might not work with legend.
- margin.left - margin.right,
availableHeight = (height || parseInt(container.style('height')) || 400)
availableHeight = (height || parseInt(container.style('height')) || 400) + 40
- margin.top - margin.bottom;
chart.update = function() { chart(selection); };
@ -8352,7 +8372,7 @@ nv.models.pieChart = function() {
chart.dispatch = dispatch;
chart.pie = pie;
d3.rebind(chart, pie, 'valueFormat', 'values', 'x', 'y', 'id', 'showLabels', 'donutLabelsOutside', 'donut', 'labelThreshold');
d3.rebind(chart, pie, 'valueFormat', 'values', 'x', 'y', 'description', 'id', 'showLabels', 'donutLabelsOutside', 'pieLabelsOutside', 'donut', 'labelThreshold');
chart.margin = function(_) {
if (!arguments.length) return margin;

25
src/models/pie.js
Unescape Escape View File

@ -11,10 +11,12 @@ nv.models.pie = function() {
, getValues = function(d) { return d.values }
, getX = function(d) { return d.x }
, getY = function(d) { return d.y }
, getDescription = function(d) { return d.description }
, id = Math.floor(Math.random() * 10000) //Create semi-unique ID in case user doesn't select one
, color = nv.utils.defaultColor()
, valueFormat = d3.format(',.2f')
, showLabels = true
, pieLabelsOutside = true
, donutLabelsOutside = false
, labelThreshold = .02 //if slice percentage is under this, don't show label
, donut = false
@ -138,9 +140,15 @@ nv.models.pie = function() {
if (showLabels) {
// This does the normal label
var labelsArc = arc;
var labelsArc
if (pieLabelsOutside){
labelsArc = arc;
}else{
labelsArc = d3.svg.arc().innerRadius(0);
}
//var labelsArc = arc;
if (donutLabelsOutside) {
labelsArc = d3.svg.arc().outerRadius(arc.outerRadius())
labelsArc = d3.svg.arc().outerRadius(arc.outerRadius());
}
ae.append("g").classed("nv-label", true)
@ -293,6 +301,12 @@ nv.models.pie = function() {
getY = d3.functor(_);
return chart;
};
chart.description = function(_) {
if (!arguments.length) return getDescription;
getDescription = _;
return chart;
};
chart.showLabels = function(_) {
if (!arguments.length) return showLabels;
@ -311,6 +325,12 @@ nv.models.pie = function() {
donutLabelsOutside = _;
return chart;
};
chart.pieLabelsOutside = function(_) {
if (!arguments.length) return pieLabelsOutside;
pieLabelsOutside = _;
return chart;
};
chart.donut = function(_) {
if (!arguments.length) return donut;
@ -341,7 +361,6 @@ nv.models.pie = function() {
labelThreshold = _;
return chart;
};
//============================================================

7
src/models/pieChart.js
Unescape Escape View File

@ -32,10 +32,11 @@ nv.models.pieChart = function() {
//------------------------------------------------------------
var showTooltip = function(e, offsetElement) {
var tooltipLabel = pie.description()(e.point) || pie.x()(e.point)
var left = e.pos[0] + ( (offsetElement && offsetElement.offsetLeft) || 0 ),
top = e.pos[1] + ( (offsetElement && offsetElement.offsetTop) || 0),
y = pie.valueFormat()(pie.y()(e.point)),
content = tooltip(pie.x()(e.point), y, e, chart);
content = tooltip(tooltipLabel, y, e, chart);
nv.tooltip.show([left, top], content, e.value < 0 ? 'n' : 's', null, offsetElement);
};
@ -48,7 +49,7 @@ nv.models.pieChart = function() {
var container = d3.select(this),
that = this;
var availableWidth = (width || parseInt(container.style('width')) || 960)
var availableWidth = (width || parseInt(container.style('width')) || 960)
- margin.left - margin.right,
availableHeight = (height || parseInt(container.style('height')) || 400)
- margin.top - margin.bottom;
@ -216,7 +217,7 @@ nv.models.pieChart = function() {
chart.dispatch = dispatch;
chart.pie = pie;
d3.rebind(chart, pie, 'valueFormat', 'values', 'x', 'y', 'id', 'showLabels', 'donutLabelsOutside', 'donut', 'labelThreshold');
d3.rebind(chart, pie, 'valueFormat', 'values', 'x', 'y', 'description', 'id', 'showLabels', 'donutLabelsOutside', 'pieLabelsOutside', 'donut', 'labelThreshold');
chart.margin = function(_) {
if (!arguments.length) return margin;

Write Preview
Loading…
Cancel
Save