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

Added filter functionality to indentedtree model (can be used to filter values besides zero)

Browse Source
master-patched
Tyler Wolf 11 years ago
parent 7b95e42a64
commit 1327ca3f86
3 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File

31
nv.d3.js
Unescape Escape View File

@ -3129,7 +3129,6 @@ nv.models.distribution = function() {
return chart;
}
nv.models.indentedTree = function() {
//============================================================
@ -3142,6 +3141,7 @@ nv.models.indentedTree = function() {
, color = nv.utils.defaultColor()
, id = Math.floor(Math.random() * 10000)
, header = true
, filterZero = false
, noData = "No Data Available."
, childIndent = 20
, columns = [{key:'key', label: 'Name', type:'text'}] //TODO: consider functions like chart.addColumn, chart.removeColumn, instead of a block like this
@ -3176,7 +3176,6 @@ nv.models.indentedTree = function() {
var nodes = tree.nodes(data[0]);
//------------------------------------------------------------
// Setup containers and skeleton of chart
@ -3205,7 +3204,7 @@ nv.models.indentedTree = function() {
var tbody = table.selectAll('tbody')
.data(function(d) {return d });
.data(function(d) { return d });
tbody.enter().append('tbody');
@ -3217,7 +3216,7 @@ nv.models.indentedTree = function() {
// Update the nodes…
var node = tbody.selectAll('tr')
.data(function(d) { return d }, function(d) { return d.id || (d.id == ++i)});
.data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; }) }, function(d) { return d.id || (d.id == ++i)});
//.style('display', 'table-row'); //TODO: see if this does anything
node.exit().remove();
@ -3255,15 +3254,16 @@ nv.models.indentedTree = function() {
.text(function(d) { return column.format ? column.format(d) :
(d[column.key] || '-') });
if (column.showCount)
if (column.showCount) {
nodeName.append('span')
.attr('class', 'nv-childrenCount')
.text(function(d) {
return ((d.values && d.values.length) || (d._values && d._values.length)) ?
'(' + ((d.values && d.values.length) || (d._values && d._values.length)) + ')'
: ''
});
.attr('class', 'nv-childrenCount');
node.selectAll('span.nv-childrenCount').text(function(d) {
return ((d.values && d.values.length) || (d._values && d._values.length)) ?
'(' + ((d.values && d.values.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; }).length) || (d._values && d._values.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; }).length)) + ')'
: ''
});
}
if (column.click)
nodeName.select('span').on('click', column.click);
@ -3406,6 +3406,12 @@ nv.models.indentedTree = function() {
return chart;
};
chart.filterZero = function(_) {
if (!arguments.length) return filterZero;
filterZero = _;
return chart;
};
chart.columns = function(_) {
if (!arguments.length) return columns;
columns = _;
@ -3434,8 +3440,7 @@ nv.models.indentedTree = function() {
return chart;
}
nv.models.legend = function() {
};nv.models.legend = function() {
//============================================================
// Public Variables with Default Settings

10
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

30
src/models/indentedTree.js
Unescape Escape View File

@ -1,4 +1,3 @@
nv.models.indentedTree = function() {
//============================================================
@ -11,6 +10,7 @@ nv.models.indentedTree = function() {
, color = nv.utils.defaultColor()
, id = Math.floor(Math.random() * 10000)
, header = true
, filterZero = false
, noData = "No Data Available."
, childIndent = 20
, columns = [{key:'key', label: 'Name', type:'text'}] //TODO: consider functions like chart.addColumn, chart.removeColumn, instead of a block like this
@ -45,7 +45,6 @@ nv.models.indentedTree = function() {
var nodes = tree.nodes(data[0]);
//------------------------------------------------------------
// Setup containers and skeleton of chart
@ -74,7 +73,7 @@ nv.models.indentedTree = function() {
var tbody = table.selectAll('tbody')
.data(function(d) {return d });
.data(function(d) { return d });
tbody.enter().append('tbody');
@ -86,7 +85,7 @@ nv.models.indentedTree = function() {
// Update the nodes…
var node = tbody.selectAll('tr')
.data(function(d) { return d }, function(d) { return d.id || (d.id == ++i)});
.data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; }) }, function(d) { return d.id || (d.id == ++i)});
//.style('display', 'table-row'); //TODO: see if this does anything
node.exit().remove();
@ -124,15 +123,16 @@ nv.models.indentedTree = function() {
.text(function(d) { return column.format ? column.format(d) :
(d[column.key] || '-') });
if (column.showCount)
if (column.showCount) {
nodeName.append('span')
.attr('class', 'nv-childrenCount')
.text(function(d) {
return ((d.values && d.values.length) || (d._values && d._values.length)) ?
'(' + ((d.values && d.values.length) || (d._values && d._values.length)) + ')'
: ''
});
.attr('class', 'nv-childrenCount');
node.selectAll('span.nv-childrenCount').text(function(d) {
return ((d.values && d.values.length) || (d._values && d._values.length)) ?
'(' + ((d.values && d.values.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; }).length) || (d._values && d._values.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) : true; }).length)) + ')'
: ''
});
}
if (column.click)
nodeName.select('span').on('click', column.click);
@ -275,6 +275,12 @@ nv.models.indentedTree = function() {
return chart;
};
chart.filterZero = function(_) {
if (!arguments.length) return filterZero;
filterZero = _;
return chart;
};
chart.columns = function(_) {
if (!arguments.length) return columns;
columns = _;
@ -303,4 +309,4 @@ nv.models.indentedTree = function() {
return chart;
}
};
Write Preview
Loading…
Cancel
Save