@@ -19,6 +19,7 @@ var svgTextUtils = require('../../lib/svg_text_utils');
19
19
var uniformText = require ( '../bar/uniform_text' ) ;
20
20
var recordMinTextSize = uniformText . recordMinTextSize ;
21
21
var clearMinTextSize = uniformText . clearMinTextSize ;
22
+ var TEXTPAD = require ( '../bar/constants' ) . TEXTPAD ;
22
23
23
24
var helpers = require ( './helpers' ) ;
24
25
var eventData = require ( './event_data' ) ;
@@ -684,6 +685,8 @@ function isCrossing(pt, angle) {
684
685
}
685
686
686
687
function calcRadTransform ( textBB , r , ring , halfAngle , midAngle ) {
688
+ r = Math . max ( 0 , r - 2 * TEXTPAD ) ;
689
+
687
690
// max size if text is rotated radially
688
691
var a = textBB . width / textBB . height ;
689
692
var s = calcMaxHalfSize ( a , halfAngle , r , ring ) ;
@@ -695,6 +698,8 @@ function calcRadTransform(textBB, r, ring, halfAngle, midAngle) {
695
698
}
696
699
697
700
function calcTanTransform ( textBB , r , ring , halfAngle , midAngle ) {
701
+ r = Math . max ( 0 , r - 2 * TEXTPAD ) ;
702
+
698
703
// max size if text is rotated tangentially
699
704
var a = textBB . height / textBB . width ;
700
705
var s = calcMaxHalfSize ( a , halfAngle , r , ring ) ;
@@ -1148,11 +1153,7 @@ function computeTransform(
1148
1153
transform , // inout
1149
1154
textBB // in
1150
1155
) {
1151
- var rotate = transform . rotate ;
1152
- var scale = transform . scale ;
1153
- if ( scale > 1 ) scale = 1 ;
1154
-
1155
- var a = rotate * Math . PI / 180 ;
1156
+ var a = transform . rotate * Math . PI / 180 ;
1156
1157
var cosA = Math . cos ( a ) ;
1157
1158
var sinA = Math . sin ( a ) ;
1158
1159
var midX = ( textBB . left + textBB . right ) / 2 ;
0 commit comments