From cb0c28e66ec2d52bddba7f696761f6b6825b9377 Mon Sep 17 00:00:00 2001 From: Anna Smirnova Date: Thu, 20 Nov 2014 12:15:05 +0500 Subject: [PATCH] Text for missing-data char is now - option. --- js/metricsgraphics.js | 9 ++++----- js/metricsgraphics.min.js | 6 +++--- src/charts/missing.js | 6 ++---- src/common/data_graphic.js | 3 ++- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/js/metricsgraphics.js b/js/metricsgraphics.js index 3bf60dcf60..8aad6ca3d2 100644 --- a/js/metricsgraphics.js +++ b/js/metricsgraphics.js @@ -131,7 +131,8 @@ function data_graphic() { right: 0, left: 0, width: 350, - height: 220 + height: 220, + missing_text: 'Data currently missing or unavailable' } var args = arguments[0]; @@ -2345,17 +2346,15 @@ charts.missing = function(args) { .attr('width', args.width - (args.left * 2)) .attr('height', args.height - (args.top * 2)); - var missing_text = 'Data currently missing or unavailable'; - // add missing text - svg.selectAll('.missing_text').data([missing_text]) + svg.selectAll('.missing_text').data([args.missing_text]) .enter().append('text') .attr('class', 'missing-text') .attr('x', args.width / 2) .attr('y', args.height / 2) .attr('dy', '.50em') .attr('text-anchor', 'middle') - .text(missing_text) + .text(args.missing_text) return this; } diff --git a/js/metricsgraphics.min.js b/js/metricsgraphics.min.js index 0cfa8022cd..1cda6c2d1a 100644 --- a/js/metricsgraphics.min.js +++ b/js/metricsgraphics.min.js @@ -2,7 +2,7 @@ moz.defaults.point={buffer:16,ls:false,lowess:false,point_size:2.5,size_accessor:null,color_accessor:null,size_range:null,color_range:null,size_domain:null,color_domain:null,color_type:'number'} moz.defaults.histogram={rollover_callback:function(d,i){$('#histogram svg .active_datapoint').html('Frequency Count: '+d.y);},binned:false,bins:null,processed_x_accessor:'x',processed_y_accessor:'y',processed_dx_accessor:'dx',bar_margin:1} moz.defaults.bar={y_accessor:'factor',x_accessor:'value',baseline_accessor:null,predictor_accessor:null,predictor_proportion:5,dodge_acessor:null,binned:true,padding_percentage:0,outer_padding_percentage:.1,height:500,top:20,bar_height:20,left:70} -moz.defaults.missing={top:0,bottom:0,right:0,left:0,width:350,height:220} +moz.defaults.missing={top:0,bottom:0,right:0,left:0,width:350,height:220,missing_text:'Data currently missing or unavailable'} var args=arguments[0];if(!args){args={};} var g='';if(args.list){args.x_accessor=0;args.y_accessor=1;} if(args.chart_type=='missing-data'){args=merge_with_defaults(args,moz.defaults.missing);charts.missing(args);} @@ -245,7 +245,7 @@ return this;} return this;} charts.missing=function(args){this.args=args;this.init=function(args){chart_title(args);d3.select(args.target).selectAll('svg').data([args]).enter().append('svg').attr('width',args.width).attr('height',args.height);d3.select(args.target).selectAll('svg *').remove() var svg=d3.select(args.target).select('svg') -svg.classed('missing',true);svg.append('rect').attr('class','missing-pane').attr('x',args.left).attr('y',args.top).attr('width',args.width-(args.left*2)).attr('height',args.height-(args.top*2));var missing_text='Data currently missing or unavailable';svg.selectAll('.missing_text').data([missing_text]).enter().append('text').attr('class','missing-text').attr('x',args.width/2).attr('y',args.height/2).attr('dy','.50em').attr('text-anchor','middle').text(missing_text) +svg.classed('missing',true);svg.append('rect').attr('class','missing-pane').attr('x',args.left).attr('y',args.top).attr('width',args.width-(args.left*2)).attr('height',args.height-(args.top*2));svg.selectAll('.missing_text').data([args.missing_text]).enter().append('text').attr('class','missing-text').attr('x',args.width/2).attr('y',args.height/2).attr('dy','.50em').attr('text-anchor','middle').text(args.missing_text) return this;} this.init(args);return this;} function raw_data_transformation(args){if(!$.isArray(args.data[0])) @@ -328,4 +328,4 @@ function arrDiff(a,b){var seen=[],diff=[];for(var i=0;i