X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=public%2Ffacet_graph.js;h=b9811d33b97e20886c8a1fa7d0db3824989b174e;hb=40e5a2a6012e16ead1c3d9a52bc0735b90d4e203;hp=496097a5fabeb945a857509dbf980d10491b8aaa;hpb=048a27381c9435896b2d6f34fae0bc95c388d408;p=MojoFacets.git

diff --git a/public/facet_graph.js b/public/facet_graph.js
index 496097a..b9811d3 100644
--- a/public/facet_graph.js
+++ b/public/facet_graph.js
@@ -5,7 +5,6 @@ var data = {
 		range: 0,
 		inc: 0,
 		inc_bar: 0,
-		inc_px: 0,
 		data: [],
 		px: [],
 		num_labels: 0,
@@ -18,8 +17,6 @@ var data = {
 		data: [],
 		inc: 0,
 		num_labels: 0,
-		labels: [],
-		num_labels: 0,
 		label_spacing: 25,
 	},
 	width: 600,
@@ -78,7 +75,13 @@ ctx.fillStyle = '#ffcc88';
 ctx.moveTo( 0, 0 );
 ctx.beginPath();
 
-for( var i in data.x.data ) {
+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 );
@@ -87,10 +90,11 @@ for( var i in data.x.data ) {
 		data.x.px.push( x );
 	} else {
 		var x_px = i * data.x.inc_bar;
-		console.debug( x_px, y );
+//		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();
@@ -104,13 +108,11 @@ function draw_labels(class_name,axis,size,css_pos,last_css_pos) {
 	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 );
-	axis.inc_px = Math.ceil( size / axis.num_labels );
 
-	var pos = 0;
 	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);
-		pos += axis.inc_px;
 	}
 
 	$('<li style="'+last_css_pos+'"><span class="line"></span><span class="label">' + axis.max + '</span></li>')