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

updated discreteBarChart to not cut off 0.00 labels

Browse Source
master-patched
Tyler Wolf 12 years ago
parent b53977efaf
commit 6c456bf92b
2 changed files with 309 additions and 309 deletions
Show Stats Download Patch File Download Diff File

616
nv.d3.js
Unescape Escape View File

@ -2305,7 +2305,7 @@ nv.models.discreteBarChart = function() {
, yAxis = nv.models.axis() , yAxis = nv.models.axis()
; ;
var margin = {top: 10, right: 10, bottom: 50, left: 60} var margin = {top: 15, right: 10, bottom: 50, left: 60}
, width = null , width = null
, height = null , height = null
, color = nv.utils.getColor() , color = nv.utils.getColor()
@ -2728,313 +2728,313 @@ nv.models.distribution = function() {
return chart; return chart;
} }
nv.models.indentedTree = function() { nv.models.indentedTree = function() {
//============================================================ //============================================================
// Public Variables with Default Settings // Public Variables with Default Settings
//------------------------------------------------------------ //------------------------------------------------------------
var margin = {top: 0, right: 0, bottom: 0, left: 0} //TODO: implement, maybe as margin on the containing div var margin = {top: 0, right: 0, bottom: 0, left: 0} //TODO: implement, maybe as margin on the containing div
, width = 960 , width = 960
, height = 500 , height = 500
, color = nv.utils.defaultColor() , color = nv.utils.defaultColor()
, id = Math.floor(Math.random() * 10000) , id = Math.floor(Math.random() * 10000)
, header = true , header = true
, noData = "No Data Available." , noData = "No Data Available."
, childIndent = 20 , childIndent = 20
, columns = [{key:'key', label: 'Name', type:'text'}] //TODO: consider functions like chart.addColumn, chart.removeColumn, instead of a block like this , columns = [{key:'key', label: 'Name', type:'text'}] //TODO: consider functions like chart.addColumn, chart.removeColumn, instead of a block like this
, tableClass = null , tableClass = null
, iconOpen = 'images/grey-plus.png' //TODO: consider removing this and replacing with a '+' or '-' unless user defines images , iconOpen = 'images/grey-plus.png' //TODO: consider removing this and replacing with a '+' or '-' unless user defines images
, iconClose = 'images/grey-minus.png' , iconClose = 'images/grey-minus.png'
, dispatch = d3.dispatch('elementClick', 'elementDblclick', 'elementMouseover', 'elementMouseout') , dispatch = d3.dispatch('elementClick', 'elementDblclick', 'elementMouseover', 'elementMouseout')
; ;
//============================================================ //============================================================
function chart(selection) { function chart(selection) {
selection.each(function(data) { selection.each(function(data) {
var i = 0, var i = 0,
depth = 1; depth = 1;
var tree = d3.layout.tree() var tree = d3.layout.tree()
.children(function(d) { return d.values }) .children(function(d) { return d.values })
.size([height, childIndent]); //Not sure if this is needed now that the result is HTML .size([height, childIndent]); //Not sure if this is needed now that the result is HTML
chart.update = function() { selection.transition().call(chart) }; chart.update = function() { selection.transition().call(chart) };
chart.container = this; chart.container = this;
//------------------------------------------------------------ //------------------------------------------------------------
// Display No Data message if there's nothing to show. // Display No Data message if there's nothing to show.
if (!data[0].key) data[0].key = noData; if (!data[0].key) data[0].key = noData;
//------------------------------------------------------------ //------------------------------------------------------------
var nodes = tree.nodes(data[0]); var nodes = tree.nodes(data[0]);
//------------------------------------------------------------ //------------------------------------------------------------
// Setup containers and skeleton of chart // Setup containers and skeleton of chart
var wrap = d3.select(this).selectAll('div').data([[nodes]]); var wrap = d3.select(this).selectAll('div').data([[nodes]]);
var wrapEnter = wrap.enter().append('div').attr('class', 'nvd3 nv-wrap nv-indentedtree'); var wrapEnter = wrap.enter().append('div').attr('class', 'nvd3 nv-wrap nv-indentedtree');
var tableEnter = wrapEnter.append('table'); var tableEnter = wrapEnter.append('table');
var table = wrap.select('table').attr('width', '100%').attr('class', tableClass); var table = wrap.select('table').attr('width', '100%').attr('class', tableClass);
//------------------------------------------------------------ //------------------------------------------------------------
if (header) { if (header) {
var thead = tableEnter.append('thead'); var thead = tableEnter.append('thead');
var theadRow1 = thead.append('tr'); var theadRow1 = thead.append('tr');
columns.forEach(function(column) { columns.forEach(function(column) {
theadRow1 theadRow1
.append('th') .append('th')
.attr('width', column.width ? column.width : '10%') .attr('width', column.width ? column.width : '10%')
.style('text-align', column.type == 'numeric' ? 'right' : 'left') .style('text-align', column.type == 'numeric' ? 'right' : 'left')
.append('span') .append('span')
.text(column.label); .text(column.label);
}); });
} }
var tbody = table.selectAll('tbody') var tbody = table.selectAll('tbody')
.data(function(d) {return d }); .data(function(d) {return d });
tbody.enter().append('tbody'); tbody.enter().append('tbody');
//compute max generations //compute max generations
depth = d3.max(nodes, function(node) { return node.depth }); depth = d3.max(nodes, function(node) { return node.depth });
tree.size([height, depth * childIndent]); //TODO: see if this is necessary at all tree.size([height, depth * childIndent]); //TODO: see if this is necessary at all
// Update the nodes… // Update the nodes…
var node = tbody.selectAll('tr') var node = tbody.selectAll('tr')
.data(function(d) { return d }, function(d) { return d.id || (d.id == ++i)}); .data(function(d) { return d }, function(d) { return d.id || (d.id == ++i)});
//.style('display', 'table-row'); //TODO: see if this does anything //.style('display', 'table-row'); //TODO: see if this does anything
node.exit().remove(); node.exit().remove();
node.select('img.nv-treeicon') node.select('img.nv-treeicon')
.attr('src', icon) .attr('src', icon)
.classed('folded', folded); .classed('folded', folded);
var nodeEnter = node.enter().append('tr'); var nodeEnter = node.enter().append('tr');
columns.forEach(function(column, index) { columns.forEach(function(column, index) {
var nodeName = nodeEnter.append('td') var nodeName = nodeEnter.append('td')
.style('padding-left', function(d) { return (index ? 0 : d.depth * childIndent + 12 + (icon(d) ? 0 : 16)) + 'px' }, 'important') //TODO: check why I did the ternary here .style('padding-left', function(d) { return (index ? 0 : d.depth * childIndent + 12 + (icon(d) ? 0 : 16)) + 'px' }, 'important') //TODO: check why I did the ternary here
.style('text-align', column.type == 'numeric' ? 'right' : 'left'); .style('text-align', column.type == 'numeric' ? 'right' : 'left');
if (index == 0) { if (index == 0) {
nodeName.append('img') nodeName.append('img')
.classed('nv-treeicon', true) .classed('nv-treeicon', true)
.classed('nv-folded', folded) .classed('nv-folded', folded)
.attr('src', icon) .attr('src', icon)
.style('width', '14px') .style('width', '14px')
.style('height', '14px') .style('height', '14px')
.style('padding', '0 1px') .style('padding', '0 1px')
.style('display', function(d) { return icon(d) ? 'inline-block' : 'none'; }) .style('display', function(d) { return icon(d) ? 'inline-block' : 'none'; })
.on('click', click); .on('click', click);
} }
nodeName.append('span') nodeName.append('span')
.attr('class', d3.functor(column.classes) ) .attr('class', d3.functor(column.classes) )
.text(function(d) { return column.format ? column.format(d) : .text(function(d) { return column.format ? column.format(d) :
(d[column.key] || '-') }); (d[column.key] || '-') });
if (column.showCount) if (column.showCount)
nodeName.append('span') nodeName.append('span')
.attr('class', 'nv-childrenCount') .attr('class', 'nv-childrenCount')
.text(function(d) { .text(function(d) {
return ((d.values && d.values.length) || (d._values && d._values.length)) ? return ((d.values && d.values.length) || (d._values && d._values.length)) ?
'(' + ((d.values && d.values.length) || (d._values && d._values.length)) + ')' '(' + ((d.values && d.values.length) || (d._values && d._values.length)) + ')'
: '' : ''
}); });
if (column.click) if (column.click)
nodeName.select('span').on('click', column.click); nodeName.select('span').on('click', column.click);
}); });
node node
.order() .order()
.on('click', function(d) { .on('click', function(d) {
dispatch.elementClick({ dispatch.elementClick({
row: this, //TODO: decide whether or not this should be consistent with scatter/line events or should be an html link (a href) row: this, //TODO: decide whether or not this should be consistent with scatter/line events or should be an html link (a href)
data: d, data: d,
pos: [d.x, d.y] pos: [d.x, d.y]
}); });
}) })
.on('dblclick', function(d) { .on('dblclick', function(d) {
dispatch.elementDblclick({ dispatch.elementDblclick({
row: this, row: this,
data: d, data: d,
pos: [d.x, d.y] pos: [d.x, d.y]
}); });
}) })
.on('mouseover', function(d) { .on('mouseover', function(d) {
dispatch.elementMouseover({ dispatch.elementMouseover({
row: this, row: this,
data: d, data: d,
pos: [d.x, d.y] pos: [d.x, d.y]
}); });
}) })
.on('mouseout', function(d) { .on('mouseout', function(d) {
dispatch.elementMouseout({ dispatch.elementMouseout({
row: this, row: this,
data: d, data: d,
pos: [d.x, d.y] pos: [d.x, d.y]
}); });
}); });
// Toggle children on click. // Toggle children on click.
function click(d, _, unshift) { function click(d, _, unshift) {
d3.event.stopPropagation(); d3.event.stopPropagation();
if(d3.event.shiftKey && !unshift) { if(d3.event.shiftKey && !unshift) {
//If you shift-click, it'll toggle fold all the children, instead of itself //If you shift-click, it'll toggle fold all the children, instead of itself
d3.event.shiftKey = false; d3.event.shiftKey = false;
d.values && d.values.forEach(function(node){ d.values && d.values.forEach(function(node){
if (node.values || node._values) { if (node.values || node._values) {
click(node, 0, true); click(node, 0, true);
} }
}); });
return true; return true;
} }
if(!hasChildren(d)) { if(!hasChildren(d)) {
//download file //download file
//window.location.href = d.url; //window.location.href = d.url;
return true; return true;
} }
if (d.values) { if (d.values) {
d._values = d.values; d._values = d.values;
d.values = null; d.values = null;
} else { } else {
d.values = d._values; d.values = d._values;
d._values = null; d._values = null;
} }
chart.update(); chart.update();
} }
function icon(d) { function icon(d) {
return (d._values && d._values.length) ? iconOpen : (d.values && d.values.length) ? iconClose : ''; return (d._values && d._values.length) ? iconOpen : (d.values && d.values.length) ? iconClose : '';
} }
function folded(d) { function folded(d) {
return (d._values && d._values.length); return (d._values && d._values.length);
} }
function hasChildren(d) { function hasChildren(d) {
var values = d.values || d._values; var values = d.values || d._values;
return (values && values.length); return (values && values.length);
} }
}); });
return chart; return chart;
} }
//============================================================ //============================================================
// Expose Public Variables // Expose Public Variables
//------------------------------------------------------------ //------------------------------------------------------------
chart.margin = function(_) { chart.margin = function(_) {
if (!arguments.length) return margin; if (!arguments.length) return margin;
margin.top = typeof _.top != 'undefined' ? _.top : margin.top; margin.top = typeof _.top != 'undefined' ? _.top : margin.top;
margin.right = typeof _.right != 'undefined' ? _.right : margin.right; margin.right = typeof _.right != 'undefined' ? _.right : margin.right;
margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom; margin.bottom = typeof _.bottom != 'undefined' ? _.bottom : margin.bottom;
margin.left = typeof _.left != 'undefined' ? _.left : margin.left; margin.left = typeof _.left != 'undefined' ? _.left : margin.left;
return chart; return chart;
}; };
chart.width = function(_) { chart.width = function(_) {
if (!arguments.length) return width; if (!arguments.length) return width;
width = _; width = _;
return chart; return chart;
}; };
chart.height = function(_) { chart.height = function(_) {
if (!arguments.length) return height; if (!arguments.length) return height;
height = _; height = _;
return chart; return chart;
}; };
chart.color = function(_) { chart.color = function(_) {
if (!arguments.length) return color; if (!arguments.length) return color;
color = nv.utils.getColor(_); color = nv.utils.getColor(_);
scatter.color(color); scatter.color(color);
return chart; return chart;
}; };
chart.id = function(_) { chart.id = function(_) {
if (!arguments.length) return id; if (!arguments.length) return id;
id = _; id = _;
return chart; return chart;
}; };
chart.header = function(_) { chart.header = function(_) {
if (!arguments.length) return header; if (!arguments.length) return header;
header = _; header = _;
return chart; return chart;
}; };
chart.noData = function(_) { chart.noData = function(_) {
if (!arguments.length) return noData; if (!arguments.length) return noData;
noData = _; noData = _;
return chart; return chart;
}; };
chart.columns = function(_) { chart.columns = function(_) {
if (!arguments.length) return columns; if (!arguments.length) return columns;
columns = _; columns = _;
return chart; return chart;
}; };
chart.tableClass = function(_) { chart.tableClass = function(_) {
if (!arguments.length) return tableClass; if (!arguments.length) return tableClass;
tableClass = _; tableClass = _;
return chart; return chart;
}; };
chart.iconOpen = function(_){ chart.iconOpen = function(_){
if (!arguments.length) return iconOpen; if (!arguments.length) return iconOpen;
iconOpen = _; iconOpen = _;
return chart; return chart;
} }
chart.iconClose = function(_){ chart.iconClose = function(_){
if (!arguments.length) return iconClose; if (!arguments.length) return iconClose;
iconClose = _; iconClose = _;
return chart; return chart;
} }
//============================================================ //============================================================
return chart; return chart;
} }
nv.models.legend = function() { nv.models.legend = function() {
//============================================================ //============================================================

2
src/models/discreteBarChart.js
Unescape Escape View File

@ -10,7 +10,7 @@ nv.models.discreteBarChart = function() {
, yAxis = nv.models.axis() , yAxis = nv.models.axis()
; ;
var margin = {top: 10, right: 10, bottom: 50, left: 60} var margin = {top: 15, right: 10, bottom: 50, left: 60}
, width = null , width = null
, height = null , height = null
, color = nv.utils.getColor() , color = nv.utils.getColor()

Write Preview
Loading…
Cancel
Save