Make the angle calculations more robust. Also ensure that angles in polar area charts...

diff --git a/src/Chart.Core.js b/src/Chart.Core.js
index 9afe5f5bbc5bc3078e3cbec7f8299764197fd9ae..861188c0c78cc2598432404571a25be4f6c4cd85 100755 (executable)
--- a/src/Chart.Core.js
+++ b/src/Chart.Core.js
@@ -1442,8 +1442,8 @@
             });
 
             // Put into the range of (-PI/2, 3PI/2]
-            var startAngle = vm.startAngle < (-0.5 * Math.PI) ? vm.startAngle + (2.0 * Math.PI) : vm.startAngle;
-            var endAngle = vm.endAngle < (-0.5 * Math.PI) ? vm.endAngle + (2.0 * Math.PI) : vm.endAngle
+            var startAngle = vm.startAngle < (-0.5 * Math.PI) ? vm.startAngle + (2.0 * Math.PI) : vm.startAngle > (1.5 * Math.PI) ? vm.startAngle - (2.0 * Math.PI): vm.startAngle;
+            var endAngle = vm.endAngle < (-0.5 * Math.PI) ? vm.endAngle + (2.0 * Math.PI) : vm.endAngle > (1.5 * Math.PI) ? vm.endAngle - (2.0 * Math.PI) : vm.endAngle
 
             //Check if within the range of the open/close angle
             var betweenAngles = (pointRelativePosition.angle >= startAngle && pointRelativePosition.angle <= endAngle),

diff --git a/src/Chart.PolarArea.js b/src/Chart.PolarArea.js
index f0ceff750ccafe7c8758e4f75dea4acc55617e57..b7e52682fd6d313540aa235cc371c821c96d25c2 100644 (file)
--- a/src/Chart.PolarArea.js
+++ b/src/Chart.PolarArea.js
@@ -148,9 +148,6 @@
 
                 var value = this.data.datasets[0].data[index];
 
-                var startAngle = Math.PI * 1.5 + (Math.PI * circumference) * index;
-                var endAngle = startAngle + (circumference * Math.PI);
-
                 helpers.extend(slice, {
                     _index: index,
                     _model: {
@@ -158,8 +155,8 @@
                         y: this.chart.height / 2,
                         innerRadius: 0,
                         outerRadius: 0,
-                        startAngle: Math.PI * 1.5,
-                        endAngle: Math.PI * 1.5,
+                        startAngle: Math.PI * -0.5,
+                        endAngle: Math.PI * -0.5,
 
                         backgroundColor: slice.custom && slice.custom.backgroundColor ? slice.custom.backgroundColor : helpers.getValueAtIndexOrDefault(this.data.datasets[0].backgroundColor, index, this.options.elements.slice.backgroundColor),
                         hoverBackgroundColor: slice.custom && slice.custom.hoverBackgroundColor ? slice.custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(this.data.datasets[0].hoverBackgroundColor, index, this.options.elements.slice.hoverBackgroundColor),
@@ -189,7 +186,7 @@
 
                 var value = this.data.datasets[0].data[index];
 
-                var startAngle = Math.PI * 1.5 + (Math.PI * circumference) * index;
+                var startAngle = (-0.5 * Math.PI) + (Math.PI * circumference) * index;
                 var endAngle = startAngle + (circumference * Math.PI);
 
                 helpers.extend(slice, {