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

fixed update for parallelCoords.js, ran make for all merged pull requests

Browse Source
master-patched
Tyler Wolf 11 years ago
parent aad23db0f0
commit e092bac1c2
6 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File

28
examples/parallelCoordinates.html
Unescape Escape View File

@ -24,34 +24,6 @@ svg {
font: 10px sans-serif;
}
.background path {
fill: none;
stroke: #ccc;
stroke-opacity: .4;
shape-rendering: crispEdges;
}
.foreground path {
fill: none;
stroke: steelblue;
stroke-opacity: .7;
}
.brush .extent {
fill-opacity: .3;
stroke: #fff;
shape-rendering: crispEdges;
}
.axis line, .axis path {
fill: none;
stroke: #000;
shape-rendering: crispEdges;
}
.axis text {
text-shadow: 0 1px 0 #fff;
}
</style>
</head>
<body>

37
nv.d3.js
Unescape Escape View File

@ -432,11 +432,11 @@ nv.models.axis = function() {
axisLabel.exit().remove();
switch (axis.orient()) {
case 'top':
axisLabel.enter().append('text').attr('class', 'nv-axislabel')
.attr('text-anchor', 'middle')
.attr('y', 0);
axisLabel.enter().append('text').attr('class', 'nv-axislabel');
var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
axisLabel
.attr('text-anchor', 'middle')
.attr('y', 0)
.attr('x', w/2);
if (showMaxMin) {
var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin')
@ -479,11 +479,11 @@ nv.models.axis = function() {
.attr('transform', function(d,i,j) { return 'rotate(' + rotateLabels + ' 0,0)' })
.attr('text-anchor', rotateLabels%360 > 0 ? 'start' : 'end');
}
axisLabel.enter().append('text').attr('class', 'nv-axislabel')
.attr('text-anchor', 'middle')
.attr('y', xLabelMargin);
axisLabel.enter().append('text').attr('class', 'nv-axislabel');
var w = (scale.range().length==2) ? scale.range()[1] : (scale.range()[scale.range().length-1]+(scale.range()[1]-scale.range()[0]));
axisLabel
.attr('text-anchor', 'middle')
.attr('y', xLabelMargin)
.attr('x', w/2);
if (showMaxMin) {
//if (showMaxMin && !isOrdinal) {
@ -518,11 +518,11 @@ nv.models.axis = function() {
break;
case 'right':
axisLabel.enter().append('text').attr('class', 'nv-axislabel')
axisLabel.enter().append('text').attr('class', 'nv-axislabel');
axisLabel
.attr('text-anchor', rotateYLabel ? 'middle' : 'begin')
.attr('transform', rotateYLabel ? 'rotate(90)' : '')
.attr('y', rotateYLabel ? (-Math.max(margin.right,width) + 12) : -10); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
axisLabel
.attr('y', rotateYLabel ? (-Math.max(margin.right,width) + 12) : -10) //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
.attr('x', rotateYLabel ? (scale.range()[0] / 2) : axis.tickPadding());
if (showMaxMin) {
var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin')
@ -560,11 +560,11 @@ nv.models.axis = function() {
if(labelPadding > width) width = labelPadding;
});
*/
axisLabel.enter().append('text').attr('class', 'nv-axislabel')
axisLabel.enter().append('text').attr('class', 'nv-axislabel');
axisLabel
.attr('text-anchor', rotateYLabel ? 'middle' : 'end')
.attr('transform', rotateYLabel ? 'rotate(-90)' : '')
.attr('y', rotateYLabel ? (-Math.max(margin.left,width) + 12) : -10); //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
axisLabel
.attr('y', rotateYLabel ? (-Math.max(margin.left,width) + 12) : -10) //TODO: consider calculating this based on largest tick width... OR at least expose this on chart
.attr('x', rotateYLabel ? (-scale.range()[0] / 2) : -axis.tickPadding());
if (showMaxMin) {
var axisMaxMin = wrap.selectAll('g.nv-axisMaxMin')
@ -5927,10 +5927,10 @@ nv.models.multiBarChart = function() {
if(rotateLabels)
xTicks
.selectAll('text')
.attr('transform', function(d,i,j) { return 'rotate('+rotateLabels+' 0,0)' })
.attr('text-transform', rotateLabels > 0 ? 'start' : 'end');
.selectAll('text')
.attr('transform', 'rotate(' + rotateLabels + ' 0,0)')
.attr('text-anchor', rotateLabels > 0 ? 'start' : 'end');
g.select('.nv-x.nv-axis').selectAll('g.nv-axisMaxMin text')
.style('opacity', 1);
@ -8233,7 +8233,7 @@ nv.models.pieChart = function() {
//------------------------------------------------------------
// Display No Data message if there's nothing to show.
if (!data || !data.length) {
if (!data[0] || !data[0].length) {
var noDataText = container.selectAll('.nv-noData').data([noData]);
noDataText.enter().append('text')
@ -11296,6 +11296,9 @@ nv.models.stackedAreaChart = function() {
return d
});
state.disabled = data.map(function(d) { return !!d.disabled });
dispatch.stateChange(state);
//selection.transition().call(chart);
chart(selection);
});

8
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
src/models/parallelCoordinates.js
Unescape Escape View File

@ -41,6 +41,8 @@ nv.models.parallelCoordinates = function() {
active = data; //set all active before first brush call
chart.update = function() { }; //This is a placeholder until this chart is made resizeable
//------------------------------------------------------------
// Setup Scales
@ -85,20 +87,22 @@ nv.models.parallelCoordinates = function() {
// Add grey background lines for context.
background = g.append('g')
background = gEnter.append('g')
.attr('class', 'background')
.selectAll('path')
.data(data)
.enter().append('path')
.attr('d', path);
.attr('d', path)
;
// Add blue foreground lines for focus.
foreground = g.append('g')
foreground = gEnter.append('g')
.attr('class', 'foreground')
.selectAll('path')
.data(data)
.enter().append('path')
.attr('d', path);
.attr('d', path)
;
// Add a group element for each dimension.
var dimension = g.selectAll('.dimension')

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

@ -63,7 +63,7 @@ nv.models.pieChart = function() {
//------------------------------------------------------------
// Display No Data message if there's nothing to show.
if (!data || !data.length) {
if (!data[0] || !data[0].length) {
var noDataText = container.selectAll('.nv-noData').data([noData]);
noDataText.enter().append('text')

31
src/nv.d3.css
Unescape Escape View File

@ -668,4 +668,35 @@ svg .title {
*/
}
/**********
* Parallel Coordinates
*/
.nvd3 .background path {
fill: none;
stroke: #ccc;
stroke-opacity: .4;
shape-rendering: crispEdges;
}
.nvd3 .foreground path {
fill: none;
stroke: steelblue;
stroke-opacity: .7;
}
.nvd3 .brush .extent {
fill-opacity: .3;
stroke: #fff;
shape-rendering: crispEdges;
}
.nvd3 .axis line, .axis path {
fill: none;
stroke: #000;
shape-rendering: crispEdges;
}
.nvd3 .axis text {
text-shadow: 0 1px 0 #fff;
}
Write Preview
Loading…
Cancel
Save