Refactor parcoords - bug fixes - reuse axes ticktext - support pseudo html labels - features for label angle & position

src/traces/parcoords/parcoords.js

@@ -434,17 +434,17 @@ module.exports = function(root, svg, parcoordsLineLayers, styledData, layout, ca
         var panels = vm.panels || (vm.panels = []);
         var dimData = yAxis.data();
         var panelCount = dimData.length - 1;
-        for(var p = 0; p < panelCount; p++) {
-            var panel = panels[p] || (panels[p] = {});
-            var dim1 = dimData[p];
-            var dim2 = dimData[p + 1];
-            panel.dim1 = dim1;
-            panel.dim2 = dim2;
-            panel.canvasX = dim1.canvasX;
-            panel.panelSizeX = dim2.canvasX - dim1.canvasX;
-            panel.panelSizeY = vm.model.canvasHeight;
-            panel.y = 0;
-            panel.canvasY = 0;
+        for(var i = 0; i < panelCount; i++) {
+            var p = panels[i] || (panels[i] = {});
+            var dim0 = dimData[i];
+            var dim1 = dimData[i + 1];
+            p.dim0 = dim0;
+            p.dim1 = dim1;
+            p.canvasX = dim0.canvasX;
+            p.panelSizeX = dim1.canvasX - dim0.canvasX;
+            p.panelSizeY = vm.model.canvasHeight;
+            p.y = 0;
+            p.canvasY = 0;
         }
     }
 
@@ -497,7 +497,7 @@ module.exports = function(root, svg, parcoordsLineLayers, styledData, layout, ca
             yAxis.filter(function(dd) { return Math.abs(d.xIndex - dd.xIndex) !== 0; })
                 .attr('transform', function(d) { return 'translate(' + d.xScale(d.xIndex) + ', 0)'; });
             d3.select(this).attr('transform', 'translate(' + d.x + ', 0)');
-            yAxis.each(function(dd, i, ii) { if(ii === d.parent.key) p.dimensions[i] = dd; });
+            yAxis.each(function(dd, i0, i1) { if(i1 === d.parent.key) p.dimensions[i0] = dd; });
             p.contextLayer && p.contextLayer.render(p.panels, false, !someFiltersActive(p));
             p.focusLayer.render && p.focusLayer.render(p.panels);
         })

src/traces/parcoords/plot.js

@@ -98,9 +98,10 @@ module.exports = function plot(gd, cdparcoords) {
 
         function sorter(orig) {
             return function sorter(d1, d2) {
-                var i1 = newIdx(visibleIndices, orig, d1);
-                var i2 = newIdx(visibleIndices, orig, d2);
-                return i1 - i2;
+                return (
+                    newIdx(visibleIndices, orig, d1) -
+                    newIdx(visibleIndices, orig, d2)
+                );
             };
         }
 

src/traces/parcoords/shaders/context_vertex.glsl

@@ -3,42 +3,50 @@ precision highp float;
 attribute vec4 p0, p1, p2, p3,
                p4, p5, p6, p7,
                p8, p9, pa, pb,
-               pc, pd, pe;
+               pc, pd, pe, pf;
 
-attribute vec4 pf;
-
-uniform mat4 dim1A, dim2A, dim1B, dim2B, dim1C, dim2C, dim1D, dim2D;
-
-uniform vec2 resolution,
-             viewBoxPosition,
-             viewBoxSize;
+uniform mat4 dim0A, dim1A, dim0B, dim1B, dim0C, dim1C, dim0D, dim1D;
 
+uniform vec2 resolution, viewBoxPos, viewBoxSize, colorClamp;
 uniform sampler2D palette;
 
-uniform vec2 colorClamp;
-
 varying vec4 fragColor;
 
-#pragma glslify: unfilteredPosition = require("./unfiltered_position.glsl")
+const vec4 unit = vec4(1.0, 1.0, 1.0, 1.0);
 
-void main() {
+float val(mat4 p, mat4 v) {
+    return dot(matrixCompMult(p, v) * unit, unit);
+}
 
-    float prominence = abs(pf[3]);
+float axisY(float ratio, mat4 A, mat4 B, mat4 C, mat4 D) {
+    float y1 = val(A, dim0A) + val(B, dim0B) + val(C, dim0C) + val(D, dim0D);
+    float y2 = val(A, dim1A) + val(B, dim1B) + val(C, dim1C) + val(D, dim1D);
+    return y1 * (1.0 - ratio) + y2 * ratio;
+}
 
-    mat4 p[4];
-    p[0] = mat4(p0, p1, p2, p3);
-    p[1] = mat4(p4, p5, p6, p7);
-    p[2] = mat4(p8, p9, pa, pb);
-    p[3] = mat4(pc, pd, pe, abs(pf));
+vec4 unfilteredPosition(float v, mat4 A, mat4 B, mat4 C, mat4 D) {
+    float x = 0.5 * sign(v) + 0.5;
+    float y = axisY(x, A, B, C, D);
+    float z = 1.0 - abs(v);
 
-    gl_Position = unfilteredPosition(
-        1.0 - prominence,
-        resolution, viewBoxPosition, viewBoxSize,
-        p,
-        sign(pf[3]),
-        dim1A, dim2A, dim1B, dim2B, dim1C, dim2C, dim1D, dim2D
+    return vec4(
+        2.0 * (vec2(x, y) * viewBoxSize + viewBoxPos) / resolution - 1.0,
+        z,
+        1.0
     );
+}
+
+void main() {
+    mat4 A = mat4(p0, p1, p2, p3);
+    mat4 B = mat4(p4, p5, p6, p7);
+    mat4 C = mat4(p8, p9, pa, pb);
+    mat4 D = mat4(pc, pd, pe, abs(pf));
+
+    float v = pf[3];
+
+    gl_Position = unfilteredPosition(v, A, B, C, D);
 
-    float clampedColorIndex = clamp((prominence - colorClamp[0]) / (colorClamp[1] - colorClamp[0]), 0.0, 1.0);
-    fragColor = texture2D(palette, vec2((clampedColorIndex * 255.0 + 0.5) / 256.0, 0.5));
+    fragColor = texture2D(palette, vec2(
+        ((abs(v) - colorClamp[0]) / (colorClamp[1] - colorClamp[0]) * 255.0 + 0.5) / 256.0, 0.5
+    ));
 }

src/traces/parcoords/shaders/fragment.glsl

@@ -1,4 +1,4 @@
-precision lowp float;
+precision highp float;
 
 varying vec4 fragColor;