From 66fa17551b5cf4fb05bee37c08bdee36f34874c5 Mon Sep 17 00:00:00 2001 From: Bob Monteverde Date: Thu, 5 Apr 2012 05:18:21 -0400 Subject: [PATCH] lots of changes with nv.chart.line, not 100% set with the API yet, but the new lineChart.html example should be 100 times easier to use than lineWithLegend.html example --- examples/lineChart.html | 8 ++-- nv.d3.js | 46 +++++++++--------- nv.d3.min.js | 4 +- src/charts/lineChart.js | 93 ++++++++++++++++++++++-------------- src/core.js | 32 ++++++++----- src/models/lineWithLegend.js | 14 ++---- 6 files changed, 108 insertions(+), 89 deletions(-) diff --git a/examples/lineChart.html b/examples/lineChart.html index 9ff1f40..2db3713 100644 --- a/examples/lineChart.html +++ b/examples/lineChart.html @@ -34,6 +34,7 @@ text { + @@ -46,8 +47,9 @@ text { nv.charts.line() - .data(sinAndCos()) .selector('#chart1') + .data(sinAndCos()) + .y(function(d) { return d.voltage }) .yAxisLabel('Voltage (v)') .build(); @@ -59,8 +61,8 @@ function sinAndCos() { cos = []; for (var i = 0; i < 100; i++) { - sin.push({x: i, y: Math.sin(i/10)}); - cos.push({x: i, y: .5 * Math.cos(i/10)}); + sin.push({x: i, voltage: Math.sin(i/10)}); + cos.push({x: i, voltage: .5 * Math.cos(i/10)}); } return [ diff --git a/nv.d3.js b/nv.d3.js index 6bb1906..6b9d5af 100644 --- a/nv.d3.js +++ b/nv.d3.js @@ -87,7 +87,11 @@ })(jQuery); (function(){ -var nv = {version: "0.0.1"}; +var nv = { + version: '0.0.1', + dev: true //set false when in production +}; + window.nv = nv; @@ -96,15 +100,15 @@ nv.charts = {}; //stores all the ready to use charts nv.graphs = []; //stores all the graphs currently on the page nv.log = {}; //stores some statistics and potential error messages -nv.dispatch = d3.dispatch("render_start", "render_end"); +nv.dispatch = d3.dispatch('render_start', 'render_end'); // ******************************************** // Public Helper functions, not part of NV window.log = function(obj) { - if ((typeof(window.console) === "object") - && (typeof(window.console.log) === "function")) + if ((typeof(window.console) === 'object') + && (typeof(window.console.log) === 'function')) console.log.apply(console, arguments); return obj; @@ -116,24 +120,22 @@ window.log = function(obj) { // ******************************************** // Public Core NV functions -nv.dispatch.on("render_start", function(e) { +nv.dispatch.on('render_start', function(e) { nv.log.startTime = +new Date; - //log('start', nv.log.startTime); }); -nv.dispatch.on("render_end", function(e) { +nv.dispatch.on('render_end', function(e) { nv.log.endTime = +new Date; nv.log.totalTime = nv.log.endTime - nv.log.startTime; - //log('end', nv.log.endTime); - log('total', nv.log.totalTime); //used for development, to keep track of graph generation times + if (nv.dev) log('total', nv.log.totalTime); //used for development, to keep track of graph generation times }); // ******************************************** // Public Core NV functions -nv.render = function render(stepSize) { - var step = stepSize || 1; // number of graphs to generate in each timout loop +nv.render = function render(step) { + step = step || 1; // number of graphs to generate in each timout loop render.active = true; nv.dispatch.render_start(); @@ -149,7 +151,7 @@ nv.render = function render(stepSize) { render.queue.splice(0, i); - if (render.queue.length > 0) setTimeout(arguments.callee, 0); + if (render.queue.length) setTimeout(arguments.callee, 0); else { nv.render.active = false; nv.dispatch.render_end(); @@ -160,7 +162,7 @@ nv.render.queue = []; nv.addGraph = function(obj) { - if (typeof arguments[0] === "function") + if (typeof arguments[0] === 'function') obj = {generate: arguments[0], callback: arguments[1]}; nv.render.queue.push(obj); @@ -169,6 +171,10 @@ nv.addGraph = function(obj) { }; + +nv.identity = function(d) { return d }; + + nv.strip = function(s) { return s.replace(/(\s|&)/g,''); } @@ -1377,6 +1383,9 @@ nv.models.lineWithLegend = function() { } chart.dispatch = dispatch; + chart.legend = legend; + chart.xAxis = xAxis; + chart.yAxis = yAxis; chart.x = function(_) { if (!arguments.length) return getX; @@ -1418,17 +1427,6 @@ nv.models.lineWithLegend = function() { }; - // Expose the x-axis' tickFormat method. - //chart.xAxis = {}; - //d3.rebind(chart.xAxis, xAxis, 'tickFormat'); - chart.xAxis = xAxis; - - // Expose the y-axis' tickFormat method. - //chart.yAxis = {}; - //d3.rebind(chart.yAxis, yAxis, 'tickFormat'); - chart.yAxis = yAxis; - - return chart; } diff --git a/nv.d3.min.js b/nv.d3.min.js index 903b0f8..79c2ef8 100644 --- a/nv.d3.min.js +++ b/nv.d3.min.js @@ -1,4 +1,4 @@ /***** * A no frills tooltip implementation. - *****/(function(a){var b=window.nvtooltip={};b.show=function(b,c,d,e){var f=a('
');d=d||"s",e=e||20,f.html(c).css({left:-1e3,top:-1e3,opacity:0}).appendTo("body");var g=f.height()+parseInt(f.css("padding-top"))+parseInt(f.css("padding-bottom")),h=f.width()+parseInt(f.css("padding-left"))+parseInt(f.css("padding-right")),i=a(window).width(),j=a(window).height(),k=a("body").scrollTop(),l=a("body").scrollLeft(),m,n;switch(d){case"e":m=b[0]-h-e,n=b[1]-g/2,mk+j&&(n=k-g-5);break;case"w":m=b[0]+e,n=b[1]-g/2,m+h>i&&(m=b[0]-h-e),nk+j&&(n=k-g-5);break;case"n":m=b[0]-h/2,n=b[1]+e,mi&&(m=i-h-5),n+g>k+j&&(n=b[1]-g-e);break;case"s":m=b[0]-h/2,n=b[1]-g-e,mi&&(m=i-h-5),k>n&&(n=b[1]+20)}f.css({left:m,top:n,opacity:1});return f},b.cleanup=function(){var b=a(".nvtooltip");b.css({"transition-delay":"0 !important","-moz-transition-delay":"0 !important","-webkit-transition-delay":"0 !important"}),b.css("opacity",0),setTimeout(function(){b.remove()},500)}})(jQuery),function(){function c(a,b,c){return function(d,e,f){var g=a(d),h=[];g1)while(g0?setTimeout(arguments.callee,0):(a.render.active=!1,a.dispatch.render_end())},0)},a.render.queue=[],a.addGraph=function(b){typeof arguments[0]=="function"&&(b={generate:arguments[0],callback:arguments[1]}),a.render.queue.push(b),a.render.active||a.render()},a.strip=function(a){return a.replace(/(\s|&)/g,"")},d3.time.monthEnd=function(a){return new Date(a.getFullYear(),a.getMonth(),0)},d3.time.monthEnds=c(d3.time.monthEnd,function(a){a.setUTCDate(a.getUTCDate()+1),a.setDate(b(a.getMonth()+1,a.getFullYear()))},function(a){return a.getMonth()}),a.models.legend=function(){function f(g){g.each(function(f){var g=d3.select(this).selectAll("g.legend").data([f]),h=g.enter().append("g").attr("class","legend").append("g"),i=g.select("g").attr("transform","translate("+a.left+","+a.top+")"),j=i.selectAll(".series").data(function(a){return a}),k=j.enter().append("g").attr("class","series").on("mouseover",function(a,b){e.legendMouseover(a,b)}).on("mouseout",function(a,b){e.legendMouseout(a,b)}).on("click",function(a,b){e.legendClick(a,b)});k.append("circle").style("fill",function(a,b){return a.color||d[b%20]}).style("stroke",function(a,b){return a.color||d[b%20]}).style("stroke-width",2).attr("r",5),k.append("text").text(function(a){return a.key}).attr("text-anchor","start").attr("dy",".32em").attr("dx","8"),j.classed("disabled",function(a){return a.disabled}),j.exit().remove();var l=5,m=5,n=0,o;j.attr("transform",function(c,d){var e=d3.select(this).select("text").node().getComputedTextLength()+28;o=m,bn&&(n=m);return"translate("+o+","+l+")"}),i.attr("transform","translate("+(b-a.right-n)+","+a.top+")"),c=a.top+a.bottom+l+15});return f}var a={top:5,right:0,bottom:5,left:10},b=400,c=20,d=d3.scale.category10().range(),e=d3.dispatch("legendClick","legendMouseover","legendMouseout");f.dispatch=e,f.margin=function(b){if(!arguments.length)return a;a=b;return f},f.width=function(a){if(!arguments.length)return b;b=a;return f},f.height=function(a){if(!arguments.length)return c;c=a;return f},f.color=function(a){if(!arguments.length)return d;d=a;return f};return f},a.models.xaxis=function(){function f(g){g.each(function(f){d.domain(a).range(b);var g=d3.select(this).selectAll("text.axislabel").data([c||null]);g.enter().append("text").attr("class","axislabel").attr("text-anchor","middle").attr("x",b[1]/2).attr("y",25),g.exit().remove(),g.text(function(a){return a}),d3.transition(d3.select(this)).call(e),d3.select(this).selectAll("line.tick").filter(function(a){return!parseFloat(Math.round(a*1e5)/1e6)}).classed("zero",!0)});return f}var a=[0,1],b=[0,1],c=!1,d=d3.scale.linear(),e=d3.svg.axis().scale(d).orient("bottom");f.domain=function(b){if(!arguments.length)return a;a=b;return f},f.range=function(a){if(!arguments.length)return b;b=a;return f},f.scale=function(a){if(!arguments.length)return d;d=a,e.scale(d);return f},f.axisLabel=function(a){if(!arguments.length)return c;c=a;return f},d3.rebind(f,e,"orient","ticks","tickSubdivide","tickSize","tickPadding","tickFormat");return f},a.models.yaxis=function(){function f(g){g.each(function(f){d.domain(a).range(b);var g=d3.select(this).selectAll("text.axislabel").data([c||null]);g.enter().append("text").attr("class","axislabel").attr("transform","rotate(-90)").attr("text-anchor","middle").attr("y",-40),g.exit().remove(),g.attr("x",-b[0]/2).text(function(a){return a}),d3.transition(d3.select(this)).call(e),d3.select(this).selectAll("line.tick").filter(function(a){return!parseFloat(Math.round(a*1e5)/1e6)}).classed("zero",!0)});return f}var a=[0,1],b=[0,1],c=!1,d=d3.scale.linear(),e=d3.svg.axis().scale(d).orient("left");f.domain=function(b){if(!arguments.length)return a;a=b;return f},f.range=function(a){if(!arguments.length)return b;b=a;return f},f.axisLabel=function(a){if(!arguments.length)return c;c=a;return f},d3.rebind(f,e,"scale","orient","ticks","tickSubdivide","tickSize","tickPadding","tickFormat");return f},a.models.bar=function(){function i(j){j.each(function(i){e.domain(["One","Two","Three","Four","Five"]).rangeRoundBands([0,b-a.left-a.right],.1),f.domain([0,d3.max(i,function(a){return a.y})]).range([c-a.top-a.bottom,0]),g.ticks(b/100),h.ticks(c/36).tickSize(-(b-a.right-a.left),0),h.tickSize(-(b-a.right-a.left),0);var j=d3.select(this).selectAll("g.wrap").data([i]),k=j.enter().append("g").attr("class","wrap").append("g");k.append("g").attr("class","x axis"),k.append("g").attr("class","y axis"),k.append("g").attr("class","bars"),j.attr("width",b).attr("height",c);var l=j.select("g").attr("transform","translate("+a.left+","+a.top+")"),m=j.select(".bars").selectAll(".bar").data(function(a){return a});m.exit().remove();var n=m.enter().append("g").attr("class","bar").on("mouseover",function(a,b){d3.select(this).classed("hover",!0)}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1)});n.append("rect").attr("y",function(a){return f(0)}),n.append("text").attr("text-anchor","middle").attr("dy","-4px"),m.attr("transform",function(a,b){return"translate("+e(a.label)+",0)"}),m.selectAll("rect").order().attr("width",e.rangeBand).transition().duration(d).attr("x",0).attr("y",function(a){return f(a.y)}).attr("height",function(a){return f.range()[0]-f(a.y)}),m.selectAll("text").attr("x",0).attr("y",function(a){return f(a.y)}).attr("dx",e.rangeBand()/2).text(function(a){return a.y}),l.select(".x.axis").attr("transform","translate(0,"+f.range()[0]+")").call(g),l.select(".y.axis").call(h)});return i}var a={top:20,right:10,bottom:20,left:60},b=960,c=500,d=500,e=d3.scale.ordinal(),f=d3.scale.linear(),g=d3.svg.axis().scale(e).orient("bottom").ticks(5),h=d3.svg.axis().scale(f).orient("left");i.margin=function(b){if(!arguments.length)return a;a=b;return i},i.width=function(c){if(!arguments.length)return b;a.left+a.right+20>c?b=a.left+a.right+20:b=c;return i},i.height=function(b){if(!arguments.length)return c;a.top+a.bottom+20>b?c=a.top+a.bottom+20:c=b;return i},i.animate=function(a){if(!arguments.length)return d;d=a;return i},i.xaxis={},d3.rebind(i.xaxis,g,"tickFormat"),i.yaxis={},d3.rebind(i.yaxis,h,"tickFormat");return i},a.models.line=function(){function q(r){r.each(function(q){var r=q.map(function(a){return a.values});o=o||l,p=p||m,l.domain(j||d3.extent(d3.merge(r),g)).range([0,b-a.left-a.right]),m.domain(k||d3.extent(d3.merge(r),h)).range([c-a.top-a.bottom,0]);var s=d3.select(this).selectAll("g.d3line").data([q]),t=s.enter().append("g").attr("class","d3line"),u=t.append("g");u.append("g").attr("class","lines");var v=s.select("g").attr("transform","translate("+a.left+","+a.top+")");t.append("defs").append("clipPath").attr("id","chart-clip-path-"+f).append("rect"),s.select("#chart-clip-path-"+f+" rect").attr("width",b-a.left-a.right).attr("height",c-a.top-a.bottom),u.attr("clip-path","url(#chart-clip-path-"+f+")");var w=u.append("g").attr("class","shiftWrap");if(i){w.append("g").attr("class","point-clips"),w.append("g").attr("class","point-paths");var z=d3.merge(q.map(function(a,b){return a.values.map(function(a,c){return[l(g(a))*(Math.random()/1e12+1),m(h(a))*(Math.random()/1e12+1),b,c]})})),A=s.select(".point-clips").selectAll(".clip-path").data(z);A.enter().append("clipPath").attr("class","clip-path").append("circle").attr("r",25),A.exit().remove(),A.attr("id",function(a,b){return"clip-"+f+"-"+a[2]+"-"+a[3]}).attr("transform",function(a){return"translate("+a[0]+","+a[1]+")"});var B=d3.geom.voronoi(z).map(function(a,b){return{data:a,series:z[b][2],point:z[b][3]}}),C=s.select(".point-paths").selectAll("path").data(B);C.enter().append("path").attr("class",function(a,b){return"path-"+b}).style("fill-opacity",0),C.exit().remove(),C.attr("clip-path",function(a,b){return"url(#clip-"+f+"-"+a.series+"-"+a.point+")"}).attr("d",function(a){return"M"+a.data.join(",")+"Z"}).on("mouseover",function(b){var c=q[b.series],d=c.values[b.point];n.pointMouseover({point:d,series:c,pos:[l(g(d))+a.left,m(h(d))+a.top],seriesIndex:b.series,pointIndex:b.point})}).on("mouseout",function(a,b){n.pointMouseout({point:q[a.series].values[a.point],series:q[a.series],seriesIndex:a.series,pointIndex:a.point})}),n.on("pointMouseover.point",function(a){s.select(".series-"+a.seriesIndex+" .point-"+a.pointIndex).classed("hover",!0)}),n.on("pointMouseout.point",function(a){s.select(".series-"+a.seriesIndex+" circle.point-"+a.pointIndex).classed("hover",!1)})}var D=s.select(".lines").selectAll(".line").data(function(a){return a},function(a){return a.key});D.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(D.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),D.attr("class",function(a,b){return"line series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return e[b%20]}).style("stroke",function(a,b){return e[b%20]}),d3.transition(D).style("stroke-opacity",1).style("fill-opacity",.5);var E=D.selectAll("path").data(function(a,b){return[a.values]});E.enter().append("path").attr("d",d3.svg.line().x(function(a){return o(g(a))}).y(function(a){return p(h(a))})),d3.transition(D.exit().selectAll("path")).attr("d",d3.svg.line().x(function(a){return l(g(a))}).y(function(a){return m(h(a))})).remove(),d3.transition(E).attr("d",d3.svg.line().x(function(a){return l(g(a))}).y(function(a){return m(h(a))}));var F=D.selectAll("circle.point").data(function(a){return a.values});F.enter().append("circle").attr("cx",function(a){return o(g(a))}).attr("cy",function(a){return p(h(a))}),d3.transition(F.exit()).attr("cx",function(a){return l(g(a))}).attr("cy",function(a){return m(h(a))}).remove(),d3.transition(D.exit().selectAll("circle.point")).attr("cx",function(a){return l(g(a))}).attr("cy",function(a){return m(h(a))}).remove(),F.attr("class",function(a,b){return"point point-"+b}),d3.transition(F).attr("cx",function(a){return l(g(a))}).attr("cy",function(a){return m(h(a))}).attr("r",d),o=l.copy(),p=m.copy()});return q}var a={top:0,right:0,bottom:0,left:0},b=960,c=500,d=function(){return 2.5},e=d3.scale.category10().range(),f=Math.floor(Math.random()*1e4),g=function(a){return a.x},h=function(a){return a.y},i=!0,j,k,l=d3.scale.linear(),m=d3.scale.linear(),n=d3.dispatch("pointMouseover","pointMouseout"),o,p;q.dispatch=n,q.x=function(a){if(!arguments.length)return g;g=a;return q},q.y=function(a){if(!arguments.length)return h;h=a;return q},q.margin=function(b){if(!arguments.length)return a;a=b;return q},q.width=function(a){if(!arguments.length)return b;b=a;return q},q.height=function(a){if(!arguments.length)return c;c=a;return q},q.xDomain=function(a){if(!arguments.length)return j;j=a;return q},q.yDomain=function(a){if(!arguments.length)return k;k=a;return q},q.interactive=function(a){if(!arguments.length)return i;i=a;return q},q.dotRadius=function(a){if(!arguments.length)return d;d=d3.functor(a);return q},q.color=function(a){if(!arguments.length)return e;e=a;return q},q.id=function(a){if(!arguments.length)return f;f=a;return q};return q},a.models.lineWithFocus=function(){function z(a){a.each(function(h){function H(){var a=y.empty()?p.domain():d3.extent(d3.merge(seriesData).filter(function(a){return j(a)>=y.extent()[0]&&j(a)<=y.extent()[1]}),k);typeof a[0]=="undefined"&&(a=p.domain()),m.domain(y.empty()?o.domain():y.extent()),n.domain(a),v.xDomain(m.domain()),v.yDomain(n.domain())}function G(){H(),D.call(v),l.select(".x.axis").call(q),l.select(".y.axis").call(r)}seriesData=h.filter(function(a){return!a.disabled}).map(function(a){return a.values}),o.domain(d3.extent(d3.merge(seriesData),j)).range([0,d-b.left-b.right]),p.domain(d3.extent(d3.merge(seriesData),k)).range([g-c.top-c.bottom,0]),m.domain(y.empty()?o.domain():y.extent()).range([0,d-b.left-b.right]),n.domain(p.domain()).range([f-b.top-b.bottom,0]),y.on("brush",G),v.width(d-b.left-b.right).height(f-b.top-b.bottom).color(h.map(function(a,b){return a.color||i[b%10]}).filter(function(a,b){return!h[b].disabled})),w.width(d-b.left-b.right).height(g-c.top-c.bottom).color(h.map(function(a,b){return a.color||i[b%10]}).filter(function(a,b){return!h[b].disabled})),H();var l=d3.select(this).selectAll("g.wrap").data([h]),A=l.enter().append("g").attr("class","wrap d3lineWithFocus").append("g");A.append("g").attr("class","focus"),A.append("g").attr("class","context"),A.append("g").attr("class","legendWrap");var B=l.select("g");u.width(d/2-b.right),B.select(".legendWrap").datum(h).attr("transform","translate("+(d/2-b.left)+",0)").call(u),b.top=u.height();var C=B.select(".focus").attr("transform","translate("+b.left+","+b.top+")");A.select(".focus").append("g").attr("class","x axis"),A.select(".focus").append("g").attr("class","y axis"),A.select(".focus").append("g").attr("class","focusLines");var D=C.select(".focusLines").datum(h.filter(function(a){return!a.disabled}));d3.transition(D).call(v),q.domain(m.domain()).range(m.range()).ticks(d/100).tickSize(-(f-b.top-b.bottom),0),C.select(".x.axis").attr("transform","translate(0,"+n.range()[0]+")"),d3.transition(B.select(".x.axis")).call(q),r.domain(n.domain()).range(n.range()).ticks(e/36).tickSize(-(d-b.right-b.left),0),d3.transition(B.select(".y.axis")).call(r);var E=B.select(".context").attr("transform","translate("+c.left+","+f+")");A.select(".context").append("g").attr("class","x2 axis"),A.select(".context").append("g").attr("class","y2 axis"),A.select(".context").append("g").attr("class","contextLines"),A.select(".context").append("g").attr("class","x brush").attr("class","x brush").call(y).selectAll("rect").attr("y",-5).attr("height",g+4);var F=E.select(".contextLines").datum(h.filter(function(a){return!a.disabled}));d3.transition(F).call(w),s.domain(o.domain()).range(o.range()).ticks(d/100).tickSize(-(g-c.top-c.bottom),0),E.select(".x2.axis").attr("transform","translate(0,"+p.range()[0]+")"),d3.transition(E.select(".x2.axis")).call(s),t.domain(p.domain()).range(p.range()).ticks((g-c.top-c.bottom)/24).tickSize(-(d-c.right-c.left),0),E.select(".y2.axis"),d3.transition(E.select(".y2.axis")).call(t),u.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,h.filter(function(a){return!a.disabled}).length||h.map(function(a){a.disabled=!1,l.selectAll(".series").classed("disabled",!1);return a}),a.transition().call(z)}),u.dispatch.on("legendMouseover",function(b,c){b.hover=!0,a.transition().call(z)}),u.dispatch.on("legendMouseout",function(b,c){b.hover=!1,a.transition().call(z)}),v.dispatch.on("pointMouseover.tooltip",function(a){x.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),v.dispatch.on("pointMouseout.tooltip",function(a){x.tooltipHide(a)})});return z}var b={top:30,right:20,bottom:30,left:60},c={top:0,right:20,bottom:20,left:60},d=960,e=500,f=400,g=100,h=function(){return 2.5},i=d3.scale.category10().range(),j=function(a){return a.x},k=function(a){return a.y},l=Math.floor(Math.random()*1e4),m=d3.scale.linear(),n=d3.scale.linear(),o=d3.scale.linear(),p=d3.scale.linear(),q=a.models.xaxis().scale(m),r=a.models.yaxis().scale(n),s=a.models.xaxis().scale(o),t=a.models.yaxis().scale(p),u=a.models.legend().height(30),v=a.models.line(),w=a.models.line().dotRadius(.1).interactive(!1),x=d3.dispatch("tooltipShow","tooltipHide"),y=d3.svg.brush().x(o);z.dispatch=x,z.x=function(a){if(!arguments.length)return j;j=a,v.x(a),w.x(a);return z},z.y=function(a){if(!arguments.length)return k;k=a,v.y(a),w.y(a);return z},z.margin=function(a){if(!arguments.length)return b;b=a;return z},z.width=function(a){if(!arguments.length)return d;d=a;return z},z.height=function(a){if(!arguments.length)return e;e=a,f=a-g;return z},z.contextHeight=function(a){if(!arguments.length)return g;g=a,f=e-a;return z},z.dotRadius=function(a){if(!arguments.length)return h;h=d3.functor(a),v.dotRadius=a;return z},z.id=function(a){if(!arguments.length)return l;l=a;return z},z.xTickFormat=function(a){if(!arguments.length)return m.tickFormat();q.tickFormat(a),s.tickFormat(a);return z},z.yTickFormat=function(a){if(!arguments.length)return n.tickFormat();r.tickFormat(a),t.tickFormat(a);return z},z.xAxis=q,z.yAxis=r;return z},a.models.lineWithLegend=function(){function p(a){a.each(function(e){var q=c(),r=d(),s=e.filter(function(a){return!a.disabled}).map(function(a){return a.values});h.domain(d3.extent(d3.merge(s),j)).range([0,q-b.left-b.right]),i.domain(d3.extent(d3.merge(s),k)).range([r-b.top-b.bottom,0]),o.width(q-b.left-b.right).height(r-b.top-b.bottom).color(e.map(function(a,b){return a.color||f[b%10]}).filter(function(a,b){return!e[b].disabled}));var t=d3.select(this).selectAll("g.wrap").data([e]),u=t.enter().append("g").attr("class","wrap d3lineWithLegend").append("g");u.append("g").attr("class","x axis"),u.append("g").attr("class","y axis"),u.append("g").attr("class","linesWrap"),u.append("g").attr("class","legendWrap"),n.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,e.filter(function(a){return!a.disabled}).length||e.map(function(a){a.disabled=!1,t.selectAll(".series").classed("disabled",!1);return a}),a.transition().call(p)}),n.dispatch.on("legendMouseover",function(b,c){b.hover=!0,a.transition().call(p)}),n.dispatch.on("legendMouseout",function(b,c){b.hover=!1,a.transition().call(p)}),o.dispatch.on("pointMouseover.tooltip",function(a){g.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),o.dispatch.on("pointMouseout.tooltip",function(a){g.tooltipHide(a)}),b.top=n.height();var v=t.select("g").attr("transform","translate("+b.left+","+n.height()+")");n.width(q/2-b.right),v.select(".legendWrap").datum(e).attr("transform","translate("+(q/2-b.left)+","+ -n.height()+")").call(n);var w=v.select(".linesWrap").datum(e.filter(function(a){return!a.disabled}));d3.transition(w).call(o),l.domain(h.domain()).range(h.range()).ticks(q/100).tickSize(-(r-b.top-b.bottom),0),v.select(".x.axis").attr("transform","translate(0,"+i.range()[0]+")"),d3.transition(v.select(".x.axis")).call(l),m.domain(i.domain()).range(i.range()).ticks(r/36).tickSize(-(q-b.right-b.left),0),d3.transition(v.select(".y.axis")).call(m)});return p}var b={top:30,right:20,bottom:50,left:60},c=function(){return 960},d=function(){return 500},e=function(){return 2.5},f=d3.scale.category10().range(),g=d3.dispatch("tooltipShow","tooltipHide"),h=d3.scale.linear(),i=d3.scale.linear(),j=function(a){return a.x},k=function(a){return a.y},l=a.models.xaxis().scale(h),m=a.models.yaxis().scale(i),n=a.models.legend().height(30),o=a.models.line();p.dispatch=g,p.x=function(a){if(!arguments.length)return j;j=a,o.x(a);return p},p.y=function(a){if(!arguments.length)return k;k=a,o.y(a);return p},p.margin=function(a){if(!arguments.length)return b;b=a;return p},p.width=function(a){if(!arguments.length)return c;c=d3.functor(a);return p},p.height=function(a){if(!arguments.length)return d;d=d3.functor(a);return p},p.dotRadius=function(a){if(!arguments.length)return e;e=d3.functor(a),o.dotRadius=a;return p},p.xAxis=l,p.yAxis=m;return p},a.models.scatter=function(){function r(s){s.each(function(r){var s=r.map(function(a){return a.values});n=n||f,o=o||g,p=p||h,r=r.map(function(a,b){a.values=a.values.map(function(a){a.series=b;return a});return a}),f.domain(d3.extent(d3.merge(s).map(i).concat(l))).range([0,b-a.left-a.right]),g.domain(d3.extent(d3.merge(s).map(j).concat(m))).range([c-a.top-a.bottom,0]),h.domain(d3.extent(d3.merge(s),k)).range([2,10]);var t=d3.merge(r.map(function(a,b){return a.values.map(function(a,c){return[f(i(a)),g(j(a)),b,c]})})),u=d3.select(this).selectAll("g.d3scatter").data([r]),v=u.enter().append("g").attr("class","d3scatter").append("g");v.append("g").attr("class","groups"),v.append("g").attr("class","point-clips"),v.append("g").attr("class","point-paths"),v.append("g").attr("class","distribution");var w=u.select("g").attr("transform","translate("+a.left+","+a.top+")"),A=v.append("g").attr("class","voronoi-clip").append("clipPath").attr("id","voronoi-clip-path-"+e).append("rect");u.select(".voronoi-clip rect").attr("x",-10).attr("y",-10).attr("width",b-a.left-a.right+20).attr("height",c-a.top-a.bottom+20),u.select(".point-paths").attr("clip-path","url(#voronoi-clip-path-"+e+")");var B=u.select(".point-clips").selectAll(".clip-path").data(t);B.enter().append("clipPath").attr("class","clip-path").append("circle").attr("r",25),B.exit().remove(),B.attr("id",function(a,b){return"clip-"+e+"-"+a[2]+"-"+a[3]}).attr("transform",function(a){return"translate("+a[0]+","+a[1]+")"});var C=d3.geom.voronoi(t).map(function(a,b){return{data:a,series:t[b][2],point:t[b][3]}}),D=u.select(".point-paths").selectAll("path").data(C);D.enter().append("path").attr("class",function(a,b){return"path-"+b}),D.exit().remove(),D.attr("clip-path",function(a,b){return"url(#clip-"+e+"-"+a.series+"-"+a.point+")"}).attr("d",function(a){return"M"+a.data.join(",")+"Z"}).on("mouseover",function(b){q.pointMouseover({point:r[b.series].values[b.point],series:r[b.series],pos:[f(i(r[b.series].values[b.point]))+a.left,g(j(r[b.series].values[b.point]))+a.top],seriesIndex:b.series,pointIndex:b.point})}).on("mouseout",function(a,b){q.pointMouseout({point:r[a.series].values[a.point],series:r[a.series],seriesIndex:a.series,pointIndex:a.point})});var E=u.select(".groups").selectAll(".group").data(function(a){return a},function(a){return a.key});E.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(E.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),E.attr("class",function(a,b){return"group series-"+b}).classed("hover",function(a){return a.hover&&!a.disabled}),d3.transition(E).style("fill",function(a,b){return d[b%10]}).style("stroke",function(a,b){return d[b%10]}).style("stroke-opacity",1).style("fill-opacity",.5);var F=E.selectAll("circle.point").data(function(a){return a.values});F.enter().append("circle").attr("cx",function(a){return n(i(a))}).attr("cy",function(a){return o(j(a))}).attr("r",function(a){return p(k(a))}),d3.transition(E.exit().selectAll("circle.point")).attr("cx",function(a){return f(i(a))}).attr("cy",function(a){return g(j(a))}).attr("r",function(a){return h(k(a))}).remove(),F.attr("class",function(a,b){return"point point-"+b}),d3.transition(F).attr("cx",function(a){return f(i(a))}).attr("cy",function(a){return g(j(a))}).attr("r",function(a){return h(k(a))});var G=E.selectAll("line.distX").data(function(a){return a.values});G.enter().append("line").attr("x1",function(a){return n(i(a))}).attr("x2",function(a){return n(i(a))}),d3.transition(E.exit().selectAll("line.distX")).attr("x1",function(a){return f(i(a))}).attr("x2",function(a){return f(i(a))}).remove(),G.attr("class",function(a,b){return"distX distX-"+b}).attr("y1",g.range()[0]).attr("y2",g.range()[0]+8),d3.transition(G).attr("x1",function(a){return f(i(a))}).attr("x2",function(a){return f(i(a))});var H=E.selectAll("line.distY").data(function(a){return a.values});H.enter().append("line").attr("y1",function(a){return o(j(a))}).attr("y2",function(a){return o(j(a))}),d3.transition(E.exit().selectAll("line.distY")).attr("y1",function(a){return g(j(a))}).attr("y2",function(a){return g(j(a))}).remove(),H.attr("class",function(a,b){return"distY distY-"+b}).attr("x1",f.range()[0]).attr("x2",f.range()[0]-8),d3.transition(H).attr("y1",function(a){return g(j(a))}).attr("y2",function(a){return g(j(a))}),q.on("pointMouseover.point",function(b){u.select(".series-"+b.seriesIndex+" .point-"+b.pointIndex).classed("hover",!0),u.select(".series-"+b.seriesIndex+" .distX-"+b.pointIndex).attr("y1",b.pos[1]-a.top),u.select(".series-"+b.seriesIndex+" .distY-"+b.pointIndex).attr("x1",b.pos[0]-a.left)}),q.on("pointMouseout.point",function(a){u.select(".series-"+a.seriesIndex+" circle.point-"+a.pointIndex).classed("hover",!1),u.select(".series-"+a.seriesIndex+" .distX-"+a.pointIndex).attr("y1",g.range()[0]),u.select(".series-"+a.seriesIndex+" .distY-"+a.pointIndex).attr("x1",f.range()[0])}),n=f.copy(),o=g.copy(),p=h.copy()});return r}var a={top:0,right:0,bottom:0,left:0},b=960,c=500,d=d3.scale.category10().range(),e=Math.floor(Math.random()*1e5),f=d3.scale.linear(),g=d3.scale.linear(),h=d3.scale.sqrt(),i=function(a){return a.x},j=function(a){return a.y},k=function(a){return a.size},l=[],m=[],n,o,p,q=d3.dispatch("pointMouseover","pointMouseout");r.dispatch=q,r.margin=function(b){if(!arguments.length)return a;a=b;return r},r.width=function(a){if(!arguments.length)return b;b=a;return r},r.height=function(a){if(!arguments.length)return c;c=a;return r},r.x=function(a){if(!arguments.length)return i;i=d3.functor(a);return r},r.y=function(a){if(!arguments.length)return j;j=d3.functor(a);return r},r.size=function(a){if(!arguments.length)return k;k=d3.functor(a);return r},r.forceX=function(a){if(!arguments.length)return l;l=a;return r},r.forceY=function(a){if(!arguments.length)return m;m=a;return r},r.color=function(a){if(!arguments.length)return d;d=a;return r},r.id=function(a){if(!arguments.length)return e;e=a;return r};return r},a.models.scatterWithLegend=function(){function w(a){a.each(function(f){var g=f.filter(function(a){return!a.disabled}).map(function(a){return a.values});q.domain(d3.extent(d3.merge(g).map(k).concat(n))).range([0,c-b.left-b.right]),r.domain(d3.extent(d3.merge(g).map(l).concat(o))).range([d-b.top-b.bottom,0]),v.width(c-b.left-b.right).height(d-b.top-b.bottom).color(f.map(function(a,b){return a.color||j[b%20]}).filter(function(a,b){return!f[b].disabled})),s.ticks(c/100).tickSize(-(d-b.top-b.bottom),0),t.ticks(d/36).tickSize(-(c-b.right-b.left),0);var h=d3.select(this).selectAll("g.wrap").data([f]),i=h.enter().append("g").attr("class","wrap d3lineWithLegend").append("g");i.append("g").attr("class","legendWrap"),i.append("g").attr("class","x axis"),i.append("g").attr("class","y axis"),i.append("g").attr("class","scatterWrap"),u.dispatch.on("legendClick",function(b,c,d){b.disabled=!b.disabled,f.filter(function(a){return!a.disabled}).length||f.map(function(a){a.disabled=!1,h.selectAll(".series").classed("disabled",!1);return a}),a.transition(e).call(w)}),v.dispatch.on("pointMouseover.tooltip",function(a){p.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),v.dispatch.on("pointMouseout.tooltip",function(a){p.tooltipHide(a)}),u.width(c/2-b.right),h.select(".legendWrap").datum(f).attr("transform","translate("+(c/2-b.left)+","+ -u.height()+")").call(u),b.top=u.height();var m=h.select("g").attr("transform","translate("+b.left+","+b.top+")"),z=h.select(".scatterWrap").datum(f.filter(function(a){return!a.disabled}));d3.transition(z).call(v),s.domain(q.domain()).range(q.range()).ticks(c/100).tickSize(-(d-b.top-b.bottom),0),m.select(".x.axis").attr("transform","translate(0,"+r.range()[0]+")"),d3.transition(m.select(".x.axis")).call(s),t.domain(r.domain()).range(r.range()).ticks(d/36).tickSize(-(c-b.right-b.left),0),d3.transition(m.select(".y.axis")).call(t)});return w}var b={top:30,right:20,bottom:50,left:60},c=960,d=500,e=500,f=!0,g=!0,h=!1,i=!1,j=d3.scale.category10().range(),k=function(a){return a.x},l=function(a){return a.y},m=function(a){return a.size},n=[],o=[],p=d3.dispatch("tooltipShow","tooltipHide"),q=d3.scale.linear(),r=d3.scale.linear(),s=a.models.xaxis().scale(q).tickPadding(10),t=a.models.yaxis().scale(r).tickPadding(10),u=a.models.legend().height(30),v=a.models.scatter();w.dispatch=p,w.margin=function(a){if(!arguments.length)return b;b=a;return w},w.width=function(a){if(!arguments.length)return c;c=a;return w},w.height=function(a){if(!arguments.length)return d;d=a;return w},w.forceX=function(a){if(!arguments.length)return n;n=a,v.forceX(a);return w},w.forceY=function(a){if(!arguments.length)return o;o=a,v.forceY(a);return w},w.animate=function(a){if(!arguments.length)return e;e=a;return w},w.xAxis=s,w.yAxis=t;return w},a.models.sparkline=function(){function h(d){d.each(function(d){f.domain(d3.extent(d,function(a){return a.x})).range([0,b-a.left-a.right]),g.domain(d3.extent(d,function(a){return a.y})).range([c-a.top-a.bottom,0]);var h=d3.select(this).selectAll("svg").data([d]),i=h.enter().append("svg").append("g");i.append("g").attr("class","sparkline").attr("transform","translate("+a.left+","+a.top+")").style("stroke",function(a,b){return a.color||e[b*2%20]}),h.attr("width",b).attr("height",c);var j=i.select(".sparkline").selectAll("path").data(function(a){return[a]});j.enter().append("path"),j.exit().remove(),j.attr("d",d3.svg.line().x(function(a){return f(a.x)}).y(function(a){return g(a.y)}));var k=i.select(".sparkline").selectAll("circle.point").data(function(a){return a.filter(function(a){return g.domain().indexOf(a.y)!=-1})});k.enter().append("circle").attr("class","point"),k.exit().remove(),k.attr("cx",function(a){return f(a.x)}).attr("cy",function(a){return g(a.y)}).attr("r",2).style("stroke",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"}).style("fill",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"})});return h}var a={top:3,right:3,bottom:3,left:3},b=200,c=20,d=!0,e=d3.scale.category20().range(),f=d3.scale.linear(),g=d3.scale.linear();h.margin=function(b){if(!arguments.length)return a;a=b;return h},h.width=function(a){if(!arguments.length)return b;b=a;return h},h.height=function(a){if(!arguments.length)return c;c=a;return h},h.animate=function(a){if(!arguments.length)return d;d=a;return h};return h},a.models.stackedArea=function(){function j(a){a.each(function(a){var f=JSON.parse(JSON.stringify(a));f=d3.layout.stack().offset(g).order(h).values(function(a){return a.values})(f);var j=f[0].values.length-1,k=d3.max(f,function(a){return d3.max(a.values,function(a){return a.y0+a.y})});i.width(c-b.left-b.right).height(d-b.top-b.bottom).y(function(a){return a.y+a.y0}).color(a.map(function(a,b){return a.color||e[b%10]}).filter(function(b,c){return!a[c].disabled}));var l=d3.select(this).selectAll("g.d3stackedarea").data([f]),m=l.enter().append("g").attr("class","d3stackedarea").append("g");m.append("g").attr("class","areaWrap"),m.append("g").attr("class","linesWrap");var n=l.select("g").attr("transform","translate("+b.left+","+b.top+")"),o=n.select(".linesWrap").datum(f.filter(function(a){return!a.disabled}));d3.transition(o).call(i);var p=c-b.left-b.right,q=d-b.top-b.bottom,r=d3.svg.area().x(function(a){return a.x*p/j}).y0(function(a){return q-a.y0*q/k}).y1(function(a){return q-(a.y+a.y0)*q/k}),s=d3.svg.area().x(function(a){return a.x*p/j}).y0(function(a){return q-a.y0*q/k}).y1(function(a){return q-a.y0*q/k}),t=n.select(".areaWrap").selectAll("path.area").data(function(a){return a});t.enter().append("path").attr("class","area"),d3.transition(t.exit -()).attr("d",function(a,b){return s(a.values,b)}).remove(),t.style("fill",function(a,b){return e[b%10]}).style("stroke",function(a,b){return e[b%10]}),d3.transition(t).attr("d",function(a,b){return r(a.values,b)})});return j}var b={top:0,right:0,bottom:0,left:0},c=960,d=500,e=d3.scale.category10().range(),f="stack",g="zero",h="default",i=a.models.line();j.margin=function(a){if(!arguments.length)return b;b=a;return j},j.width=function(a){if(!arguments.length)return c;c=a;return j},j.height=function(a){if(!arguments.length)return d;d=a;return j},j.color=function(a){if(!arguments.length)return e;e=a;return j},j.offset=function(a){if(!arguments.length)return g;g=a;return j},j.order=function(a){if(!arguments.length)return h;h=a;return j},j.style=function(a){if(!arguments.length)return f;f=a;switch(f){case"stack":g="zero",h="default";break;case"stream":g="wiggle",h="inside-out";break;case"expand":g="expand",h="default"}return j},j.dispatch=i.dispatch;return j},a.models.stackedAreaWithLegend=function(){function r(a){a.each(function(e){var f=e.filter(function(a){return!a.disabled}).reduce(function(a,b,c){b.values.forEach(function(b,d){c||(a[d]={x:b.x,y:0}),a[d].y+=k(b)});return a},[]);h.domain(d3.extent(d3.merge(f),j)).range([0,c-b.left-b.right]),i.domain(p.offset()=="zero"?[0,d3.max(d3.merge(f),k)]:[0,1]).range([d-b.top-b.bottom,0]),p.width(c-b.left-b.right).height(d-b.top-b.bottom);var s=d3.select(this).selectAll("g.wrap").data([e]),t=s.enter().append("g").attr("class","wrap d3stackedWithLegend").append("g");t.append("g").attr("class","x axis"),t.append("g").attr("class","y axis"),t.append("g").attr("class","stackedWrap"),t.append("g").attr("class","legendWrap"),t.append("g").attr("class","controlsWrap"),n.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,b.disabled?b.values.map(function(a){a._y=a.y,a.y=0;return a}):b.values.map(function(a){a.y=a._y;return a}),e.filter(function(a){return!a.disabled}).length||e.map(function(a){a.disabled=!1,a.values.map(function(a){a.y=a._y;return a});return a}),a.transition().call(r)}),o.dispatch.on("legendClick",function(b,c){if(!!b.disabled){q=q.map(function(a){a.disabled=!0;return a}),b.disabled=!1;switch(b.key){case"Stacked":p.style("stack");break;case"Stream":p.style("stream");break;case"Expanded":p.style("expand")}a.transition().call(r)}}),p.dispatch.on("pointMouseover.tooltip",function(a){g.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),p.dispatch.on("pointMouseout.tooltip",function(a){g.tooltipHide(a)}),b.top=n.height();var u=s.select("g").attr("transform","translate("+b.left+","+b.top+")");n.width(c/2-b.right),o.width(280).color(["#666","#666","#666"]),u.select(".legendWrap").datum(e).attr("transform","translate("+(c/2-b.left)+","+ -b.top+")").call(n),u.select(".controlsWrap").datum(q).attr("transform","translate(0,"+ -b.top+")").call(o);var v=u.select(".stackedWrap").datum(e);d3.transition(v).call(p),l.domain(h.domain()).range(h.range()).ticks(c/100).tickSize(-(d-b.top-b.bottom),0),u.select(".x.axis").attr("transform","translate(0,"+i.range()[0]+")"),d3.transition(u.select(".x.axis")).call(l),m.domain(i.domain()).range(i.range()).ticks(p.offset()=="wiggle"?0:d/36).tickSize(-(c-b.right-b.left),0).tickFormat(p.offset()=="zero"?d3.format(",.2f"):d3.format("%")),d3.transition(u.select(".y.axis")).call(m)});return r}var b={top:30,right:20,bottom:50,left:60},c=960,d=500,e=function(){return 2.5},f=d3.scale.category10().range(),g=d3.dispatch("tooltipShow","tooltipHide"),h=d3.scale.linear(),i=d3.scale.linear(),j=function(a){return a.x},k=function(a){return a.y},l=a.models.xaxis().scale(h),m=a.models.yaxis().scale(i),n=a.models.legend().height(30),o=a.models.legend().height(30),p=a.models.stackedArea(),q=[{key:"Stacked"},{key:"Stream",disabled:!0},{key:"Expanded",disabled:!0}];r.dispatch=g,r.x=function(a){if(!arguments.length)return j;j=a,p.x(a);return r},r.y=function(a){if(!arguments.length)return k;k=a,p.y(a);return r},r.margin=function(a){if(!arguments.length)return b;b=a;return r},r.width=function(a){if(!arguments.length)return c;c=a;return r},r.height=function(a){if(!arguments.length)return d;d=a;return r},r.dotRadius=function(a){if(!arguments.length)return e;e=d3.functor(a),p.dotRadius=a;return r},r.stacked=p,r.xAxis=l,r.yAxis=m;return r}}() \ No newline at end of file + *****/(function(a){var b=window.nvtooltip={};b.show=function(b,c,d,e){var f=a('
');d=d||"s",e=e||20,f.html(c).css({left:-1e3,top:-1e3,opacity:0}).appendTo("body");var g=f.height()+parseInt(f.css("padding-top"))+parseInt(f.css("padding-bottom")),h=f.width()+parseInt(f.css("padding-left"))+parseInt(f.css("padding-right")),i=a(window).width(),j=a(window).height(),k=a("body").scrollTop(),l=a("body").scrollLeft(),m,n;switch(d){case"e":m=b[0]-h-e,n=b[1]-g/2,mk+j&&(n=k-g-5);break;case"w":m=b[0]+e,n=b[1]-g/2,m+h>i&&(m=b[0]-h-e),nk+j&&(n=k-g-5);break;case"n":m=b[0]-h/2,n=b[1]+e,mi&&(m=i-h-5),n+g>k+j&&(n=b[1]-g-e);break;case"s":m=b[0]-h/2,n=b[1]-g-e,mi&&(m=i-h-5),k>n&&(n=b[1]+20)}f.css({left:m,top:n,opacity:1});return f},b.cleanup=function(){var b=a(".nvtooltip");b.css({"transition-delay":"0 !important","-moz-transition-delay":"0 !important","-webkit-transition-delay":"0 !important"}),b.css("opacity",0),setTimeout(function(){b.remove()},500)}})(jQuery),function(){function c(a,b,c){return function(d,e,f){var g=a(d),h=[];g1)while(gn&&(n=m);return"translate("+o+","+l+")"}),i.attr("transform","translate("+(b-a.right-n)+","+a.top+")"),c=a.top+a.bottom+l+15});return f}var a={top:5,right:0,bottom:5,left:10},b=400,c=20,d=d3.scale.category10().range(),e=d3.dispatch("legendClick","legendMouseover","legendMouseout");f.dispatch=e,f.margin=function(b){if(!arguments.length)return a;a=b;return f},f.width=function(a){if(!arguments.length)return b;b=a;return f},f.height=function(a){if(!arguments.length)return c;c=a;return f},f.color=function(a){if(!arguments.length)return d;d=a;return f};return f},a.models.xaxis=function(){function f(g){g.each(function(f){d.domain(a).range(b);var g=d3.select(this).selectAll("text.axislabel").data([c||null]);g.enter().append("text").attr("class","axislabel").attr("text-anchor","middle").attr("x",b[1]/2).attr("y",25),g.exit().remove(),g.text(function(a){return a}),d3.transition(d3.select(this)).call(e),d3.select(this).selectAll("line.tick").filter(function(a){return!parseFloat(Math.round(a*1e5)/1e6)}).classed("zero",!0)});return f}var a=[0,1],b=[0,1],c=!1,d=d3.scale.linear(),e=d3.svg.axis().scale(d).orient("bottom");f.domain=function(b){if(!arguments.length)return a;a=b;return f},f.range=function(a){if(!arguments.length)return b;b=a;return f},f.scale=function(a){if(!arguments.length)return d;d=a,e.scale(d);return f},f.axisLabel=function(a){if(!arguments.length)return c;c=a;return f},d3.rebind(f,e,"orient","ticks","tickSubdivide","tickSize","tickPadding","tickFormat");return f},a.models.yaxis=function(){function f(g){g.each(function(f){d.domain(a).range(b);var g=d3.select(this).selectAll("text.axislabel").data([c||null]);g.enter().append("text").attr("class","axislabel").attr("transform","rotate(-90)").attr("text-anchor","middle").attr("y",-40),g.exit().remove(),g.attr("x",-b[0]/2).text(function(a){return a}),d3.transition(d3.select(this)).call(e),d3.select(this).selectAll("line.tick").filter(function(a){return!parseFloat(Math.round(a*1e5)/1e6)}).classed("zero",!0)});return f}var a=[0,1],b=[0,1],c=!1,d=d3.scale.linear(),e=d3.svg.axis().scale(d).orient("left");f.domain=function(b){if(!arguments.length)return a;a=b;return f},f.range=function(a){if(!arguments.length)return b;b=a;return f},f.axisLabel=function(a){if(!arguments.length)return c;c=a;return f},d3.rebind(f,e,"scale","orient","ticks","tickSubdivide","tickSize","tickPadding","tickFormat");return f},a.models.bar=function(){function i(j){j.each(function(i){e.domain(["One","Two","Three","Four","Five"]).rangeRoundBands([0,b-a.left-a.right],.1),f.domain([0,d3.max(i,function(a){return a.y})]).range([c-a.top-a.bottom,0]),g.ticks(b/100),h.ticks(c/36).tickSize(-(b-a.right-a.left),0),h.tickSize(-(b-a.right-a.left),0);var j=d3.select(this).selectAll("g.wrap").data([i]),k=j.enter().append("g").attr("class","wrap").append("g");k.append("g").attr("class","x axis"),k.append("g").attr("class","y axis"),k.append("g").attr("class","bars"),j.attr("width",b).attr("height",c);var l=j.select("g").attr("transform","translate("+a.left+","+a.top+")"),m=j.select(".bars").selectAll(".bar").data(function(a){return a});m.exit().remove();var n=m.enter().append("g").attr("class","bar").on("mouseover",function(a,b){d3.select(this).classed("hover",!0)}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1)});n.append("rect").attr("y",function(a){return f(0)}),n.append("text").attr("text-anchor","middle").attr("dy","-4px"),m.attr("transform",function(a,b){return"translate("+e(a.label)+",0)"}),m.selectAll("rect").order().attr("width",e.rangeBand).transition().duration(d).attr("x",0).attr("y",function(a){return f(a.y)}).attr("height",function(a){return f.range()[0]-f(a.y)}),m.selectAll("text").attr("x",0).attr("y",function(a){return f(a.y)}).attr("dx",e.rangeBand()/2).text(function(a){return a.y}),l.select(".x.axis").attr("transform","translate(0,"+f.range()[0]+")").call(g),l.select(".y.axis").call(h)});return i}var a={top:20,right:10,bottom:20,left:60},b=960,c=500,d=500,e=d3.scale.ordinal(),f=d3.scale.linear(),g=d3.svg.axis().scale(e).orient("bottom").ticks(5),h=d3.svg.axis().scale(f).orient("left");i.margin=function(b){if(!arguments.length)return a;a=b;return i},i.width=function(c){if(!arguments.length)return b;a.left+a.right+20>c?b=a.left+a.right+20:b=c;return i},i.height=function(b){if(!arguments.length)return c;a.top+a.bottom+20>b?c=a.top+a.bottom+20:c=b;return i},i.animate=function(a){if(!arguments.length)return d;d=a;return i},i.xaxis={},d3.rebind(i.xaxis,g,"tickFormat"),i.yaxis={},d3.rebind(i.yaxis,h,"tickFormat");return i},a.models.line=function(){function q(r){r.each(function(q){var r=q.map(function(a){return a.values});o=o||l,p=p||m,l.domain(j||d3.extent(d3.merge(r),g)).range([0,b-a.left-a.right]),m.domain(k||d3.extent(d3.merge(r),h)).range([c-a.top-a.bottom,0]);var s=d3.select(this).selectAll("g.d3line").data([q]),t=s.enter().append("g").attr("class","d3line"),u=t.append("g");u.append("g").attr("class","lines");var v=s.select("g").attr("transform","translate("+a.left+","+a.top+")");t.append("defs").append("clipPath").attr("id","chart-clip-path-"+f).append("rect"),s.select("#chart-clip-path-"+f+" rect").attr("width",b-a.left-a.right).attr("height",c-a.top-a.bottom),u.attr("clip-path","url(#chart-clip-path-"+f+")");var w=u.append("g").attr("class","shiftWrap");if(i){w.append("g").attr("class","point-clips"),w.append("g").attr("class","point-paths");var z=d3.merge(q.map(function(a,b){return a.values.map(function(a,c){return[l(g(a))*(Math.random()/1e12+1),m(h(a))*(Math.random()/1e12+1),b,c]})})),A=s.select(".point-clips").selectAll(".clip-path").data(z);A.enter().append("clipPath").attr("class","clip-path").append("circle").attr("r",25),A.exit().remove(),A.attr("id",function(a,b){return"clip-"+f+"-"+a[2]+"-"+a[3]}).attr("transform",function(a){return"translate("+a[0]+","+a[1]+")"});var B=d3.geom.voronoi(z).map(function(a,b){return{data:a,series:z[b][2],point:z[b][3]}}),C=s.select(".point-paths").selectAll("path").data(B);C.enter().append("path").attr("class",function(a,b){return"path-"+b}).style("fill-opacity",0),C.exit().remove(),C.attr("clip-path",function(a,b){return"url(#clip-"+f+"-"+a.series+"-"+a.point+")"}).attr("d",function(a){return"M"+a.data.join(",")+"Z"}).on("mouseover",function(b){var c=q[b.series],d=c.values[b.point];n.pointMouseover({point:d,series:c,pos:[l(g(d))+a.left,m(h(d))+a.top],seriesIndex:b.series,pointIndex:b.point})}).on("mouseout",function(a,b){n.pointMouseout({point:q[a.series].values[a.point],series:q[a.series],seriesIndex:a.series,pointIndex:a.point})}),n.on("pointMouseover.point",function(a){s.select(".series-"+a.seriesIndex+" .point-"+a.pointIndex).classed("hover",!0)}),n.on("pointMouseout.point",function(a){s.select(".series-"+a.seriesIndex+" circle.point-"+a.pointIndex).classed("hover",!1)})}var D=s.select(".lines").selectAll(".line").data(function(a){return a},function(a){return a.key});D.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(D.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),D.attr("class",function(a,b){return"line series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return e[b%20]}).style("stroke",function(a,b){return e[b%20]}),d3.transition(D).style("stroke-opacity",1).style("fill-opacity",.5);var E=D.selectAll("path").data(function(a,b){return[a.values]});E.enter().append("path").attr("d",d3.svg.line().x(function(a){return o(g(a))}).y(function(a){return p(h(a))})),d3.transition(D.exit().selectAll("path")).attr("d",d3.svg.line().x(function(a){return l(g(a))}).y(function(a){return m(h(a))})).remove(),d3.transition(E).attr("d",d3.svg.line().x(function(a){return l(g(a))}).y(function(a){return m(h(a))}));var F=D.selectAll("circle.point").data(function(a){return a.values});F.enter().append("circle").attr("cx",function(a){return o(g(a))}).attr("cy",function(a){return p(h(a))}),d3.transition(F.exit()).attr("cx",function(a){return l(g(a))}).attr("cy",function(a){return m(h(a))}).remove(),d3.transition(D.exit().selectAll("circle.point")).attr("cx",function(a){return l(g(a))}).attr("cy",function(a){return m(h(a))}).remove(),F.attr("class",function(a,b){return"point point-"+b}),d3.transition(F).attr("cx",function(a){return l(g(a))}).attr("cy",function(a){return m(h(a))}).attr("r",d),o=l.copy(),p=m.copy()});return q}var a={top:0,right:0,bottom:0,left:0},b=960,c=500,d=function(){return 2.5},e=d3.scale.category10().range(),f=Math.floor(Math.random()*1e4),g=function(a){return a.x},h=function(a){return a.y},i=!0,j,k,l=d3.scale.linear(),m=d3.scale.linear(),n=d3.dispatch("pointMouseover","pointMouseout"),o,p;q.dispatch=n,q.x=function(a){if(!arguments.length)return g;g=a;return q},q.y=function(a){if(!arguments.length)return h;h=a;return q},q.margin=function(b){if(!arguments.length)return a;a=b;return q},q.width=function(a){if(!arguments.length)return b;b=a;return q},q.height=function(a){if(!arguments.length)return c;c=a;return q},q.xDomain=function(a){if(!arguments.length)return j;j=a;return q},q.yDomain=function(a){if(!arguments.length)return k;k=a;return q},q.interactive=function(a){if(!arguments.length)return i;i=a;return q},q.dotRadius=function(a){if(!arguments.length)return d;d=d3.functor(a);return q},q.color=function(a){if(!arguments.length)return e;e=a;return q},q.id=function(a){if(!arguments.length)return f;f=a;return q};return q},a.models.lineWithFocus=function(){function z(a){a.each(function(h){function H(){var a=y.empty()?p.domain():d3.extent(d3.merge(seriesData).filter(function(a){return j(a)>=y.extent()[0]&&j(a)<=y.extent()[1]}),k);typeof a[0]=="undefined"&&(a=p.domain()),m.domain(y.empty()?o.domain():y.extent()),n.domain(a),v.xDomain(m.domain()),v.yDomain(n.domain())}function G(){H(),D.call(v),l.select(".x.axis").call(q),l.select(".y.axis").call(r)}seriesData=h.filter(function(a){return!a.disabled}).map(function(a){return a.values}),o.domain(d3.extent(d3.merge(seriesData),j)).range([0,d-b.left-b.right]),p.domain(d3.extent(d3.merge(seriesData),k)).range([g-c.top-c.bottom,0]),m.domain(y.empty()?o.domain():y.extent()).range([0,d-b.left-b.right]),n.domain(p.domain()).range([f-b.top-b.bottom,0]),y.on("brush",G),v.width(d-b.left-b.right).height(f-b.top-b.bottom).color(h.map(function(a,b){return a.color||i[b%10]}).filter(function(a,b){return!h[b].disabled})),w.width(d-b.left-b.right).height(g-c.top-c.bottom).color(h.map(function(a,b){return a.color||i[b%10]}).filter(function(a,b){return!h[b].disabled})),H();var l=d3.select(this).selectAll("g.wrap").data([h]),A=l.enter().append("g").attr("class","wrap d3lineWithFocus").append("g");A.append("g").attr("class","focus"),A.append("g").attr("class","context"),A.append("g").attr("class","legendWrap");var B=l.select("g");u.width(d/2-b.right),B.select(".legendWrap").datum(h).attr("transform","translate("+(d/2-b.left)+",0)").call(u),b.top=u.height();var C=B.select(".focus").attr("transform","translate("+b.left+","+b.top+")");A.select(".focus").append("g").attr("class","x axis"),A.select(".focus").append("g").attr("class","y axis"),A.select(".focus").append("g").attr("class","focusLines");var D=C.select(".focusLines").datum(h.filter(function(a){return!a.disabled}));d3.transition(D).call(v),q.domain(m.domain()).range(m.range()).ticks(d/100).tickSize(-(f-b.top-b.bottom),0),C.select(".x.axis").attr("transform","translate(0,"+n.range()[0]+")"),d3.transition(B.select(".x.axis")).call(q),r.domain(n.domain()).range(n.range()).ticks(e/36).tickSize(-(d-b.right-b.left),0),d3.transition(B.select(".y.axis")).call(r);var E=B.select(".context").attr("transform","translate("+c.left+","+f+")");A.select(".context").append("g").attr("class","x2 axis"),A.select(".context").append("g").attr("class","y2 axis"),A.select(".context").append("g").attr("class","contextLines"),A.select(".context").append("g").attr("class","x brush").attr("class","x brush").call(y).selectAll("rect").attr("y",-5).attr("height",g+4);var F=E.select(".contextLines").datum(h.filter(function(a){return!a.disabled}));d3.transition(F).call(w),s.domain(o.domain()).range(o.range()).ticks(d/100).tickSize(-(g-c.top-c.bottom),0),E.select(".x2.axis").attr("transform","translate(0,"+p.range()[0]+")"),d3.transition(E.select(".x2.axis")).call(s),t.domain(p.domain()).range(p.range()).ticks((g-c.top-c.bottom)/24).tickSize(-(d-c.right-c.left),0),E.select(".y2.axis"),d3.transition(E.select(".y2.axis")).call(t),u.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,h.filter(function(a){return!a.disabled}).length||h.map(function(a){a.disabled=!1,l.selectAll(".series").classed("disabled",!1);return a}),a.transition().call(z)}),u.dispatch.on("legendMouseover",function(b,c){b.hover=!0,a.transition().call(z)}),u.dispatch.on("legendMouseout",function(b,c){b.hover=!1,a.transition().call(z)}),v.dispatch.on("pointMouseover.tooltip",function(a){x.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),v.dispatch.on("pointMouseout.tooltip",function(a){x.tooltipHide(a)})});return z}var b={top:30,right:20,bottom:30,left:60},c={top:0,right:20,bottom:20,left:60},d=960,e=500,f=400,g=100,h=function(){return 2.5},i=d3.scale.category10().range(),j=function(a){return a.x},k=function(a){return a.y},l=Math.floor(Math.random()*1e4),m=d3.scale.linear(),n=d3.scale.linear(),o=d3.scale.linear(),p=d3.scale.linear(),q=a.models.xaxis().scale(m),r=a.models.yaxis().scale(n),s=a.models.xaxis().scale(o),t=a.models.yaxis().scale(p),u=a.models.legend().height(30),v=a.models.line(),w=a.models.line().dotRadius(.1).interactive(!1),x=d3.dispatch("tooltipShow","tooltipHide"),y=d3.svg.brush().x(o);z.dispatch=x,z.x=function(a){if(!arguments.length)return j;j=a,v.x(a),w.x(a);return z},z.y=function(a){if(!arguments.length)return k;k=a,v.y(a),w.y(a);return z},z.margin=function(a){if(!arguments.length)return b;b=a;return z},z.width=function(a){if(!arguments.length)return d;d=a;return z},z.height=function(a){if(!arguments.length)return e;e=a,f=a-g;return z},z.contextHeight=function(a){if(!arguments.length)return g;g=a,f=e-a;return z},z.dotRadius=function(a){if(!arguments.length)return h;h=d3.functor(a),v.dotRadius=a;return z},z.id=function(a){if(!arguments.length)return l;l=a;return z},z.xTickFormat=function(a){if(!arguments.length)return m.tickFormat();q.tickFormat(a),s.tickFormat(a);return z},z.yTickFormat=function(a){if(!arguments.length)return n.tickFormat();r.tickFormat(a),t.tickFormat(a);return z},z.xAxis=q,z.yAxis=r;return z},a.models.lineWithLegend=function(){function p(a){a.each(function(e){var q=c(),r=d(),s=e.filter(function(a){return!a.disabled}).map(function(a){return a.values});h.domain(d3.extent(d3.merge(s),j)).range([0,q-b.left-b.right]),i.domain(d3.extent(d3.merge(s),k)).range([r-b.top-b.bottom,0]),o.width(q-b.left-b.right).height(r-b.top-b.bottom).color(e.map(function(a,b){return a.color||f[b%10]}).filter(function(a,b){return!e[b].disabled}));var t=d3.select(this).selectAll("g.wrap").data([e]),u=t.enter().append("g").attr("class","wrap d3lineWithLegend").append("g");u.append("g").attr("class","x axis"),u.append("g").attr("class","y axis"),u.append("g").attr("class","linesWrap"),u.append("g").attr("class","legendWrap"),n.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,e.filter(function(a){return!a.disabled}).length||e.map(function(a){a.disabled=!1,t.selectAll(".series").classed("disabled",!1);return a}),a.transition().call(p)}),n.dispatch.on("legendMouseover",function(b,c){b.hover=!0,a.transition().call(p)}),n.dispatch.on("legendMouseout",function(b,c){b.hover=!1,a.transition().call(p)}),o.dispatch.on("pointMouseover.tooltip",function(a){g.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),o.dispatch.on("pointMouseout.tooltip",function(a){g.tooltipHide(a)}),b.top=n.height();var v=t.select("g").attr("transform","translate("+b.left+","+n.height()+")");n.width(q/2-b.right),v.select(".legendWrap").datum(e).attr("transform","translate("+(q/2-b.left)+","+ -n.height()+")").call(n);var w=v.select(".linesWrap").datum(e.filter(function(a){return!a.disabled}));d3.transition(w).call(o),l.domain(h.domain()).range(h.range()).ticks(q/100).tickSize(-(r-b.top-b.bottom),0),v.select(".x.axis").attr("transform","translate(0,"+i.range()[0]+")"),d3.transition(v.select(".x.axis")).call(l),m.domain(i.domain()).range(i.range()).ticks(r/36).tickSize(-(q-b.right-b.left),0),d3.transition(v.select(".y.axis")).call(m)});return p}var b={top:30,right:20,bottom:50,left:60},c=function(){return 960},d=function(){return 500},e=function(){return 2.5},f=d3.scale.category10().range(),g=d3.dispatch("tooltipShow","tooltipHide"),h=d3.scale.linear(),i=d3.scale.linear(),j=function(a){return a.x},k=function(a){return a.y},l=a.models.xaxis().scale(h),m=a.models.yaxis().scale(i),n=a.models.legend().height(30),o=a.models.line();p.dispatch=g,p.legend=n,p.xAxis=l,p.yAxis=m,p.x=function(a){if(!arguments.length)return j;j=a,o.x(a);return p},p.y=function(a){if(!arguments.length)return k;k=a,o.y(a);return p},p.margin=function(a){if(!arguments.length)return b;b=a;return p},p.width=function(a){if(!arguments.length)return c;c=d3.functor(a);return p},p.height=function(a){if(!arguments.length)return d;d=d3.functor(a);return p},p.dotRadius=function(a){if(!arguments.length)return e;e=d3.functor(a),o.dotRadius=a;return p};return p},a.models.scatter=function(){function r(s){s.each(function(r){var s=r.map(function(a){return a.values});n=n||f,o=o||g,p=p||h,r=r.map(function(a,b){a.values=a.values.map(function(a){a.series=b;return a});return a}),f.domain(d3.extent(d3.merge(s).map(i).concat(l))).range([0,b-a.left-a.right]),g.domain(d3.extent(d3.merge(s).map(j).concat(m))).range([c-a.top-a.bottom,0]),h.domain(d3.extent(d3.merge(s),k)).range([2,10]);var t=d3.merge(r.map(function(a,b){return a.values.map(function(a,c){return[f(i(a)),g(j(a)),b,c]})})),u=d3.select(this).selectAll("g.d3scatter").data([r]),v=u.enter().append("g").attr("class","d3scatter").append("g");v.append("g").attr("class","groups"),v.append("g").attr("class","point-clips"),v.append("g").attr("class","point-paths"),v.append("g").attr("class","distribution");var w=u.select("g").attr("transform","translate("+a.left+","+a.top+")"),A=v.append("g").attr("class","voronoi-clip").append("clipPath").attr("id","voronoi-clip-path-"+e).append("rect");u.select(".voronoi-clip rect").attr("x",-10).attr("y",-10).attr("width",b-a.left-a.right+20).attr("height",c-a.top-a.bottom+20),u.select(".point-paths").attr("clip-path","url(#voronoi-clip-path-"+e+")");var B=u.select(".point-clips").selectAll(".clip-path").data(t);B.enter().append("clipPath").attr("class","clip-path").append("circle").attr("r",25),B.exit().remove(),B.attr("id",function(a,b){return"clip-"+e+"-"+a[2]+"-"+a[3]}).attr("transform",function(a){return"translate("+a[0]+","+a[1]+")"});var C=d3.geom.voronoi(t).map(function(a,b){return{data:a,series:t[b][2],point:t[b][3]}}),D=u.select(".point-paths").selectAll("path").data(C);D.enter().append("path").attr("class",function(a,b){return"path-"+b}),D.exit().remove(),D.attr("clip-path",function(a,b){return"url(#clip-"+e+"-"+a.series+"-"+a.point+")"}).attr("d",function(a){return"M"+a.data.join(",")+"Z"}).on("mouseover",function(b){q.pointMouseover({point:r[b.series].values[b.point],series:r[b.series],pos:[f(i(r[b.series].values[b.point]))+a.left,g(j(r[b.series].values[b.point]))+a.top],seriesIndex:b.series,pointIndex:b.point})}).on("mouseout",function(a,b){q.pointMouseout({point:r[a.series].values[a.point],series:r[a.series],seriesIndex:a.series,pointIndex:a.point})});var E=u.select(".groups").selectAll(".group").data(function(a){return a},function(a){return a.key});E.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(E.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),E.attr("class",function(a,b){return"group series-"+b}).classed("hover",function(a){return a.hover&&!a.disabled}),d3.transition(E).style("fill",function(a,b){return d[b%10]}).style("stroke",function(a,b){return d[b%10]}).style("stroke-opacity",1).style("fill-opacity",.5);var F=E.selectAll("circle.point").data(function(a){return a.values});F.enter().append("circle").attr("cx",function(a){return n(i(a))}).attr("cy",function(a){return o(j(a))}).attr("r",function(a){return p(k(a))}),d3.transition(E.exit().selectAll("circle.point")).attr("cx",function(a){return f(i(a))}).attr("cy",function(a){return g(j(a))}).attr("r",function(a){return h(k(a))}).remove(),F.attr("class",function(a,b){return"point point-"+b}),d3.transition(F).attr("cx",function(a){return f(i(a))}).attr("cy",function(a){return g(j(a))}).attr("r",function(a){return h(k(a))});var G=E.selectAll("line.distX").data(function(a){return a.values});G.enter().append("line").attr("x1",function(a){return n(i(a))}).attr("x2",function(a){return n(i(a))}),d3.transition(E.exit().selectAll("line.distX")).attr("x1",function(a){return f(i(a))}).attr("x2",function(a){return f(i(a))}).remove(),G.attr("class",function(a,b){return"distX distX-"+b}).attr("y1",g.range()[0]).attr("y2",g.range()[0]+8),d3.transition(G).attr("x1",function(a){return f(i(a))}).attr("x2",function(a){return f(i(a))});var H=E.selectAll("line.distY").data(function(a){return a.values});H.enter().append("line").attr("y1",function(a){return o(j(a))}).attr("y2",function(a){return o(j(a))}),d3.transition(E.exit().selectAll("line.distY")).attr("y1",function(a){return g(j(a))}).attr("y2",function(a){return g(j(a))}).remove(),H.attr("class",function(a,b){return"distY distY-"+b}).attr("x1",f.range()[0]).attr("x2",f.range()[0]-8),d3.transition(H).attr("y1",function(a){return g(j(a))}).attr("y2",function(a){return g(j(a))}),q.on("pointMouseover.point",function(b){u.select(".series-"+b.seriesIndex+" .point-"+b.pointIndex).classed("hover",!0),u.select(".series-"+b.seriesIndex+" .distX-"+b.pointIndex).attr("y1",b.pos[1]-a.top),u.select(".series-"+b.seriesIndex+" .distY-"+b.pointIndex).attr("x1",b.pos[0]-a.left)}),q.on("pointMouseout.point",function(a){u.select(".series-"+a.seriesIndex+" circle.point-"+a.pointIndex).classed("hover",!1),u.select(".series-"+a.seriesIndex+" .distX-"+a.pointIndex).attr("y1",g.range()[0]),u.select(".series-"+a.seriesIndex+" .distY-"+a.pointIndex).attr("x1",f.range()[0])}),n=f.copy(),o=g.copy(),p=h.copy()});return r}var a={top:0,right:0,bottom:0,left:0},b=960,c=500,d=d3.scale.category10().range(),e=Math.floor(Math.random()*1e5),f=d3.scale.linear(),g=d3.scale.linear(),h=d3.scale.sqrt(),i=function(a){return a.x},j=function(a){return a.y},k=function(a){return a.size},l=[],m=[],n,o,p,q=d3.dispatch("pointMouseover","pointMouseout");r.dispatch=q,r.margin=function(b){if(!arguments.length)return a;a=b;return r},r.width=function(a){if(!arguments.length)return b;b=a;return r},r.height=function(a){if(!arguments.length)return c;c=a;return r},r.x=function(a){if(!arguments.length)return i;i=d3.functor(a);return r},r.y=function(a){if(!arguments.length)return j;j=d3.functor(a);return r},r.size=function(a){if(!arguments.length)return k;k=d3.functor(a);return r},r.forceX=function(a){if(!arguments.length)return l;l=a;return r},r.forceY=function(a){if(!arguments.length)return m;m=a;return r},r.color=function(a){if(!arguments.length)return d;d=a;return r},r.id=function(a){if(!arguments.length)return e;e=a;return r};return r},a.models.scatterWithLegend=function(){function w(a){a.each(function(f){var g=f.filter(function(a){return!a.disabled}).map(function(a){return a.values});q.domain(d3.extent(d3.merge(g).map(k).concat(n))).range([0,c-b.left-b.right]),r.domain(d3.extent(d3.merge(g).map(l).concat(o))).range([d-b.top-b.bottom,0]),v.width(c-b.left-b.right).height(d-b.top-b.bottom).color(f.map(function(a,b){return a.color||j[b%20]}).filter(function(a,b){return!f[b].disabled})),s.ticks(c/100).tickSize(-(d-b.top-b.bottom),0),t.ticks(d/36).tickSize(-(c-b.right-b.left),0);var h=d3.select(this).selectAll("g.wrap").data([f]),i=h.enter().append("g").attr("class","wrap d3lineWithLegend").append("g");i.append("g").attr("class","legendWrap"),i.append("g").attr("class","x axis"),i.append("g").attr("class","y axis"),i.append("g").attr("class","scatterWrap"),u.dispatch.on("legendClick",function(b,c,d){b.disabled=!b.disabled,f.filter(function(a){return!a.disabled}).length||f.map(function(a){a.disabled=!1,h.selectAll(".series").classed("disabled",!1);return a}),a.transition(e).call(w)}),v.dispatch.on("pointMouseover.tooltip",function(a){p.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),v.dispatch.on("pointMouseout.tooltip",function(a){p.tooltipHide(a)}),u.width(c/2-b.right),h.select(".legendWrap").datum(f).attr("transform","translate("+(c/2-b.left)+","+ -u.height()+")").call(u),b.top=u.height();var m=h.select("g").attr("transform","translate("+b.left+","+b.top+")"),z=h.select(".scatterWrap").datum(f.filter(function(a){return!a.disabled}));d3.transition(z).call(v),s.domain(q.domain()).range(q.range()).ticks(c/100).tickSize(-(d-b.top-b.bottom),0),m.select(".x.axis").attr("transform","translate(0,"+r.range()[0]+")"),d3.transition(m.select(".x.axis")).call(s),t.domain(r.domain()).range(r.range()).ticks(d/36).tickSize(-(c-b.right-b.left),0),d3.transition(m.select(".y.axis")).call(t)});return w}var b={top:30,right:20,bottom:50,left:60},c=960,d=500,e=500,f=!0,g=!0,h=!1,i=!1,j=d3.scale.category10().range(),k=function(a){return a.x},l=function(a){return a.y},m=function(a){return a.size},n=[],o=[],p=d3.dispatch("tooltipShow","tooltipHide"),q=d3.scale.linear(),r=d3.scale.linear(),s=a.models.xaxis().scale(q).tickPadding(10),t=a.models.yaxis().scale(r).tickPadding(10),u=a.models.legend().height(30),v=a.models.scatter();w.dispatch=p,w.margin=function(a){if(!arguments.length)return b;b=a;return w},w.width=function(a){if(!arguments.length)return c;c=a;return w},w.height=function(a){if(!arguments.length)return d;d=a;return w},w.forceX=function(a){if(!arguments.length)return n;n=a,v.forceX(a);return w},w.forceY=function(a){if(!arguments.length)return o;o=a,v.forceY(a);return w},w.animate=function(a){if(!arguments.length)return e;e=a;return w},w.xAxis=s,w.yAxis=t;return w},a.models.sparkline=function(){function h(d){d.each(function(d){f.domain(d3.extent(d,function(a){return a.x})).range([0,b-a.left-a.right]),g.domain(d3.extent(d,function(a){return a.y})).range([c-a.top-a.bottom,0]);var h=d3.select(this).selectAll("svg").data([d]),i=h.enter().append("svg").append("g");i.append("g").attr("class","sparkline").attr("transform","translate("+a.left+","+a.top+")").style("stroke",function(a,b){return a.color||e[b*2%20]}),h.attr("width",b).attr("height",c);var j=i.select(".sparkline").selectAll("path").data(function(a){return[a]});j.enter().append("path"),j.exit().remove(),j.attr("d",d3.svg.line().x(function(a){return f(a.x)}).y(function(a){return g(a.y)}));var k=i.select(".sparkline").selectAll("circle.point").data(function(a){return a.filter(function(a){return g.domain().indexOf(a.y)!=-1})});k.enter().append("circle").attr("class","point"),k.exit().remove(),k.attr("cx",function(a){return f(a.x)}).attr("cy",function(a){return g(a.y)}).attr("r",2).style("stroke",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"}).style("fill",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"})});return h}var a={top:3,right:3,bottom:3,left:3},b=200,c=20,d=!0,e=d3.scale.category20().range(),f=d3.scale.linear(),g=d3.scale.linear();h.margin=function(b){if(!arguments.length)return a;a=b;return h},h.width=function(a){if(!arguments.length)return b;b=a;return h},h.height=function(a){if(!arguments.length)return c;c=a;return h},h.animate=function(a){if(!arguments.length)return d;d=a;return h};return h},a.models.stackedArea=function(){function j(a){a.each(function(a){var f=JSON.parse(JSON.stringify(a));f=d3.layout.stack().offset(g).order(h).values(function(a){return a.values})(f);var j=f[0].values.length-1,k=d3.max(f,function(a){return d3.max(a.values,function(a){return a.y0+a.y})});i.width(c-b.left-b.right).height(d-b.top-b.bottom).y(function(a){return a.y+a.y0}).color(a.map(function(a,b){return a.color||e[b%10]}).filter(function(b,c){return!a[c].disabled}));var l=d3.select(this).selectAll("g.d3stackedarea").data([f]),m=l.enter().append("g").attr("class","d3stackedarea").append("g");m.append("g").attr("class","areaWrap"),m.append("g").attr("class","linesWrap");var n=l.select("g").attr("transform","translate("+b.left+","+b.top+")"),o=n.select(".linesWrap").datum(f.filter(function(a){return!a.disabled}));d3.transition(o).call(i);var p=c-b.left-b.right,q=d-b.top-b.bottom,r=d3.svg.area().x(function(a){return a.x*p/j}).y0(function(a){return q-a.y0*q/k}).y1(function(a){return q-(a.y+a.y0)*q/k}),s=d3.svg.area().x(function(a){return a.x*p/j}).y0(function(a){return q-a.y0*q/k}).y1(function(a){return q-a.y0*q/k}),t=n.select(".areaWrap").selectAll("path.area").data(function(a){return a});t.enter().append +("path").attr("class","area"),d3.transition(t.exit()).attr("d",function(a,b){return s(a.values,b)}).remove(),t.style("fill",function(a,b){return e[b%10]}).style("stroke",function(a,b){return e[b%10]}),d3.transition(t).attr("d",function(a,b){return r(a.values,b)})});return j}var b={top:0,right:0,bottom:0,left:0},c=960,d=500,e=d3.scale.category10().range(),f="stack",g="zero",h="default",i=a.models.line();j.margin=function(a){if(!arguments.length)return b;b=a;return j},j.width=function(a){if(!arguments.length)return c;c=a;return j},j.height=function(a){if(!arguments.length)return d;d=a;return j},j.color=function(a){if(!arguments.length)return e;e=a;return j},j.offset=function(a){if(!arguments.length)return g;g=a;return j},j.order=function(a){if(!arguments.length)return h;h=a;return j},j.style=function(a){if(!arguments.length)return f;f=a;switch(f){case"stack":g="zero",h="default";break;case"stream":g="wiggle",h="inside-out";break;case"expand":g="expand",h="default"}return j},j.dispatch=i.dispatch;return j},a.models.stackedAreaWithLegend=function(){function r(a){a.each(function(e){var f=e.filter(function(a){return!a.disabled}).reduce(function(a,b,c){b.values.forEach(function(b,d){c||(a[d]={x:b.x,y:0}),a[d].y+=k(b)});return a},[]);h.domain(d3.extent(d3.merge(f),j)).range([0,c-b.left-b.right]),i.domain(p.offset()=="zero"?[0,d3.max(d3.merge(f),k)]:[0,1]).range([d-b.top-b.bottom,0]),p.width(c-b.left-b.right).height(d-b.top-b.bottom);var s=d3.select(this).selectAll("g.wrap").data([e]),t=s.enter().append("g").attr("class","wrap d3stackedWithLegend").append("g");t.append("g").attr("class","x axis"),t.append("g").attr("class","y axis"),t.append("g").attr("class","stackedWrap"),t.append("g").attr("class","legendWrap"),t.append("g").attr("class","controlsWrap"),n.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,b.disabled?b.values.map(function(a){a._y=a.y,a.y=0;return a}):b.values.map(function(a){a.y=a._y;return a}),e.filter(function(a){return!a.disabled}).length||e.map(function(a){a.disabled=!1,a.values.map(function(a){a.y=a._y;return a});return a}),a.transition().call(r)}),o.dispatch.on("legendClick",function(b,c){if(!!b.disabled){q=q.map(function(a){a.disabled=!0;return a}),b.disabled=!1;switch(b.key){case"Stacked":p.style("stack");break;case"Stream":p.style("stream");break;case"Expanded":p.style("expand")}a.transition().call(r)}}),p.dispatch.on("pointMouseover.tooltip",function(a){g.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),p.dispatch.on("pointMouseout.tooltip",function(a){g.tooltipHide(a)}),b.top=n.height();var u=s.select("g").attr("transform","translate("+b.left+","+b.top+")");n.width(c/2-b.right),o.width(280).color(["#666","#666","#666"]),u.select(".legendWrap").datum(e).attr("transform","translate("+(c/2-b.left)+","+ -b.top+")").call(n),u.select(".controlsWrap").datum(q).attr("transform","translate(0,"+ -b.top+")").call(o);var v=u.select(".stackedWrap").datum(e);d3.transition(v).call(p),l.domain(h.domain()).range(h.range()).ticks(c/100).tickSize(-(d-b.top-b.bottom),0),u.select(".x.axis").attr("transform","translate(0,"+i.range()[0]+")"),d3.transition(u.select(".x.axis")).call(l),m.domain(i.domain()).range(i.range()).ticks(p.offset()=="wiggle"?0:d/36).tickSize(-(c-b.right-b.left),0).tickFormat(p.offset()=="zero"?d3.format(",.2f"):d3.format("%")),d3.transition(u.select(".y.axis")).call(m)});return r}var b={top:30,right:20,bottom:50,left:60},c=960,d=500,e=function(){return 2.5},f=d3.scale.category10().range(),g=d3.dispatch("tooltipShow","tooltipHide"),h=d3.scale.linear(),i=d3.scale.linear(),j=function(a){return a.x},k=function(a){return a.y},l=a.models.xaxis().scale(h),m=a.models.yaxis().scale(i),n=a.models.legend().height(30),o=a.models.legend().height(30),p=a.models.stackedArea(),q=[{key:"Stacked"},{key:"Stream",disabled:!0},{key:"Expanded",disabled:!0}];r.dispatch=g,r.x=function(a){if(!arguments.length)return j;j=a,p.x(a);return r},r.y=function(a){if(!arguments.length)return k;k=a,p.y(a);return r},r.margin=function(a){if(!arguments.length)return b;b=a;return r},r.width=function(a){if(!arguments.length)return c;c=a;return r},r.height=function(a){if(!arguments.length)return d;d=a;return r},r.dotRadius=function(a){if(!arguments.length)return e;e=d3.functor(a),p.dotRadius=a;return r},r.stacked=p,r.xAxis=l,r.yAxis=m;return r}}() \ No newline at end of file diff --git a/src/charts/lineChart.js b/src/charts/lineChart.js index 94de1c4..573f03d 100644 --- a/src/charts/lineChart.js +++ b/src/charts/lineChart.js @@ -1,40 +1,52 @@ -//may make these more specific, like 'time series line with month end data points', etc. -// or may make that yet another layer of abstraction.... trying to not get too crazy +// This is an attempt to make an extremely easy to use chart that is ready to go, +// basically the chart models with the extra glue... Queuing, tooltips, automatic resize, etc. +// I may make these more specific, like 'time series line with month end data points', etc. +// or may make yet another layer of abstraction... common settings. nv.charts.line = function() { - var selector = null, data = [], - xTickFormat = d3.format(',r'), - yTickFormat = d3.format(',.2f'), - xAxisLabel = null, - yAxisLabel = null, - duration = 500; + duration = 500, + tooltip = function(key, x, y, e, graph) { + return '

' + key + '

' + + '

' + y + ' at ' + x + '

' + }; + var graph = nv.models.lineWithLegend(), - showTooltip = function(e) { //TODO: simplify so all the calcualtions don't need to be done by the user. + showTooltip = function(e) { var offset = $(selector).offset(), left = e.pos[0] + offset.left, top = e.pos[1] + offset.top, - formatY = graph.yAxis.tickFormat(), //Assumes using same format as axis, can customize to show higher precision, etc. - formatX = graph.xAxis.tickFormat(); - - // uses the chart's getX and getY, you may customize if x position is not the same as the value you want - // ex. daily data without weekends, x is the index, while you want the date - var content = '

' + e.series.key + '

' + - '

' + - formatY(graph.y()(e.point)) + ' at ' + formatX(graph.x()(e.point)) + - '

'; + formatX = graph.xAxis.tickFormat(), + formatY = graph.yAxis.tickFormat(), + x = formatX(graph.x()(e.point)), + y = formatY(graph.y()(e.point)), + content = tooltip(e.series.key, x, y, e, graph); nvtooltip.show([left, top], content); }; + //setting component defaults + graph.xAxis.tickFormat(d3.format(',r')); + graph.yAxis.tickFormat(d3.format(',.2f')); + + //TODO: consider a method more similar to how the models are built function chart() { + if (!selector || !data.length) return chart; //do nothing if you have nothing to work with + + d3.select(selector).select('svg') + .datum(data) + .transition().duration(duration).call(graph); //consider using transition chaining like in the models + return chart; } + // This should always only be called once, then update should be used after, + // in which case should consider the 'd3 way' and merge this with update, + // but simply do this on enter... should try anoter example that way chart.build = function() { if (!selector || !data.length) return chart; //do nothing if you have nothing to work with @@ -49,13 +61,6 @@ nv.charts.line = function() { .width(width) .height(height); - graph.xAxis - .tickFormat(xTickFormat); - - graph.yAxis - .tickFormat(yTickFormat) - .axisLabel(yAxisLabel); - svg .attr('width', width()) .attr('height', height()) @@ -68,6 +73,7 @@ nv.charts.line = function() { graph.dispatch.on('tooltipShow', showTooltip); graph.dispatch.on('tooltipHide', nvtooltip.cleanup); + //TODO: create resize queue and have nv core handle resize instead of binding all to window resize $(window).resize(function() { // now that width and height are functions, should be automatic..of course you can always override them d3.select(selector + ' svg') @@ -82,12 +88,18 @@ nv.charts.line = function() { }; + /* + // moved to chart() chart.update = function() { - //TODO: create update code + if (!selector || !data.length) return chart; //do nothing if you have nothing to work with + + d3.select(selector).select('svg') + .datum(data) + .transition().duration(duration).call(graph); return chart; }; - + */ chart.data = function(_) { if (!arguments.length) return data; @@ -107,31 +119,40 @@ nv.charts.line = function() { return chart; }; + chart.tooltip = function(_) { + if (!arguments.length) return tooltip; + tooltip = _; + return chart; + }; + chart.xTickFormat = function(_) { - if (!arguments.length) return xTickFormat; - xTickFormat = _; + if (!arguments.length) return graph.xAxis.tickFormat(); + graph.xAxis.tickFormat(typeof _ === 'function' ? _ : d3.format(_)); return chart; }; chart.yTickFormat = function(_) { - if (!arguments.length) return yTickFormat; - yTickFormat = _; + if (!arguments.length) return graph.yAxis.tickFormat(); + graph.yAxis.tickFormat(typeof _ === 'function' ? _ : d3.format(_)); return chart; }; chart.xAxisLabel = function(_) { - if (!arguments.length) return xAxisLabel; - xAxisLabel = _; + if (!arguments.length) return graph.xAxis.axisLabel(); + graph.xAxis.axisLabel(_); return chart; }; chart.yAxisLabel = function(_) { - if (!arguments.length) return yAxisLabel; - yAxisLabel = _; + if (!arguments.length) return graph.yAxis.axisLabel(); + graph.yAxis.axisLabel(_); return chart; }; + d3.rebind(chart, graph, 'x', 'y'); + + chart.graph = graph; // Give direct access for getter/setters, and dispatchers return chart; -} +}; diff --git a/src/core.js b/src/core.js index 74495a9..8fcb5eb 100644 --- a/src/core.js +++ b/src/core.js @@ -1,4 +1,8 @@ -var nv = {version: "0.0.1"}; +var nv = { + version: '0.0.1', + dev: true //set false when in production +}; + window.nv = nv; @@ -7,15 +11,15 @@ nv.charts = {}; //stores all the ready to use charts nv.graphs = []; //stores all the graphs currently on the page nv.log = {}; //stores some statistics and potential error messages -nv.dispatch = d3.dispatch("render_start", "render_end"); +nv.dispatch = d3.dispatch('render_start', 'render_end'); // ******************************************** // Public Helper functions, not part of NV window.log = function(obj) { - if ((typeof(window.console) === "object") - && (typeof(window.console.log) === "function")) + if ((typeof(window.console) === 'object') + && (typeof(window.console.log) === 'function')) console.log.apply(console, arguments); return obj; @@ -27,24 +31,22 @@ window.log = function(obj) { // ******************************************** // Public Core NV functions -nv.dispatch.on("render_start", function(e) { +nv.dispatch.on('render_start', function(e) { nv.log.startTime = +new Date; - //log('start', nv.log.startTime); }); -nv.dispatch.on("render_end", function(e) { +nv.dispatch.on('render_end', function(e) { nv.log.endTime = +new Date; nv.log.totalTime = nv.log.endTime - nv.log.startTime; - //log('end', nv.log.endTime); - log('total', nv.log.totalTime); //used for development, to keep track of graph generation times + if (nv.dev) log('total', nv.log.totalTime); //used for development, to keep track of graph generation times }); // ******************************************** // Public Core NV functions -nv.render = function render(stepSize) { - var step = stepSize || 1; // number of graphs to generate in each timout loop +nv.render = function render(step) { + step = step || 1; // number of graphs to generate in each timout loop render.active = true; nv.dispatch.render_start(); @@ -60,7 +62,7 @@ nv.render = function render(stepSize) { render.queue.splice(0, i); - if (render.queue.length > 0) setTimeout(arguments.callee, 0); + if (render.queue.length) setTimeout(arguments.callee, 0); else { nv.render.active = false; nv.dispatch.render_end(); @@ -71,7 +73,7 @@ nv.render.queue = []; nv.addGraph = function(obj) { - if (typeof arguments[0] === "function") + if (typeof arguments[0] === 'function') obj = {generate: arguments[0], callback: arguments[1]}; nv.render.queue.push(obj); @@ -80,6 +82,10 @@ nv.addGraph = function(obj) { }; + +nv.identity = function(d) { return d }; + + nv.strip = function(s) { return s.replace(/(\s|&)/g,''); } diff --git a/src/models/lineWithLegend.js b/src/models/lineWithLegend.js index 3cf6a5d..a5480b8 100644 --- a/src/models/lineWithLegend.js +++ b/src/models/lineWithLegend.js @@ -135,6 +135,9 @@ nv.models.lineWithLegend = function() { } chart.dispatch = dispatch; + chart.legend = legend; + chart.xAxis = xAxis; + chart.yAxis = yAxis; chart.x = function(_) { if (!arguments.length) return getX; @@ -176,16 +179,5 @@ nv.models.lineWithLegend = function() { }; - // Expose the x-axis' tickFormat method. - //chart.xAxis = {}; - //d3.rebind(chart.xAxis, xAxis, 'tickFormat'); - chart.xAxis = xAxis; - - // Expose the y-axis' tickFormat method. - //chart.yAxis = {}; - //d3.rebind(chart.yAxis, yAxis, 'tickFormat'); - chart.yAxis = yAxis; - - return chart; }