last version , we display by order only .

add somes text traces into the baseline test

Author: ErwanMAS

src/traces/scattergl/index.js

@@ -261,35 +261,23 @@ function sceneUpdate(gd, subplot) {
             var i;
             for(i = 0; i < scene.count; i++) {
                 if(scene.fill2d && scene.fillOptions[i]) {
-                    // must do all fills first
                     scene.fill2d.draw(i);
-                    if(scene.line2d && scene.lineOptions[i]) {
-                        scene.line2d.draw(i);
-                        if(scene.error2d && scene.errorXOptions[i]) {
-                            scene.error2d.draw(i);
-                        }
-                        if(scene.error2d && scene.errorYOptions[i]) {
-                            scene.error2d.draw(i + scene.count);
-                        }
-                    }
-                    if(scene.scatter2d && scene.markerOptions[i] && (!scene.selectBatch || !scene.selectBatch[i])) {
-                        // traces in no-selection mode
-                        scene.scatter2d.draw(i);
-                    }
-                } else {
-                    if(scene.line2d && scene.lineOptions[i]) {
-                        scene.line2d.draw(i);
-                    }
-                    if(scene.error2d && scene.errorXOptions[i]) {
-                        scene.error2d.draw(i);
-                    }
-                    if(scene.error2d && scene.errorYOptions[i]) {
-                        scene.error2d.draw(i + scene.count);
-                    }
-                    if(scene.scatter2d && scene.markerOptions[i] && (!scene.selectBatch || !scene.selectBatch[i])) {
-                        // traces in no-selection mode
-                        scene.scatter2d.draw(i);
-                    }
+                }
+                if(scene.line2d && scene.lineOptions[i]) {
+                    scene.line2d.draw(i);
+                }
+                if(scene.error2d && scene.errorXOptions[i]) {
+                    scene.error2d.draw(i);
+                }
+                if(scene.error2d && scene.errorYOptions[i]) {
+                    scene.error2d.draw(i + scene.count);
+                }
+                if(scene.scatter2d && scene.markerOptions[i] && (!scene.selectBatch || !scene.selectBatch[i])) {
+                    // traces in no-selection mode
+                    scene.scatter2d.draw(i);
+                }
+                if(scene.glText[i] && scene.textOptions[i]) {
+                    scene.glText[i].render();
                 }
             }
 
@@ -299,12 +287,6 @@ function sceneUpdate(gd, subplot) {
                 scene.scatter2d.draw(scene.unselectBatch);
             }
 
-            for(i = 0; i < scene.count; i++) {
-                if(scene.glText[i] && scene.textOptions[i]) {
-                    scene.glText[i].render();
-                }
-            }
-
             scene.dirty = false;
         };
 

test/image/baselines/gl2d_order_error.png

@@ -8,6 +8,11 @@
 	                "marker": {"color": "#800"},"line": {"color": "#400"}
 		},{
 			"type": "scattergl",
+                        "y": [3, 2, 1, 1], "mode":"text","xaxis": "x", "yaxis": "y" ,
+                        "text": ["A","B","C","D"],
+                        "textfont": { "size": [ 30, 20 , 30 , 30 ] }
+                },{
+                        "type": "scattergl",
 			"y": [1, 4, 0, 3],
 			"fillcolor":"#282","fill": "tozeroy", "xaxis": "x", "yaxis": "y" ,
 	                "error_x": {"value": 0.4, "type": "constant","color":"#028"},
@@ -22,6 +27,11 @@
 			"marker": {"color": "#088"},"line": {"color": "#044"}
 		},{
 			"type": "scatter",
+                        "y": [3, 2, 1, 1], "mode":"text","xaxis": "x2", "yaxis": "y2" ,
+                        "text": ["A","B","C","D"],
+                        "textfont": { "size": [ 30, 20 , 30 , 30 ] }
+                },{
+                        "type": "scatter",
 			"y": [1, 4, 0, 3],
 			"fillcolor":"#882","fill": "tozeroy", "xaxis": "x2", "yaxis": "y2" ,
 	                "error_x": {"value": 0.4, "type": "constant","color":"#028"},