fix y labels position

[MojoFacets.git] / public / facet_graph.js

diff --git a/public/facet_graph.js b/public/facet_graph.js
index 21fe41c..700593d 100644 (file)
--- a/public/facet_graph.js
+++ b/public/facet_graph.js
@@ -5,6 +5,7 @@ var data = {
        max_y: Number.MIN_VALUE,
        x_data: [],
        y_data: [],
+       x_px: [],
        y_labels: [],
        width: 600,
        height: 400,
@@ -33,7 +34,7 @@ data.x_range = data.max_x - data.min_x;
 data.y_range = data.max_y - data.min_y;
 
 
-var y_num_labels = Math.round( data.height / 30 ); // padding between vertical labels
+var y_num_labels = Math.round( data.height / 20 ); // padding between vertical labels
 var y_inc = Math.ceil( data.y_range / y_num_labels );
 
 var y_pos = data.min_y;
@@ -43,6 +44,12 @@ while( y_pos < data.max_y - y_inc ) {
 }
 data.y_labels.push( data.max_y );
 
+data.numeric = $('span#numeric').length;
+data.x_inc = data.numeric
+       ? Math.round( data.width / data.x_range )
+       : data.width / data.x_data.length
+       ;
+
 console.debug( 'data', data );
 
 var canvas = $('<canvas/>');
@@ -61,17 +68,50 @@ var ctx = canvas[0].getContext('2d');
 ctx.translate( 0, data.height ); // start at bottom left
 ctx.lineWidth = 2;
 ctx.strokeStyle = '#ff8800';
+ctx.fillStyle = '#ffcc88';
 
-ctx.moveTo( 0, -data.y_data[0] );
+ctx.moveTo( 0, 0 );
 ctx.beginPath();
 
 for( var i in data.x_data ) {
-       var x = Math.ceil( ( data.x_data[i] - data.min_x ) / data.x_range * data.width  );
+       var x = data.x_data[i];
+       if ( data.numeric ) x = Math.ceil( ( x - data.min_x ) / data.x_range * data.width  );
        var y = Math.ceil( ( data.y_data[i] - data.min_y ) / data.y_range * data.height );
-       console.debug( i, x, y );
-       ctx.lineTo( x, -y );
+       if ( data.numeric ) {
+               ctx.lineTo( x, -y );
+               data.x_px.push( x );
+       } else {
+               var x_px = i * data.x_inc;
+               console.debug( x_px, y );
+               ctx.fillRect( x_px, 0, data.x_inc, -y );
+               ctx.strokeRect( x_px, 0, data.x_inc, -y );
+       }
 }
 
 ctx.stroke();
 ctx.closePath();
 
+var labels_x = $('<ul class="labels-x"></ul>')
+       .css({ width: data.width, height: data.height, position: 'absolute' });
+
+var x_pos = 0;
+
+for( var i in data.x_data ) {
+       if ( Math.abs( data.x_px[i] - x_pos ) > 20 ) {
+               x_pos = data.x_px[i];
+               $('<li><span class="line"></span><span class="label">' + data.x_data[i] + '</span></li>')
+                       .css({ left: x_pos })
+                       .appendTo(labels_x);
+       }
+}
+labels_x.appendTo(canvasContain);
+
+var labels_y = $('<ul class="labels-y"></ul>')
+       .css({ width: data.width, height: data.height, position: 'absolute' });
+
+for( var i in data.y_labels ) {
+               $('<li><span class="line"></span><span class="label">' + data.y_labels[i] + '</span></li>')
+                       .css({ bottom: Math.ceil( ( data.y_labels[i] - data.min_y ) / data.y_range * data.height ) })
+                       .appendTo(labels_y);
+}
+labels_y.appendTo(canvasContain);