rename zmin,zmax,zauto,intensity to cmin,cmax,cauto,surfacecolor

Author: mikolalysenko

src/plot_api/plot_api.js

@@ -761,6 +761,11 @@ function cleanData(data, existingData) {
             if(cont.colorscale === 'YIGnBu') cont.colorscale = 'YlGnBu';
             if(cont.colorscale === 'YIOrRd') cont.colorscale = 'YlOrRd';
         }
+        if(Plots.traceIs(trace, 'surface')) {
+          if('zmin' in trace) trace.cmin = trace.zmin
+          if('zmax' in trace) trace.cmax = trace.zmax
+          if('zauto' in trace) trace.cauto = trace.zauto
+        }
 
         // prune empty containers made before the new nestedProperty
         if(emptyContainer(trace, 'line')) delete trace.line;

src/traces/surface/attributes.js

@@ -95,16 +95,16 @@ module.exports = {
         valType: 'data_array',
         description: 'Sets the text elements associated with each z value.'
     },
-    intensity: {
+    surfacecolor: {
         valType: 'data_array',
         description: [
             'Sets the surface intensity values,',
             'used for setting a color scale independent of z'
         ].join(' ')
     },
-    zauto: colorscaleAttrs.zauto,
-    zmin: colorscaleAttrs.zmin,
-    zmax: colorscaleAttrs.zmax,
+    cauto: colorscaleAttrs.zauto,
+    cmin: colorscaleAttrs.zmin,
+    cmax: colorscaleAttrs.zmax,
     colorscale: colorscaleAttrs.colorscale,
     autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale,
         {dflt: false}),
@@ -168,5 +168,11 @@ module.exports = {
 
     _nestedModules: {  // nested module coupling
         'colorbar': 'Colorbar'
+    },
+
+    _deprecated: {
+      zauto: colorscaleAttrs.zauto,
+      zmin: colorscaleAttrs.zmin,
+      zmax: colorscaleAttrs.zmax
     }
 };

src/traces/surface/calc.js

@@ -15,7 +15,7 @@ var colorscaleCalc = require('../../components/colorscale/calc');
 // Compute auto-z and autocolorscale if applicable
 module.exports = function calc(gd, trace) {
     if(trace.intensity) {
-        colorscaleCalc(trace, trace.intensity, '', 'intensity');
+        colorscaleCalc(trace, trace.surfacecolor, '', 'c');
     } else {
         colorscaleCalc(trace, trace.z, '', 'z');
     }

src/traces/surface/convert.js

@@ -245,28 +245,26 @@ proto.update = function(data) {
         dynamicColor: [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]],
         dynamicWidth: [1, 1, 1],
         dynamicTint: [1, 1, 1],
-        opacity: 1
-        // TODO: Need to think about how to calculate this
-        /*
-        intensityBounds: [
-          data.zmin * scaleFactor[2],
-          data.zmax * scaleFactor[2]]
-        */
+        opacity: 1,
     };
 
+    if('cmin' in data && 'cmax' in data) {
+      params.intensityBounds = [ data.cmin, data.cmax ]
+    }
+
     //Refine if necessary
-    if('intensity' in data) {
+    if(data.surfacecolor) {
         var intensity = ndarray(
           new Float32Array(xlen * ylen), [xlen, ylen]);
         fill(intensity, function(row, col) {
-            return data.intensity[col][row];
+            return data.surfacecolor[col][row];
         });
         coords.push(intensity);
     }
 
     this.dataScale = refine(coords);
 
-    if('intensity' in data) {
+    if(data.surfacecolor) {
         params.intensity = coords.pop();
     }
 
@@ -317,7 +315,6 @@ proto.update = function(data) {
 
     params.coords = coords;
 
-
     surface.update(params);
 
     surface.highlightEnable = highlightEnable;

src/traces/surface/defaults.js

@@ -58,7 +58,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('hidesurface');
     coerce('opacity');
 
-    coerce('intensity');
+    coerce('surfacecolor');
 
     coerce('colorscale');
 
@@ -88,6 +88,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     }
 
     colorscaleDefaults(
-        traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'}
+        traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'c'}
     );
 };

test/image/mocks/gl3d_surface_intensity.json

@@ -123,7 +123,7 @@
           -0.904072142017061
         ]
       ],
-      "intensity": [
+      "surfacecolor": [
         [
           10,
           9,