X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-utils.js;h=b73475d0542d4d7d99ca0720467ed959f1d599a5;hb=df21c270fa737f335329fb9e75048b0ce26aa37d;hp=9185a0f3ccc643550c24a50d69f1e446cf713f4d;hpb=a8ef67a899be1bc19dbd51d802cd237e1f90a2e9;p=dygraphs.git diff --git a/dygraph-utils.js b/dygraph-utils.js index 9185a0f..b73475d 100644 --- a/dygraph-utils.js +++ b/dygraph-utils.js @@ -51,20 +51,24 @@ Dygraph.DOT_DASH_LINE = [7, 2, 2, 2]; Dygraph.log = function(severity, message) { var st; if (typeof(printStackTrace) != 'undefined') { - // Remove uninteresting bits: logging functions and paths. - st = printStackTrace({guess:false}); - while (st[0].indexOf("stacktrace") != -1) { - st.splice(0, 1); - } + try { + // Remove uninteresting bits: logging functions and paths. + st = printStackTrace({guess:false}); + while (st[0].indexOf("stacktrace") != -1) { + st.splice(0, 1); + } - st.splice(0, 2); - for (var i = 0; i < st.length; i++) { - st[i] = st[i].replace(/\([^)]*\/(.*)\)/, '@$1') - .replace(/\@.*\/([^\/]*)/, '@$1') - .replace('[object Object].', ''); + st.splice(0, 2); + for (var i = 0; i < st.length; i++) { + st[i] = st[i].replace(/\([^)]*\/(.*)\)/, '@$1') + .replace(/\@.*\/([^\/]*)/, '@$1') + .replace('[object Object].', ''); + } + var top_msg = st.splice(0, 1)[0]; + message += ' (' + top_msg.replace(/^.*@ ?/, '') + ')'; + } catch(e) { + // Oh well, it was worth a shot! } - var top_msg = st.splice(0, 1)[0]; - message += ' (' + top_msg.replace(/^.*@ ?/, '') + ')'; } if (typeof(console) != 'undefined') { @@ -147,6 +151,21 @@ Dygraph.addEvent = function addEvent(elem, type, fn) { /** * @private + * Add an event handler. This event handler is kept until the graph is + * destroyed with a call to graph.destroy(). + * + * @param { DOM element } elem The element to add the event to. + * @param { String } type The type of the event, e.g. 'click' or 'mousemove'. + * @param { Function } fn The function to call on the event. The function takes + * one parameter: the event object. + */ +Dygraph.prototype.addEvent = function addEvent(elem, type, fn) { + Dygraph.addEvent(elem, type, fn); + this.registeredEvents_.push({ elem : elem, type : type, fn : fn }); +}; + +/** + * @private * Remove an event handler. This smooths a difference between IE and the rest of * the world. * @param { DOM element } elem The element to add the event to. @@ -332,6 +351,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 +513,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"); @@ -560,7 +602,7 @@ Dygraph.updateDeep = function (self, o) { // DOM objects are shallowly-copied. self[k] = o[k]; } else if (typeof(o[k]) == 'object') { - if (typeof(self[k]) != 'object') { + if (typeof(self[k]) != 'object' || self[k] === null) { self[k] = {}; } Dygraph.updateDeep(self[k], o[k]); @@ -643,6 +685,62 @@ Dygraph.isAndroid = function() { return (/Android/).test(navigator.userAgent); }; +Dygraph.Iterator = function(array, start, length, predicate) { + start = start || 0; + length = length || array.length; + this.hasNext = true; // Use to identify if there's another element. + this.peek = null; // Use for look-ahead + this.start_ = start; + this.array_ = array; + this.predicate_ = predicate; + this.end_ = Math.min(array.length, start + length); + this.nextIdx_ = start - 1; // use -1 so initial advance works. + this.next(); // ignoring result. +} + +Dygraph.Iterator.prototype.next = function() { + if (!this.hasNext) { + return null; + } + var obj = this.peek; + + var nextIdx = this.nextIdx_ + 1; + var found = false; + while (nextIdx < this.end_) { + if (!this.predicate_ || this.predicate_(this.array_, nextIdx)) { + this.peek = this.array_[nextIdx]; + found = true; + break; + } + nextIdx++; + } + this.nextIdx_ = nextIdx; + if (!found) { + this.hasNext = false; + this.peek = null; + } + return obj; +} + +/** + * @private + * Returns a new iterator over array, between indexes start and + * start + length, and only returns entries that pass the accept function + * + * @param array the array to iterate over. + * @param start the first index to iterate over, 0 if absent. + * @param length the number of elements in the array to iterate over. + * This, along with start, defines a slice of the array, and so length + * doesn't imply the number of elements in the iterator when accept + * doesn't always accept all values. array.length when absent. + * @param predicate a function that takes parameters array and idx, which + * returns true when the element should be returned. If omitted, all + * elements are accepted. + */ +Dygraph.createIterator = function(array, start, length, predicate) { + return new Dygraph.Iterator(array, start, length, predicate); +}; + /** * @private * Call a function N times at a given interval, then call a cleanup function @@ -844,9 +942,8 @@ Dygraph.regularShape_ = function( var coords = computeCoordinates(); ctx.lineTo(coords[0], coords[1]); } - ctx.stroke(); ctx.fill(); - ctx.closePath(); + ctx.stroke(); } Dygraph.shapeFunction_ = function(sides, rotationRadians, delta) { @@ -878,9 +975,8 @@ Dygraph.Circles = { ctx.strokeStyle = color; ctx.fillStyle = "white"; ctx.arc(cx, cy, radius, 0, 2 * Math.PI, false); - ctx.stroke(); ctx.fill(); - ctx.closePath(); + ctx.stroke(); }, STAR : Dygraph.shapeFunction_(5, 0, 4 * Math.PI / 5), PLUS : function(g, name, ctx, cx, cy, color, radius) { @@ -889,14 +985,14 @@ Dygraph.Circles = { ctx.beginPath(); ctx.moveTo(cx + radius, cy); ctx.lineTo(cx - radius, cy); - ctx.stroke(); ctx.closePath(); + ctx.stroke(); ctx.beginPath(); ctx.moveTo(cx, cy + radius); ctx.lineTo(cx, cy - radius); - ctx.stroke(); ctx.closePath(); + ctx.stroke(); }, EX : function(g, name, ctx, cx, cy, color, radius) { ctx.strokeStyle = color; @@ -911,7 +1007,6 @@ Dygraph.Circles = { ctx.moveTo(cx + radius, cy - radius); ctx.lineTo(cx - radius, cy + radius); ctx.closePath(); - ctx.stroke(); } };