rm old errorbar plot and style from index

Author: etpinard

src/components/errorbars/index.js

@@ -9,14 +9,6 @@
 
 'use strict';
 
-var d3 = require('d3');
-var isNumeric = require('fast-isnumeric');
-
-var Lib = require('../../lib');
-var Color = require('../color');
-var subTypes = require('../../traces/scatter/subtypes');
-
-
 var errorBars = module.exports = {};
 
 errorBars.attributes = require('./attributes');
@@ -49,123 +41,9 @@ errorBars.calcFromTrace = function(trace, layout) {
     return calcdataMock;
 };
 
-// the main drawing function for errorbars
-errorBars.plot = function(gd, plotinfo, cd) {
-    //  ___   <-- "errorhats"
-    //   |
-    //   |    <-- "errorbars"
-    //   |
-    //  ___   <-- "errorshoes"
-
-    var xa = plotinfo.x(),
-        ya = plotinfo.y();
-
-    // first remove all existing errorbars
-    // TODO: use enter/exit instead
-    plotinfo.plot.select('.errorlayer').selectAll('g.errorbars').remove();
-    var coords;
-
-    // draw the errorbars
-    plotinfo.plot.select('.errorlayer').selectAll('g.errorbars')
-        .data(cd)
-      .enter().append('g')
-        .attr('class','errorbars')
-        .each(function(d) {
-            var trace = d[0].trace,
-                xObj = trace.error_x,
-                yObj = trace.error_y,
-                sparse = subTypes.hasMarkers(trace) &&
-                    trace.marker.maxdisplayed>0;
-
-            if(!yObj.visible && !xObj.visible) return;
-
-            d3.select(this).selectAll('g')
-                .data(Lib.identity)
-              .enter().append('g')
-                .each(function(d) {
-                    coords = errorcoords(d, xa, ya);
-                    var eb = d3.select(this),
-                        path;
-                    if(sparse && !d.vis) return;
-
-                    if(yObj.visible && isNumeric(coords.x) &&
-                            isNumeric(coords.yh) &&
-                            isNumeric(coords.ys)) {
-                        var yw = yObj.width;
-                        path = 'M'+(coords.x-yw)+','+coords.yh+'h'+(2*yw) + // hat
-                            'm-'+yw+',0V'+coords.ys; // bar
-                        if(!coords.noYS) path += 'm-'+yw+',0h'+(2*yw); // shoe
-
-                        eb.append('path')
-                            .classed('yerror', true)
-                            .attr('d', path);
-                    }
-                    if(xObj.visible && isNumeric(coords.y) &&
-                            isNumeric(coords.xh) &&
-                            isNumeric(coords.xs)) {
-                        var xw = (xObj.copy_ystyle ? yObj : xObj).width;
-                        path = 'M'+coords.xh+','+(coords.y-xw)+'v'+(2*xw) + // hat
-                            'm0,-'+xw+'H'+coords.xs; // bar
-                        if(!coords.noXS) path += 'm0,-'+xw+'v'+(2*xw); // shoe
-
-                        eb.append('path')
-                            .classed('xerror', true)
-                            .attr('d', path);
-                    }
-                });
-        });
-};
-
-errorBars.style = function(gd) {
-    d3.select(gd).selectAll('g.errorbars').each(function(d) {
-        var eb = d3.select(this),
-            trace = d[0].trace,
-            yObj = trace.error_y||{},
-            xObj = trace.error_x||{};
-
-        eb.selectAll('g path.yerror')
-            .style('stroke-width', yObj.thickness+'px')
-            .call(Color.stroke, yObj.color);
-
-        if(xObj.copy_ystyle) xObj = yObj;
-
-        eb.selectAll('g path.xerror')
-            .style('stroke-width', xObj.thickness+'px')
-            .call(Color.stroke, xObj.color);
-    });
-};
-
-function errorcoords(d, xa, ya) {
-    // compute the coordinates of the error-bar objects
-    var out = {
-        x: xa.c2p(d.x),
-        y: ya.c2p(d.y)
-    };
-
-    // calculate the error bar size and hat and shoe locations
-    if(d.yh!==undefined) {
-        out.yh = ya.c2p(d.yh);
-        out.ys = ya.c2p(d.ys);
-
-        // if the shoes go off-scale (ie log scale, error bars past zero)
-        // clip the bar and hide the shoes
-        if(!isNumeric(out.ys)) {
-            out.noYS = true;
-            out.ys = ya.c2p(d.ys, true);
-        }
-    }
-    if(d.xh!==undefined) {
-        out.xh = xa.c2p(d.xh);
-        out.xs = xa.c2p(d.xs);
-
-        if(!isNumeric(out.xs)) {
-            out.noXS = true;
-            out.xs = xa.c2p(d.xs, true);
-        }
-    }
+errorBars.plot = require('./plot');
 
-    return out;
-}
+errorBars.style = require('./style');
 
 errorBars.hoverInfo = function(calcPoint, trace, hoverPoint) {
     if(trace.error_y.visible) {