return Math.log(x) / LN_TEN;
};
+/**
+ * @private
+ * @param {number} r0
+ * @param {number} r1
+ * @param {number} pct
+ * @return {number}
+ */
+export var logRangeFraction = function(r0, r1, pct) {
+ // Computing the inverse of toPercentXCoord. The function was arrived at with
+ // the following steps:
+ //
+ // Original calcuation:
+ // pct = (log(x) - log(xRange[0])) / (log(xRange[1]) - log(xRange[0])));
+ //
+ // Multiply both sides by the right-side demoninator.
+ // pct * (log(xRange[1] - log(xRange[0]))) = log(x) - log(xRange[0])
+ //
+ // add log(xRange[0]) to both sides
+ // log(xRange[0]) + (pct * (log(xRange[1]) - log(xRange[0])) = log(x);
+ //
+ // Swap both sides of the equation,
+ // log(x) = log(xRange[0]) + (pct * (log(xRange[1]) - log(xRange[0]))
+ //
+ // Use both sides as the exponent in 10^exp and we're done.
+ // x = 10 ^ (log(xRange[0]) + (pct * (log(xRange[1]) - log(xRange[0])))
+
+ var logr0 = log10(r0);
+ var logr1 = log10(r1);
+ var exponent = logr0 + (pct * (logr1 - logr0));
+ var value = Math.pow(LOG_SCALE, exponent);
+ return value;
+};
+
/** A dotted line stroke pattern. */
export var DOTTED_LINE = [2, 2];
/** A dashed line stroke pattern. */
* @return {string} A time of the form "HH:MM" or "HH:MM:SS"
* @private
*/
-export function hmsString_(hh, mm, ss) {
+export function hmsString_(hh, mm, ss, ms) {
var ret = zeropad(hh) + ":" + zeropad(mm);
if (ss) {
ret += ":" + zeropad(ss);
+ if (ms) {
+ var str = "" + ms;
+ ret += "." + ('000'+str).substring(str.length);
+ }
}
return ret;
};
var hh = accessors.getHours(date);
var mm = accessors.getMinutes(date);
var ss = accessors.getSeconds(date);
+ var ms = accessors.getMilliseconds(date);
// Get a year string:
var year = "" + y;
// Get a 0 padded month string
var month = zeropad(m + 1); //months are 0-offset, sigh
// Get a 0 padded day string
var day = zeropad(d);
- var frac = hh * 3600 + mm * 60 + ss;
+ var frac = hh * 3600 + mm * 60 + ss + 1e-3 * ms;
var ret = year + "/" + month + "/" + day;
if (frac) {
- ret += " " + hmsString_(hh, mm, ss);
+ ret += " " + hmsString_(hh, mm, ss, ms);
}
return ret;
};
};
/**
- * Checks whether the user is on an Android browser.
- * Android does not fully support the <canvas> tag, e.g. w/r/t/ clipping.
- * @return {boolean}
- * @private
- */
-export function isAndroid() {
- return (/Android/).test(navigator.userAgent);
-};
-
-
-/**
* TODO(danvk): use @template here when it's better supported for classes.
* @param {!Array} array
* @param {number} start
'annotationDblClickHandler': true,
'annotationMouseOutHandler': true,
'annotationMouseOverHandler': true,
- 'axisLabelColor': true,
'axisLineColor': true,
'axisLineWidth': true,
'clickCallback': true,
'interactionModel': true,
'isZoomedIgnoreProgrammaticZoom': true,
'labelsDiv': true,
- 'labelsDivStyles': true,
- 'labelsDivWidth': true,
'labelsKMB': true,
'labelsKMG2': true,
'labelsSeparateLines': true,
};
/**
- * To create a "drag" interaction, you typically register a mousedown event
- * handler on the element where the drag begins. In that handler, you register a
- * mouseup handler on the window to determine when the mouse is released,
- * wherever that release happens. This works well, except when the user releases
- * the mouse over an off-domain iframe. In that case, the mouseup event is
- * handled by the iframe and never bubbles up to the window handler.
- *
- * To deal with this issue, we cover iframes with high z-index divs to make sure
- * they don't capture mouseup.
- *
- * Usage:
- * element.addEventListener('mousedown', function() {
- * var tarper = new utils.IFrameTarp();
- * tarper.cover();
- * var mouseUpHandler = function() {
- * ...
- * window.removeEventListener(mouseUpHandler);
- * tarper.uncover();
- * };
- * window.addEventListener('mouseup', mouseUpHandler);
- * };
- *
- * @constructor
- */
-export function IFrameTarp() {
- /** @type {Array.<!HTMLDivElement>} */
- this.tarps = [];
-};
-
-/**
- * Find all the iframes in the document and cover them with high z-index
- * transparent divs.
- */
-IFrameTarp.prototype.cover = function() {
- var iframes = document.getElementsByTagName("iframe");
- for (var i = 0; i < iframes.length; i++) {
- var iframe = iframes[i];
- var pos = Dygraph.findPos(iframe),
- x = pos.x,
- y = pos.y,
- width = iframe.offsetWidth,
- height = iframe.offsetHeight;
-
- var div = document.createElement("div");
- div.style.position = "absolute";
- div.style.left = x + 'px';
- div.style.top = y + 'px';
- div.style.width = width + 'px';
- div.style.height = height + 'px';
- div.style.zIndex = 999;
- document.body.appendChild(div);
- this.tarps.push(div);
- }
-};
-
-/**
- * Remove all the iframe covers. You should call this in a mouseup handler.
- */
-IFrameTarp.prototype.uncover = function() {
- for (var i = 0; i < this.tarps.length; i++) {
- this.tarps[i].parentNode.removeChild(this.tarps[i]);
- }
- this.tarps = [];
-};
-
-/**
* Determine whether |data| is delimited by CR, CRLF, LF, LFCR.
* @param {string} data
* @return {?string} the delimiter that was detected (or null on failure).
return (containeeNode === container);
};
-
// This masks some numeric issues in older versions of Firefox,
// where 1.0/Math.pow(10,2) != Math.pow(10,-2).
/** @type {function(number,number):number} */
var RGBA_RE = /^rgba?\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})(?:,\s*([01](?:\.\d+)?))?\)$/;
/**
- * Helper for Dygraph.toRGB_ which parses strings of the form:
+ * Helper for toRGB_ which parses strings of the form:
* rgb(123, 45, 67)
* rgba(123, 45, 67, 0.5)
* @return parsed {r,g,b,a?} tuple or null.
hours = accessors.getHours(date),
mins = accessors.getMinutes(date),
secs = accessors.getSeconds(date),
- millis = accessors.getSeconds(date);
+ millis = accessors.getMilliseconds(date);
if (granularity >= DygraphTickers.Granularity.DECADAL) {
return '' + year;
// e.g. '21 Jan' (%d%b)
return zeropad(day) + ' ' + SHORT_MONTH_NAMES_[month];
} else {
- return hmsString_(hours, mins, secs);
+ return hmsString_(hours, mins, secs, millis);
}
}
};
projects / dygraphs.git / blobdiff