#fi-51 contour plot fill test case

Author: monfera

src/traces/contourgl/convert.js

@@ -152,7 +152,6 @@ function convertColorscale(fullTrace, fill) {
 
     for(var i = 0; i < N; i++) {
         var level = levels[i] = start + cs * (i) - (fill ? cs / 2 : 0); // in case of fill, use band midpoint
-        console.log(level)
         var color = str2RGBArray(colorMap(level));
 
         for(var j = 0; j < 4; j++) {

test/jasmine/tests/gl_scatterplot_contour_test.js

@@ -88,8 +88,8 @@ function transpose(a) {
     return a[0].map(function(ignore, columnIndex) {return a.map(function(row) {return row[columnIndex];});});
 }
 
-function jitter(n) {
-    return n + (Math.random() - 0.5) / 2;
+function jitter(maxJitterRatio, n) {
+    return n * (1 + maxJitterRatio * (2 * Math.random() - 1));
 }
 
 function rotate(rad, point) {
@@ -99,61 +99,62 @@ function rotate(rad, point) {
     }
 }
 
-function generator() {
+function generate(maxJitter) {
     var x = d3.range(-12, 13, 1); // left closed, right open interval
     var y = d3.range(-12, 13, 1); // left closed, right open interval
     var i, j, p, z = new Array(x.length);
     for(i = 0; i < x.length; i++) {
         z[i] = new Array(y.length);
         for(j = 0; j < y.length; j++) {
             p = rotate(Math.PI / 4, {x: x[i], y: -y[j]})
-            z[i][j]  = jitter(Math.pow(p.x, 2) / (10 * 10) + Math.pow(p.y, 2) / (4 * 4))
+            z[i][j]  = jitter(maxJitter, Math.pow(p.x, 2) / (10 * 10) + Math.pow(p.y, 2) / (4 * 4))
         }
     }
     return {x: x, y: y, z: z} // looking forward to the ES2015 return {x, y, z}
 }
 
-var model = generator();
-
 // equivalent to the new example case in gl-contour2d
-var plotDataCircular = {
-    "data": [
-        {
-            "type": "contourgl",
-            "x": model.x.map(jitter),
-            "y": model.y.map(jitter),
-            "z": transpose(model.z), // gl-vis is column-major order while ploly is row-major order
-            "colorscale": "Jet",
-            "contours": {
-                "start": 0,
-                "end": 2,
-                "size": 0.1,
-                "coloring": "lines"
+var plotDataElliptical = function(maxJitter) {
+    var model = generate(maxJitter);
+    return {
+        "data": [
+            {
+                "type": "contour",
+                "x": model.x,
+                "y": model.y,
+                "z": transpose(model.z), // gl-vis is column-major order while ploly is row-major order
+                "colorscale": "Jet",
+                "contours": {
+                    "start": 0,
+                    "end": 2,
+                    "size": 0.1,
+                    "coloring": "fill"
+                },
+                "uid": "ad5624",
+                "zmin": 0,
+                "zmax": 2
+            }
+        ],
+        "layout": {
+            "xaxis": {
+                "range": [
+                    -10,
+                    10
+                ],
+                "autorange": true
             },
-            "uid": "ad5624",
-            "zmin": 0,
-            "zmax": 2
+            "yaxis": {
+                "range": [
+                    -10,
+                    10
+                ],
+                "autorange": true
+            },
+            "height": 600,
+            "width": 600,
+            "autosize": true
         }
-    ],
-    "layout": {
-        "xaxis": {
-            "range": [
-                -10,
-                10
-            ],
-            "autorange": true
-        },
-        "yaxis": {
-            "range": [
-                -10,
-                10
-            ],
-            "autorange": true
-        },
-        "height": 600,
-        "width": 600,
-        "autosize": true
-    }
+    };
 };
 
 
@@ -171,20 +172,30 @@ fdescribe('contourgl plots', function() {
         });
     });
 
-    // this dataset is less forgiving because it uses a noisy surface (random, will look different on each run)
     it('render without raising an error (coloring: "lines")', function(done) {
+        var mock = Lib.extendDeep({}, plotDataElliptical(0));
+        mock.data[0].contours.coloring = "lines"; // "fill" is the default
         withSetupTeardown(done, function(gd) {
-            return makePlot(gd, plotDataCircular);
+            return makePlot(gd, plotDataElliptical);
         });
     });
 
-    // same with fill
-    fit('render without raising an error (coloring: "fill")', function(done) {
-        var mock = Lib.extendDeep({}, plotDataCircular);
-        mock.data[0].contours.coloring = "fill"; // or delete property - fill is the default
+    it('render smooth, regular ellipses without raising an error (coloring: "fill")', function(done) {
+        var mock = plotDataElliptical(0);
         withSetupTeardown(done, function(gd) {
             return makePlot(gd, mock);
         });
     });
 
+    fit('render ellipses with added noise without raising an error (coloring: "fill")', function(done) {
+        var mock = plotDataElliptical(0.5);
+        withSetupTeardown(done, function(gd) {
+            return makePlot(gd, mock);
+        });
+    });
+
+
+
+
+
 });