Fix carpet visibility changes

Author: rreusser

src/plots/plots.js

@@ -574,6 +574,7 @@ plots.cleanPlot = function(newFullData, newFullLayout, oldFullData, oldFullLayou
         var query = (
             '.hm' + oldUid +
             ',.contour' + oldUid +
+            ',.carpet' + oldUid +
             ',#clip' + oldUid +
             ',.trace' + oldUid
         );

src/traces/carpet/axis_attributes.js

@@ -160,22 +160,6 @@ module.exports = {
             'Used with `tickvals`.'
         ].join(' ')
     },
-    mirror: {
-        valType: 'enumerated',
-        values: [true, 'ticks', false, 'all', 'allticks'],
-        dflt: false,
-        role: 'style',
-        description: [
-            'Determines if the axis lines or/and ticks are mirrored to',
-            'the opposite side of the plotting area.',
-            'If *true*, the axis lines are mirrored.',
-            'If *ticks*, the axis lines and ticks are mirrored.',
-            'If *false*, mirroring is disable.',
-            'If *all*, axis lines are mirrored on all shared-axes subplots.',
-            'If *allticks*, axis lines and ticks are mirrored',
-            'on all shared-axes subplots.'
-        ].join(' ')
-    },
     showticklabels: {
         valType: 'enumerated',
         values: ['start', 'end', 'both', 'none'],

src/traces/carpet/axis_defaults.js

@@ -93,10 +93,11 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, options)
     coerce('ticktext');
     coerce('tick0');
     coerce('dtick');
-    coerce('arraytick0');
-    coerce('arraydtick');
-    // coerce('gridoffset');
-    // coerce('gridstep');
+
+    if(containerOut.tickmode === 'array') {
+        coerce('arraytick0');
+        coerce('arraydtick');
+    }
 
     coerce('labelpadding');
 

src/traces/carpet/plot.js

@@ -42,12 +42,13 @@ function plotOne(gd, plotinfo, cd) {
     var gridLayer = plotinfo.plot.selectAll('.carpetlayer');
     var clipLayer = makeg(fullLayout._defs, 'g', 'clips');
 
-    var minorLayer = makeg(gridLayer, 'g', 'minorlayer');
-    var majorLayer = makeg(gridLayer, 'g', 'majorlayer');
-    var boundaryLayer = makeg(gridLayer, 'g', 'boundarylayer');
-    var labelLayer = makeg(gridLayer, 'g', 'labellayer');
+    var axisLayer = makeg(gridLayer, 'g', 'carpet' + trace.uid);
+    var minorLayer = makeg(axisLayer, 'g', 'minorlayer');
+    var majorLayer = makeg(axisLayer, 'g', 'majorlayer');
+    var boundaryLayer = makeg(axisLayer, 'g', 'boundarylayer');
+    var labelLayer = makeg(axisLayer, 'g', 'labellayer');
 
-    gridLayer.style('opacity', trace.opacity);
+    axisLayer.style('opacity', trace.opacity);
 
     drawGridLines(xa, ya, majorLayer, aax, 'a', aax._gridlines, true);
     drawGridLines(xa, ya, majorLayer, bax, 'b', bax._gridlines, true);
@@ -65,7 +66,7 @@ function plotOne(gd, plotinfo, cd) {
     drawAxisTitles(labelLayer, trace, t, xa, ya, maxAExtent, maxBExtent);
 
     // Swap for debugging in order to draw directly:
-    // drawClipPath(trace, gridLayer, xa, ya);
+    // drawClipPath(trace, axisLayer, xa, ya);
     drawClipPath(trace, t, clipLayer, xa, ya);
 }
 

src/traces/contourcarpet/calc.js

@@ -28,7 +28,7 @@ var lookupCarpet = require('../carpet/lookup_carpetid');
 // contour maps, because the makeBoundArray calls are too entangled
 module.exports = function calc(gd, trace) {
     var carpet = trace.carpet = lookupCarpet(gd, trace);
-    if(!carpet) return;
+    if(!carpet || !carpet.visible) return;
 
     if(!trace.a || !trace.b) {
         // Look up the original incoming carpet data:

src/traces/contourcarpet/plot.js

@@ -40,6 +40,8 @@ function plotOne(gd, plotinfo, cd) {
     var carpet = trace.carpet = lookupCarpet(gd, trace);
     var carpetcd = gd.calcdata[carpet.index][0];
 
+    if(!carpet.visible) return;
+
     var a = cd[0].a;
     var b = cd[0].b;
     var contours = trace.contours;

test/image/mocks/cheater.json

@@ -3,7 +3,6 @@
     {
       "type":"carpet",
       "name": "carpet axis",
-      "opacity": 0.2,
       "a":[
         0.1, 0.1, 0.1, 0.1,
         0.3, 0.3, 0.3, 0.3,