Merge branch 'gl2d-more-symbols' into booz_2

Author: etpinard

package.json

@@ -64,6 +64,7 @@
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",
     "fast-isnumeric": "^1.1.1",
+    "font-atlas-sdf": "^1.3.3",
     "gl-contour2d": "^1.1.2",
     "gl-error2d": "^1.2.1",
     "gl-error3d": "^1.0.6",
@@ -76,7 +77,7 @@
     "gl-plot3d": "^1.5.4",
     "gl-pointcloud2d": "^1.0.0",
     "gl-scatter2d": "^1.3.1",
-    "gl-scatter2d-sdf": "^1.3.9",
+    "gl-scatter2d-sdf": "^1.3.10",
     "gl-scatter3d": "^1.0.4",
     "gl-select-box": "^1.0.1",
     "gl-shader": "4.2.0",

src/constants/gl2d_markers.js

@@ -0,0 +1,133 @@
+/**
+* Copyright 2012-2017, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var extendFlat = require('../lib/extend').extendFlat;
+
+var symbolsWithOpenSupport = {
+    'circle': {
+        unicode: '●'
+    },
+    'square': {
+        unicode: '■'
+    },
+    'diamond': {
+        unicode: '◆'
+    },
+    'cross': {
+        unicode: '✚'
+    },
+    'x': {
+        unicode: '❌'
+    },
+    'triangle-up': {
+        unicode: '▲'
+    },
+    'triangle-down': {
+        unicode: '▼'
+    },
+    'triangle-left': {
+        unicode: '◄'
+    },
+    'triangle-right': {
+        unicode: '►'
+    },
+    'triangle-ne': {
+        unicode: '◥'
+    },
+    'triangle-nw': {
+        unicode: '◤'
+    },
+    'triangle-se': {
+        unicode: '◢'
+    },
+    'triangle-sw': {
+        unicode: '◣'
+    },
+    'pentagon': {
+        unicode: '⬟'
+    },
+    'hexagon': {
+        unicode: '⬢'
+    },
+    'hexagon2': {
+        unicode: '⬣'
+    },
+    'star': {
+        unicode: '★'
+    },
+    'diamond-tall': {
+        unicode: '♦'
+    },
+    'bowtie': {
+        unicode: '⧓'
+    },
+    'diamond-x': {
+        unicode: '❖',
+        bwFactor: 0.25
+    },
+    'cross-thin': {
+        unicode: '+',
+        noBorder: true
+    },
+    'asterisk': {
+        unicode: '✳',
+        noBorder: true
+    },
+    'y-up': {
+        unicode: '⅄',
+        noBorder: true
+    },
+    'y-down': {
+        unicode: 'Y',
+        noBorder: true
+    },
+    'line-ew': {
+        unicode: '─',
+        noBorder: true
+    },
+    'line-ns': {
+        unicode: '│',
+        noBorder: true
+    }
+};
+
+var openSymbols = {};
+var keys = Object.keys(symbolsWithOpenSupport);
+
+for(var i = 0; i < keys.length; i++) {
+    var k = keys[i];
+    openSymbols[k + '-open'] = extendFlat({}, symbolsWithOpenSupport[k]);
+}
+
+var otherSymbols = {
+    'circle-cross-open': {
+        unicode: '⨁',
+        noFill: true
+    },
+    'circle-x-open': {
+        unicode: '⨂',
+        noFill: true
+    },
+    'square-cross-open': {
+        unicode: '⊞',
+        noFill: true
+    },
+    'square-x-open': {
+        unicode: '⊠',
+        noFill: true
+    }
+};
+
+module.exports = extendFlat({},
+    symbolsWithOpenSupport,
+    openSymbols,
+    otherSymbols
+);

src/constants/gl_markers.js renamed to src/constants/gl3d_markers.js

@@ -13,7 +13,7 @@ var colorAttributes = require('../../components/colorscale/color_attributes');
 var errorBarAttrs = require('../../components/errorbars/attributes');
 var DASHES = require('../../constants/gl3d_dashes');
 
-var MARKER_SYMBOLS = require('../../constants/gl_markers');
+var MARKER_SYMBOLS = require('../../constants/gl3d_markers');
 var extendFlat = require('../../lib/extend').extendFlat;
 
 var scatterLineAttrs = scatterAttrs.line,

src/traces/scatter3d/attributes.js

@@ -20,7 +20,7 @@ var str2RgbaArray = require('../../lib/str2rgbarray');
 var formatColor = require('../../lib/gl_format_color');
 var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 var DASH_PATTERNS = require('../../constants/gl3d_dashes');
-var MARKER_SYMBOLS = require('../../constants/gl_markers');
+var MARKER_SYMBOLS = require('../../constants/gl3d_markers');
 
 var calculateError = require('./calc_errors');
 

src/traces/scatter3d/convert.js

@@ -12,7 +12,7 @@ var Scatter3D = {};
 
 Scatter3D.plot = require('./convert');
 Scatter3D.attributes = require('./attributes');
-Scatter3D.markerSymbols = require('../../constants/gl_markers');
+Scatter3D.markerSymbols = require('../../constants/gl3d_markers');
 Scatter3D.supplyDefaults = require('./defaults');
 Scatter3D.colorbar = require('../scatter/colorbar');
 Scatter3D.calc = require('./calc');

src/traces/scatter3d/index.js

@@ -12,7 +12,7 @@ var scatterAttrs = require('../scatter/attributes');
 var colorAttributes = require('../../components/colorscale/color_attributes');
 
 var DASHES = require('../../constants/gl2d_dashes');
-var MARKERS = require('../../constants/gl_markers');
+var MARKERS = require('../../constants/gl2d_markers');
 var extendFlat = require('../../lib/extend').extendFlat;
 var extendDeep = require('../../lib/extend').extendDeep;
 

src/traces/scattergl/attributes.js

@@ -25,12 +25,12 @@ var formatColor = require('../../lib/gl_format_color');
 var subTypes = require('../scatter/subtypes');
 var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 var getTraceColor = require('../scatter/get_trace_color');
-var MARKER_SYMBOLS = require('../../constants/gl_markers');
+var MARKER_SYMBOLS = require('../../constants/gl2d_markers');
 var DASHES = require('../../constants/gl2d_dashes');
 
 var AXES = ['xaxis', 'yaxis'];
 var DESELECTDIM = 0.2;
-
+var transparent = [0, 0, 0, 0];
 
 function LineWithMarkers(scene, uid) {
     this.scene = scene;
@@ -218,7 +218,7 @@ function _convertArray(convert, data, count) {
 var convertNumber = convertArray.bind(null, function(x) { return +x; });
 var convertColorBase = convertArray.bind(null, str2RGBArray);
 var convertSymbol = convertArray.bind(null, function(x) {
-    return MARKER_SYMBOLS[x] || '●';
+    return MARKER_SYMBOLS[x] ? x : 'circle';
 });
 
 function convertColor(color, opacity, count) {
@@ -255,6 +255,19 @@ function _convertColor(colors, opacities, count) {
     return result;
 }
 
+function isSymbolOpen(symbol) {
+    return symbol.split('-open')[1] === '';
+}
+
+function fillColor(colorIn, colorOut, offsetIn, offsetOut, isDimmed) {
+    var dim = isDimmed ? DESELECTDIM : 1;
+
+    for(var j = 0; j < 3; j++) {
+        colorIn[4 * offsetIn + j] = colorOut[4 * offsetOut + j];
+    }
+    colorIn[4 * offsetIn + j] = dim * colorOut[4 * offsetOut + j];
+}
+
 proto.update = function(options, cdscatter) {
     if(options.visible !== true) {
         this.isVisible = false;
@@ -507,7 +520,7 @@ proto.updateFancy = function(options) {
     var getX = (xaxis.type === 'log') ? xaxis.d2l : function(x) { return x; };
     var getY = (yaxis.type === 'log') ? yaxis.d2l : function(y) { return y; };
 
-    var i, j, xx, yy, ex0, ex1, ey0, ey1;
+    var i, xx, yy, ex0, ex1, ey0, ey1;
 
     for(i = 0; i < len; ++i) {
         this.xData[i] = xx = getX(x[i]);
@@ -564,33 +577,57 @@ proto.updateFancy = function(options) {
         this.scatter.options.colors = new Array(pId * 4);
         this.scatter.options.borderColors = new Array(pId * 4);
 
-        var markerSizeFunc = makeBubbleSizeFn(options),
-            markerOpts = options.marker,
-            markerOpacity = markerOpts.opacity,
-            traceOpacity = options.opacity,
-            colors = convertColorScale(markerOpts, markerOpacity, traceOpacity, len),
-            glyphs = convertSymbol(markerOpts.symbol, len),
-            borderWidths = convertNumber(markerOpts.line.width, len),
-            borderColors = convertColorScale(markerOpts.line, markerOpacity, traceOpacity, len),
-            index;
+        var markerSizeFunc = makeBubbleSizeFn(options);
+        var markerOpts = options.marker;
+        var markerOpacity = markerOpts.opacity;
+        var traceOpacity = options.opacity;
+        var symbols = convertSymbol(markerOpts.symbol, len);
+        var colors = convertColorScale(markerOpts, markerOpacity, traceOpacity, len);
+        var borderWidths = convertNumber(markerOpts.line.width, len);
+        var borderColors = convertColorScale(markerOpts.line, markerOpacity, traceOpacity, len);
+        var index, symbol, symbolSpec, _colors, _borderColors, bwFactor, isOpen, isDimmed;
 
         sizes = convertArray(markerSizeFunc, markerOpts.size, len);
 
         for(i = 0; i < pId; ++i) {
             index = idToIndex[i];
+            symbol = symbols[index];
+            symbolSpec = MARKER_SYMBOLS[symbol];
+            isOpen = isSymbolOpen(symbol);
+            isDimmed = selIds && !selIds[index];
+
+            if(symbolSpec.noBorder && !isOpen) {
+                _colors = borderColors;
+            } else {
+                _colors = colors;
+            }
+
+            if(isOpen) {
+                _borderColors = colors;
+            } else {
+                _borderColors = borderColors;
+            }
+
+            if(symbolSpec.bwFactor) {
+                bwFactor = symbolSpec.bwFactor;
+            } else if(symbolSpec.noBorder) {
+                bwFactor = 0.25;
+            } else if(symbolSpec.noFill) {
+                bwFactor = 0.1;
+            } else {
+                bwFactor = 0.5;
+            }
 
             this.scatter.options.sizes[i] = 4.0 * sizes[index];
-            this.scatter.options.glyphs[i] = glyphs[index];
-            this.scatter.options.borderWidths[i] = 0.5 * borderWidths[index];
+            this.scatter.options.glyphs[i] = symbolSpec.unicode;
+            this.scatter.options.borderWidths[i] = bwFactor * borderWidths[index];
 
-            for(j = 0; j < 4; ++j) {
-                var color = colors[4 * index + j];
-                if(selIds && !selIds[index] && j === 3) {
-                    color *= DESELECTDIM;
-                }
-                this.scatter.options.colors[4 * i + j] = color;
-                this.scatter.options.borderColors[4 * i + j] = borderColors[4 * index + j];
+            if(isOpen && !symbolSpec.noBorder && !symbolSpec.noFill) {
+                fillColor(this.scatter.options.colors, transparent, i, 0);
+            } else {
+                fillColor(this.scatter.options.colors, _colors, i, index, isDimmed);
             }
+            fillColor(this.scatter.options.borderColors, _borderColors, i, index, isDimmed);
         }
 
         // prevent scatter from resnapping points