Merge branch 'master' into gradient-fill

Author: alexcjohnson

package.json

@@ -74,7 +74,7 @@
     "gl-plot3d": "^1.5.4",
     "gl-pointcloud2d": "^1.0.0",
     "gl-scatter2d": "^1.2.2",
-    "gl-scatter2d-sdf": "1.3.4",
+    "gl-scatter2d-sdf": "^1.3.9",
     "gl-scatter3d": "^1.0.4",
     "gl-select-box": "^1.0.1",
     "gl-shader": "4.2.0",

src/components/drawing/index.js

@@ -573,6 +573,7 @@ drawing.makeTester = function(gd) {
 // always returns a copy of the bbox, so the caller can modify it safely
 var savedBBoxes = [],
     maxSavedBBoxes = 10000;
+
 drawing.bBox = function(node) {
     // cache elements we've already measured so we don't have to
     // remeasure the same thing many times
@@ -581,32 +582,36 @@ drawing.bBox = function(node) {
         return Lib.extendFlat({}, savedBBoxes[saveNum.value]);
     }
 
-    var test3 = d3.select('#js-plotly-tester'),
-        tester = test3.node();
+    if(!drawing.test3) {
+        drawing.test3 = d3.select('#js-plotly-tester');
+        drawing.tester = drawing.test3.node();
+    }
 
     // copy the node to test into the tester
     var testNode = node.cloneNode(true);
-    tester.appendChild(testNode);
+    drawing.tester.appendChild(testNode);
     // standardize its position... do we really want to do this?
     d3.select(testNode).attr({
         x: 0,
         y: 0,
         transform: ''
     });
 
-    var testRect = testNode.getBoundingClientRect(),
-        refRect = test3.select('.js-reference-point')
+    var testRect = testNode.getBoundingClientRect();
+    if(!drawing.refRect) {
+        drawing.refRect = drawing.test3.select('.js-reference-point')
             .node().getBoundingClientRect();
+    }
 
-    tester.removeChild(testNode);
+    drawing.tester.removeChild(testNode);
 
     var bb = {
         height: testRect.height,
         width: testRect.width,
-        left: testRect.left - refRect.left,
-        top: testRect.top - refRect.top,
-        right: testRect.right - refRect.left,
-        bottom: testRect.bottom - refRect.top
+        left: testRect.left - drawing.refRect.left,
+        top: testRect.top - drawing.refRect.top,
+        right: testRect.right - drawing.refRect.left,
+        bottom: testRect.bottom - drawing.refRect.top
     };
 
     // make sure we don't have too many saved boxes,

src/components/legend/draw.js

@@ -514,7 +514,9 @@ function handleClick(g, gd, numClicks) {
             allTraces.push(i);
             // Allow the legendonly state through for *all* trace types (including
             // carpet for which it's overridden with true/false in supplyDefaults)
-            traceVisibility.push('legendonly');
+            traceVisibility.push(
+                Registry.traceIs(fullData[i], 'notLegendIsolatable') ? true : 'legendonly'
+            );
         }
 
         if(legendgroup === '') {

src/lib/svg_text_utils.js

@@ -19,6 +19,8 @@ var stringMappings = require('../constants/string_mappings');
 
 // Append SVG
 
+var parser = new DOMParser();
+
 d3.selection.prototype.appendSVG = function(_svgString) {
     var skeleton = [
         '<svg xmlns="', xmlnsNamespaces.svg, '" ',
@@ -27,7 +29,7 @@ d3.selection.prototype.appendSVG = function(_svgString) {
         '</svg>'
     ].join('');
 
-    var dom = new DOMParser().parseFromString(skeleton, 'application/xml'),
+    var dom = parser.parseFromString(skeleton, 'application/xml'),
         childNode = dom.documentElement.firstChild;
 
     while(childNode) {

src/plot_api/manage_arrays.js

@@ -13,6 +13,7 @@ var nestedProperty = require('../lib/nested_property');
 var isPlainObject = require('../lib/is_plain_object');
 var noop = require('../lib/noop');
 var Loggers = require('../lib/loggers');
+var sorterAsc = require('../lib/search').sorterAsc;
 var Registry = require('../registry');
 
 
@@ -101,7 +102,7 @@ exports.applyContainerArrayChanges = function applyContainerArrayChanges(gd, np,
         return true;
     }
 
-    var componentNums = Object.keys(edits).map(Number).sort(),
+    var componentNums = Object.keys(edits).map(Number).sort(sorterAsc),
         componentArrayIn = np.get(),
         componentArray = componentArrayIn || [],
         // componentArrayFull is used just to keep splices in line between

src/plot_api/plot_api.js

@@ -288,7 +288,8 @@ Plotly.plot = function(gd, data, layout, config) {
     // Now plot the data
     function drawData() {
         var calcdata = gd.calcdata,
-            i;
+            i,
+            rangesliderContainers = fullLayout._infolayer.selectAll('g.rangeslider-container');
 
         // in case of traces that were heatmaps or contour maps
         // previously, remove them and their colorbars explicitly
@@ -308,7 +309,7 @@ Plotly.plot = function(gd, data, layout, config) {
                     .selectAll(query)
                     .remove();
 
-                fullLayout._infolayer.selectAll('g.rangeslider-container')
+                rangesliderContainers
                     .selectAll(query)
                     .remove();
             }

src/plots/gl2d/camera.js

@@ -110,7 +110,7 @@ function createCamera(scene) {
                     result.boxEnd[1] = dataY;
 
                     // we need to mark the box as initialized right away
-                    // so that we can tell the start and end pionts apart
+                    // so that we can tell the start and end points apart
                     result.boxInited = true;
 
                     // but don't actually enable the box until the cursor moves
@@ -189,6 +189,10 @@ function createCamera(scene) {
                     result.boxEnabled = false;
                     result.boxInited = false;
                 }
+                // if box was inited but button released then - reset the box
+                else if(result.boxInited) {
+                    result.boxInited = false;
+                }
                 break;
 
             case 'pan':

src/traces/scatter/plot.js

@@ -463,6 +463,7 @@ function plotOne(gd, idx, plotinfo, cdscatter, cdscatterAll, element, transition
         });
 
         join.selectAll('text')
+            .classed('textpoint', true)
             .call(Drawing.textPointStyle, trace)
             .each(function(d) {
 

src/traces/scattercarpet/calc.js

@@ -12,10 +12,10 @@
 var isNumeric = require('fast-isnumeric');
 
 var Axes = require('../../plots/cartesian/axes');
-var Lib = require('../../lib');
 
 var subTypes = require('../scatter/subtypes');
 var calcColorscale = require('../scatter/colorscale_calc');
+var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
 var lookupCarpet = require('../carpet/lookup_carpetid');
 
 module.exports = function calc(gd, trace) {
@@ -68,8 +68,7 @@ module.exports = function calc(gd, trace) {
 
     calcColorscale(trace);
 
-    // this has migrated up from arraysToCalcdata as we have a reference to 's' here
-    if(typeof s !== 'undefined') Lib.mergeArray(s, cd, 'ms');
+    arraysToCalcdata(cd, trace);
 
     return cd;
 };

src/transforms/filter.js

@@ -15,7 +15,7 @@ var axisIds = require('../plots/cartesian/axis_ids');
 var autoType = require('../plots/cartesian/axis_autotype');
 var setConvert = require('../plots/cartesian/set_convert');
 
-var INEQUALITY_OPS = ['=', '<', '>=', '>', '<='];
+var COMPARISON_OPS = ['=', '!=', '<', '>=', '>', '<='];
 var INTERVAL_OPS = ['[]', '()', '[)', '(]', '][', ')(', '](', ')['];
 var SET_OPS = ['{}', '}{'];
 
@@ -51,12 +51,16 @@ exports.attributes = {
     },
     operation: {
         valType: 'enumerated',
-        values: [].concat(INEQUALITY_OPS).concat(INTERVAL_OPS).concat(SET_OPS),
+        values: []
+            .concat(COMPARISON_OPS)
+            .concat(INTERVAL_OPS)
+            .concat(SET_OPS),
         dflt: '=',
         description: [
             'Sets the filter operation.',
 
             '*=* keeps items equal to `value`',
+            '*!=* keeps items not equal to `value`',
 
             '*<* keeps items less than `value`',
             '*<=* keeps items less than or equal to `value`',
@@ -87,21 +91,31 @@ exports.attributes = {
             'Values are expected to be in the same type as the data linked',
             'to *target*.',
 
-            'When `operation` is set to one of the inequality values',
-            '(' + INEQUALITY_OPS + ')',
+            'When `operation` is set to one of',
+            'the comparison values (' + COMPARISON_OPS + ')',
             '*value* is expected to be a number or a string.',
 
-            'When `operation` is set to one of the interval value',
+            'When `operation` is set to one of the interval values',
             '(' + INTERVAL_OPS + ')',
             '*value* is expected to be 2-item array where the first item',
             'is the lower bound and the second item is the upper bound.',
 
-            'When `operation`, is set to one of the set value',
+            'When `operation`, is set to one of the set values',
             '(' + SET_OPS + ')',
             '*value* is expected to be an array with as many items as',
             'the desired set elements.'
         ].join(' ')
-    }
+    },
+    preservegaps: {
+        valType: 'boolean',
+        dflt: false,
+        description: [
+            'Determines whether or not gaps in data arrays produced by the filter operation',
+            'are preserved.',
+            'Setting this to *true* might be useful when plotting a line chart',
+            'with `connectgaps` set to *false*.'
+        ].join(' ')
+    },
 };
 
 exports.supplyDefaults = function(transformIn) {
@@ -114,6 +128,7 @@ exports.supplyDefaults = function(transformIn) {
     var enabled = coerce('enabled');
 
     if(enabled) {
+        coerce('preservegaps');
         coerce('operation');
         coerce('value');
         coerce('target');
@@ -149,36 +164,47 @@ exports.calcTransform = function(gd, trace, opts) {
     var d2cTarget = (target === 'x' || target === 'y' || target === 'z') ?
         target : filterArray;
 
-    var dataToCoord = getDataToCoordFunc(gd, trace, d2cTarget),
-        filterFunc = getFilterFunc(opts, dataToCoord, targetCalendar),
-        arrayAttrs = PlotSchema.findArrayAttributes(trace),
-        originalArrays = {};
-
-    // copy all original array attribute values,
-    // and clear arrays in trace
-    for(var k = 0; k < arrayAttrs.length; k++) {
-        var attr = arrayAttrs[k],
-            np = Lib.nestedProperty(trace, attr);
+    var dataToCoord = getDataToCoordFunc(gd, trace, d2cTarget);
+    var filterFunc = getFilterFunc(opts, dataToCoord, targetCalendar);
+    var arrayAttrs = PlotSchema.findArrayAttributes(trace);
+    var originalArrays = {};
 
-        originalArrays[attr] = Lib.extendDeep([], np.get());
-        np.set([]);
+    function forAllAttrs(fn, index) {
+        for(var j = 0; j < arrayAttrs.length; j++) {
+            var np = Lib.nestedProperty(trace, arrayAttrs[j]);
+            fn(np, index);
+        }
     }
 
-    function fill(attr, i) {
-        var oldArr = originalArrays[attr],
-            newArr = Lib.nestedProperty(trace, attr).get();
-
-        newArr.push(oldArr[i]);
+    var initFn;
+    var fillFn;
+    if(opts.preservegaps) {
+        initFn = function(np) {
+            originalArrays[np.astr] = Lib.extendDeep([], np.get());
+            np.set(new Array(len));
+        };
+        fillFn = function(np, index) {
+            var val = originalArrays[np.astr][index];
+            np.get()[index] = val;
+        };
+    } else {
+        initFn = function(np) {
+            originalArrays[np.astr] = Lib.extendDeep([], np.get());
+            np.set([]);
+        };
+        fillFn = function(np, index) {
+            var val = originalArrays[np.astr][index];
+            np.get().push(val);
+        };
     }
 
-    for(var i = 0; i < len; i++) {
-        var v = filterArray[i];
-
-        if(!filterFunc(v)) continue;
+    // copy all original array attribute values, and clear arrays in trace
+    forAllAttrs(initFn);
 
-        for(var j = 0; j < arrayAttrs.length; j++) {
-            fill(arrayAttrs[j], i);
-        }
+    // loop through filter array, fill trace arrays if passed
+    for(var i = 0; i < len; i++) {
+        var passed = filterFunc(filterArray[i]);
+        if(passed) forAllAttrs(fillFn, i);
     }
 };
 
@@ -245,7 +271,7 @@ function getFilterFunc(opts, d2c, targetCalendar) {
 
     var coercedValue;
 
-    if(isOperationIn(INEQUALITY_OPS)) {
+    if(isOperationIn(COMPARISON_OPS)) {
         coercedValue = hasArrayValue ? d2cValue(value[0]) : d2cValue(value);
     }
     else if(isOperationIn(INTERVAL_OPS)) {
@@ -262,6 +288,9 @@ function getFilterFunc(opts, d2c, targetCalendar) {
         case '=':
             return function(v) { return d2cTarget(v) === coercedValue; };
 
+        case '!=':
+            return function(v) { return d2cTarget(v) !== coercedValue; };
+
         case '<':
             return function(v) { return d2cTarget(v) < coercedValue; };
 

test/image/baselines/gl2d_10.png

@@ -0,0 +1,53 @@
+{
+  "data": [
+    {
+      "type": "scattergl",
+      "x": [1, 2, 3, 4, 5, 6, 7],
+      "y": [1, 1, 1, 1, 1, 1, 1],
+      "mode": "markers",
+      "text": [
+        "marker symbol: 'circle'",
+        "marker symbol: 'circle-open'",
+        "marker symbol: 'square'",
+        "marker symbol: 'square-open'",
+        "marker symbol: 'diamond'",
+        "marker symbol: 'diamond-open'",
+        "marker symbol: 'cross'"
+      ],
+      "marker": {
+        "color": "blue",
+        "size": 20,
+        "symbol": [
+          "circle",
+          "circle-open",
+          "square",
+          "square-open",
+          "diamond",
+          "diamond-open",
+          "cross"
+        ],
+        "line": {
+          "color": "orange",
+          "width": 1.5
+        }
+      }
+    }
+  ],
+  "layout": {
+    "width": 500,
+    "height": 500,
+    "xaxis": {
+      "zeroline": false,
+      "showline": false,
+      "showticklabels": false,
+      "range": [0, 10]
+    },
+    "yaxis": {
+      "zeroline": false,
+      "showline": false,
+      "showticklabels": false,
+      "range": [0, 6]
+    },
+    "hovermode": "closest"
+  }
+}