X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=public%2Ffacet_graph.js;fp=public%2Ffacet_graph.js;h=94b009bf4109421a533b87f84c64e527eacfbdcf;hb=367e3b271797e214f4823033e171c42c13f8cb20;hp=2dac6f98ef014ab6fe8651324f63341a82e94a8c;hpb=f8369526b54c622beb7f6c490ef8b4261db42bf4;p=MojoFacets.git diff --git a/public/facet_graph.js b/public/facet_graph.js index 2dac6f9..94b009b 100644 --- a/public/facet_graph.js +++ b/public/facet_graph.js @@ -4,8 +4,12 @@ var data = { max: Number.MIN_VALUE, range: 0, inc: 0, + inc_bar: 0, + inc_px: 0, data: [], px: [], + num_labels: 0, + label_spacing: 30, }, y: { min: Number.MAX_VALUE, @@ -15,6 +19,8 @@ var data = { inc: 0, num_labels: 0, labels: [], + num_labels: 0, + label_spacing: 25, }, width: 600, height: 400, @@ -44,23 +50,13 @@ data.x.range = data.x.max - data.x.min; data.y.range = data.y.max - data.y.min; -var y_num_labels = Math.round( data.height / 20 ); // padding between vertical labels -data.y.inc = Math.ceil( data.y.range / y_num_labels ); - -var y_last_pos = Math.ceil( data.y.max - data.y.inc / 2 ); -for( var y_pos = data.y.min; y_pos < y_last_pos; y_pos += data.y.inc ) { - data.y.labels.push( y_pos ); -} -data.y.labels.push( data.y.max ); data.numeric = $('span#numeric').length; -data.x.inc = data.numeric +data.x.inc_bar = data.numeric ? Math.round( data.width / data.x.range ) : data.width / data.x.data.length ; -console.debug( 'data', data ); - var canvas = $(''); canvas.attr({ @@ -90,42 +86,43 @@ for( var i in data.x.data ) { ctx.lineTo( x, -y ); data.x.px.push( x ); } else { - var x_px = i * data.x.inc; + var x_px = i * data.x.inc_bar; console.debug( x_px, y ); - ctx.fillRect( x_px, 0, data.x.inc, -y ); - ctx.strokeRect( x_px, 0, data.x.inc, -y ); + ctx.fillRect( x_px, 0, data.x.inc_bar, -y ); + ctx.strokeRect( x_px, 0, data.x.inc_bar, -y ); } } ctx.stroke(); ctx.closePath(); -if ( data.numeric ) { +function draw_labels(class_name,axis,size,css_pos,last_css_pos) { + + var labels = $('