Also fix violin traces

plotly · Oct 25, 2019 · 349ef64 · 349ef64
1 parent 1e4aa7e
commit 349ef64
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 7 deletions.
diff --git a/src/traces/scatter/line_points.js b/src/traces/scatter/line_points.js
@@ -67,8 +67,8 @@ module.exports = function linePoints(d, opts) {
     function getPt(index) {
         var di = d[index];
         if(!di) return false;
-        var x = xa.c2p(di.x);
-        var y = ya.c2p(di.y);
+        var x = opts.linearized ? xa.l2p(di.x) : xa.c2p(di.x);
+        var y = opts.linearized ? ya.l2p(di.y) : ya.c2p(di.y);
 
         // if non-positive log values, set them VERY far off-screen
         // so the line looks essentially straight from the previous point.

diff --git a/src/traces/violin/plot.js b/src/traces/violin/plot.js
@@ -28,7 +28,8 @@ module.exports = function plot(gd, plotinfo, cdViolins, violinLayer) {
             connectGaps: true,
             baseTolerance: 0.75,
             shape: 'spline',
-            simplify: true
+            simplify: true,
+            linearized: true
         });
         return Drawing.smoothopen(segments[0], 1);
     }
@@ -64,8 +65,8 @@ module.exports = function plot(gd, plotinfo, cdViolins, violinLayer) {
             var pathSel = d3.select(this);
             var density = d.density;
             var len = density.length;
-            var posCenter = d.pos + bPos;
-            var posCenterPx = posAxis.c2p(posCenter);
+            var posCenter = posAxis.c2l(d.pos + bPos, true);
+            var posCenterPx = posAxis.l2p(posCenter);
 
             var scale;
             if(trace.width) {
@@ -85,7 +86,7 @@ module.exports = function plot(gd, plotinfo, cdViolins, violinLayer) {
                 for(i = 0; i < len; i++) {
                     pt = pts[i] = {};
                     pt[t.posLetter] = posCenter + (density[i].v / scale);
-                    pt[t.valLetter] = density[i].t;
+                    pt[t.valLetter] = valAxis.c2l(density[i].t, true);
                 }
                 pathPos = makePath(pts);
             }
@@ -95,7 +96,7 @@ module.exports = function plot(gd, plotinfo, cdViolins, violinLayer) {
                 for(k = 0, i = len - 1; k < len; k++, i--) {
                     pt = pts[k] = {};
                     pt[t.posLetter] = posCenter - (density[i].v / scale);
-                    pt[t.valLetter] = density[i].t;
+                    pt[t.valLetter] = valAxis.c2l(density[i].t, true);
                 }
                 pathNeg = makePath(pts);
             }

diff --git a/test/image/baselines/violin_log_scale.png b/test/image/baselines/violin_log_scale.png
diff --git a/test/image/mocks/violin_log_scale.json b/test/image/mocks/violin_log_scale.json
@@ -0,0 +1,94 @@
+{
+    "data": [
+        {
+            "y": [
+                1.0,
+                1.1,
+                1.0,
+                0.9,
+                1.2,
+                2.0,
+                1.5,
+                2.3,
+                1.7,
+                2.2,
+                1.0,
+                1.1,
+                1.2,
+                0.9,
+                1.1
+            ],
+            "x": [
+                1,
+                1,
+                1,
+                1,
+                1,
+                10,
+                10,
+                10,
+                10,
+                10,
+                100,
+                100,
+                100,
+                100,
+                100
+            ],
+            "type": "violin",
+            "box": {
+                "visible": true
+            },
+            "meanline": {
+                "visible": true
+            },
+            "side": "negative"
+        },
+        {
+            "y": [
+                2.2,
+                2.3,
+                2.0,
+                2.5,
+                2.1,
+                0.1,
+                0.5,
+                0.8,
+                0.3,
+                0.3,
+                2.4,
+                2.0,
+                1.5,
+                1.6,
+                1.9
+            ],
+            "x": [
+                1,
+                1,
+                1,
+                1,
+                1,
+                10,
+                10,
+                10,
+                10,
+                10,
+                100,
+                100,
+                100,
+                100,
+                100
+            ],
+            "type": "violin",
+            "meanline": {
+                "visible": true
+            },
+            "side": "positive"
+        }
+    ],
+    "layout": {
+        "xaxis": {
+            "type": "log"
+        }
+    }
+}