This commit is contained in:
Jason Davies 2011-04-07 22:38:50 +01:00
Родитель 34ffbbf1d0
Коммит 7fba63734f
3 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -25,7 +25,8 @@ d3.chart.bullet = function() {
rangeColor = d3.scale.linear(),
measureColor = d3.scale.linear(),
scale = d3.scale.linear(),
tickFormat = d3.format(',.0f');
tickFormat = d3.format(',.0f'),
transition = function(x) { return x };
var reverse = function(l) {
for (var i=0, ii=l.length; i<ii; i++) {
@ -34,9 +35,6 @@ d3.chart.bullet = function() {
};
var bullet = function(chart) {
var transition = duration ?
function(x) { return x.transition().duration(duration) } :
function(x) { return x };
var data = [];
for (var i=0, ii=this[0].length; i<ii; i++) {
data.push(this[0][i].__data__);
@ -171,6 +169,8 @@ d3.chart.bullet = function() {
bullet.duration = function(x) {
if (!arguments.length) return duration;
duration = x;
transition = duration ? function(x) { return x.transition().duration(duration) } :
function(x) { return x };
return bullet;
};

2
d3.chart.min.js поставляемый
Просмотреть файл

@ -1 +1 @@
(function(){d3.chart={},d3.chart.bullet=function(){var a="left",b=0,c=function(a){return a.ranges},d=function(a){return a.markers},e=function(a){return a.measures},f,g=null,h=800,i=30,j=d3.scale.linear(),k=d3.scale.linear(),l=d3.scale.linear(),m=d3.format(",.0f"),n=function(a){for(var b=0,c=a.length;b<c;b++)a[b].sort(function(a,b){return b-a})},o=function(a){var f=b?function(a){return a.transition().duration(b)}:function(a){return a},g=[];for(var h=0,o=this[0].length;h<o;h++)g.push(this[0][h].__data__);var p={ranges:g.map(c),measures:g.map(e),markers:g.map(d)};q(p),n(p.ranges),n(p.measures),a.selectAll("rect.range").data(c).enter().append("svg:rect").attr("class","range"),f(a.selectAll("rect.range")).attr("width",l).attr("height",i).attr("fill",function(a,b){return j(b)}),a.selectAll("rect.measure").data(e).enter().append("svg:rect").attr("class","measure"),f(a.selectAll("rect.measure")).attr("width",l).attr("height",i/3).attr("y",i/3).attr("fill",function(a,b){return k(b)}),a.selectAll("line.marker").data(d).enter().append("svg:line").attr("class","marker").attr("stroke","#000").attr("stroke-width","2px"),f(a.selectAll("line.marker")).attr("x1",l).attr("x2",l).attr("y1",i/6).attr("y2",i*5/6);var r=l.ticks(10),s=this.selectAll("line.rule").data(r);s.exit().remove(),s.enter().append("svg:line").attr("class","rule").attr("stroke","#666").attr("stroke-width",".5px"),f(a.selectAll("line.rule")).attr("x1",l).attr("x2",l).attr("y1",i).attr("y2",i*7/6);var t=this.selectAll("text.tick").data(r);t.exit().remove(),t.enter().append("svg:text").attr("class","tick").attr("text-anchor","middle").attr("dy","1em"),f(a.selectAll("text.tick").text(m)).attr("x",l).attr("y",i*7/6)},p=function(a){return d3.max(a,function(a){return a.length})},q=function(b){f=/^left|right$/.test(a),j.domain([0,Math.max(1,p(b.ranges)-1)]).range(["#eee","#bbb"]),k.domain([0,Math.max(1,p(b.measures)-1)]).range(["lightsteelblue","steelblue"]),g=d3.max([].concat(b.ranges,b.markers,b.measures),function(a){return d3.max(a)}),l.domain([0,g]).range([0,h])};o.orient=function(b){if(!arguments.length)return a;a=b;return o},o.ranges=function(a){if(!arguments.length)return c;c=a;return o},o.markers=function(a){if(!arguments.length)return d;d=a;return o},o.measures=function(a){if(!arguments.length)return e;e=a;return o},o.maximum=function(a){if(!arguments.length)return g;g=a;return o},o.width=function(a){if(!arguments.length)return h;h=a;return o},o.height=function(a){if(!arguments.length)return i;i=a;return o},o.tickFormat=function(a){if(!arguments.length)return m;m=a;return o},o.duration=function(a){if(!arguments.length)return b;b=a;return o};return o}})()
(function(){d3.chart={},d3.chart.bullet=function(){var a="left",b=0,c=function(a){return a.ranges},d=function(a){return a.markers},e=function(a){return a.measures},f,g=null,h=800,i=30,j=d3.scale.linear(),k=d3.scale.linear(),l=d3.scale.linear(),m=d3.format(",.0f"),n=function(a){return a},o=function(a){for(var b=0,c=a.length;b<c;b++)a[b].sort(function(a,b){return b-a})},p=function(a){var b=[];for(var f=0,g=this[0].length;f<g;f++)b.push(this[0][f].__data__);var h={ranges:b.map(c),measures:b.map(e),markers:b.map(d)};r(h),o(h.ranges),o(h.measures),a.selectAll("rect.range").data(c).enter().append("svg:rect").attr("class","range"),n(a.selectAll("rect.range")).attr("width",l).attr("height",i).attr("fill",function(a,b){return j(b)}),a.selectAll("rect.measure").data(e).enter().append("svg:rect").attr("class","measure"),n(a.selectAll("rect.measure")).attr("width",l).attr("height",i/3).attr("y",i/3).attr("fill",function(a,b){return k(b)}),a.selectAll("line.marker").data(d).enter().append("svg:line").attr("class","marker").attr("stroke","#000").attr("stroke-width","2px"),n(a.selectAll("line.marker")).attr("x1",l).attr("x2",l).attr("y1",i/6).attr("y2",i*5/6);var p=l.ticks(10),q=this.selectAll("line.rule").data(p);q.exit().remove(),q.enter().append("svg:line").attr("class","rule").attr("stroke","#666").attr("stroke-width",".5px"),n(a.selectAll("line.rule")).attr("x1",l).attr("x2",l).attr("y1",i).attr("y2",i*7/6);var s=this.selectAll("text.tick").data(p);s.exit().remove(),s.enter().append("svg:text").attr("class","tick").attr("text-anchor","middle").attr("dy","1em"),n(a.selectAll("text.tick").text(m)).attr("x",l).attr("y",i*7/6)},q=function(a){return d3.max(a,function(a){return a.length})},r=function(b){f=/^left|right$/.test(a),j.domain([0,Math.max(1,q(b.ranges)-1)]).range(["#eee","#bbb"]),k.domain([0,Math.max(1,q(b.measures)-1)]).range(["lightsteelblue","steelblue"]),g=d3.max([].concat(b.ranges,b.markers,b.measures),function(a){return d3.max(a)}),l.domain([0,g]).range([0,h])};p.orient=function(b){if(!arguments.length)return a;a=b;return p},p.ranges=function(a){if(!arguments.length)return c;c=a;return p},p.markers=function(a){if(!arguments.length)return d;d=a;return p},p.measures=function(a){if(!arguments.length)return e;e=a;return p},p.maximum=function(a){if(!arguments.length)return g;g=a;return p},p.width=function(a){if(!arguments.length)return h;h=a;return p},p.height=function(a){if(!arguments.length)return i;i=a;return p},p.tickFormat=function(a){if(!arguments.length)return m;m=a;return p},p.duration=function(a){if(!arguments.length)return b;b=a,n=b?function(a){return a.transition().duration(b)}:function(a){return a};return p};return p}})()

Просмотреть файл

@ -24,7 +24,8 @@ d3.chart.bullet = function() {
rangeColor = d3.scale.linear(),
measureColor = d3.scale.linear(),
scale = d3.scale.linear(),
tickFormat = d3.format(',.0f');
tickFormat = d3.format(',.0f'),
transition = function(x) { return x };
var reverse = function(l) {
for (var i=0, ii=l.length; i<ii; i++) {
@ -33,9 +34,6 @@ d3.chart.bullet = function() {
};
var bullet = function(chart) {
var transition = duration ?
function(x) { return x.transition().duration(duration) } :
function(x) { return x };
var data = [];
for (var i=0, ii=this[0].length; i<ii; i++) {
data.push(this[0][i].__data__);
@ -170,6 +168,8 @@ d3.chart.bullet = function() {
bullet.duration = function(x) {
if (!arguments.length) return duration;
duration = x;
transition = duration ? function(x) { return x.transition().duration(duration) } :
function(x) { return x };
return bullet;
};