From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 16 May 2010 22:40:15 +0000 (+0200)
Subject: added x and y labels
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=f9dbc6b350ba55dbb39937be3c7fb6941a2d3444;p=MojoFacets.git

added x and y labels
---

diff --git a/public/facet_graph.js b/public/facet_graph.js
index 21fe41c..ff27d19 100644
--- 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;
@@ -62,7 +63,7 @@ ctx.translate( 0, data.height ); // start at bottom left
 ctx.lineWidth = 2;
 ctx.strokeStyle = '#ff8800';
 
-ctx.moveTo( 0, -data.y_data[0] );
+ctx.moveTo( 0, 0 );
 ctx.beginPath();
 
 for( var i in data.x_data ) {
@@ -70,8 +71,28 @@ for( var i in data.x_data ) {
 	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 );
+	data.x_px.push( x );
 }
 
 ctx.stroke();
 ctx.closePath();
 
+var labels_x = $('<ul class="labels-x"></ul>')
+	.css({ width: data.width, height: data.height, position: 'absolute' });
+
+for( var i in data.x_data ) {
+		$('<li><span class="line"></span><span class="label">' + data.x_data[i] + '</span></li>')
+			.css({ left: data.x_px[i] })
+			.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.y_range * data.height ) })
+			.appendTo(labels_y);
+}
+labels_y.appendTo(canvasContain);
diff --git a/public/mojo_facets.css b/public/mojo_facets.css
index f7dafbc..a04d877 100644
--- a/public/mojo_facets.css
+++ b/public/mojo_facets.css
@@ -53,4 +53,47 @@ div.col_opts {
 
 .chart {
 	float: right;
+	position: relative;
 }
+
+.labels-x,
+.labels-y {
+	position: absolute;
+	left: 0;
+	top: 0;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	height: 100%;
+}
+
+.labels-x li,
+.labels-y li {
+	position: absolute;
+	bottom: 0;
+	color: #555;
+	font-size: 75%;
+}
+
+.labels-y li span.line {
+	position: absolute;
+	border: 0 solid #ccc;
+}
+.labels-x li {
+	margin-top: 5px;
+	bottom: -1.5em;
+}
+.labels-y li {
+	width: 100%;
+}
+.labels-y li span.label {
+	right: 100%;
+	position: absolute;
+	margin-right: 5px;
+}
+.labels-y li span.line {
+	border-top-width: 1px;
+	width: 100%;
+}
+