don't dump every x pixel in debug log

[MojoFacets.git] / public / facet_graph.js

diff --git a/public/facet_graph.js b/public/facet_graph.js
index 301a470..b9811d3 100644 (file)
--- a/public/facet_graph.js
+++ b/public/facet_graph.js
@@ -1,11 +1,24 @@
 var data = {
-       min_x: 0,
-       max_x: 0,
-       min_y: 0,
-       max_y: 0,
-       x_data: [],
-       y_data: [],
-       y_labels: [],
+       x: {
+               min: Number.MAX_VALUE,
+               max: Number.MIN_VALUE,
+               range: 0,
+               inc: 0,
+               inc_bar: 0,
+               data: [],
+               px: [],
+               num_labels: 0,
+               label_spacing: 30,
+       },
+       y: {
+               min: Number.MAX_VALUE,
+               max: Number.MIN_VALUE,
+               range: 0,
+               data: [],
+               inc: 0,
+               num_labels: 0,
+               label_spacing: 25,
+       },
        width: 600,
        height: 400,
 };
@@ -15,35 +28,31 @@ var ul = $('ul#facet');
 ul.find('li label').each( function(){
        var v = parseFloat( $(this).text() );
        if ( isNaN(v) ) v = 0;
-       if ( v > data.max_x ) data.max_x = v;
-       if ( v < data.min_x ) data.min_x = v;
-       data.x_data.push( v );
+       if ( v > data.x.max ) data.x.max = v;
+       if ( v < data.x.min ) data.x.min = v;
+       data.x.data.push( v );
 });
 
 ul.find('li span.count').each( function(){
        var v = parseFloat( $(this).text() ); // FIXME not numeric!
        if ( isNaN(v) ) v = 0;
-       if ( v > data.max_y ) data.max_y = v;
-       if ( v < data.min_y ) data.min_y = v;
-       data.y_data.push( v );
+       if ( v > data.y.max ) data.y.max = v;
+       if ( v < data.y.min ) data.y.min = v;
+       data.y.data.push( v );
 });
 
+data.y.min = 0; // XXX force to 0, because it's count
 
-data.x_range = data.max_x - data.min_x;
-data.y_range = data.max_y - data.min_y;
+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 / 30 ); // padding between vertical labels
-var y_inc = Math.ceil( data.y_range / y_num_labels );
 
-var y_pos = data.min_y;
-while( y_pos < data.max_y - y_inc ) {
-       data.y_labels.push( y_pos );
-       y_pos += y_inc;
-}
-data.y_labels.push( data.max_y );
-
-console.debug( 'data', data );
+data.numeric = $('span#numeric').length;
+data.x.inc_bar = data.numeric
+       ? Math.round( data.width / data.x.range )
+       : data.width / data.x.data.length
+       ;
 
 var canvas = $('<canvas/>');
 
@@ -61,17 +70,62 @@ 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 y = Math.ceil( ( data.y_data[i] - data.min_y ) / data.y_range * data.height );
-       console.debug( i, x, y );
-       ctx.lineTo( x, -y );
+var elements = data.x.data.length;
+var step = elements / data.width;
+console.debug( elements, step );
+if ( step < 1 ) step = 1;
+var i_float = 0;
+while( i_float < elements ) {
+       var i = i_float.toFixed();
+       var x = data.x.data[i];
+       if ( data.numeric ) x = Math.ceil( ( x - data.x.min ) / data.x.range * data.width  );
+       var y = Math.ceil( ( data.y.data[i] - data.y.min ) / data.y.range * data.height );
+       if ( data.numeric ) {
+               ctx.lineTo( x, -y );
+               data.x.px.push( x );
+       } else {
+               var x_px = i * data.x.inc_bar;
+//             console.debug( x_px, y );
+               ctx.fillRect( x_px, 0, data.x.inc_bar, -y );
+               ctx.strokeRect( x_px, 0, data.x.inc_bar, -y );
+       }
+       i_float += step;
 }
 
 ctx.stroke();
 ctx.closePath();
 
+function draw_labels(class_name,axis,size,css_pos,last_css_pos) {
+
+       var labels = $('<ul class="'+class_name+'"></ul>')
+               .css({ width: data.width, height: data.height, position: 'absolute' });
+
+       axis.num_labels = Math.round( size / axis.label_spacing );
+       if ( axis.num_labels > axis.range ) axis.num_labels = axis.range;
+       axis.inc = Math.ceil( axis.range / axis.num_labels );
+
+       for( var val = axis.min; val < axis.max ; val += axis.inc ) {
+               var pos = Math.ceil( ( val - axis.min ) / axis.range * size );
+               $('<li style="'+css_pos+': '+pos+'px"><span class="line"></span><span class="label">' + val + '</span></li>')
+                       .appendTo(labels);
+       }
+
+       $('<li style="'+last_css_pos+'"><span class="line"></span><span class="label">' + axis.max + '</span></li>')
+               .appendTo(labels);
+
+       labels.appendTo(canvasContain);
+
+}
+
+if ( data.numeric )  draw_labels( 'labels-x', data.x, data.width, 'left', 'right:0px' );
+
+draw_labels( 'labels-y', data.y, data.height, 'bottom', 'bottom:'+data.height+'px' );
+
+
+console.debug( 'data', data );
+