projects
/
MojoFacets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
calculate pos from value to prevent rounding errors
[MojoFacets.git]
/
public
/
facet_graph.js
diff --git
a/public/facet_graph.js
b/public/facet_graph.js
index
30b1b3a
..
70ab79d
100644
(file)
--- a/
public/facet_graph.js
+++ b/
public/facet_graph.js
@@
-1,12
+1,24
@@
var data = {
var data = {
- min_x: Number.MAX_VALUE,
- max_x: Number.MIN_VALUE,
- min_y: Number.MAX_VALUE,
- max_y: Number.MIN_VALUE,
- x_data: [],
- y_data: [],
- x_px: [],
- 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,
};
width: 600,
height: 400,
};
@@
-16,43
+28,32
@@
var ul = $('ul#facet');
ul.find('li label').each( function(){
var v = parseFloat( $(this).text() );
if ( isNaN(v) ) v = 0;
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.ma
x = 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;
});
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 / 20 ); // padding between vertical labels
-var y_inc = Math.ceil( data.y_range / y_num_labels );
-
-var y_pos = data.min_y;
-var y_last_pos = Math.ceil( data.max_y - y_inc / 2 );
-while( y_pos < y_last_pos ) {
- data.y_labels.push( y_pos );
- y_pos += y_inc;
-}
-data.y_labels.push( data.max_y );
data.numeric = $('span#numeric').length;
data.numeric = $('span#numeric').length;
-data.x
_inc
= data.numeric
- ? Math.round( data.width / data.x
_
range )
- : data.width / data.x
_
data.length
+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({
var canvas = $('<canvas/>');
canvas.attr({
@@
-74,45
+75,50
@@
ctx.fillStyle = '#ffcc88';
ctx.moveTo( 0, 0 );
ctx.beginPath();
ctx.moveTo( 0, 0 );
ctx.beginPath();
-for( var i in data.x
_
data ) {
- 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 );
+for( var i in data.x
.
data ) {
+ 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 );
if ( data.numeric ) {
ctx.lineTo( x, -y );
- data.x
_
px.push( x );
+ data.x
.
px.push( x );
} else {
} else {
- var x_px = i * data.x
_inc
;
+ 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
, -y );
- ctx.strokeRect( x_px, 0, data.x
_inc
, -y );
+ ctx.fillRect( x_px, 0, data.x
.inc_bar
, -y );
+ ctx.strokeRect( x_px, 0, data.x
.inc_bar
, -y );
}
}
ctx.stroke();
ctx.closePath();
}
}
ctx.stroke();
ctx.closePath();
-var labels_x = $('<ul class="labels-x"></ul>')
- .css({ width: data.width, height: data.height, position: 'absolute' });
+function draw_labels(class_name,axis,size,css_pos,last_css_pos) {
-var x_pos = 0;
+ var labels = $('<ul class="'+class_name+'"></ul>')
+ .css({ width: data.width, height: data.height, position: 'absolute' });
-for( var i in data.x_data ) {
- if ( data.numeric && ( i == 0 || Math.abs( data.x_px[i] - x_pos ) > 20 ) ) {
- x_pos = data.x_px[i];
- $('<li><span class="line"></span><span class="label">' + data.x_data[i] + '</span></li>')
- .css({ left: x_pos })
- .appendTo(labels_x);
+ 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);
}
}
-}
-labels_x.appendTo(canvasContain);
-var labels_y = $('<ul class="labels-y"></ul>')
- .css({ width: data.width, height: data.height, position: 'absolute' });
+ $('<li style="'+last_css_pos+'"><span class="line"></span><span class="label">' + axis.max + '</span></li>')
+ .appendTo(labels);
+
+ labels.appendTo(canvasContain);
-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.min_y ) / data.y_range * data.height ) })
- .appendTo(labels_y);
}
}
-labels_y.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 );
+