fixup test

Author: archmoj

src/traces/isosurface/fn_generate-iso-meshes.js

@@ -712,6 +712,33 @@ var generateIsoMeshes = function(data) {
 
         var activeStyle = null;
 
+        // draw spaceframes
+        if(showSpaceframe && spaceframeFill) {
+            setFill(spaceframeFill);
+
+            drawSpaceframe(activeStyle, vMin, vMax);
+        }
+
+        // draw iso-surfaces
+        if(showSurface && surfaceFill) {
+            setFill(surfaceFill);
+
+            var surfacePattern = data.surface.pattern;
+            var surfaceCount = data.surface.count;
+            for(var q = 0; q < surfaceCount; q++) {
+                var ratio = (surfaceCount === 1) ? 0.5 : q / (surfaceCount - 1);
+                var level = (1 - ratio) * vMin + ratio * vMax;
+
+                var d1 = Math.abs(level - minValues);
+                var d2 = Math.abs(level - maxValues);
+                var ranges = (d1 > d2) ?
+                    [minValues, level] :
+                    [level, maxValues];
+
+                drawSurface(surfacePattern, ranges[0], ranges[1]);
+            }
+        }
+
         var setupMinMax = [
             [ Math.min(vMin, maxValues), Math.max(vMin, maxValues) ],
             [ Math.min(minValues, vMax), Math.max(minValues, vMax) ]
@@ -802,33 +829,6 @@ var generateIsoMeshes = function(data) {
             }
         });
 
-        // draw spaceframes
-        if(showSpaceframe && spaceframeFill) {
-            setFill(spaceframeFill);
-
-            drawSpaceframe(activeStyle, vMin, vMax);
-        }
-
-        // draw iso-surfaces
-        if(showSurface && surfaceFill) {
-            setFill(surfaceFill);
-
-            var surfacePattern = data.surface.pattern;
-            var surfaceCount = data.surface.count;
-            for(var q = 0; q < surfaceCount; q++) {
-                var ratio = (surfaceCount === 1) ? 0.5 : q / (surfaceCount - 1);
-                var level = (1 - ratio) * vMin + ratio * vMax;
-
-                var d1 = Math.abs(level - minValues);
-                var d2 = Math.abs(level - maxValues);
-                var ranges = (d1 > d2) ?
-                    [minValues, level] :
-                    [level, maxValues];
-
-                drawSurface(surfacePattern, ranges[0], ranges[1]);
-            }
-        }
-
         // remove vertices arrays (i.e. grid points) in case no face was created.
         if(numFaces === 0) {
             emptyVertices();

test/image/compare_pixels_test.js

@@ -97,7 +97,8 @@ function untestableFilter(mockName) {
         mockName === 'font-wishlist' ||
         mockName.indexOf('gl2d_') !== -1 ||
         mockName.indexOf('mapbox_') !== -1 ||
-        mockName.indexOf('gl3d_cone-') !== -1
+        mockName.indexOf('gl3d_cone-') !== -1 ||
+        mockName.indexOf('gl3d_volume_mri') !== -1
     );
 
     if(!cond) console.log(' -', mockName);

test/image/mocks/gl3d_volume_mri.json

@@ -1,25 +1,16 @@
 {
     "data": [{
         "type": "volume",
-        "colorscale": [[ 0.0, "rgb(255,255,255)" ], [ 0.15, "rgb(255,255,0)" ], [ 0.3, "rgb(255,0,0)" ], [ 1.0, "rgb(0,0,0)" ]],
+        "colorscale": [[ 0.0, "rgb(255,255,255)" ], [ 0.125, "rgb(255,255,0)" ], [ 0.200, "rgb(255,0,0)" ], [ 0.275, "rgb(0,0,0)" ], [ 1.0, "rgb(255,255,255)" ]],
         "reversescale": false,
-        "opacityscale": false,
-        "opacity": 0.03,
-        "surface": { "show": true, "fill": 1.0, "count": 11 },
-        "spaceframe": { "show": true, "fill": 1.0 },
+        "opacityscale": [[ 0.0, 0.0 ], [ 0.125, 0.1 ], [ 0.200, 1.0 ], [ 0.275, 1.0 ], [ 1.0, 0.0 ]],
+        "opacity": 0.04,
+        "surface": { "show": true, "fill": 1.0, "count": 9 },
+        "spaceframe": { "show": false, "fill": 1.0 },
         "slices": {
-            "x": { "show": false, "fill": 1.0 },
-            "y": { "show": false, "fill": 1.0 },
-            "z": { "show": false, "fill": 1.0 }
-        },
-        "caps": {
-            "x": { "show": false, "fill": 1.0 },
-            "y": { "show": false, "fill": 1.0 },
-            "z": { "show": false, "fill": 1.0 }
-        },
-        "contour": {
-            "show": false,
-            "width": 4
+            "x": { "show": true, "fill": 1.0 },
+            "y": { "show": true, "fill": 1.0 },
+            "z": { "show": true, "fill": 1.0 }
         },
         "isomin": null,
         "isomax": null,
@@ -11049,9 +11040,9 @@
             "zaxis": { "nticks": 12, "autorange": "reversed" },
             "camera": {
                 "eye": {
-                    "x": 1.5,
-                    "y": -0.25,
-                    "z": -0.5
+                    "x": -1.5,
+                    "y": -0.75,
+                    "z": 0.25
                 },
                 "center": {
                     "x": 0,