10
10
11
11
var Registry = require ( '../../registry' ) ;
12
12
13
- function calculateAxisErrors ( data , params , scaleFactor ) {
13
+ function calculateAxisErrors ( data , params , scaleFactor , axis , calendar ) {
14
14
if ( ! params || ! params . visible ) return null ;
15
15
16
16
var computeError = Registry . getComponentMethod ( 'errorbars' , 'makeComputeError' ) ( params ) ;
@@ -19,9 +19,10 @@ function calculateAxisErrors(data, params, scaleFactor) {
19
19
for ( var i = 0 ; i < data . length ; i ++ ) {
20
20
var errors = computeError ( + data [ i ] , i ) ;
21
21
22
+ var point = axis . d2l ( data [ i ] , 0 , calendar ) * scaleFactor ; // A bit wasteful
22
23
result [ i ] = [
23
- - errors [ 0 ] * scaleFactor ,
24
- errors [ 1 ] * scaleFactor
24
+ ( axis . d2l ( data [ i ] - errors [ 0 ] , 0 , calendar ) * scaleFactor ) - point || - point ,
25
+ ( axis . d2l ( data [ i ] + errors [ 1 ] , 0 , calendar ) * scaleFactor ) - point || - point
25
26
] ;
26
27
}
27
28
@@ -35,11 +36,11 @@ function dataLength(array) {
35
36
return 0 ;
36
37
}
37
38
38
- function calculateErrors ( data , scaleFactor ) {
39
+ function calculateErrors ( data , scaleFactor , sceneLayout ) {
39
40
var errors = [
40
- calculateAxisErrors ( data . x , data . error_x , scaleFactor [ 0 ] ) ,
41
- calculateAxisErrors ( data . y , data . error_y , scaleFactor [ 1 ] ) ,
42
- calculateAxisErrors ( data . z , data . error_z , scaleFactor [ 2 ] )
41
+ calculateAxisErrors ( data . x , data . error_x , scaleFactor [ 0 ] , sceneLayout . xaxis , data . xcalendar ) ,
42
+ calculateAxisErrors ( data . y , data . error_y , scaleFactor [ 1 ] , sceneLayout . yaxis , data . ycalendar ) ,
43
+ calculateAxisErrors ( data . z , data . error_z , scaleFactor [ 2 ] , sceneLayout . zaxis , data . zcalendar )
43
44
] ;
44
45
45
46
var n = dataLength ( errors ) ;
0 commit comments