plotly · archmoj · Mar 10, 2020 · Jan 24, 2020 · Jan 24, 2020 · Jan 24, 2020
diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
@@ -19,6 +19,7 @@ var svgTextUtils = require('../../lib/svg_text_utils');
 var uniformText = require('../bar/uniform_text');
 var recordMinTextSize = uniformText.recordMinTextSize;
 var clearMinTextSize = uniformText.clearMinTextSize;
+var TEXTPAD = require('../bar/constants').TEXTPAD;
 
 var helpers = require('./helpers');
 var eventData = require('./event_data');
@@ -669,6 +670,8 @@ function isCrossing(pt, angle) {
 }
 
 function calcRadTransform(textBB, r, ring, halfAngle, midAngle) {
+    r = Math.max(0, r - 2 * TEXTPAD);
+
     // max size if text is rotated radially
     var a = textBB.width / textBB.height;
     var s = calcMaxHalfSize(a, halfAngle, r, ring);
@@ -680,6 +683,8 @@ function calcRadTransform(textBB, r, ring, halfAngle, midAngle) {
 }
 
 function calcTanTransform(textBB, r, ring, halfAngle, midAngle) {
+    r = Math.max(0, r - 2 * TEXTPAD);
+
     // max size if text is rotated tangentially
     var a = textBB.height / textBB.width;
     var s = calcMaxHalfSize(a, halfAngle, r, ring);
@@ -1133,11 +1138,7 @@ function computeTransform(
     transform,  // inout
     textBB      // in
 ) {
-    var rotate = transform.rotate;
-    var scale = transform.scale;
-    if(scale > 1) scale = 1;
-
-    var a = rotate * Math.PI / 180;
+    var a = transform.rotate * Math.PI / 180;
     var cosA = Math.cos(a);
     var sinA = Math.sin(a);
     var midX = (textBB.left + textBB.right) / 2;

diff --git a/test/image/baselines/display-text_zero-number.png b/test/image/baselines/display-text_zero-number.png
diff --git a/test/image/baselines/funnelarea_pie_colorways.png b/test/image/baselines/funnelarea_pie_colorways.png
diff --git a/test/image/baselines/funnelarea_with_other_traces.png b/test/image/baselines/funnelarea_with_other_traces.png
diff --git a/test/image/baselines/legend-constant-itemsizing.png b/test/image/baselines/legend-constant-itemsizing.png
diff --git a/test/image/baselines/mathjax.png b/test/image/baselines/mathjax.png
diff --git a/test/image/baselines/pie_automargin.png b/test/image/baselines/pie_automargin.png
diff --git a/test/image/baselines/pie_fonts.png b/test/image/baselines/pie_fonts.png
diff --git a/test/image/baselines/pie_inside-text-orientation.png b/test/image/baselines/pie_inside-text-orientation.png
diff --git a/test/image/baselines/pie_scale_textpos_hideslices.png b/test/image/baselines/pie_scale_textpos_hideslices.png
diff --git a/test/image/baselines/pie_style_arrays.png b/test/image/baselines/pie_style_arrays.png
diff --git a/test/image/baselines/pie_textpad_radial.png b/test/image/baselines/pie_textpad_radial.png
diff --git a/test/image/baselines/pie_textpad_tangential.png b/test/image/baselines/pie_textpad_tangential.png
diff --git a/test/image/baselines/sunburst_branchvalues-total-almost-equal.png b/test/image/baselines/sunburst_branchvalues-total-almost-equal.png
diff --git a/test/image/baselines/sunburst_coffee.png b/test/image/baselines/sunburst_coffee.png
diff --git a/test/image/baselines/sunburst_count_branches.png b/test/image/baselines/sunburst_count_branches.png
diff --git a/test/image/baselines/sunburst_flare.png b/test/image/baselines/sunburst_flare.png
diff --git a/test/image/baselines/sunburst_inside-text-orientation.png b/test/image/baselines/sunburst_inside-text-orientation.png
diff --git a/test/image/baselines/sunburst_inside-text-orientation_clock.png b/test/image/baselines/sunburst_inside-text-orientation_clock.png
diff --git a/test/image/baselines/sunburst_packages_colorscale_novalue.png b/test/image/baselines/sunburst_packages_colorscale_novalue.png
diff --git a/test/image/baselines/sunburst_textfit.png b/test/image/baselines/sunburst_textfit.png
diff --git a/test/image/baselines/sunburst_textpad_radial.png b/test/image/baselines/sunburst_textpad_radial.png
diff --git a/test/image/baselines/sunburst_textpad_tangential.png b/test/image/baselines/sunburst_textpad_tangential.png
diff --git a/test/image/baselines/sunburst_values.png b/test/image/baselines/sunburst_values.png
diff --git a/test/image/baselines/sunburst_values_colorscale.png b/test/image/baselines/sunburst_values_colorscale.png
diff --git a/test/image/baselines/sunburst_with-without_values.png b/test/image/baselines/sunburst_with-without_values.png
diff --git a/test/image/baselines/texttemplate.png b/test/image/baselines/texttemplate.png
diff --git a/test/image/baselines/treemap_level-depth.png b/test/image/baselines/treemap_level-depth.png
diff --git a/test/image/baselines/treemap_sunburst_marker_colors.png b/test/image/baselines/treemap_sunburst_marker_colors.png
diff --git a/test/image/baselines/uniformtext_pie_16_auto.png b/test/image/baselines/uniformtext_pie_16_auto.png
diff --git a/test/image/baselines/uniformtext_pie_8_horizontal.png b/test/image/baselines/uniformtext_pie_8_horizontal.png
diff --git a/test/image/baselines/uniformtext_pie_8_horizontal_center.png b/test/image/baselines/uniformtext_pie_8_horizontal_center.png
diff --git a/test/image/baselines/uniformtext_pie_8_radial.png b/test/image/baselines/uniformtext_pie_8_radial.png
diff --git a/test/image/baselines/uniformtext_pie_8_tangential.png b/test/image/baselines/uniformtext_pie_8_tangential.png
diff --git a/test/image/baselines/uniformtext_pie_inside-text-orientation.png b/test/image/baselines/uniformtext_pie_inside-text-orientation.png
diff --git a/test/image/baselines/uniformtext_sunburst_inside-text-orientation.png b/test/image/baselines/uniformtext_sunburst_inside-text-orientation.png
diff --git a/test/image/mocks/pie_fonts.json b/test/image/mocks/pie_fonts.json
@@ -9,6 +9,7 @@
         "inherit from<br><b>global...</b>",
         "font"
       ],
+      "textposition": ["outside", "inside"],
       "type": "pie",
       "domain": {
         "x": [0, 0.4],

diff --git a/test/image/mocks/pie_textpad_radial.json b/test/image/mocks/pie_textpad_radial.json
@@ -0,0 +1,46 @@
+{
+    "data": [
+        {
+            "type": "pie",
+            "hole": 0.5,
+            "labels": [
+                "a",
+                "b",
+                "c",
+                "d"
+            ],
+            "values": [
+                20,
+                10,
+                2,
+                1
+            ],
+            "textposition": "inside",
+            "insidetextorientation": "radial",
+            "marker": {
+                "colors": [
+                    "pink",
+                    "lightgreen",
+                    "skyblue",
+                    "orange"
+                ],
+                "line": {
+                    "width": 3,
+                    "color": [
+                        "red",
+                        "green",
+                        "blue",
+                        "grey"
+                    ]
+                }
+            }
+        }
+    ],
+    "layout": {
+        "width": 300,
+        "height": 300,
+        "title": {
+            "text": "should provide some pad<br>before fiting & printing text"
+        }
+    }
+}
diff --git a/test/image/mocks/pie_textpad_tangential.json b/test/image/mocks/pie_textpad_tangential.json
@@ -0,0 +1,46 @@
+{
+    "data": [
+        {
+            "type": "pie",
+            "hole": 0.5,
+            "labels": [
+                "a",
+                "b",
+                "c",
+                "d"
+            ],
+            "values": [
+                20,
+                10,
+                2,
+                1
+            ],
+            "textposition": "inside",
+            "insidetextorientation": "tangential",
+            "marker": {
+                "colors": [
+                    "pink",
+                    "lightgreen",
+                    "skyblue",
+                    "orange"
+                ],
+                "line": {
+                    "width": 3,
+                    "color": [
+                        "red",
+                        "green",
+                        "blue",
+                        "grey"
+                    ]
+                }
+            }
+        }
+    ],
+    "layout": {
+        "width": 300,
+        "height": 300,
+        "title": {
+            "text": "should provide some pad<br>before fiting & printing text"
+        }
+    }
+}
diff --git a/test/image/mocks/sunburst_textpad_radial.json b/test/image/mocks/sunburst_textpad_radial.json
@@ -0,0 +1,52 @@
+{
+    "data": [
+        {
+            "type": "sunburst",
+            "parents": [
+                "",
+                "",
+                "",
+                "",
+                "Alpha",
+                "Bravo",
+                "Charlie",
+                "Delta"
+            ],
+            "labels": [
+                "Alpha",
+                "Bravo",
+                "Charlie",
+                "Delta",
+                "Echo",
+                "Foxtrot",
+                "Golf",
+                "Hotel"
+            ],
+            "branchvalues": "total",
+            "values": [
+                20,
+                10,
+                2,
+                1,
+                20,
+                10,
+                2,
+                1
+            ],
+            "textposition": "inside",
+            "insidetextorientation": "radial",
+            "marker": {
+                "line": {
+                    "width": 3
+                }
+            }
+        }
+    ],
+    "layout": {
+        "width": 300,
+        "height": 300,
+        "title": {
+            "text": "should provide some pad<br>before fiting & printing text"
+        }
+    }
+}
diff --git a/test/image/mocks/sunburst_textpad_tangential.json b/test/image/mocks/sunburst_textpad_tangential.json
@@ -0,0 +1,52 @@
+{
+    "data": [
+        {
+            "type": "sunburst",
+            "parents": [
+                "",
+                "",
+                "",
+                "",
+                "Alpha",
+                "Bravo",
+                "Charlie",
+                "Delta"
+            ],
+            "labels": [
+                "Alpha",
+                "Bravo",
+                "Charlie",
+                "Delta",
+                "Echo",
+                "Foxtrot",
+                "Golf",
+                "Hotel"
+            ],
+            "branchvalues": "total",
+            "values": [
+                20,
+                10,
+                2,
+                1,
+                20,
+                10,
+                2,
+                1
+            ],
+            "textposition": "inside",
+            "insidetextorientation": "tangential",
+            "marker": {
+                "line": {
+                    "width": 3
+                }
+            }
+        }
+    ],
+    "layout": {
+        "width": 300,
+        "height": 300,
+        "title": {
+            "text": "should provide some pad<br>before fiting & printing text"
+        }
+    }
+}
diff --git a/test/jasmine/tests/pie_test.js b/test/jasmine/tests/pie_test.js
@@ -2010,15 +2010,15 @@ describe('pie uniformtext', function() {
         Plotly.plot(gd, fig)
         .then(assertTextSizes('without uniformtext', {
             fontsizes: [12, 12, 12, 12, 12, 12, 12, 12],
-            scales: [1, 1, 1, 1, 1, 1, 1, 0.58],
+            scales: [1, 1, 1, 1, 1, 1, 1, 0.52],
         }))
         .then(function() {
             fig.layout.uniformtext = {mode: 'hide'}; // default with minsize=0
             return Plotly.react(gd, fig);
         })
         .then(assertTextSizes('using mode: "hide"', {
             fontsizes: [12, 12, 12, 12, 12, 12, 12, 12],
-            scales: [0.58, 0.58, 0.58, 0.58, 0.58, 0.58, 0.58, 0.58],
+            scales: [0.52, 0.52, 0.52, 0.52, 0.52, 0.52, 0.52, 0.52],
         }))
         .then(function() {
             fig.layout.uniformtext.minsize = 9; // set a minsize less than trace font size
@@ -2058,7 +2058,7 @@ describe('pie uniformtext', function() {
         })
         .then(assertTextSizes('clear uniformtext', {
             fontsizes: [12, 12, 12, 12, 12, 12, 12, 12],
-            scales: [1, 1, 1, 1, 1, 1, 1, 0.58],
+            scales: [1, 1, 1, 1, 1, 1, 1, 0.52],
         }))
         .catch(failTest)
         .then(done);

diff --git a/test/jasmine/tests/sunburst_test.js b/test/jasmine/tests/sunburst_test.js
@@ -1975,7 +1975,7 @@ describe('sunburst inside text orientation', function() {
             return Plotly.react(gd, fig);
         })
         .then(assertTextRotations('using "tangential"', {
-            rotations: [0, 0, -42, -78]
+            rotations: [0, 30, -42, -78]
         }))
         .then(function() {
             fig.data[0].insidetextorientation = 'auto';
@@ -2060,15 +2060,15 @@ describe('sunburst uniformtext', function() {
         Plotly.plot(gd, fig)
         .then(assertTextSizes('without uniformtext', {
             fontsizes: [12, 12, 12, 12, 12, 12, 12, 12, 12, 12],
-            scales: [1, 1, 1, 1, 1, 1, 1, 1, 1, 0.58],
+            scales: [1, 1, 1, 1, 1, 1, 1, 1, 1, 0.52],
         }))
         .then(function() {
             fig.layout.uniformtext = {mode: 'hide'}; // default with minsize=0
             return Plotly.react(gd, fig);
         })
         .then(assertTextSizes('using mode: "hide"', {
             fontsizes: [12, 12, 12, 12, 12, 12, 12, 12, 12, 12],
-            scales: [0.58, 0.58, 0.58, 0.58, 0.58, 0.58, 0.58, 0.58, 0.58, 0.58],
+            scales: [0.52, 0.52, 0.52, 0.52, 0.52, 0.52, 0.52, 0.52, 0.52, 0.52],
         }))
         .then(function() {
             fig.layout.uniformtext.minsize = 9; // set a minsize less than trace font size
@@ -2108,7 +2108,7 @@ describe('sunburst uniformtext', function() {
         })
         .then(assertTextSizes('clear uniformtext', {
             fontsizes: [12, 12, 12, 12, 12, 12, 12, 12, 12, 12],
-            scales: [1, 1, 1, 1, 1, 1, 1, 1, 1, 0.58],
+            scales: [1, 1, 1, 1, 1, 1, 1, 1, 1, 0.52],
         }))
         .catch(failTest)
         .then(done);