Commit 179bed96 authored by David Schnur's avatar David Schnur

Declare variables that should have been local.

parent 8110f0c1
...@@ -65,20 +65,21 @@ More detail and specific examples can be found in the included HTML file. ...@@ -65,20 +65,21 @@ More detail and specific examples can be found in the included HTML file.
function init(plot) { function init(plot) {
var canvas = null; var canvas = null,
var canvasWidth = 0; canvasWidth = 0,
var canvasHeight = 0; canvasHeight = 0,
var target = null; target = null,
var maxRadius = null; maxRadius = null,
var centerLeft = null; centerLeft = null,
var centerTop = null; centerTop = null,
var total = 0; total = 0,
var redraw = true; redraw = true,
var redrawAttempts = 10; redrawAttempts = 10,
var shrink = 0.95; shrink = 0.95,
var legendWidth = 0; legendWidth = 0,
var processed = false; processed = false,
var raw = false; raw = false,
ctx = null;
// interactive variables // interactive variables
...@@ -528,7 +529,7 @@ More detail and specific examples can be found in the included HTML file. ...@@ -528,7 +529,7 @@ More detail and specific examples can be found in the included HTML file.
// subtract the center // subtract the center
layer.save(); layer.save();
innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius; var innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;
layer.globalCompositeOperation = "destination-out"; // this does not work with excanvas, but it will fall back to using the stroke color layer.globalCompositeOperation = "destination-out"; // this does not work with excanvas, but it will fall back to using the stroke color
layer.beginPath(); layer.beginPath();
layer.fillStyle = options.series.pie.stroke.color; layer.fillStyle = options.series.pie.stroke.color;
...@@ -563,9 +564,10 @@ More detail and specific examples can be found in the included HTML file. ...@@ -563,9 +564,10 @@ More detail and specific examples can be found in the included HTML file.
function findNearbySlice(mouseX, mouseY) { function findNearbySlice(mouseX, mouseY) {
var slices = plot.getData(); var slices = plot.getData(),
var options = plot.getOptions(); options = plot.getOptions(),
var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius; radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius,
x, y;
for (var i = 0; i < slices.length; ++i) { for (var i = 0; i < slices.length; ++i) {
...@@ -597,17 +599,17 @@ More detail and specific examples can be found in the included HTML file. ...@@ -597,17 +599,17 @@ More detail and specific examples can be found in the included HTML file.
// excanvas for IE doesn;t support isPointInPath, this is a workaround. // excanvas for IE doesn;t support isPointInPath, this is a workaround.
p1X = radius * Math.cos(s.startAngle); var p1X = radius * Math.cos(s.startAngle),
p1Y = radius * Math.sin(s.startAngle); p1Y = radius * Math.sin(s.startAngle),
p2X = radius * Math.cos(s.startAngle + s.angle / 4); p2X = radius * Math.cos(s.startAngle + s.angle / 4),
p2Y = radius * Math.sin(s.startAngle + s.angle / 4); p2Y = radius * Math.sin(s.startAngle + s.angle / 4),
p3X = radius * Math.cos(s.startAngle + s.angle / 2); p3X = radius * Math.cos(s.startAngle + s.angle / 2),
p3Y = radius * Math.sin(s.startAngle + s.angle / 2); p3Y = radius * Math.sin(s.startAngle + s.angle / 2),
p4X = radius * Math.cos(s.startAngle + s.angle / 1.5); p4X = radius * Math.cos(s.startAngle + s.angle / 1.5),
p4Y = radius * Math.sin(s.startAngle + s.angle / 1.5); p4Y = radius * Math.sin(s.startAngle + s.angle / 1.5),
p5X = radius * Math.cos(s.startAngle + s.angle); p5X = radius * Math.cos(s.startAngle + s.angle),
p5Y = radius * Math.sin(s.startAngle + s.angle); p5Y = radius * Math.sin(s.startAngle + s.angle),
arrPoly = [[0, 0], [p1X, p1Y], [p2X, p2Y], [p3X, p3Y], [p4X, p4Y], [p5X, p5Y]]; arrPoly = [[0, 0], [p1X, p1Y], [p2X, p2Y], [p3X, p3Y], [p4X, p4Y], [p5X, p5Y]],
arrPoint = [x, y]; arrPoint = [x, y];
// TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt? // TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?
...@@ -723,7 +725,7 @@ More detail and specific examples can be found in the included HTML file. ...@@ -723,7 +725,7 @@ More detail and specific examples can be found in the included HTML file.
octx.translate(centerLeft, centerTop); octx.translate(centerLeft, centerTop);
octx.scale(1, options.series.pie.tilt); octx.scale(1, options.series.pie.tilt);
for (i = 0; i < highlights.length; ++i) { for (var i = 0; i < highlights.length; ++i) {
drawHighlight(highlights[i].series); drawHighlight(highlights[i].series);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment