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

Using category20 colors instead of category10, now the default colors work with up to 20 series, will deal with more later

Browse Source
master-patched
Bob Monteverde 12 years ago
parent 9ff72baad4
commit b806a46f91
15 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File

37
nv.d3.js
Unescape Escape View File

@ -909,7 +909,7 @@ nv.models.cumulativeLine = function() {
var margin = {top: 30, right: 20, bottom: 30, left: 60},
getWidth = function() { return 960 },
getHeight = function() { return 500 },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
dotRadius = function() { return 2.5 },
getX = function(d) { return d.x },
getY = function(d) { return d.y },
@ -1200,7 +1200,7 @@ nv.models.legend = function() {
var margin = {top: 5, right: 0, bottom: 5, left: 10},
width = 400,
height = 20,
color = d3.scale.category10().range();
color = d3.scale.category20().range();
var dispatch = d3.dispatch('legendClick', 'legendMouseover', 'legendMouseout');
@ -1310,7 +1310,7 @@ nv.models.line = function() {
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
height = 500,
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
id = Math.floor(Math.random() * 10000), //Create semi-unique ID incase user doesn't select one
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point
@ -1544,7 +1544,7 @@ nv.models.linePlusBar = function() {
dotRadius = function() { return 2.5 },
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
dispatch = d3.dispatch('tooltipShow', 'tooltipHide');
var x = d3.scale.linear(),
@ -1794,7 +1794,7 @@ nv.models.lineWithFocus = function() {
height1 = 400,
height2 = 100,
dotRadius = function() { return 2.5 },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
getX = function(d) { return d.x },
getY = function(d) { return d.y },
id = Math.floor(Math.random() * 10000); //Create semi-unique ID incase user doesn't select one
@ -2150,7 +2150,7 @@ nv.models.lineWithLegend = function() {
var margin = {top: 30, right: 20, bottom: 50, left: 60},
width = function() { return 960 },
height = function() { return 500 },
color = d3.scale.category10().range();
color = d3.scale.category20().range();
var x = d3.scale.linear(),
y = d3.scale.linear(),
@ -2587,10 +2587,11 @@ nv.models.pie = function() {
}
nv.models.scatter = function() {
//Default Settings
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
height = 500,
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
id = Math.floor(Math.random() * 100000), //Create semi-unique ID incase user doesn't selet one
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point
@ -2951,7 +2952,7 @@ nv.models.scatterWithLegend = function() {
yAxisLabelText = false,
showDistX = false,
showDistY = false,
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
forceX = [],
forceY = [];
@ -3008,6 +3009,7 @@ nv.models.scatterWithLegend = function() {
//TODO: margins should be adjusted based on what components are used: axes, axis labels, legend
//TODO: Fix height issue on first render if legend height is larger than margin.top, NEED TO FIX EVERY MODEL WITH A LEGEND
margin.top = legend.height();
var g = wrap.select('g')
@ -3029,7 +3031,6 @@ nv.models.scatterWithLegend = function() {
d3.transition(scatterWrap).call(scatter);
//TODO: FIX the dist line rotate on enable/disable series
if ( showDistX || showDistY) {
var distWrap = scatterWrap.selectAll('g.distribution')
.data(function(d) { return d }, function(d) { return d.key });
@ -3343,7 +3344,7 @@ nv.models.sparklinePlus = function() {
animate = true,
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
id = Math.floor(Math.random() * 100000), //Create semi-unique ID incase user doesn't selet one
xTickFormat = d3.format(',r'),
yTickFormat = d3.format(',.2f');
@ -3491,15 +3492,15 @@ nv.models.stackedArea = function() {
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
height = 500,
color = d3.scale.category10().range(),
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category20().range(),
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point
style = 'stack',
offset = 'zero',
order = 'default',
interactive = true, // If true, plots a voronoi overlay for advanced point interection
clipEdge = false, // if true, masks lines within x and y scale
xDomain, yDomain;
xDomain, yDomain; // Used to manually set the x and y domain, good to save time if calculation has already been made
/************************************
* offset:
@ -3779,7 +3780,7 @@ nv.models.stackedAreaWithLegend = function() {
getWidth = function() { return 960 },
getHeight = function() { return 500 },
dotRadius = function() { return 2.5 },
color = d3.scale.category10().range();
color = d3.scale.category20().range();
var x = d3.scale.linear(),
y = d3.scale.linear(),
@ -3830,6 +3831,7 @@ nv.models.stackedAreaWithLegend = function() {
stacked
.width(availableWidth)
.height(availableHeight)
.color(color)
var wrap = d3.select(this).selectAll('g.wrap').data([data]);
@ -3850,7 +3852,10 @@ nv.models.stackedAreaWithLegend = function() {
.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
legend.width(width/2 - margin.right);
legend
.width(width/2 - margin.right)
.color(color);
g.select('.legendWrap')
.datum(data)
.attr('transform', 'translate(' + (width/2 - margin.left) + ',' + (-margin.top) +')')

4
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -3,7 +3,7 @@ nv.models.cumulativeLine = function() {
var margin = {top: 30, right: 20, bottom: 30, left: 60},
getWidth = function() { return 960 },
getHeight = function() { return 500 },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
dotRadius = function() { return 2.5 },
getX = function(d) { return d.x },
getY = function(d) { return d.y },

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

@ -14,7 +14,7 @@ nv.models.historicalBar = function() {
forceX = [],
forceY = [],
clipEdge = true,
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
xDomain, yDomain;
var x = d3.scale.linear(),

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

@ -3,7 +3,7 @@ nv.models.legend = function() {
var margin = {top: 5, right: 0, bottom: 5, left: 10},
width = 400,
height = 20,
color = d3.scale.category10().range();
color = d3.scale.category20().range();
var dispatch = d3.dispatch('legendClick', 'legendMouseover', 'legendMouseout');

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

@ -4,7 +4,7 @@ nv.models.line = function() {
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
height = 500,
color = d3.scale.category10().range(),
color = d3.scale.category20().range(), // array of colors to be used in order
id = Math.floor(Math.random() * 10000), //Create semi-unique ID incase user doesn't select one
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point

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

@ -6,7 +6,7 @@ nv.models.linePlusBar = function() {
dotRadius = function() { return 2.5 },
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
dispatch = d3.dispatch('tooltipShow', 'tooltipHide');
var x = d3.scale.linear(),

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

@ -7,7 +7,7 @@ nv.models.lineWithFocus = function() {
height1 = 400,
height2 = 100,
dotRadius = function() { return 2.5 },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
getX = function(d) { return d.x },
getY = function(d) { return d.y },
id = Math.floor(Math.random() * 10000); //Create semi-unique ID incase user doesn't select one

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

@ -6,7 +6,7 @@ nv.models.lineWithLegend = function() {
dotRadius = function() { return 2.5 },
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
dispatch = d3.dispatch('tooltipShow', 'tooltipHide');
var x = d3.scale.linear(),

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

@ -3,7 +3,7 @@ nv.models.lineWithLegend = function() {
var margin = {top: 30, right: 20, bottom: 50, left: 60},
width = function() { return 960 },
height = function() { return 500 },
color = d3.scale.category10().range();
color = d3.scale.category20().range();
var x = d3.scale.linear(),
y = d3.scale.linear(),

3
src/models/scatter.js
Unescape Escape View File

@ -1,9 +1,10 @@
nv.models.scatter = function() {
//Default Settings
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
height = 500,
color = d3.scale.category10().range(),
color = d3.scale.category20().range(), // array of colors to be used in order
id = Math.floor(Math.random() * 100000), //Create semi-unique ID incase user doesn't selet one
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point

3
src/models/scatterWithLegend.js
Unescape Escape View File

@ -9,7 +9,7 @@ nv.models.scatterWithLegend = function() {
yAxisLabelText = false,
showDistX = false,
showDistY = false,
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
forceX = [],
forceY = [];
@ -66,6 +66,7 @@ nv.models.scatterWithLegend = function() {
//TODO: margins should be adjusted based on what components are used: axes, axis labels, legend
//TODO: Fix height issue on first render if legend height is larger than margin.top, NEED TO FIX EVERY MODEL WITH A LEGEND
margin.top = legend.height();
var g = wrap.select('g')

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

@ -6,7 +6,7 @@ nv.models.sparklinePlus = function() {
animate = true,
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category10().range(),
color = d3.scale.category20().range(),
id = Math.floor(Math.random() * 100000), //Create semi-unique ID incase user doesn't selet one
xTickFormat = d3.format(',r'),
yTickFormat = d3.format(',.2f');

8
src/models/stackedArea.js
Unescape Escape View File

@ -4,15 +4,15 @@ nv.models.stackedArea = function() {
var margin = {top: 0, right: 0, bottom: 0, left: 0},
width = 960,
height = 500,
color = d3.scale.category10().range(),
getX = function(d) { return d.x },
getY = function(d) { return d.y },
color = d3.scale.category20().range(), // array of colors to be used in order
getX = function(d) { return d.x }, // accessor to get the x value from a data point
getY = function(d) { return d.y }, // accessor to get the y value from a data point
style = 'stack',
offset = 'zero',
order = 'default',
interactive = true, // If true, plots a voronoi overlay for advanced point interection
clipEdge = false, // if true, masks lines within x and y scale
xDomain, yDomain;
xDomain, yDomain; // Used to manually set the x and y domain, good to save time if calculation has already been made
/************************************
* offset:

8
src/models/stackedAreaWithLegend.js
Unescape Escape View File

@ -4,7 +4,7 @@ nv.models.stackedAreaWithLegend = function() {
getWidth = function() { return 960 },
getHeight = function() { return 500 },
dotRadius = function() { return 2.5 },
color = d3.scale.category10().range();
color = d3.scale.category20().range();
var x = d3.scale.linear(),
y = d3.scale.linear(),
@ -55,6 +55,7 @@ nv.models.stackedAreaWithLegend = function() {
stacked
.width(availableWidth)
.height(availableHeight)
.color(color)
var wrap = d3.select(this).selectAll('g.wrap').data([data]);
@ -75,7 +76,10 @@ nv.models.stackedAreaWithLegend = function() {
.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
legend.width(width/2 - margin.right);
legend
.width(width/2 - margin.right)
.color(color);
g.select('.legendWrap')
.datum(data)
.attr('transform', 'translate(' + (width/2 - margin.left) + ',' + (-margin.top) +')')

Write Preview
Loading…
Cancel
Save