X-Git-Url: http://git.rot13.org/?p=MojoFacets.git;a=blobdiff_plain;f=public%2Ffacet_graph.js;h=b9811d33b97e20886c8a1fa7d0db3824989b174e;hp=2dac6f98ef014ab6fe8651324f63341a82e94a8c;hb=8d6cad8b9b87ae38715f85d75b5eb410a687bbdc;hpb=f8369526b54c622beb7f6c490ef8b4261db42bf4

diff --git a/public/facet_graph.js b/public/facet_graph.js
index 2dac6f9..b9811d3 100644
--- a/public/facet_graph.js
+++ b/public/facet_graph.js
@@ -4,8 +4,11 @@ var data = {
 		max: Number.MIN_VALUE,
 		range: 0,
 		inc: 0,
+		inc_bar: 0,
 		data: [],
 		px: [],
+		num_labels: 0,
+		label_spacing: 30,
 	},
 	y: {
 		min: Number.MAX_VALUE,
@@ -14,7 +17,7 @@ var data = {
 		data: [],
 		inc: 0,
 		num_labels: 0,
-		labels: [],
+		label_spacing: 25,
 	},
 	width: 600,
 	height: 400,
@@ -44,23 +47,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/>');
 
 canvas.attr({
@@ -82,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 );
@@ -90,42 +89,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;
-		console.debug( x_px, y );
-		ctx.fillRect( x_px, 0, data.x.inc, -y );
-		ctx.strokeRect( x_px, 0, data.x.inc, -y );
+		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();
 
-if ( data.numeric ) {
+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' });
 
-var labels_x = $('<ul class="labels-x"></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);
 
-for( var x_pos = 0; x_pos < data.width; x_pos += data.x.inc ) {
-	var x_val = ( x_pos / data.width * data.x.range ) + data.x.min;
-	$('<li><span class="label">' + x_val + '</span></li>')
-		.css({ left: x_pos })
-		.appendTo(labels_x);
 }
 
-$('<li><span class="label">' + data.x.max + '</span></li>')
-		.css({ right: 0 })
-		.appendTo(labels_x);
+if ( data.numeric )  draw_labels( 'labels-x', data.x, data.width, 'left', 'right:0px' );
 
-labels_x.appendTo(canvasContain);
+draw_labels( 'labels-y', data.y, data.height, 'bottom', 'bottom:'+data.height+'px' );
 
-} // data.numeric
 
-var labels_y = $('<ul class="labels-y"></ul>')
-	.css({ width: data.width, height: data.height, position: 'absolute' });
+console.debug( 'data', data );
 
-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.y.min ) / data.y.range * data.height ) })
-			.appendTo(labels_y);
-}
-labels_y.appendTo(canvasContain);