use contour/attributes in contourcarpet/attributes

alexcjohnson · alexcjohnson · commit 2f3a71272d8b · 2017-06-23T17:07:31.000-04:00
diff --git a/src/traces/contour/attributes.js b/src/traces/contour/attributes.js
@@ -107,7 +107,7 @@ module.exports = extendFlat({}, {
             role: 'style',
             description: [
                 'Determines whether or not the contour lines are drawn.',
-                'Has only an effect if `contours.coloring` is set to *fill*.'
+                'Has an effect only if `contours.coloring` is set to *fill*.'
             ].join(' ')
         },
         showlabels: {
diff --git a/src/traces/contourcarpet/attributes.js b/src/traces/contourcarpet/attributes.js
@@ -9,6 +9,8 @@
 'use strict';
 
 var heatmapAttrs = require('../heatmap/attributes');
+var contourAttrs = require('../contour/attributes');
+var contourContourAttrs = contourAttrs.contours;
 var scatterAttrs = require('../scatter/attributes');
 var colorscaleAttrs = require('../../components/colorscale/attributes');
 var colorbarAttrs = require('../../components/colorbar/attributes');
@@ -58,30 +60,8 @@ module.exports = extendFlat({}, {
         ].join(' ')
     },
 
-    autocontour: {
-        valType: 'boolean',
-        dflt: true,
-        role: 'style',
-        description: [
-            'Determines whether or not the contour level attributes are',
-            'picked by an algorithm.',
-            'If *true*, the number of contour levels can be set in `ncontours`.',
-            'If *false*, set the contour level attributes in `contours`.'
-        ].join(' ')
-    },
-    ncontours: {
-        valType: 'integer',
-        dflt: 15,
-        min: 1,
-        role: 'style',
-        description: [
-            'Sets the maximum number of contour levels. The actual number',
-            'of contours will be chosen automatically to be less than or',
-            'equal to the value of `ncontours`.',
-            'Has an effect only if `autocontour` is *true* or if',
-            '`contours.size` is missing.'
-        ].join(' ')
-    },
+    autocontour: contourAttrs.autocontour,
+    ncontours: contourAttrs.ncontours,
 
     contours: {
         type: {
@@ -96,35 +76,11 @@ module.exports = extendFlat({}, {
                 '`value` parameters.'
             ].join(' ')
         },
-        start: {
-            valType: 'number',
-            dflt: null,
-            role: 'style',
-            description: [
-                'Sets the starting contour level value.',
-                'Must be less than `contours.end`'
-            ].join(' ')
-        },
-        end: {
-            valType: 'number',
-            dflt: null,
-            role: 'style',
-            description: [
-                'Sets the end contour level value.',
-                'Must be more than `contours.start`'
-            ].join(' ')
-        },
-        size: {
-            valType: 'number',
-            dflt: null,
-            min: 0,
-            role: 'style',
-            description: [
-                'Sets the step between each contour level.',
-                'Must be positive.'
-            ].join(' ')
-        },
+        start: contourContourAttrs.start,
+        end: contourContourAttrs.end,
+        size: contourContourAttrs.size,
         coloring: {
+            // from contourAttrs.contours.coloring but no 'heatmap' option
             valType: 'enumerated',
             values: ['fill', 'lines', 'none'],
             dflt: 'fill',
@@ -136,15 +92,7 @@ module.exports = extendFlat({}, {
                 'If *none*, no coloring is applied on this trace.'
             ].join(' ')
         },
-        showlines: {
-            valType: 'boolean',
-            dflt: true,
-            role: 'style',
-            description: [
-                'Determines whether or not the contour lines are drawn.',
-                'Has only an effect if `contours.coloring` is set to *fill*.'
-            ].join(' ')
-        },
+        showlines: contourContourAttrs.showlines,
         operation: {
             valType: 'enumerated',
             values: [].concat(constants.INEQUALITY_OPS).concat(constants.INTERVAL_OPS).concat(constants.SET_OPS),
