Skip to content
Browse files

Merge branch 'master' of github.com:highslide-software/highcharts.com

  • Loading branch information...
2 parents f0748c9 + d0e00f6 commit b1b59c31672612906fb03c83d490005aa21a63be @eolsson eolsson committed
Showing with 10 additions and 8 deletions.
  1. +5 −4 js/highcharts.src.js
  2. +5 −4 js/parts/PieSeries.js
View
9 js/highcharts.src.js
@@ -10694,7 +10694,7 @@ var PieSeries = extendClass(Series, {
// set the anchor point for tooltips
radiusX = mathCos(angle) * positions[2] / 2;
- series.radiusY = radiusY = mathSin(angle) * positions[2] / 2;
+ radiusY = mathSin(angle) * positions[2] / 2;
point.tooltipPos = [
positions[0] + radiusX * 0.7,
positions[1] + radiusY * 0.7
@@ -10831,13 +10831,14 @@ var PieSeries = extendClass(Series, {
connector,
connectorPath,
distanceOption = options.distance,
- radiusY = series.radiusY,
+ seriesCenter = series.center,
+ radius = seriesCenter[2] / 2,
+ centerY = seriesCenter[1],
outside = distanceOption > 0,
dataLabel,
labelPos,
labelHeight,
lastY,
- centerY = series.center[1],
halves = [// divide the points into right and left halves for anti collision
[], // right
[] // left
@@ -10895,7 +10896,7 @@ var PieSeries = extendClass(Series, {
sign = lowerHalf ? 1 : -1;
// build the slots
- for (pos = centerY + radiusY - distanceOption; pos <= centerY - radiusY + distanceOption; pos += labelHeight) {
+ for (pos = centerY - radius - distanceOption; pos <= centerY + radius + distanceOption; pos += labelHeight) {
slots.push(pos);
// visualize the slot
/*
View
9 js/parts/PieSeries.js
@@ -238,7 +238,7 @@ var PieSeries = extendClass(Series, {
// set the anchor point for tooltips
radiusX = mathCos(angle) * positions[2] / 2;
- series.radiusY = radiusY = mathSin(angle) * positions[2] / 2;
+ radiusY = mathSin(angle) * positions[2] / 2;
point.tooltipPos = [
positions[0] + radiusX * 0.7,
positions[1] + radiusY * 0.7
@@ -375,13 +375,14 @@ var PieSeries = extendClass(Series, {
connector,
connectorPath,
distanceOption = options.distance,
- radiusY = series.radiusY,
+ seriesCenter = series.center,
+ radius = seriesCenter[2] / 2,
+ centerY = seriesCenter[1],
outside = distanceOption > 0,
dataLabel,
labelPos,
labelHeight,
lastY,
- centerY = series.center[1],
halves = [// divide the points into right and left halves for anti collision
[], // right
[] // left
@@ -439,7 +440,7 @@ var PieSeries = extendClass(Series, {
sign = lowerHalf ? 1 : -1;
// build the slots
- for (pos = centerY + radiusY - distanceOption; pos <= centerY - radiusY + distanceOption; pos += labelHeight) {
+ for (pos = centerY - radius - distanceOption; pos <= centerY + radius + distanceOption; pos += labelHeight) {
slots.push(pos);
// visualize the slot
/*

0 comments on commit b1b59c3

Please sign in to comment.
Something went wrong with that request. Please try again.