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

whitespace cleanup in scatterChart

Browse Source
master-patched
Bob Monteverde 12 years ago
parent 58de184cf9
commit 8cc955c29c
3 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File

54
nv.d3.js
Unescape Escape View File

@ -5926,33 +5926,35 @@ nv.models.scatterChart = function() {
// Public Variables with Default Settings // Public Variables with Default Settings
//------------------------------------------------------------ //------------------------------------------------------------
var margin = {top: 30, right: 20, bottom: 50, left: 60} var margin = {top: 30, right: 20, bottom: 50, left: 60}
, width = null , width = null
, height = null , height = null
, color = d3.scale.category20().range() , color = d3.scale.category20().range()
//x = scatter.xScale(), //x = scatter.xScale(),
, x = d3.fisheye.scale(d3.scale.linear).distortion(0) , x = d3.fisheye.scale(d3.scale.linear).distortion(0)
//y = scatter.yScale(), //y = scatter.yScale(),
, y = d3.fisheye.scale(d3.scale.linear).distortion(0) , y = d3.fisheye.scale(d3.scale.linear).distortion(0)
, showDistX = false , showDistX = false
, showDistY = false , showDistY = false
, showLegend = true , showLegend = true
, showControls = true , showControls = true
, fisheye = 0 , fisheye = 0
, pauseFisheye = false , pauseFisheye = false
, tooltips = true , tooltips = true
, tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' } , tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' }
, tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' } , tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' }
, tooltip = function(key, x, y, e, graph) { , tooltip = function(key, x, y, e, graph) {
return '<h3>' + key + '</h3>' + return '<h3>' + key + '</h3>' +
'<p>' + y + ' at ' + x + '</p>' '<p>' + y + ' at ' + x + '</p>'
} }
, scatter = nv.models.scatter().xScale(x).yScale(y) , scatter = nv.models.scatter().xScale(x).yScale(y)
, xAxis = nv.models.axis().orient('bottom').tickPadding(10) , xAxis = nv.models.axis().orient('bottom').tickPadding(10)
, yAxis = nv.models.axis().orient('left').tickPadding(10) , yAxis = nv.models.axis().orient('left').tickPadding(10)
, legend = nv.models.legend().height(30) , legend = nv.models.legend().height(30)
, controls = nv.models.legend().height(30) , controls = nv.models.legend().height(30)
, dispatch = d3.dispatch('tooltipShow', 'tooltipHide') , distX = nv.models.distribution().axis('x')
, distY = nv.models.distribution().axis('y')
, dispatch = d3.dispatch('tooltipShow', 'tooltipHide')
; ;
//============================================================ //============================================================
@ -5962,9 +5964,7 @@ nv.models.scatterChart = function() {
// Private Variables // Private Variables
//------------------------------------------------------------ //------------------------------------------------------------
var distX = nv.models.distribution().axis('x').scale(x) var x0, y0;
, distY = nv.models.distribution().axis('y').scale(y)
, x0, y0; //TODO: abstract distribution component and have old scales stored there
var showTooltip = function(e, offsetElement) { var showTooltip = function(e, offsetElement) {
//TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?) //TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?)
@ -6103,6 +6103,7 @@ nv.models.scatterChart = function() {
distX distX
.scale(x)
.width(availableWidth) .width(availableWidth)
.color(data.map(function(d,i) { .color(data.map(function(d,i) {
return d.color || color[i % color.length]; return d.color || color[i % color.length];
@ -6116,6 +6117,7 @@ nv.models.scatterChart = function() {
distY distY
.scale(y)
.width(availableHeight) .width(availableHeight)
.color(data.map(function(d,i) { .color(data.map(function(d,i) {
return d.color || color[i % color.length]; return d.color || color[i % color.length];
@ -6266,6 +6268,8 @@ nv.models.scatterChart = function() {
chart.controls = legend; chart.controls = legend;
chart.xAxis = xAxis; chart.xAxis = xAxis;
chart.yAxis = yAxis; chart.yAxis = yAxis;
chart.distX = distX;
chart.distY = distY;
d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius'); d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius');

4
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

54
src/models/scatterChart.js
Unescape Escape View File

@ -5,33 +5,35 @@ nv.models.scatterChart = function() {
// Public Variables with Default Settings // Public Variables with Default Settings
//------------------------------------------------------------ //------------------------------------------------------------
var margin = {top: 30, right: 20, bottom: 50, left: 60} var margin = {top: 30, right: 20, bottom: 50, left: 60}
, width = null , width = null
, height = null , height = null
, color = d3.scale.category20().range() , color = d3.scale.category20().range()
//x = scatter.xScale(), //x = scatter.xScale(),
, x = d3.fisheye.scale(d3.scale.linear).distortion(0) , x = d3.fisheye.scale(d3.scale.linear).distortion(0)
//y = scatter.yScale(), //y = scatter.yScale(),
, y = d3.fisheye.scale(d3.scale.linear).distortion(0) , y = d3.fisheye.scale(d3.scale.linear).distortion(0)
, showDistX = false , showDistX = false
, showDistY = false , showDistY = false
, showLegend = true , showLegend = true
, showControls = true , showControls = true
, fisheye = 0 , fisheye = 0
, pauseFisheye = false , pauseFisheye = false
, tooltips = true , tooltips = true
, tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' } , tooltipX = function(key, x, y) { return '<strong>' + x + '</strong>' }
, tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' } , tooltipY = function(key, x, y) { return '<strong>' + y + '</strong>' }
, tooltip = function(key, x, y, e, graph) { , tooltip = function(key, x, y, e, graph) {
return '<h3>' + key + '</h3>' + return '<h3>' + key + '</h3>' +
'<p>' + y + ' at ' + x + '</p>' '<p>' + y + ' at ' + x + '</p>'
} }
, scatter = nv.models.scatter().xScale(x).yScale(y) , scatter = nv.models.scatter().xScale(x).yScale(y)
, xAxis = nv.models.axis().orient('bottom').tickPadding(10) , xAxis = nv.models.axis().orient('bottom').tickPadding(10)
, yAxis = nv.models.axis().orient('left').tickPadding(10) , yAxis = nv.models.axis().orient('left').tickPadding(10)
, legend = nv.models.legend().height(30) , legend = nv.models.legend().height(30)
, controls = nv.models.legend().height(30) , controls = nv.models.legend().height(30)
, dispatch = d3.dispatch('tooltipShow', 'tooltipHide') , distX = nv.models.distribution().axis('x')
, distY = nv.models.distribution().axis('y')
, dispatch = d3.dispatch('tooltipShow', 'tooltipHide')
; ;
//============================================================ //============================================================
@ -41,9 +43,7 @@ nv.models.scatterChart = function() {
// Private Variables // Private Variables
//------------------------------------------------------------ //------------------------------------------------------------
var distX = nv.models.distribution().axis('x').scale(x) var x0, y0;
, distY = nv.models.distribution().axis('y').scale(y)
, x0, y0; //TODO: abstract distribution component and have old scales stored there
var showTooltip = function(e, offsetElement) { var showTooltip = function(e, offsetElement) {
//TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?) //TODO: make tooltip style an option between single or dual on axes (maybe on all charts with axes?)
@ -182,6 +182,7 @@ nv.models.scatterChart = function() {
distX distX
.scale(x)
.width(availableWidth) .width(availableWidth)
.color(data.map(function(d,i) { .color(data.map(function(d,i) {
return d.color || color[i % color.length]; return d.color || color[i % color.length];
@ -195,6 +196,7 @@ nv.models.scatterChart = function() {
distY distY
.scale(y)
.width(availableHeight) .width(availableHeight)
.color(data.map(function(d,i) { .color(data.map(function(d,i) {
return d.color || color[i % color.length]; return d.color || color[i % color.length];
@ -345,6 +347,8 @@ nv.models.scatterChart = function() {
chart.controls = legend; chart.controls = legend;
chart.xAxis = xAxis; chart.xAxis = xAxis;
chart.yAxis = yAxis; chart.yAxis = yAxis;
chart.distX = distX;
chart.distY = distY;
d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius'); d3.rebind(chart, scatter, 'id', 'interactive', 'pointActive', 'shape', 'size', 'xScale', 'yScale', 'zScale', 'xDomain', 'yDomain', 'sizeDomain', 'forceX', 'forceY', 'forceSize', 'clipVoronoi', 'clipRadius');

Write Preview
Loading…
Cancel
Save