X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-utils.js;h=c6c3a60345712b76cd023fa212011b3fb0611c17;hb=6a4457b403f78ba559550f97330ac25ee4d9629f;hp=06eb6668668f5732e8d841eef4bab260c8bcf0a3;hpb=4ab51f75d72a9e6c98a508b6788367c0198de4d9;p=dygraphs.git diff --git a/dygraph-utils.js b/dygraph-utils.js index 06eb666..c6c3a60 100644 --- a/dygraph-utils.js +++ b/dygraph-utils.js @@ -332,6 +332,21 @@ Dygraph.isOK = function(x) { }; /** + * @private + * @param { Object } p The point to consider, valid points are {x, y} objects + * @param { Boolean } allowNaNY Treat point with y=NaN as valid + * @return { Boolean } Whether the point has numeric x and y. + */ +Dygraph.isValidPoint = function(p, allowNaNY) { + if (!p) return false; // null or undefined object + if (p.yval === null) return false; // missing point + if (p.x === null || p.x === undefined) return false; + if (p.y === null || p.y === undefined) return false; + if (isNaN(p.x) || (!allowNaNY && isNaN(p.y))) return false; + return true; +}; + +/** * Number formatting function which mimicks the behavior of %g in printf, i.e. * either exponential or fixed format (without trailing 0s) is used depending on * the length of the generated string. The advantage of this format is that @@ -479,9 +494,17 @@ Dygraph.dateParser = function(dateStr) { var dateStrSlashed; var d; - // Let the system try the format first. - d = Dygraph.dateStrToMillis(dateStr); - if (d && !isNaN(d)) return d; + // Let the system try the format first, with one caveat: + // YYYY-MM-DD[ HH:MM:SS] is interpreted as UTC by a variety of browsers. + // dygraphs displays dates in local time, so this will result in surprising + // inconsistencies. But if you specify "T" or "Z" (i.e. YYYY-MM-DDTHH:MM:SS), + // then you probably know what you're doing, so we'll let you go ahead. + // Issue: http://code.google.com/p/dygraphs/issues/detail?id=255 + if (dateStr.search("-") == -1 || + dateStr.search("T") != -1 || dateStr.search("Z") != -1) { + d = Dygraph.dateStrToMillis(dateStr); + if (d && !isNaN(d)) return d; + } if (dateStr.search("-") != -1) { // e.g. '2009-7-12' or '2009-07-12' dateStrSlashed = dateStr.replace("-", "/", "g"); @@ -700,7 +723,7 @@ Dygraph.isPixelChangingOptionList = function(labels, attrs) { 'clickCallback': true, 'digitsAfterDecimal': true, 'drawCallback': true, - 'drawHighlightCallback': true, + 'drawHighlightPointCallback': true, 'drawPoints': true, 'drawPointCallback': true, 'drawXGrid': true, @@ -809,21 +832,23 @@ Dygraph.compareArrays = function(array1, array2) { }; /** - * this.sides: the number of sides in the shape. - * this.rotation: the shift of the initial angle. - * this.delta: the angle shift for each line. If missing, creates a regular + * ctx: the canvas context + * sides: the number of sides in the shape. + * radius: the radius of the image. + * cx: center x coordate + * cy: center y coordinate + * rotationRadians: the shift of the initial angle, in radians. + * delta: the angle shift for each line. If missing, creates a regular * polygon. */ -Dygraph.RegularShape_ = function(sides, rotation, delta) { - this.sides = sides; - this.rotation = rotation ? rotation : 0; - this.delta = delta ? delta : Math.PI * 2 / sides; -} +Dygraph.regularShape_ = function( + ctx, sides, radius, cx, cy, rotationRadians, delta) { + rotationRadians = rotationRadians ? rotationRadians : 0; + delta = delta ? delta : Math.PI * 2 / sides; -Dygraph.RegularShape_.prototype.draw = function(ctx, cx, cy, radius) { ctx.beginPath(); var first = true; - var initialAngle = this.rotation; + var initialAngle = rotationRadians; var angle = initialAngle; var computeCoordinates = function() { @@ -837,17 +862,25 @@ Dygraph.RegularShape_.prototype.draw = function(ctx, cx, cy, radius) { var y = initialCoordinates[1]; ctx.moveTo(x, y); - for (var idx = 0; idx < this.sides; idx++) { - angle = (idx == this.sides - 1) ? initialAngle : (angle + this.delta); + for (var idx = 0; idx < sides; idx++) { + angle = (idx == sides - 1) ? initialAngle : (angle + delta); var coords = computeCoordinates(); ctx.lineTo(coords[0], coords[1]); } + ctx.fill(); ctx.stroke(); - ctx.closePath(); } -Dygraph.DrawPolygon_ = function(sides, rotation, ctx, cx, cy, color, radius, delta) { - new Dygraph.RegularShape_(sides, rotation, delta).draw(ctx, cx, cy, radius); +Dygraph.shapeFunction_ = function(sides, rotationRadians, delta) { + return function(g, name, ctx, cx, cy, color, radius) { + ctx.strokeStyle = color; + ctx.fillStyle = "white"; + Dygraph.regularShape_(ctx, sides, radius, cx, cy, rotationRadians, delta); + }; +}; + +Dygraph.DrawPolygon_ = function(sides, rotationRadians, ctx, cx, cy, color, radius, delta) { + new Dygraph.RegularShape_(sides, rotationRadians, delta).draw(ctx, cx, cy, radius); } Dygraph.Circles = { @@ -857,44 +890,21 @@ Dygraph.Circles = { ctx.arc(canvasx, canvasy, radius, 0, 2 * Math.PI, false); ctx.fill(); }, - TRIANGLE : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; - ctx.strokeStyle = color; - new Dygraph.RegularShape_(3).draw(ctx, cx, cy, radius); - }, - SQUARE : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; - ctx.strokeStyle = color; - new Dygraph.RegularShape_(4, Math.PI / 4).draw(ctx, cx, cy, radius); - }, - DIAMOND : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; - ctx.strokeStyle = color; - new Dygraph.RegularShape_(4).draw(ctx, cx, cy, radius); - }, - PENTAGON : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; - ctx.strokeStyle = color; - new Dygraph.RegularShape_(5).draw(ctx, cx, cy, radius); - }, - HEXAGON : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; - ctx.strokeStyle = color; - new Dygraph.RegularShape_(6).draw(ctx, cx, cy, radius); - }, + TRIANGLE : Dygraph.shapeFunction_(3), + SQUARE : Dygraph.shapeFunction_(4, Math.PI / 4), + DIAMOND : Dygraph.shapeFunction_(4), + PENTAGON : Dygraph.shapeFunction_(5), + HEXAGON : Dygraph.shapeFunction_(6), CIRCLE : function(g, name, ctx, cx, cy, color, radius) { ctx.beginPath(); ctx.strokeStyle = color; + ctx.fillStyle = "white"; ctx.arc(cx, cy, radius, 0, 2 * Math.PI, false); + ctx.fill(); ctx.stroke(); }, - STAR : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; - ctx.strokeStyle = color; - new Dygraph.RegularShape_(5, 0, 4 * Math.PI / 5).draw(ctx, cx, cy, radius); - }, + STAR : Dygraph.shapeFunction_(5, 0, 4 * Math.PI / 5), PLUS : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; ctx.strokeStyle = color; ctx.beginPath(); @@ -907,12 +917,10 @@ Dygraph.Circles = { ctx.moveTo(cx, cy + radius); ctx.lineTo(cx, cy - radius); ctx.closePath(); - ctx.stroke(); }, EX : function(g, name, ctx, cx, cy, color, radius) { - ctx.lineWidth = 1; - ctx.strokeStyle = "black"; + ctx.strokeStyle = color; ctx.beginPath(); ctx.moveTo(cx + radius, cy + radius); @@ -924,7 +932,6 @@ Dygraph.Circles = { ctx.moveTo(cx + radius, cy - radius); ctx.lineTo(cx - radius, cy + radius); ctx.closePath(); - ctx.stroke(); } };