Merge branch 'master' of https://github.com/plotly/streambed into share_key_api_v2_access

Conflicts:
	shelly/plots/tests/test_plots_endpoint.py

Author: BRONSOLO

3d-test-dashboard/testplots/generateImages.js renamed to 3d-test-dashboard/generateImages.js

@@ -1,14 +1,20 @@
-var plotly = require('plotly')('BenPostlethwaite','hqsfedlbhi');
+/*
+ * Enter your username and api key of your local instance.
+ */
+var plotly = require('plotly')('etpinard','rmkfg621kv');
+plotly.host = 'local.plot.ly';
+
 var ProgressBar = require('progress');
 var fs = require('fs');
 
-
 var imgOpts = {
     format: 'png',
     width: 1000,
     height: 600
 };
 
+var figDir = './testplots/';
+
 var Bert = {
 
     queue: [],
@@ -65,7 +71,7 @@ var Bert = {
                 return;
             }
 
-            var fileStream = fs.createWriteStream(job.name + '.png');
+            var fileStream = fs.createWriteStream(figDir + job.name + '.png');
             imageStream.pipe(fileStream);
 
             self.checkJobProgress();
@@ -74,11 +80,11 @@ var Bert = {
     }
 };
 
-fs.readdirSync('./').filter(function (plotjson) {
+fs.readdirSync(figDir).filter(function (plotjson) {
     return plotjson.indexOf('json') !== -1;
 
 }).forEach(function (plotjson) {
-    var figure = require('./'+plotjson);
+    var figure = require(figDir + plotjson);
     Bert.addsJob({
         name:  plotjson.split('.json')[0],
         workload: figure

3d-test-dashboard/test.js

@@ -165,6 +165,9 @@ plots['ribbons'] = require('./testplots/ribbons.json');
 plots['date-time'] = require('./testplots/scatter-date.json');
 plots['cufflinks'] = require('./testplots/cufflinks.json');
 plots['chrisp-nan-1'] = require('./testplots/chrisp-nan-1.json');
+plots['marker-arrays'] = require('./testplots/marker-arrays.json');
+plots['scatter3d-colorscale'] = require('./testplots/scatter3d-colorscale.json');
+plots['autocolorscale'] = require('./testplots/autocolorscale.json');
 
 
 plotButtons(plots);

3d-test-dashboard/testplots/autocolorscale.json

@@ -0,0 +1,39 @@
+{
+    "data": [
+        {
+            "type": "surface",
+            "z": [
+                [
+                    8.41,
+                    3,
+                    4
+                ],
+                [
+                    1,
+                    2,
+                    3
+                ],
+                [
+                    2,
+                    43,
+                    1
+                ]
+            ],
+            "autocolorscale": true
+        }
+    ],
+    "layout": {
+        "title": "Simple surface",
+        "scene": {
+            "aspectratio": {
+                "x": 1,
+                "y": 1,
+                "z": 1
+            }
+        },
+        "height": 598,
+        "width": 1080,
+        "autosize": true,
+        "showlegend": false
+    }
+}

3d-test-dashboard/testplots/autocolorscale.png

@@ -0,0 +1,66 @@
+{
+    "data": [
+        {
+            "type": "scatter3d",
+            "x": [
+                100.75,
+                157.53,
+                140.72,
+                134.03
+            ],
+            "y": [
+                -102.63,
+                -110.53,
+                -96.97,
+                -163.59
+            ],
+            "z": [
+                -102.63,
+                -110.53,
+                -96.97,
+                -163.59
+            ],
+            "marker": {
+                "color": [
+                    "blue",
+                    "red",
+                    "orange",
+                    "black"
+                ],
+                "line": {
+                    "color": [
+                        "black",
+                        "blue"
+                    ],
+                    "width": 1
+                },
+                "size": [
+                    10,
+                    20,
+                    30,
+                    40
+                ],
+                "symbol": [
+                    "circle",
+                    "square",
+                    "cross"
+                ]
+            },
+            "uid": "2899cc"
+        }
+    ],
+    "layout": {
+        "title": "Scatter3d arrayOk",
+        "scene": {
+            "aspectratio": {
+                "x": 1,
+                "y": 1,
+                "z": 1
+            }
+        },
+        "height": 579,
+        "width": 1071,
+        "autosize": true,
+        "showlegend": false
+    }
+}

3d-test-dashboard/testplots/autorange-zero.png

@@ -0,0 +1,52 @@
+{
+    "data": [
+        {
+            "x": [
+                1,
+                2,
+                3,
+                4,
+                5
+            ],
+            "y": [
+                1,
+                2,
+                3,
+                4,
+                5
+            ],
+            "z": [
+                5,
+                1,
+                4,
+                2,
+                3
+            ],
+            "marker": {
+                "color": [
+                    2,
+                    2,
+                    3,
+                    4,
+                    10
+                ],
+                "size": [
+                    10,
+                    20,
+                    30,
+                    40,
+                    50
+                ],
+                "colorscale": "Greens",
+                "colorbar": {
+                    "title": "WOW"
+                }
+            },
+            "type": "scatter3d",
+            "mode": "markers"
+        }
+    ],
+    "layout": {
+        "title": "scatter3d + colorbar = <3"
+    }
+}

3d-test-dashboard/testplots/bunny.png

@@ -1,5 +1,7 @@
 'use strict';
 
+/* global d3:false */
+
 var colorscale = module.exports = {},
     Plotly = require('./plotly'),
     tinycolor = require('tinycolor2'),
@@ -96,8 +98,8 @@ function isValidScaleArray(scl) {
             }
             highestVal = +si[0];
         }
-       return isValid;
-   }
+        return isValid;
+    }
 }
 
 colorscale.isValidScale = function(scl) {
@@ -131,11 +133,22 @@ colorscale.getScale = function(scl, dflt) {
 colorscale.hasColorscale = function(trace, containerStr) {
     var container = containerStr ?
             Plotly.Lib.nestedProperty(trace, containerStr).get() || {} :
-            trace;
+            trace,
+        color = container.color,
+        isArrayWithOneNumber = false;
+
+    if(Array.isArray(color)) {
+        for(var i = 0; i < color.length; i++) {
+            if(isNumeric(color[i])) {
+                isArrayWithOneNumber = true;
+                break;
+            }
+        }
+    }
 
     return (
         (typeof container==='object' && container!==null) && (
-            Array.isArray(container.color) ||
+            isArrayWithOneNumber ||
             container.showscale===true ||
             (isNumeric(container.cmin) && isNumeric(container.cmax)) ||
             colorscale.isValidScale(container.colorscale) ||
@@ -234,3 +247,27 @@ colorscale.calc = function(trace, vals, containerStr, cLetter) {
     container[cLetter + 'max'] = max;
     container.colorscale = scl;
 };
+
+colorscale.makeScaleFunction = function(scl, cmin, cmax) {
+    var N = scl.length,
+        domain = new Array(N),
+        range = new Array(N),
+        si;
+
+    for(var i = 0; i < N; i++) {
+        si = scl[i];
+        domain[i] = cmin + si[0] * (cmax - cmin);
+        range[i] = si[1];
+    }
+
+    var sclFunc = d3.scale.linear()
+        .domain(domain)
+        .interpolate(d3.interpolateRgb)
+        .range(range);
+
+    return function(v) {
+        if(isNumeric(v)) return sclFunc(v);
+        else if(tinycolor(v).isValid()) return v;
+        else return Plotly.Color.defaultLine;
+    };
+};

3d-test-dashboard/testplots/chrisp-nan-1.png

@@ -95,7 +95,7 @@ drawing.dashLine = function(s, dash, lineWidth) {
         'stroke-dasharray': dash,
         'stroke-width': lineWidth + 'px'
     });
-}
+};
 
 drawing.fillGroupStyle = function(s) {
     s.style('stroke-width',0)
@@ -568,7 +568,7 @@ var SYMBOLDEFS = {
         },
         needLine: true,
         noDot: true
-    },
+    }
 };
 
 drawing.symbolNames = [];
@@ -711,18 +711,15 @@ drawing.pointStyle = function(s, trace) {
 // have a colorscale for it (ie mscl, mcmin, mcmax) - if we do, translate
 // all numeric color values according to that scale
 drawing.tryColorscale = function(cont, contIn, prefix) {
-    var colorArray = Plotly.Lib.nestedProperty(cont, prefix+'color').get(),
-        scl = Plotly.Lib.nestedProperty(cont, prefix+'colorscale').get(),
-        auto = Plotly.Lib.nestedProperty(cont, prefix+'cauto').get(),
-        minProp = Plotly.Lib.nestedProperty(cont, prefix+'cmin'),
-        maxProp = Plotly.Lib.nestedProperty(cont, prefix+'cmax'),
+    var colorArray = Plotly.Lib.nestedProperty(cont, prefix + 'color').get(),
+        scl = Plotly.Lib.nestedProperty(cont, prefix + 'colorscale').get(),
+        auto = Plotly.Lib.nestedProperty(cont, prefix + 'cauto').get(),
+        minProp = Plotly.Lib.nestedProperty(cont, prefix + 'cmin'),
+        maxProp = Plotly.Lib.nestedProperty(cont, prefix + 'cmax'),
         min = minProp.get(),
         max = maxProp.get();
 
     if(scl && Array.isArray(colorArray)) {
-        if(typeof scl === 'string') scl = Plotly.Color.scales[scl];
-        if(!scl) scl = Plotly.Color.defaultScale;
-
         if(auto || !isNumeric(min) || !isNumeric(max)) {
             min = Infinity;
             max = -Infinity;
@@ -738,15 +735,10 @@ drawing.tryColorscale = function(cont, contIn, prefix) {
             }
             minProp.set(min);
             maxProp.set(max);
-            Plotly.Lib.nestedProperty(contIn, prefix+'cmin').set(min);
-            Plotly.Lib.nestedProperty(contIn, prefix+'cmax').set(max);
+            Plotly.Lib.nestedProperty(contIn, prefix + 'cmin').set(min);
+            Plotly.Lib.nestedProperty(contIn, prefix + 'cmax').set(max);
         }
-
-        var sclfunc = d3.scale.linear()
-            .domain(scl.map(function(si){ return min + si[0]*(max-min); }))
-            .interpolate(d3.interpolateRgb)
-            .range(scl.map(function(si){ return si[1]; }));
-        return function(v){ return isNumeric(v) ? sclfunc(v) : v; };
+        return Plotly.Colorscale.makeScaleFunction(scl, min, max);
     }
     else return Plotly.Lib.identity;
 };