use computeError in gl3d error bar convert step

Author: etpinard

src/traces/scatter3d/calc_errors.js

@@ -9,59 +9,21 @@
 
 'use strict';
 
-function calculateAxisErrors(data, params, scaleFactor) {
-    if(!params || !params.visible) return null;
+var computeError = require('../../components/errorbars/compute_error');
 
-    function option(name, value) {
-        if(name in params) return params[name];
-        return value;
-    }
 
-    var result = new Array(data.length),
-        type = option('type', 'percent'),
-        symmetric = option('symmetric', true),
-        value = +option('value', 10),
-        minusValue = +option('valueminus', 10),
-        error = option('array', null),
-        minusError = option('arrayminus', null);
-
-    if(symmetric) {
-        minusValue = value;
-        minusError = error;
-    }
+function calculateAxisErrors(data, params, scaleFactor) {
+    if(!params || !params.visible) return null;
 
-    if(type === 'data' && (!error || !minusError)) return null;
+    var result = new Array(data.length);
 
     for(var i = 0; i < data.length; i++) {
-        var x = +data[i];
-
-        switch(type) {
-            case 'percent':
-                result[i] = [
-                    -Math.abs(x) * (minusValue / 100.0) * scaleFactor,
-                    Math.abs(x) * (value / 100.0) * scaleFactor
-                ];
-                break;
-
-            case 'constant':
-                result[i] = [
-                    -minusValue * scaleFactor,
-                    value * scaleFactor
-                ];
-                break;
-
-            case 'sqrt':
-                var r = Math.sqrt(Math.abs(x)) * scaleFactor;
-                result[i] = [-r, r];
-                break;
-
-            case 'data':
-                result[i] = [
-                    -(+minusError[i]) * scaleFactor,
-                    (+error[i]) * scaleFactor
-                ];
-                break;
-        }
+        var errors = computeError(+data[i], i, params);
+
+        result[i] = [
+            -errors[0] * scaleFactor,
+            errors[1] * scaleFactor
+        ];
     }
 
     return result;

src/traces/scatter3d/convert.js

@@ -23,7 +23,6 @@ var formatColor = require('../../lib/gl_format_color');
 var DASH_PATTERNS = require('../../constants/gl3d_dashes.json');
 var MARKER_SYMBOLS = require('../../constants/gl_markers.json');
 
-// TODO use ErrorBars.calcFromTrace instead
 var calculateError = require('./calc_errors');
 
 function LineWithMarkers(scene, uid) {