diff --git a/js/main.js b/js/main.js index 5e99cd5d14..57a3d1b8c1 100644 --- a/js/main.js +++ b/js/main.js @@ -220,6 +220,7 @@ $(document).ready(function() { right: torso.right, target: '#missing1', linked: true, + y_rug:true, y_extended_ticks: true, x_accessor: 'date', y_accessor: ['value', 'value2', 'value3'] diff --git a/src/charts/point.js b/src/charts/point.js index 993fc8a63c..227dce7284 100644 --- a/src/charts/point.js +++ b/src/charts/point.js @@ -1,3 +1,6 @@ + + + charts.point = function(args) { this.args = args; @@ -50,44 +53,6 @@ charts.point = function(args) { pts.attr('r', args.point_size); } - //are we adding rug plots? - var rug; - if (args.x_rug) { - rug = g.selectAll('line.x_rug').data(args.data[0]) - .enter().append('svg:line') - .attr('x1', args.scalefns.xf) - .attr('x2', args.scalefns.xf) - .attr('y1', args.height-args.top+args.buffer/2) - .attr('y2', args.height-args.top) - .attr('class', 'x-rug') - .attr('opacity', 0.3); - - if (args.color_accessor) { - rug.attr('stroke', args.scalefns.color); - } - else { - rug.classed('x-rug-mono', true); - } - } - - if (args.y_rug) { - rug = g.selectAll('line.y_rug').data(args.data[0]) - .enter().append('svg:line') - .attr('x1', args.left+1) - .attr('x2', args.left+args.buffer/2) - .attr('y1', args.scalefns.yf) - .attr('y2', args.scalefns.yf) - .attr('class', 'y-rug') - .attr('opacity', 0.3); - - if (args.color_accessor) { - rug.attr('stroke', args.scalefns.color); - } - else { - rug.classed('y-rug-mono', true); - } - } - return this; } diff --git a/src/common/x_axis.js b/src/common/x_axis.js index d69747d4d4..eea489b4cf 100644 --- a/src/common/x_axis.js +++ b/src/common/x_axis.js @@ -1,3 +1,29 @@ +function x_rug(args){ + var svg = d3.select(args.target + ' svg'); + var all_data=[]; + for (var i=0; i