projects
/
MojoFacets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
352a9cb
)
drop simple histograms for non-numeric
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Mon, 17 May 2010 22:15:54 +0000
(
00:15
+0200)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Mon, 17 May 2010 22:15:54 +0000
(
00:15
+0200)
public/facet_graph.js
patch
|
blob
|
history
diff --git
a/public/facet_graph.js
b/public/facet_graph.js
index
4613bab
..
88fd735
100644
(file)
--- a/
public/facet_graph.js
+++ b/
public/facet_graph.js
@@
-44,6
+44,9
@@
while( y_pos < data.max_y - y_inc ) {
}
data.y_labels.push( data.max_y );
}
data.y_labels.push( data.max_y );
+data.numeric = $('span#numeric').length;
+data.x_inc = Math.round( data.width / data.x_range );
+
console.debug( 'data', data );
var canvas = $('<canvas/>');
console.debug( 'data', data );
var canvas = $('<canvas/>');
@@
-62,16
+65,25
@@
var ctx = canvas[0].getContext('2d');
ctx.translate( 0, data.height ); // start at bottom left
ctx.lineWidth = 2;
ctx.strokeStyle = '#ff8800';
ctx.translate( 0, data.height ); // start at bottom left
ctx.lineWidth = 2;
ctx.strokeStyle = '#ff8800';
+ctx.fillStyle = '#ffcc88';
ctx.moveTo( 0, 0 );
ctx.beginPath();
for( var i in data.x_data ) {
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 );
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 );
+ 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.stroke();