--- a/src/pyams_skin/resources/js/ext/flot/jquery.flot.js Thu Sep 26 11:55:17 2019 +0200
+++ b/src/pyams_skin/resources/js/ext/flot/jquery.flot.js Wed Oct 16 13:00:43 2019 +0200
@@ -1,510 +1,98 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
+/* Javascript plotting library for jQuery, version 3.0.0.
Copyright (c) 2007-2014 IOLA and Ole Laursen.
Licensed under the MIT license.
*/
-// first an inline dependency, jquery.colorhelpers.js, we inline it here
-// for convenience
-
-/* Plugin for jQuery for working with colors.
- *
- * Version 1.1.
- *
- * Inspiration from jQuery color animation plugin by John Resig.
- *
- * Released under the MIT license by Ole Laursen, October 2009.
- *
- * Examples:
- *
- * $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
- * var c = $.color.extract($("#mydiv"), 'background-color');
- * console.log(c.r, c.g, c.b, c.a);
- * $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
- *
- * Note that .scale() and .add() return the same modified object
- * instead of making a new one.
- *
- * V. 1.1: Fix error handling so e.g. parsing an empty string does
- * produce a color rather than just crashing.
- */
-(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i<c.length;++i)o[c.charAt(i)]+=d;return o.normalize()};o.scale=function(c,f){for(var i=0;i<c.length;++i)o[c.charAt(i)]*=f;return o.normalize()};o.toString=function(){if(o.a>=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return value<min?min:value>max?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
-
// the actual Flot code
(function($) {
-
- // Cache the prototype hasOwnProperty for faster access
-
- var hasOwnProperty = Object.prototype.hasOwnProperty;
-
- // A shim to provide 'detach' to jQuery versions prior to 1.4. Using a DOM
- // operation produces the same effect as detach, i.e. removing the element
- // without touching its jQuery data.
-
- // Do not merge this into Flot 0.9, since it requires jQuery 1.4.4+.
-
- if (!$.fn.detach) {
- $.fn.detach = function() {
- return this.each(function() {
- if (this.parentNode) {
- this.parentNode.removeChild( this );
- }
- });
- };
+ "use strict";
+
+ var Canvas = window.Flot.Canvas;
+
+ function defaultTickGenerator(axis) {
+ var ticks = [],
+ start = $.plot.saturated.saturate($.plot.saturated.floorInBase(axis.min, axis.tickSize)),
+ i = 0,
+ v = Number.NaN,
+ prev;
+
+ if (start === -Number.MAX_VALUE) {
+ ticks.push(start);
+ start = $.plot.saturated.floorInBase(axis.min + axis.tickSize, axis.tickSize);
+ }
+
+ do {
+ prev = v;
+ //v = start + i * axis.tickSize;
+ v = $.plot.saturated.multiplyAdd(axis.tickSize, i, start);
+ ticks.push(v);
+ ++i;
+ } while (v < axis.max && v !== prev);
+
+ return ticks;
}
- ///////////////////////////////////////////////////////////////////////////
- // The Canvas object is a wrapper around an HTML5 <canvas> tag.
- //
- // @constructor
- // @param {string} cls List of classes to apply to the canvas.
- // @param {element} container Element onto which to append the canvas.
- //
- // Requiring a container is a little iffy, but unfortunately canvas
- // operations don't work unless the canvas is attached to the DOM.
-
- function Canvas(cls, container) {
-
- var element = container.children("." + cls)[0];
-
- if (element == null) {
-
- element = document.createElement("canvas");
- element.className = cls;
-
- $(element).css({ direction: "ltr", position: "absolute", left: 0, top: 0 })
- .appendTo(container);
-
- // If HTML5 Canvas isn't available, fall back to [Ex|Flash]canvas
-
- if (!element.getContext) {
- if (window.G_vmlCanvasManager) {
- element = window.G_vmlCanvasManager.initElement(element);
- } else {
- throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.");
- }
- }
- }
-
- this.element = element;
-
- var context = this.context = element.getContext("2d");
-
- // Determine the screen's ratio of physical to device-independent
- // pixels. This is the ratio between the canvas width that the browser
- // advertises and the number of pixels actually present in that space.
-
- // The iPhone 4, for example, has a device-independent width of 320px,
- // but its screen is actually 640px wide. It therefore has a pixel
- // ratio of 2, while most normal devices have a ratio of 1.
-
- var devicePixelRatio = window.devicePixelRatio || 1,
- backingStoreRatio =
- context.webkitBackingStorePixelRatio ||
- context.mozBackingStorePixelRatio ||
- context.msBackingStorePixelRatio ||
- context.oBackingStorePixelRatio ||
- context.backingStorePixelRatio || 1;
-
- this.pixelRatio = devicePixelRatio / backingStoreRatio;
-
- // Size the canvas to match the internal dimensions of its container
-
- this.resize(container.width(), container.height());
-
- // Collection of HTML div layers for text overlaid onto the canvas
-
- this.textContainer = null;
- this.text = {};
-
- // Cache of text fragments and metrics, so we can avoid expensively
- // re-calculating them when the plot is re-rendered in a loop.
-
- this._textCache = {};
- }
-
- // Resizes the canvas to the given dimensions.
- //
- // @param {number} width New width of the canvas, in pixels.
- // @param {number} width New height of the canvas, in pixels.
-
- Canvas.prototype.resize = function(width, height) {
-
- if (width <= 0 || height <= 0) {
- throw new Error("Invalid dimensions for plot, width = " + width + ", height = " + height);
- }
-
- var element = this.element,
- context = this.context,
- pixelRatio = this.pixelRatio;
-
- // Resize the canvas, increasing its density based on the display's
- // pixel ratio; basically giving it more pixels without increasing the
- // size of its element, to take advantage of the fact that retina
- // displays have that many more pixels in the same advertised space.
-
- // Resizing should reset the state (excanvas seems to be buggy though)
-
- if (this.width != width) {
- element.width = width * pixelRatio;
- element.style.width = width + "px";
- this.width = width;
- }
-
- if (this.height != height) {
- element.height = height * pixelRatio;
- element.style.height = height + "px";
- this.height = height;
- }
-
- // Save the context, so we can reset in case we get replotted. The
- // restore ensure that we're really back at the initial state, and
- // should be safe even if we haven't saved the initial state yet.
-
- context.restore();
- context.save();
-
- // Scale the coordinate space to match the display density; so even though we
- // may have twice as many pixels, we still want lines and other drawing to
- // appear at the same size; the extra pixels will just make them crisper.
-
- context.scale(pixelRatio, pixelRatio);
- };
-
- // Clears the entire canvas area, not including any overlaid HTML text
-
- Canvas.prototype.clear = function() {
- this.context.clearRect(0, 0, this.width, this.height);
- };
-
- // Finishes rendering the canvas, including managing the text overlay.
-
- Canvas.prototype.render = function() {
-
- var cache = this._textCache;
-
- // For each text layer, add elements marked as active that haven't
- // already been rendered, and remove those that are no longer active.
-
- for (var layerKey in cache) {
- if (hasOwnProperty.call(cache, layerKey)) {
-
- var layer = this.getTextLayer(layerKey),
- layerCache = cache[layerKey];
-
- layer.hide();
-
- for (var styleKey in layerCache) {
- if (hasOwnProperty.call(layerCache, styleKey)) {
- var styleCache = layerCache[styleKey];
- for (var key in styleCache) {
- if (hasOwnProperty.call(styleCache, key)) {
-
- var positions = styleCache[key].positions;
-
- for (var i = 0, position; position = positions[i]; i++) {
- if (position.active) {
- if (!position.rendered) {
- layer.append(position.element);
- position.rendered = true;
- }
- } else {
- positions.splice(i--, 1);
- if (position.rendered) {
- position.element.detach();
- }
- }
- }
-
- if (positions.length == 0) {
- delete styleCache[key];
- }
- }
- }
- }
- }
-
- layer.show();
- }
- }
- };
-
- // Creates (if necessary) and returns the text overlay container.
- //
- // @param {string} classes String of space-separated CSS classes used to
- // uniquely identify the text layer.
- // @return {object} The jQuery-wrapped text-layer div.
-
- Canvas.prototype.getTextLayer = function(classes) {
-
- var layer = this.text[classes];
-
- // Create the text layer if it doesn't exist
-
- if (layer == null) {
-
- // Create the text layer container, if it doesn't exist
-
- if (this.textContainer == null) {
- this.textContainer = $("<div class='flot-text'></div>")
- .css({
- position: "absolute",
- top: 0,
- left: 0,
- bottom: 0,
- right: 0,
- 'font-size': "smaller",
- color: "#545454"
- })
- .insertAfter(this.element);
- }
-
- layer = this.text[classes] = $("<div></div>")
- .addClass(classes)
- .css({
- position: "absolute",
- top: 0,
- left: 0,
- bottom: 0,
- right: 0
- })
- .appendTo(this.textContainer);
- }
-
- return layer;
- };
-
- // Creates (if necessary) and returns a text info object.
- //
- // The object looks like this:
- //
- // {
- // width: Width of the text's wrapper div.
- // height: Height of the text's wrapper div.
- // element: The jQuery-wrapped HTML div containing the text.
- // positions: Array of positions at which this text is drawn.
- // }
- //
- // The positions array contains objects that look like this:
- //
- // {
- // active: Flag indicating whether the text should be visible.
- // rendered: Flag indicating whether the text is currently visible.
- // element: The jQuery-wrapped HTML div containing the text.
- // x: X coordinate at which to draw the text.
- // y: Y coordinate at which to draw the text.
- // }
- //
- // Each position after the first receives a clone of the original element.
- //
- // The idea is that that the width, height, and general 'identity' of the
- // text is constant no matter where it is placed; the placements are a
- // secondary property.
- //
- // Canvas maintains a cache of recently-used text info objects; getTextInfo
- // either returns the cached element or creates a new entry.
- //
- // @param {string} layer A string of space-separated CSS classes uniquely
- // identifying the layer containing this text.
- // @param {string} text Text string to retrieve info for.
- // @param {(string|object)=} font Either a string of space-separated CSS
- // classes or a font-spec object, defining the text's font and style.
- // @param {number=} angle Angle at which to rotate the text, in degrees.
- // Angle is currently unused, it will be implemented in the future.
- // @param {number=} width Maximum width of the text before it wraps.
- // @return {object} a text info object.
-
- Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) {
-
- var textStyle, layerCache, styleCache, info;
-
- // Cast the value to a string, in case we were given a number or such
-
- text = "" + text;
-
- // If the font is a font-spec object, generate a CSS font definition
-
- if (typeof font === "object") {
- textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px/" + font.lineHeight + "px " + font.family;
- } else {
- textStyle = font;
- }
-
- // Retrieve (or create) the cache for the text's layer and styles
-
- layerCache = this._textCache[layer];
-
- if (layerCache == null) {
- layerCache = this._textCache[layer] = {};
- }
-
- styleCache = layerCache[textStyle];
-
- if (styleCache == null) {
- styleCache = layerCache[textStyle] = {};
- }
-
- info = styleCache[text];
-
- // If we can't find a matching element in our cache, create a new one
-
- if (info == null) {
-
- var element = $("<div></div>").html(text)
- .css({
- position: "absolute",
- 'max-width': width,
- top: -9999
- })
- .appendTo(this.getTextLayer(layer));
-
- if (typeof font === "object") {
- element.css({
- font: textStyle,
- color: font.color
- });
- } else if (typeof font === "string") {
- element.addClass(font);
- }
-
- info = styleCache[text] = {
- width: element.outerWidth(true),
- height: element.outerHeight(true),
- element: element,
- positions: []
- };
-
- element.detach();
- }
-
- return info;
- };
-
- // Adds a text string to the canvas text overlay.
- //
- // The text isn't drawn immediately; it is marked as rendering, which will
- // result in its addition to the canvas on the next render pass.
- //
- // @param {string} layer A string of space-separated CSS classes uniquely
- // identifying the layer containing this text.
- // @param {number} x X coordinate at which to draw the text.
- // @param {number} y Y coordinate at which to draw the text.
- // @param {string} text Text string to draw.
- // @param {(string|object)=} font Either a string of space-separated CSS
- // classes or a font-spec object, defining the text's font and style.
- // @param {number=} angle Angle at which to rotate the text, in degrees.
- // Angle is currently unused, it will be implemented in the future.
- // @param {number=} width Maximum width of the text before it wraps.
- // @param {string=} halign Horizontal alignment of the text; either "left",
- // "center" or "right".
- // @param {string=} valign Vertical alignment of the text; either "top",
- // "middle" or "bottom".
-
- Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) {
-
- var info = this.getTextInfo(layer, text, font, angle, width),
- positions = info.positions;
-
- // Tweak the div's position to match the text's alignment
-
- if (halign == "center") {
- x -= info.width / 2;
- } else if (halign == "right") {
- x -= info.width;
- }
-
- if (valign == "middle") {
- y -= info.height / 2;
- } else if (valign == "bottom") {
- y -= info.height;
- }
-
- // Determine whether this text already exists at this position.
- // If so, mark it for inclusion in the next render pass.
-
- for (var i = 0, position; position = positions[i]; i++) {
- if (position.x == x && position.y == y) {
- position.active = true;
- return;
- }
- }
-
- // If the text doesn't exist at this position, create a new entry
-
- // For the very first position we'll re-use the original element,
- // while for subsequent ones we'll clone it.
-
- position = {
- active: true,
- rendered: false,
- element: positions.length ? info.element.clone() : info.element,
- x: x,
- y: y
- };
-
- positions.push(position);
-
- // Move the element to its final position within the container
-
- position.element.css({
- top: Math.round(y),
- left: Math.round(x),
- 'text-align': halign // In case the text wraps
- });
- };
-
- // Removes one or more text strings from the canvas text overlay.
- //
- // If no parameters are given, all text within the layer is removed.
- //
- // Note that the text is not immediately removed; it is simply marked as
- // inactive, which will result in its removal on the next render pass.
- // This avoids the performance penalty for 'clear and redraw' behavior,
- // where we potentially get rid of all text on a layer, but will likely
- // add back most or all of it later, as when redrawing axes, for example.
- //
- // @param {string} layer A string of space-separated CSS classes uniquely
- // identifying the layer containing this text.
- // @param {number=} x X coordinate of the text.
- // @param {number=} y Y coordinate of the text.
- // @param {string=} text Text string to remove.
- // @param {(string|object)=} font Either a string of space-separated CSS
- // classes or a font-spec object, defining the text's font and style.
- // @param {number=} angle Angle at which the text is rotated, in degrees.
- // Angle is currently unused, it will be implemented in the future.
-
- Canvas.prototype.removeText = function(layer, x, y, text, font, angle) {
- if (text == null) {
- var layerCache = this._textCache[layer];
- if (layerCache != null) {
- for (var styleKey in layerCache) {
- if (hasOwnProperty.call(layerCache, styleKey)) {
- var styleCache = layerCache[styleKey];
- for (var key in styleCache) {
- if (hasOwnProperty.call(styleCache, key)) {
- var positions = styleCache[key].positions;
- for (var i = 0, position; position = positions[i]; i++) {
- position.active = false;
- }
- }
- }
- }
- }
- }
- } else {
- var positions = this.getTextInfo(layer, text, font, angle).positions;
- for (var i = 0, position; position = positions[i]; i++) {
- if (position.x == x && position.y == y) {
- position.active = false;
- }
- }
- }
- };
-
- ///////////////////////////////////////////////////////////////////////////
- // The top-level container for the entire plot.
-
+ function defaultTickFormatter(value, axis, precision) {
+ var oldTickDecimals = axis.tickDecimals,
+ expPosition = ("" + value).indexOf("e");
+
+ if (expPosition !== -1) {
+ return expRepTickFormatter(value, axis, precision);
+ }
+
+ if (precision > 0) {
+ axis.tickDecimals = precision;
+ }
+
+ var factor = axis.tickDecimals ? parseFloat('1e' + axis.tickDecimals) : 1,
+ formatted = "" + Math.round(value * factor) / factor;
+
+ // If tickDecimals was specified, ensure that we have exactly that
+ // much precision; otherwise default to the value's own precision.
+ if (axis.tickDecimals != null) {
+ var decimal = formatted.indexOf("."),
+ decimalPrecision = decimal === -1 ? 0 : formatted.length - decimal - 1;
+ if (decimalPrecision < axis.tickDecimals) {
+ var decimals = ("" + factor).substr(1, axis.tickDecimals - decimalPrecision);
+ formatted = (decimalPrecision ? formatted : formatted + ".") + decimals;
+ }
+ }
+
+ axis.tickDecimals = oldTickDecimals;
+ return formatted;
+ };
+
+ function expRepTickFormatter(value, axis, precision) {
+ var expPosition = ("" + value).indexOf("e"),
+ exponentValue = parseInt(("" + value).substr(expPosition + 1)),
+ tenExponent = expPosition !== -1 ? exponentValue : (value > 0 ? Math.floor(Math.log(value) / Math.LN10) : 0),
+ roundWith = parseFloat('1e' + tenExponent),
+ x = value / roundWith;
+
+ if (precision) {
+ var updatedPrecision = recomputePrecision(value, precision);
+ return (value / roundWith).toFixed(updatedPrecision) + 'e' + tenExponent;
+ }
+
+ if (axis.tickDecimals > 0) {
+ return x.toFixed(recomputePrecision(value, axis.tickDecimals)) + 'e' + tenExponent;
+ }
+ return x.toFixed() + 'e' + tenExponent;
+ }
+
+ function recomputePrecision(num, precision) {
+ //for numbers close to zero, the precision from flot will be a big number
+ //while for big numbers, the precision will be negative
+ var log10Value = Math.log(Math.abs(num)) * Math.LOG10E,
+ newPrecision = Math.abs(log10Value + precision);
+
+ return newPrecision <= 20 ? Math.floor(newPrecision) : 20;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////
+ // The top-level container for the entire plot.
function Plot(placeholder, data_, options_, plugins) {
// data is on the form:
// [ series1, series2 ... ]
@@ -515,18 +103,6 @@
options = {
// the color theme used for graphs
colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"],
- legend: {
- show: true,
- noColumns: 1, // number of colums in legend table
- labelFormatter: null, // fn: string -> string
- labelBoxBorderColor: "#ccc", // border color for the little label boxes
- container: null, // container (as jQuery object) to put legend in, null means default on top of graph
- position: "ne", // position of default legend container within plot
- margin: 5, // distance from grid edge to default legend container within plot
- backgroundColor: null, // null means auto-detect
- backgroundOpacity: 0.85, // set to 0 to avoid background
- sorted: null // default to no legend sorting
- },
xaxis: {
show: null, // null = auto-detect, true = always, false = never
position: "bottom", // or "top"
@@ -538,21 +114,35 @@
inverseTransform: null, // if transform is set, this should be the inverse function
min: null, // min. value to show, null means set automatically
max: null, // max. value to show, null means set automatically
- autoscaleMargin: null, // margin in % to add if auto-setting min/max
+ autoScaleMargin: null, // margin in % to add if autoScale option is on "loose" mode,
+ autoScale: "exact", // Available modes: "none", "loose", "exact", "sliding-window"
+ windowSize: null, // null or number. This is the size of sliding-window.
+ growOnly: null, // grow only, useful for smoother auto-scale, the scales will grow to accomodate data but won't shrink back.
ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
tickFormatter: null, // fn: number -> string
+ showTickLabels: "major", // "none", "endpoints", "major", "all"
labelWidth: null, // size of tick labels in pixels
labelHeight: null,
reserveSpace: null, // whether to reserve space even if axis isn't shown
- tickLength: null, // size in pixels of ticks, or "full" for whole line
+ tickLength: null, // size in pixels of major tick marks
+ showMinorTicks: null, // true = show minor tick marks, false = hide minor tick marks
+ showTicks: null, // true = show tick marks, false = hide all tick marks
+ gridLines: null, // true = show grid lines, false = hide grid lines
alignTicksWithAxis: null, // axis number or null for no sync
tickDecimals: null, // no. of decimals, null means auto
tickSize: null, // number or [number, "unit"]
- minTickSize: null // number or [number, "unit"]
+ minTickSize: null, // number or [number, "unit"]
+ offset: { below: 0, above: 0 }, // the plot drawing offset. this is calculated by the flot.navigate for each axis
+ boxPosition: { centerX: 0, centerY: 0 } //position of the axis on the corresponding axis box
},
yaxis: {
- autoscaleMargin: 0.02,
- position: "left" // or "right"
+ autoScaleMargin: 0.02, // margin in % to add if autoScale option is on "loose" mode
+ autoScale: "loose", // Available modes: "none", "loose", "exact"
+ growOnly: null, // grow only, useful for smoother auto-scale, the scales will grow to accomodate data but won't shrink back.
+ position: "left", // or "right"
+ showTickLabels: "major", // "none", "endpoints", "major", "all"
+ offset: { below: 0, above: 0 }, // the plot drawing offset. this is calculated by the flot.navigate for each axis
+ boxPosition: { centerX: 0, centerY: 0 } //position of the axis on the corresponding axis box
},
xaxes: [],
yaxes: [],
@@ -563,12 +153,12 @@
lineWidth: 2, // in pixels
fill: true,
fillColor: "#ffffff",
- symbol: "circle" // or callback
+ symbol: 'circle' // or callback
},
lines: {
// we don't put in show: false so we can see
// whether lines were actively disabled
- lineWidth: 2, // in pixels
+ lineWidth: 1, // in pixels
fill: false,
fillColor: null,
steps: false
@@ -578,11 +168,14 @@
bars: {
show: false,
lineWidth: 2, // in pixels
- barWidth: 1, // in units of the x axis
+ // barWidth: number or [number, absolute]
+ // when 'absolute' is false, 'number' is relative to the minimum distance between points for the series
+ // when 'absolute' is true, 'number' is considered to be in units of the x-axis
+ horizontal: false,
+ barWidth: 0.8,
fill: true,
fillColor: null,
align: "left", // "left", "right", or "center"
- horizontal: false,
zero: true
},
shadowSize: 3,
@@ -598,7 +191,7 @@
margin: 0, // distance from the canvas edge to the grid
labelMargin: 5, // in pixels
axisMargin: 8, // in pixels
- borderWidth: 2, // in pixels
+ borderWidth: 1, // in pixels
minBorderMargin: null, // in pixels, null means taken from points radius
markings: null, // array of ranges or fn: axes -> array of ranges
markingsColor: "#f4f4f4",
@@ -607,65 +200,108 @@
clickable: false,
hoverable: false,
autoHighlight: true, // highlight in case mouse is near
- mouseActiveRadius: 10 // how far the mouse can be away to activate an item
+ mouseActiveRadius: 15 // how far the mouse can be away to activate an item
},
interaction: {
- redrawOverlayInterval: 1000/60 // time between updates, -1 means in same flow
+ redrawOverlayInterval: 1000 / 60 // time between updates, -1 means in same flow
},
hooks: {}
},
- surface = null, // the canvas for the plot itself
- overlay = null, // canvas for interactive stuff on top of plot
- eventHolder = null, // jQuery object that events should be bound to
- ctx = null, octx = null,
- xaxes = [], yaxes = [],
- plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
- plotWidth = 0, plotHeight = 0,
- hooks = {
- processOptions: [],
- processRawData: [],
- processDatapoints: [],
- processOffset: [],
- drawBackground: [],
- drawSeries: [],
- draw: [],
- bindEvents: [],
- drawOverlay: [],
- shutdown: []
- },
- plot = this;
+ surface = null, // the canvas for the plot itself
+ overlay = null, // canvas for interactive stuff on top of plot
+ eventHolder = null, // jQuery object that events should be bound to
+ ctx = null,
+ octx = null,
+ xaxes = [],
+ yaxes = [],
+ plotOffset = {
+ left: 0,
+ right: 0,
+ top: 0,
+ bottom: 0
+ },
+ plotWidth = 0,
+ plotHeight = 0,
+ hooks = {
+ processOptions: [],
+ processRawData: [],
+ processDatapoints: [],
+ processOffset: [],
+ setupGrid: [],
+ adjustSeriesDataRange: [],
+ setRange: [],
+ drawBackground: [],
+ drawSeries: [],
+ drawAxis: [],
+ draw: [],
+ axisReserveSpace: [],
+ bindEvents: [],
+ drawOverlay: [],
+ resize: [],
+ shutdown: []
+ },
+ plot = this;
+
+ var eventManager = {};
+
+ // interactive features
+
+ var redrawTimeout = null;
// public functions
plot.setData = setData;
plot.setupGrid = setupGrid;
plot.draw = draw;
- plot.getPlaceholder = function() { return placeholder; };
- plot.getCanvas = function() { return surface.element; };
- plot.getPlotOffset = function() { return plotOffset; };
- plot.width = function () { return plotWidth; };
- plot.height = function () { return plotHeight; };
- plot.offset = function () {
+ plot.getPlaceholder = function() {
+ return placeholder;
+ };
+ plot.getCanvas = function() {
+ return surface.element;
+ };
+ plot.getSurface = function() {
+ return surface;
+ };
+ plot.getEventHolder = function() {
+ return eventHolder[0];
+ };
+ plot.getPlotOffset = function() {
+ return plotOffset;
+ };
+ plot.width = function() {
+ return plotWidth;
+ };
+ plot.height = function() {
+ return plotHeight;
+ };
+ plot.offset = function() {
var o = eventHolder.offset();
o.left += plotOffset.left;
o.top += plotOffset.top;
return o;
};
- plot.getData = function () { return series; };
- plot.getAxes = function () {
- var res = {}, i;
- $.each(xaxes.concat(yaxes), function (_, axis) {
- if (axis)
- res[axis.direction + (axis.n != 1 ? axis.n : "") + "axis"] = axis;
+ plot.getData = function() {
+ return series;
+ };
+ plot.getAxes = function() {
+ var res = {};
+ $.each(xaxes.concat(yaxes), function(_, axis) {
+ if (axis) {
+ res[axis.direction + (axis.n !== 1 ? axis.n : "") + "axis"] = axis;
+ }
});
return res;
};
- plot.getXAxes = function () { return xaxes; };
- plot.getYAxes = function () { return yaxes; };
- plot.c2p = canvasToAxisCoords;
- plot.p2c = axisToCanvasCoords;
- plot.getOptions = function () { return options; };
- plot.highlight = highlight;
- plot.unhighlight = unhighlight;
+ plot.getXAxes = function() {
+ return xaxes;
+ };
+ plot.getYAxes = function() {
+ return yaxes;
+ };
+ plot.c2p = canvasToCartesianAxisCoords;
+ plot.p2c = cartesianAxisToCanvasCoords;
+ plot.getOptions = function() {
+ return options;
+ };
plot.triggerRedrawOverlay = triggerRedrawOverlay;
plot.pointOffset = function(point) {
return {
@@ -674,7 +310,7 @@
};
};
plot.shutdown = shutdown;
- plot.destroy = function () {
+ plot.destroy = function() {
shutdown();
placeholder.removeData("plot").empty();
@@ -688,37 +324,54 @@
xaxes = [];
yaxes = [];
hooks = null;
- highlights = [];
plot = null;
};
- plot.resize = function () {
- var width = placeholder.width(),
- height = placeholder.height();
+
+ plot.resize = function() {
+ var width = placeholder.width(),
+ height = placeholder.height();
surface.resize(width, height);
overlay.resize(width, height);
+
+ executeHooks(hooks.resize, [width, height]);
};
+ plot.clearTextCache = function () {
+ surface.clearCache();
+ overlay.clearCache();
+ };
+
+ plot.autoScaleAxis = autoScaleAxis;
+ plot.computeRangeForDataSeries = computeRangeForDataSeries;
+ plot.adjustSeriesDataRange = adjustSeriesDataRange;
+ plot.findNearbyItem = findNearbyItem;
+ plot.findNearbyInterpolationPoint = findNearbyInterpolationPoint;
+ plot.computeValuePrecision = computeValuePrecision;
+ plot.computeTickSize = computeTickSize;
+ plot.addEventHandler = addEventHandler;
+
// public attributes
plot.hooks = hooks;
// initialize
+ var MINOR_TICKS_COUNT_CONSTANT = $.plot.uiConstants.MINOR_TICKS_COUNT_CONSTANT;
+ var TICK_LENGTH_CONSTANT = $.plot.uiConstants.TICK_LENGTH_CONSTANT;
initPlugins(plot);
- parseOptions(options_);
setupCanvases();
+ parseOptions(options_);
setData(data_);
- setupGrid();
+ setupGrid(true);
draw();
bindEvents();
-
function executeHooks(hook, args) {
args = [plot].concat(args);
- for (var i = 0; i < hook.length; ++i)
+ for (var i = 0; i < hook.length; ++i) {
hook[i].apply(this, args);
+ }
}
function initPlugins() {
-
// References to key classes, allowing plugins to modify them
var classes = {
@@ -728,13 +381,13 @@
for (var i = 0; i < plugins.length; ++i) {
var p = plugins[i];
p.init(plot, classes);
- if (p.options)
+ if (p.options) {
$.extend(true, options, p.options);
+ }
}
}
function parseOptions(opts) {
-
$.extend(true, options, opts);
// $.extend merges arrays, rather than replacing them. When less
@@ -743,23 +396,34 @@
// not expected behavior; avoid it by replacing them here.
if (opts && opts.colors) {
- options.colors = opts.colors;
+ options.colors = opts.colors;
}
- if (options.xaxis.color == null)
+ if (options.xaxis.color == null) {
options.xaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();
- if (options.yaxis.color == null)
+ }
+
+ if (options.yaxis.color == null) {
options.yaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();
-
- if (options.xaxis.tickColor == null) // grid.tickColor for back-compatibility
+ }
+
+ if (options.xaxis.tickColor == null) {
+ // grid.tickColor for back-compatibility
options.xaxis.tickColor = options.grid.tickColor || options.xaxis.color;
- if (options.yaxis.tickColor == null) // grid.tickColor for back-compatibility
+ }
+
+ if (options.yaxis.tickColor == null) {
+ // grid.tickColor for back-compatibility
options.yaxis.tickColor = options.grid.tickColor || options.yaxis.color;
-
- if (options.grid.borderColor == null)
+ }
+
+ if (options.grid.borderColor == null) {
options.grid.borderColor = options.grid.color;
- if (options.grid.tickColor == null)
+ }
+
+ if (options.grid.tickColor == null) {
options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString();
+ }
// Fill in defaults for axis options, including any unspecified
// font-spec fields, if a font-spec was provided.
@@ -780,7 +444,6 @@
axisCount = options.xaxes.length || 1;
for (i = 0; i < axisCount; ++i) {
-
axisOptions = options.xaxes[i];
if (axisOptions && !axisOptions.tickColor) {
axisOptions.tickColor = axisOptions.color;
@@ -802,7 +465,6 @@
axisCount = options.yaxes.length || 1;
for (i = 0; i < axisCount; ++i) {
-
axisOptions = options.yaxes[i];
if (axisOptions && !axisOptions.tickColor) {
axisOptions.tickColor = axisOptions.color;
@@ -822,66 +484,35 @@
}
}
- // backwards compatibility, to be removed in future
- if (options.xaxis.noTicks && options.xaxis.ticks == null)
- options.xaxis.ticks = options.xaxis.noTicks;
- if (options.yaxis.noTicks && options.yaxis.ticks == null)
- options.yaxis.ticks = options.yaxis.noTicks;
- if (options.x2axis) {
- options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis);
- options.xaxes[1].position = "top";
- // Override the inherit to allow the axis to auto-scale
- if (options.x2axis.min == null) {
- options.xaxes[1].min = null;
- }
- if (options.x2axis.max == null) {
- options.xaxes[1].max = null;
+ // save options on axes for future reference
+ for (i = 0; i < options.xaxes.length; ++i) {
+ getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i];
+ }
+
+ for (i = 0; i < options.yaxes.length; ++i) {
+ getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i];
+ }
+
+ //process boxPosition options used for axis.box size
+ $.each(allAxes(), function(_, axis) {
+ axis.boxPosition = axis.options.boxPosition || {centerX: 0, centerY: 0};
+ });
+
+ // add hooks from options
+ for (var n in hooks) {
+ if (options.hooks[n] && options.hooks[n].length) {
+ hooks[n] = hooks[n].concat(options.hooks[n]);
}
}
- if (options.y2axis) {
- options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis);
- options.yaxes[1].position = "right";
- // Override the inherit to allow the axis to auto-scale
- if (options.y2axis.min == null) {
- options.yaxes[1].min = null;
- }
- if (options.y2axis.max == null) {
- options.yaxes[1].max = null;
- }
- }
- if (options.grid.coloredAreas)
- options.grid.markings = options.grid.coloredAreas;
- if (options.grid.coloredAreasColor)
- options.grid.markingsColor = options.grid.coloredAreasColor;
- if (options.lines)
- $.extend(true, options.series.lines, options.lines);
- if (options.points)
- $.extend(true, options.series.points, options.points);
- if (options.bars)
- $.extend(true, options.series.bars, options.bars);
- if (options.shadowSize != null)
- options.series.shadowSize = options.shadowSize;
- if (options.highlightColor != null)
- options.series.highlightColor = options.highlightColor;
-
- // save options on axes for future reference
- for (i = 0; i < options.xaxes.length; ++i)
- getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i];
- for (i = 0; i < options.yaxes.length; ++i)
- getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i];
-
- // add hooks from options
- for (var n in hooks)
- if (options.hooks[n] && options.hooks[n].length)
- hooks[n] = hooks[n].concat(options.hooks[n]);
executeHooks(hooks.processOptions, [options]);
}
function setData(d) {
+ var oldseries = series;
series = parseData(d);
fillInSeriesOptions();
- processData();
+ processData(oldseries);
}
function parseData(d) {
@@ -896,9 +527,10 @@
$.extend(true, s, d[i]);
d[i].data = s.data;
+ } else {
+ s.data = d[i];
}
- else
- s.data = d[i];
+
res.push(s);
}
@@ -907,51 +539,68 @@
function axisNumber(obj, coord) {
var a = obj[coord + "axis"];
- if (typeof a == "object") // if we got a real axis, extract number
+ if (typeof a === "object") {
+ // if we got a real axis, extract number
a = a.n;
- if (typeof a != "number")
+ }
+
+ if (typeof a !== "number") {
a = 1; // default to first axis
+ }
+
return a;
}
function allAxes() {
// return flat array without annoying null entries
- return $.grep(xaxes.concat(yaxes), function (a) { return a; });
+ return xaxes.concat(yaxes).filter(function(a) {
+ return a;
+ });
}
- function canvasToAxisCoords(pos) {
+ // canvas to axis for cartesian axes
+ function canvasToCartesianAxisCoords(pos) {
// return an object with x/y corresponding to all used axes
- var res = {}, i, axis;
+ var res = {},
+ i, axis;
for (i = 0; i < xaxes.length; ++i) {
axis = xaxes[i];
- if (axis && axis.used)
+ if (axis && axis.used) {
res["x" + axis.n] = axis.c2p(pos.left);
+ }
}
for (i = 0; i < yaxes.length; ++i) {
axis = yaxes[i];
- if (axis && axis.used)
+ if (axis && axis.used) {
res["y" + axis.n] = axis.c2p(pos.top);
+ }
}
- if (res.x1 !== undefined)
+ if (res.x1 !== undefined) {
res.x = res.x1;
- if (res.y1 !== undefined)
+ }
+
+ if (res.y1 !== undefined) {
res.y = res.y1;
+ }
return res;
}
- function axisToCanvasCoords(pos) {
+ // axis to canvas for cartesian axes
+ function cartesianAxisToCanvasCoords(pos) {
// get canvas coords from the first pair of x/y found in pos
- var res = {}, i, axis, key;
+ var res = {},
+ i, axis, key;
for (i = 0; i < xaxes.length; ++i) {
axis = xaxes[i];
if (axis && axis.used) {
key = "x" + axis.n;
- if (pos[key] == null && axis.n == 1)
+ if (pos[key] == null && axis.n === 1) {
key = "x";
+ }
if (pos[key] != null) {
res.left = axis.p2c(pos[key]);
@@ -964,8 +613,9 @@
axis = yaxes[i];
if (axis && axis.used) {
key = "y" + axis.n;
- if (pos[key] == null && axis.n == 1)
+ if (pos[key] == null && axis.n === 1) {
key = "y";
+ }
if (pos[key] != null) {
res.top = axis.p2c(pos[key]);
@@ -978,19 +628,21 @@
}
function getOrCreateAxis(axes, number) {
- if (!axes[number - 1])
+ if (!axes[number - 1]) {
axes[number - 1] = {
n: number, // save the number for future reference
- direction: axes == xaxes ? "x" : "y",
- options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis)
+ direction: axes === xaxes ? "x" : "y",
+ options: $.extend(true, {}, axes === xaxes ? options.xaxis : options.yaxis)
};
+ }
return axes[number - 1];
}
function fillInSeriesOptions() {
-
- var neededColors = series.length, maxIndex = -1, i;
+ var neededColors = series.length,
+ maxIndex = -1,
+ i;
// Subtract the number of series that already have fixed colors or
// color indexes from the number that we still need to generate.
@@ -999,7 +651,7 @@
var sc = series[i].color;
if (sc != null) {
neededColors--;
- if (typeof sc == "number" && sc > maxIndex) {
+ if (typeof sc === "number" && sc > maxIndex) {
maxIndex = sc;
}
}
@@ -1015,12 +667,14 @@
// Generate all the colors, using first the option colors and then
// variations on those colors once they're exhausted.
- var c, colors = [], colorPool = options.colors,
- colorPoolSize = colorPool.length, variation = 0;
+ var c, colors = [],
+ colorPool = options.colors,
+ colorPoolSize = colorPool.length,
+ variation = 0,
+ definedColors = Math.max(0, series.length - neededColors);
for (i = 0; i < neededColors; i++) {
-
- c = $.color.parse(colorPool[i % colorPoolSize] || "#666");
+ c = $.color.parse(colorPool[(definedColors + i) % colorPoolSize] || "#666");
// Each time we exhaust the colors in the pool we adjust
// a scaling factor used to produce more variations on
@@ -1030,7 +684,7 @@
// Reset the variation after every few cycles, or else
// it will end up producing only white or black colors.
- if (i % colorPoolSize == 0 && i) {
+ if (i % colorPoolSize === 0 && i) {
if (variation >= 0) {
if (variation < 0.5) {
variation = -variation - 0.2;
@@ -1043,7 +697,8 @@
// Finalize the series options, filling in their colors
- var colori = 0, s;
+ var colori = 0,
+ s;
for (i = 0; i < series.length; ++i) {
s = series[i];
@@ -1051,20 +706,23 @@
if (s.color == null) {
s.color = colors[colori].toString();
++colori;
+ } else if (typeof s.color === "number") {
+ s.color = colors[s.color].toString();
}
- else if (typeof s.color == "number")
- s.color = colors[s.color].toString();
// turn on lines automatically in case nothing is set
if (s.lines.show == null) {
var v, show = true;
- for (v in s)
+ for (v in s) {
if (s[v] && s[v].show) {
show = false;
break;
}
- if (show)
+ }
+
+ if (show) {
s.lines.show = true;
+ }
}
// If nothing was provided for lines.zero, default it to match
@@ -1080,33 +738,58 @@
}
}
- function processData() {
+ function processData(prevSeries) {
var topSentry = Number.POSITIVE_INFINITY,
bottomSentry = Number.NEGATIVE_INFINITY,
- fakeInfinity = Number.MAX_VALUE,
- i, j, k, m, length,
- s, points, ps, x, y, axis, val, f, p,
+ i, j, k, m,
+ s, points, ps, val, f, p,
data, format;
function updateAxis(axis, min, max) {
- if (min < axis.datamin && min != -fakeInfinity)
+ if (min < axis.datamin && min !== -Infinity) {
axis.datamin = min;
- if (max > axis.datamax && max != fakeInfinity)
+ }
+
+ if (max > axis.datamax && max !== Infinity) {
axis.datamax = max;
+ }
}
- $.each(allAxes(), function (_, axis) {
+ function reusePoints(prevSeries, i) {
+ if (prevSeries && prevSeries[i] && prevSeries[i].datapoints && prevSeries[i].datapoints.points) {
+ return prevSeries[i].datapoints.points;
+ }
+
+ return [];
+ }
+
+ $.each(allAxes(), function(_, axis) {
// init axis
- axis.datamin = topSentry;
- axis.datamax = bottomSentry;
+ if (axis.options.growOnly !== true) {
+ axis.datamin = topSentry;
+ axis.datamax = bottomSentry;
+ } else {
+ if (axis.datamin === undefined) {
+ axis.datamin = topSentry;
+ }
+ if (axis.datamax === undefined) {
+ axis.datamax = bottomSentry;
+ }
+ }
axis.used = false;
});
for (i = 0; i < series.length; ++i) {
s = series[i];
- s.datapoints = { points: [] };
-
- executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
+ s.datapoints = {
+ points: []
+ };
+
+ if (s.datapoints.points.length === 0) {
+ s.datapoints.points = reusePoints(prevSeries, i);
+ }
+
+ executeHooks(hooks.processRawData, [s, s.data, s.datapoints]);
}
// first pass: clean and copy data
@@ -1119,31 +802,50 @@
if (!format) {
format = [];
// find out how to copy
- format.push({ x: true, number: true, required: true });
- format.push({ y: true, number: true, required: true });
-
- if (s.bars.show || (s.lines.show && s.lines.fill)) {
- var autoscale = !!((s.bars.show && s.bars.zero) || (s.lines.show && s.lines.zero));
- format.push({ y: true, number: true, required: false, defaultValue: 0, autoscale: autoscale });
- if (s.bars.horizontal) {
- delete format[format.length - 1].y;
- format[format.length - 1].x = true;
+ format.push({
+ x: true,
+ y: false,
+ number: true,
+ required: true,
+ computeRange: s.xaxis.options.autoScale !== 'none',
+ defaultValue: null
+ });
+
+ format.push({
+ x: false,
+ y: true,
+ number: true,
+ required: true,
+ computeRange: s.yaxis.options.autoScale !== 'none',
+ defaultValue: null
+ });
+
+ if (s.stack || s.bars.show || (s.lines.show && s.lines.fill)) {
+ var expectedPs = s.datapoints.pointsize != null ? s.datapoints.pointsize : (s.data && s.data[0] && s.data[0].length ? s.data[0].length : 3);
+ if (expectedPs > 2) {
+ format.push({
+ x: false,
+ y: true,
+ number: true,
+ required: false,
+ computeRange: s.yaxis.options.autoScale !== 'none',
+ defaultValue: 0
+ });
}
}
s.datapoints.format = format;
}
- if (s.datapoints.pointsize != null)
- continue; // already filled in
+ s.xaxis.used = s.yaxis.used = true;
+
+ if (s.datapoints.pointsize != null) continue; // already filled in
s.datapoints.pointsize = format.length;
-
ps = s.datapoints.pointsize;
points = s.datapoints.points;
var insertSteps = s.lines.show && s.lines.steps;
- s.xaxis.used = s.yaxis.used = true;
for (j = k = 0; j < data.length; ++j, k += ps) {
p = data[j];
@@ -1157,20 +859,15 @@
if (f) {
if (f.number && val != null) {
val = +val; // convert to number
- if (isNaN(val))
+ if (isNaN(val)) {
val = null;
- else if (val == Infinity)
- val = fakeInfinity;
- else if (val == -Infinity)
- val = -fakeInfinity;
+ }
}
if (val == null) {
- if (f.required)
- nullify = true;
-
- if (f.defaultValue != null)
- val = f.defaultValue;
+ if (f.required) nullify = true;
+
+ if (f.defaultValue != null) val = f.defaultValue;
}
}
@@ -1184,7 +881,7 @@
if (val != null) {
f = format[m];
// extract min/max info
- if (f.autoscale !== false) {
+ if (f.computeRange) {
if (f.x) {
updateAxis(s.xaxis, val, val);
}
@@ -1196,122 +893,62 @@
points[k + m] = null;
}
}
- else {
- // a little bit of line specific stuff that
- // perhaps shouldn't be here, but lacking
- // better means...
- if (insertSteps && k > 0
- && points[k - ps] != null
- && points[k - ps] != points[k]
- && points[k - ps + 1] != points[k + 1]) {
- // copy the point to make room for a middle point
- for (m = 0; m < ps; ++m)
- points[k + ps + m] = points[k + m];
-
- // middle point has same y
- points[k + 1] = points[k - ps + 1];
-
- // we've added a point, better reflect that
- k += ps;
- }
- }
}
+
+ points.length = k; //trims the internal buffer to the correct length
}
// give the hooks a chance to run
for (i = 0; i < series.length; ++i) {
s = series[i];
- executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
+ executeHooks(hooks.processDatapoints, [s, s.datapoints]);
}
// second pass: find datamax/datamin for auto-scaling
for (i = 0; i < series.length; ++i) {
s = series[i];
- points = s.datapoints.points;
- ps = s.datapoints.pointsize;
format = s.datapoints.format;
- var xmin = topSentry, ymin = topSentry,
- xmax = bottomSentry, ymax = bottomSentry;
-
- for (j = 0; j < points.length; j += ps) {
- if (points[j] == null)
- continue;
-
- for (m = 0; m < ps; ++m) {
- val = points[j + m];
- f = format[m];
- if (!f || f.autoscale === false || val == fakeInfinity || val == -fakeInfinity)
- continue;
-
- if (f.x) {
- if (val < xmin)
- xmin = val;
- if (val > xmax)
- xmax = val;
- }
- if (f.y) {
- if (val < ymin)
- ymin = val;
- if (val > ymax)
- ymax = val;
- }
- }
+ if (format.every(function (f) { return !f.computeRange; })) {
+ continue;
}
- if (s.bars.show) {
- // make sure we got room for the bar on the dancing floor
- var delta;
-
- switch (s.bars.align) {
- case "left":
- delta = 0;
- break;
- case "right":
- delta = -s.bars.barWidth;
- break;
- default:
- delta = -s.bars.barWidth / 2;
- }
-
- if (s.bars.horizontal) {
- ymin += delta;
- ymax += delta + s.bars.barWidth;
- }
- else {
- xmin += delta;
- xmax += delta + s.bars.barWidth;
- }
+ var range = plot.adjustSeriesDataRange(s,
+ plot.computeRangeForDataSeries(s));
+
+ executeHooks(hooks.adjustSeriesDataRange, [s, range]);
+
+ updateAxis(s.xaxis, range.xmin, range.xmax);
+ updateAxis(s.yaxis, range.ymin, range.ymax);
+ }
+
+ $.each(allAxes(), function(_, axis) {
+ if (axis.datamin === topSentry) {
+ axis.datamin = null;
}
- updateAxis(s.xaxis, xmin, xmax);
- updateAxis(s.yaxis, ymin, ymax);
- }
-
- $.each(allAxes(), function (_, axis) {
- if (axis.datamin == topSentry)
- axis.datamin = null;
- if (axis.datamax == bottomSentry)
+ if (axis.datamax === bottomSentry) {
axis.datamax = null;
+ }
});
}
function setupCanvases() {
-
// Make sure the placeholder is clear of everything except canvases
// from a previous plot in this container that we'll try to re-use.
placeholder.css("padding", 0) // padding messes up the positioning
- .children().filter(function(){
+ .children().filter(function() {
return !$(this).hasClass("flot-overlay") && !$(this).hasClass('flot-base');
}).remove();
- if (placeholder.css("position") == 'static')
+ if (placeholder.css("position") === 'static') {
placeholder.css("position", "relative"); // for positioning labels and overlay
-
- surface = new Canvas("flot-base", placeholder);
- overlay = new Canvas("flot-overlay", placeholder); // overlay canvas for interactive features
+ }
+
+ surface = new Canvas("flot-base", placeholder[0]);
+ overlay = new Canvas("flot-overlay", placeholder[0]); // overlay canvas for interactive features
ctx = surface.context;
octx = overlay.context;
@@ -1333,32 +970,27 @@
}
function bindEvents() {
- // bind events
- if (options.grid.hoverable) {
- eventHolder.mousemove(onMouseMove);
-
- // Use bind, rather than .mouseleave, because we officially
- // still support jQuery 1.2.6, which doesn't define a shortcut
- // for mouseenter or mouseleave. This was a bug/oversight that
- // was fixed somewhere around 1.3.x. We can return to using
- // .mouseleave when we drop support for 1.2.6.
-
- eventHolder.bind("mouseleave", onMouseLeave);
- }
-
- if (options.grid.clickable)
- eventHolder.click(onClick);
-
executeHooks(hooks.bindEvents, [eventHolder]);
}
+ function addEventHandler(event, handler, eventHolder, priority) {
+ var key = eventHolder + event;
+ var eventList = eventManager[key] || [];
+
+ eventList.push({"event": event, "handler": handler, "eventHolder": eventHolder, "priority": priority});
+ eventList.sort((a, b) => b.priority - a.priority );
+ eventList.forEach( eventData => {
+ eventData.eventHolder.unbind(eventData.event, eventData.handler);
+ eventData.eventHolder.bind(eventData.event, eventData.handler);
+ });
+
+ eventManager[key] = eventList;
+ }
+
function shutdown() {
- if (redrawTimeout)
+ if (redrawTimeout) {
clearTimeout(redrawTimeout);
-
- eventHolder.unbind("mousemove", onMouseMove);
- eventHolder.unbind("mouseleave", onMouseLeave);
- eventHolder.unbind("click", onClick);
+ }
executeHooks(hooks.shutdown, [eventHolder]);
}
@@ -1367,54 +999,92 @@
// set helper functions on the axis, assumes plot area
// has been computed already
- function identity(x) { return x; }
+ function identity(x) {
+ return x;
+ }
var s, m, t = axis.options.transform || identity,
it = axis.options.inverseTransform;
// precompute how much the axis is scaling a point
// in canvas space
- if (axis.direction == "x") {
- s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min));
+ if (axis.direction === "x") {
+ if (isFinite(t(axis.max) - t(axis.min))) {
+ s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min));
+ } else {
+ s = axis.scale = 1 / Math.abs($.plot.saturated.delta(t(axis.min), t(axis.max), plotWidth));
+ }
m = Math.min(t(axis.max), t(axis.min));
- }
- else {
- s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min));
+ } else {
+ if (isFinite(t(axis.max) - t(axis.min))) {
+ s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min));
+ } else {
+ s = axis.scale = 1 / Math.abs($.plot.saturated.delta(t(axis.min), t(axis.max), plotHeight));
+ }
s = -s;
m = Math.max(t(axis.max), t(axis.min));
}
// data point to canvas coordinate
- if (t == identity) // slight optimization
- axis.p2c = function (p) { return (p - m) * s; };
- else
- axis.p2c = function (p) { return (t(p) - m) * s; };
+ if (t === identity) {
+ // slight optimization
+ axis.p2c = function(p) {
+ if (isFinite(p - m)) {
+ return (p - m) * s;
+ } else {
+ return (p / 4 - m / 4) * s * 4;
+ }
+ };
+ } else {
+ axis.p2c = function(p) {
+ var tp = t(p);
+
+ if (isFinite(tp - m)) {
+ return (tp - m) * s;
+ } else {
+ return (tp / 4 - m / 4) * s * 4;
+ }
+ };
+ }
+
// canvas coordinate to data point
- if (!it)
- axis.c2p = function (c) { return m + c / s; };
- else
- axis.c2p = function (c) { return it(m + c / s); };
+ if (!it) {
+ axis.c2p = function(c) {
+ return m + c / s;
+ };
+ } else {
+ axis.c2p = function(c) {
+ return it(m + c / s);
+ };
+ }
}
function measureTickLabels(axis) {
-
var opts = axis.options,
- ticks = axis.ticks || [],
+ ticks = opts.showTickLabels !== 'none' && axis.ticks ? axis.ticks : [],
+ showMajorTickLabels = opts.showTickLabels === 'major' || opts.showTickLabels === 'all',
+ showEndpointsTickLabels = opts.showTickLabels === 'endpoints' || opts.showTickLabels === 'all',
labelWidth = opts.labelWidth || 0,
labelHeight = opts.labelHeight || 0,
- maxWidth = labelWidth || (axis.direction == "x" ? Math.floor(surface.width / (ticks.length || 1)) : null),
legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis",
layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles,
font = opts.font || "flot-tick-label tickLabel";
for (var i = 0; i < ticks.length; ++i) {
-
var t = ticks[i];
-
- if (!t.label)
+ var label = t.label;
+
+ if (!t.label ||
+ (showMajorTickLabels === false && i > 0 && i < ticks.length - 1) ||
+ (showEndpointsTickLabels === false && (i === 0 || i === ticks.length - 1))) {
continue;
-
- var info = surface.getTextInfo(layer, t.label, font, null, maxWidth);
+ }
+
+ if (typeof t.label === 'object') {
+ label = t.label.name;
+ }
+
+ var info = surface.getTextInfo(layer, label, font);
labelWidth = Math.max(labelWidth, info.width);
labelHeight = Math.max(labelHeight, info.height);
@@ -1431,16 +1101,21 @@
// dimension per axis, the other dimension depends on the
// other axes so will have to wait
+ // here reserve additional space
+ executeHooks(hooks.axisReserveSpace, [axis]);
+
var lw = axis.labelWidth,
lh = axis.labelHeight,
pos = axis.options.position,
isXAxis = axis.direction === "x",
tickLength = axis.options.tickLength,
+ showTicks = axis.options.showTicks,
+ showMinorTicks = axis.options.showMinorTicks,
+ gridLines = axis.options.gridLines,
axisMargin = options.grid.axisMargin,
padding = options.grid.labelMargin,
innermost = true,
outermost = true,
- first = true,
found = false;
// Determine the axis's position in its direction and on its side
@@ -1456,55 +1131,82 @@
innermost = false;
}
}
- if (!found) {
- first = false;
- }
}
});
// The outermost axis on each side has no margin
-
if (outermost) {
axisMargin = 0;
}
- // The ticks for the first axis in each direction stretch across
-
+ // Set the default tickLength if necessary
if (tickLength == null) {
- tickLength = first ? "full" : 5;
+ tickLength = TICK_LENGTH_CONSTANT;
+ }
+
+ // By default, major tick marks are visible
+ if (showTicks == null) {
+ showTicks = true;
+ }
+
+ // By default, minor tick marks are visible
+ if (showMinorTicks == null) {
+ showMinorTicks = true;
}
- if (!isNaN(+tickLength))
- padding += +tickLength;
+ // By default, grid lines are visible
+ if (gridLines == null) {
+ if (innermost) {
+ gridLines = true;
+ } else {
+ gridLines = false;
+ }
+ }
+
+ if (!isNaN(+tickLength)) {
+ padding += showTicks ? +tickLength : 0;
+ }
if (isXAxis) {
lh += padding;
- if (pos == "bottom") {
+ if (pos === "bottom") {
plotOffset.bottom += lh + axisMargin;
- axis.box = { top: surface.height - plotOffset.bottom, height: lh };
+ axis.box = {
+ top: surface.height - plotOffset.bottom,
+ height: lh
+ };
+ } else {
+ axis.box = {
+ top: plotOffset.top + axisMargin,
+ height: lh
+ };
+ plotOffset.top += lh + axisMargin;
}
- else {
- axis.box = { top: plotOffset.top + axisMargin, height: lh };
- plotOffset.top += lh + axisMargin;
+ } else {
+ lw += padding;
+
+ if (pos === "left") {
+ axis.box = {
+ left: plotOffset.left + axisMargin,
+ width: lw
+ };
+ plotOffset.left += lw + axisMargin;
+ } else {
+ plotOffset.right += lw + axisMargin;
+ axis.box = {
+ left: surface.width - plotOffset.right,
+ width: lw
+ };
}
}
- else {
- lw += padding;
-
- if (pos == "left") {
- axis.box = { left: plotOffset.left + axisMargin, width: lw };
- plotOffset.left += lw + axisMargin;
- }
- else {
- plotOffset.right += lw + axisMargin;
- axis.box = { left: surface.width - plotOffset.right, width: lw };
- }
- }
-
- // save for future reference
+
+ // save for future reference
axis.position = pos;
axis.tickLength = tickLength;
+ axis.showMinorTicks = showMinorTicks;
+ axis.showTicks = showTicks;
+ axis.gridLines = gridLines;
axis.box.padding = padding;
axis.innermost = innermost;
}
@@ -1512,11 +1214,10 @@
function allocateAxisBoxSecondPhase(axis) {
// now that all axis boxes have been placed in one
// dimension, we can set the remaining dimension coordinates
- if (axis.direction == "x") {
+ if (axis.direction === "x") {
axis.box.left = plotOffset.left - axis.labelWidth / 2;
axis.box.width = surface.width - plotOffset.left - plotOffset.right + axis.labelWidth;
- }
- else {
+ } else {
axis.box.top = plotOffset.top - axis.labelHeight / 2;
axis.box.height = surface.height - plotOffset.bottom - plotOffset.top + axis.labelHeight;
}
@@ -1527,28 +1228,30 @@
// inside the canvas and isn't clipped off
var minMargin = options.grid.minBorderMargin,
- axis, i;
+ i;
// check stuff from the plot (FIXME: this should just read
// a value from the series, otherwise it's impossible to
// customize)
if (minMargin == null) {
minMargin = 0;
- for (i = 0; i < series.length; ++i)
- minMargin = Math.max(minMargin, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
+ for (i = 0; i < series.length; ++i) {
+ minMargin = Math.max(minMargin, 2 * (series[i].points.radius + series[i].points.lineWidth / 2));
+ }
}
- var margins = {
- left: minMargin,
- right: minMargin,
- top: minMargin,
- bottom: minMargin
- };
+ var a, offset = {},
+ margins = {
+ left: minMargin,
+ right: minMargin,
+ top: minMargin,
+ bottom: minMargin
+ };
// check axis labels, note we don't check the actual
// labels but instead use the overall width/height to not
// jump as much around with replots
- $.each(allAxes(), function (_, axis) {
+ $.each(allAxes(), function(_, axis) {
if (axis.reserveSpace && axis.ticks && axis.ticks.length) {
if (axis.direction === "x") {
margins.left = Math.max(margins.left, axis.labelWidth / 2);
@@ -1560,53 +1263,87 @@
}
});
+ for (a in margins) {
+ offset[a] = margins[a] - plotOffset[a];
+ }
+ $.each(xaxes.concat(yaxes), function(_, axis) {
+ alignAxisWithGrid(axis, offset, function (offset) {
+ return offset > 0;
+ });
+ });
+
plotOffset.left = Math.ceil(Math.max(margins.left, plotOffset.left));
plotOffset.right = Math.ceil(Math.max(margins.right, plotOffset.right));
plotOffset.top = Math.ceil(Math.max(margins.top, plotOffset.top));
plotOffset.bottom = Math.ceil(Math.max(margins.bottom, plotOffset.bottom));
}
- function setupGrid() {
- var i, axes = allAxes(), showGrid = options.grid.show;
+ function alignAxisWithGrid(axis, offset, isValid) {
+ if (axis.direction === "x") {
+ if (axis.position === "bottom" && isValid(offset.bottom)) {
+ axis.box.top -= Math.ceil(offset.bottom);
+ }
+ if (axis.position === "top" && isValid(offset.top)) {
+ axis.box.top += Math.ceil(offset.top);
+ }
+ } else {
+ if (axis.position === "left" && isValid(offset.left)) {
+ axis.box.left += Math.ceil(offset.left);
+ }
+ if (axis.position === "right" && isValid(offset.right)) {
+ axis.box.left -= Math.ceil(offset.right);
+ }
+ }
+ }
+
+ function setupGrid(autoScale) {
+ var i, a, axes = allAxes(),
+ showGrid = options.grid.show;
// Initialize the plot's offset from the edge of the canvas
- for (var a in plotOffset) {
- var margin = options.grid.margin || 0;
- plotOffset[a] = typeof margin == "number" ? margin : margin[a] || 0;
+ for (a in plotOffset) {
+ plotOffset[a] = 0;
}
executeHooks(hooks.processOffset, [plotOffset]);
// If the grid is visible, add its border width to the offset
-
- for (var a in plotOffset) {
- if(typeof(options.grid.borderWidth) == "object") {
+ for (a in plotOffset) {
+ if (typeof (options.grid.borderWidth) === "object") {
plotOffset[a] += showGrid ? options.grid.borderWidth[a] : 0;
- }
- else {
+ } else {
plotOffset[a] += showGrid ? options.grid.borderWidth : 0;
}
}
- $.each(axes, function (_, axis) {
+ $.each(axes, function(_, axis) {
var axisOpts = axis.options;
axis.show = axisOpts.show == null ? axis.used : axisOpts.show;
axis.reserveSpace = axisOpts.reserveSpace == null ? axis.show : axisOpts.reserveSpace;
- setRange(axis);
+ setupTickFormatter(axis);
+ executeHooks(hooks.setRange, [axis, autoScale]);
+ setRange(axis, autoScale);
});
if (showGrid) {
-
- var allocatedAxes = $.grep(axes, function (axis) {
+ plotWidth = surface.width - plotOffset.left - plotOffset.right;
+ plotHeight = surface.height - plotOffset.bottom - plotOffset.top;
+
+ var allocatedAxes = $.grep(axes, function(axis) {
return axis.show || axis.reserveSpace;
});
- $.each(allocatedAxes, function (_, axis) {
+ $.each(allocatedAxes, function(_, axis) {
// make the ticks
setupTickGeneration(axis);
- setTicks(axis);
- snapRangeToTicks(axis, axis.ticks);
+ setMajorTicks(axis);
+ snapRangeToTicks(axis, axis.ticks, series);
+
+ //for computing the endpoints precision, transformationHelpers are needed
+ setTransformationHelpers(axis);
+ setEndpointTicks(axis, series);
+
// find labelWidth/Height for axis
measureTickLabels(axis);
});
@@ -1614,23 +1351,38 @@
// with all dimensions calculated, we can compute the
// axis bounding boxes, start from the outside
// (reverse order)
- for (i = allocatedAxes.length - 1; i >= 0; --i)
+ for (i = allocatedAxes.length - 1; i >= 0; --i) {
allocateAxisBoxFirstPhase(allocatedAxes[i]);
+ }
// make sure we've got enough space for things that
// might stick out
adjustLayoutForThingsStickingOut();
- $.each(allocatedAxes, function (_, axis) {
+ $.each(allocatedAxes, function(_, axis) {
allocateAxisBoxSecondPhase(axis);
});
}
+ //adjust axis and plotOffset according to grid.margins
+ if (options.grid.margin) {
+ for (a in plotOffset) {
+ var margin = options.grid.margin || 0;
+ plotOffset[a] += typeof margin === "number" ? margin : (margin[a] || 0);
+ }
+ $.each(xaxes.concat(yaxes), function(_, axis) {
+ alignAxisWithGrid(axis, options.grid.margin, function(offset) {
+ return offset !== undefined && offset !== null;
+ });
+ });
+ }
+
+ //after adjusting the axis, plot width and height will be modified
plotWidth = surface.width - plotOffset.left - plotOffset.right;
plotHeight = surface.height - plotOffset.bottom - plotOffset.top;
// now we got the proper plot dimensions, we can compute the scaling
- $.each(axes, function (_, axis) {
+ $.each(axes, function(_, axis) {
setTransformationHelpers(axis);
});
@@ -1638,69 +1390,154 @@
drawAxisLabels();
}
- insertLegend();
+ executeHooks(hooks.setupGrid, []);
}
- function setRange(axis) {
- var opts = axis.options,
- min = +(opts.min != null ? opts.min : axis.datamin),
- max = +(opts.max != null ? opts.max : axis.datamax),
- delta = max - min;
-
- if (delta == 0.0) {
+ function widenMinMax(minimum, maximum) {
+ var min = (minimum === undefined ? null : minimum);
+ var max = (maximum === undefined ? null : maximum);
+ var delta = max - min;
+ if (delta === 0.0) {
// degenerate case
- var widen = max == 0 ? 1 : 0.01;
-
- if (opts.min == null)
- min -= widen;
+ var widen = max === 0 ? 1 : 0.01;
+ var wmin = null;
+ if (min == null) {
+ wmin -= widen;
+ }
+
// always widen max if we couldn't widen min to ensure we
// don't fall into min == max which doesn't work
- if (opts.max == null || opts.min != null)
+ if (max == null || min != null) {
max += widen;
- }
- else {
- // consider autoscaling
- var margin = opts.autoscaleMargin;
- if (margin != null) {
- if (opts.min == null) {
- min -= delta * margin;
- // make sure we don't go below zero if all values
- // are positive
- if (min < 0 && axis.datamin != null && axis.datamin >= 0)
- min = 0;
- }
- if (opts.max == null) {
- max += delta * margin;
- if (max > 0 && axis.datamax != null && axis.datamax <= 0)
- max = 0;
- }
+ }
+
+ if (wmin != null) {
+ min = wmin;
}
}
- axis.min = min;
- axis.max = max;
+
+ return {
+ min: min,
+ max: max
+ };
}
- function setupTickGeneration(axis) {
- var opts = axis.options;
-
- // estimate number of ticks
- var noTicks;
- if (typeof opts.ticks == "number" && opts.ticks > 0)
- noTicks = opts.ticks;
- else
- // heuristic based on the model a*sqrt(x) fitted to
- // some data points that seemed reasonable
- noTicks = 0.3 * Math.sqrt(axis.direction == "x" ? surface.width : surface.height);
-
- var delta = (axis.max - axis.min) / noTicks,
- dec = -Math.floor(Math.log(delta) / Math.LN10),
- maxDec = opts.tickDecimals;
-
- if (maxDec != null && dec > maxDec) {
- dec = maxDec;
+ function autoScaleAxis(axis) {
+ var opts = axis.options,
+ min = opts.min,
+ max = opts.max,
+ datamin = axis.datamin,
+ datamax = axis.datamax,
+ delta;
+
+ switch (opts.autoScale) {
+ case "none":
+ min = +(opts.min != null ? opts.min : datamin);
+ max = +(opts.max != null ? opts.max : datamax);
+ break;
+ case "loose":
+ if (datamin != null && datamax != null) {
+ min = datamin;
+ max = datamax;
+ delta = $.plot.saturated.saturate(max - min);
+ var margin = ((typeof opts.autoScaleMargin === 'number') ? opts.autoScaleMargin : 0.02);
+ min = $.plot.saturated.saturate(min - delta * margin);
+ max = $.plot.saturated.saturate(max + delta * margin);
+
+ // make sure we don't go below zero if all values are positive
+ if (min < 0 && datamin >= 0) {
+ min = 0;
+ }
+ } else {
+ min = opts.min;
+ max = opts.max;
+ }
+ break;
+ case "exact":
+ min = (datamin != null ? datamin : opts.min);
+ max = (datamax != null ? datamax : opts.max);
+ break;
+ case "sliding-window":
+ if (datamax > max) {
+ // move the window to fit the new data,
+ // keeping the axis range constant
+ max = datamax;
+ min = Math.max(datamax - (opts.windowSize || 100), min);
+ }
+ break;
+ }
+
+ var widenedMinMax = widenMinMax(min, max);
+ min = widenedMinMax.min;
+ max = widenedMinMax.max;
+
+ // grow loose or grow exact supported
+ if (opts.growOnly === true && opts.autoScale !== "none" && opts.autoScale !== "sliding-window") {
+ min = (min < datamin) ? min : (datamin !== null ? datamin : min);
+ max = (max > datamax) ? max : (datamax !== null ? datamax : max);
}
- var magn = Math.pow(10, -dec),
+ axis.autoScaledMin = min;
+ axis.autoScaledMax = max;
+ }
+
+ function setRange(axis, autoScale) {
+ var min = typeof axis.options.min === 'number' ? axis.options.min : axis.min,
+ max = typeof axis.options.max === 'number' ? axis.options.max : axis.max,
+ plotOffset = axis.options.offset;
+
+ if (autoScale) {
+ autoScaleAxis(axis);
+ min = axis.autoScaledMin;
+ max = axis.autoScaledMax;
+ }
+
+ min = (min != null ? min : -1) + (plotOffset.below || 0);
+ max = (max != null ? max : 1) + (plotOffset.above || 0);
+
+ if (min > max) {
+ var tmp = min;
+ min = max;
+ max = tmp;
+ axis.options.offset = { above: 0, below: 0 };
+ }
+
+ axis.min = $.plot.saturated.saturate(min);
+ axis.max = $.plot.saturated.saturate(max);
+ }
+
+ function computeValuePrecision (min, max, direction, ticks, tickDecimals) {
+ var noTicks = fixupNumberOfTicks(direction, surface, ticks);
+
+ var delta = $.plot.saturated.delta(min, max, noTicks),
+ dec = -Math.floor(Math.log(delta) / Math.LN10);
+
+ //if it is called with tickDecimals, then the precision should not be greather then that
+ if (tickDecimals && dec > tickDecimals) {
+ dec = tickDecimals;
+ }
+
+ var magn = parseFloat('1e' + (-dec)),
+ norm = delta / magn;
+
+ if (norm > 2.25 && norm < 3 && (dec + 1) <= tickDecimals) {
+ //we need an extra decimals when tickSize is 2.5
+ ++dec;
+ }
+
+ return isFinite(dec) ? dec : 0;
+ };
+
+ function computeTickSize (min, max, noTicks, tickDecimals) {
+ var delta = $.plot.saturated.delta(min, max, noTicks),
+ dec = -Math.floor(Math.log(delta) / Math.LN10);
+
+ //if it is called with tickDecimals, then the precision should not be greather then that
+ if (tickDecimals && dec > tickDecimals) {
+ dec = tickDecimals;
+ }
+
+ var magn = parseFloat('1e' + (-dec)),
norm = delta / magn, // norm is between 1.0 and 10.0
size;
@@ -1708,10 +1545,8 @@
size = 1;
} else if (norm < 3) {
size = 2;
- // special case for 2.5, requires an extra decimal
- if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
+ if (norm > 2.25 && (tickDecimals == null || (dec + 1) <= tickDecimals)) {
size = 2.5;
- ++dec;
}
} else if (norm < 7.5) {
size = 5;
@@ -1720,82 +1555,97 @@
}
size *= magn;
-
- if (opts.minTickSize != null && size < opts.minTickSize) {
- size = opts.minTickSize;
+ return size;
+ }
+
+ function getAxisTickSize(min, max, direction, options, tickDecimals) {
+ var noTicks;
+
+ if (typeof options.ticks === "number" && options.ticks > 0) {
+ noTicks = options.ticks;
+ } else {
+ // heuristic based on the model a*sqrt(x) fitted to
+ // some data points that seemed reasonable
+ noTicks = 0.3 * Math.sqrt(direction === "x" ? surface.width : surface.height);
+ }
+
+ var size = computeTickSize(min, max, noTicks, tickDecimals);
+
+ if (options.minTickSize != null && size < options.minTickSize) {
+ size = options.minTickSize;
}
- axis.delta = delta;
- axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
- axis.tickSize = opts.tickSize || size;
-
- // Time mode was moved to a plug-in in 0.8, and since so many people use it
- // we'll add an especially friendly reminder to make sure they included it.
-
- if (opts.mode == "time" && !axis.tickGenerator) {
- throw new Error("Time mode requires the flot.time plugin.");
+ return options.tickSize || size;
+ };
+
+ function fixupNumberOfTicks(direction, surface, ticksOption) {
+ var noTicks;
+
+ if (typeof ticksOption === "number" && ticksOption > 0) {
+ noTicks = ticksOption;
+ } else {
+ noTicks = 0.3 * Math.sqrt(direction === "x" ? surface.width : surface.height);
}
+ return noTicks;
+ }
+
+ function setupTickFormatter(axis) {
+ var opts = axis.options;
+ if (!axis.tickFormatter) {
+ if (typeof opts.tickFormatter === 'function') {
+ axis.tickFormatter = function() {
+ var args = Array.prototype.slice.call(arguments);
+ return "" + opts.tickFormatter.apply(null, args);
+ };
+ } else {
+ axis.tickFormatter = defaultTickFormatter;
+ }
+ }
+ }
+
+ function setupTickGeneration(axis) {
+ var opts = axis.options;
+ var noTicks;
+
+ noTicks = fixupNumberOfTicks(axis.direction, surface, opts.ticks);
+
+ axis.delta = $.plot.saturated.delta(axis.min, axis.max, noTicks);
+ var precision = plot.computeValuePrecision(axis.min, axis.max, axis.direction, noTicks, opts.tickDecimals);
+
+ axis.tickDecimals = Math.max(0, opts.tickDecimals != null ? opts.tickDecimals : precision);
+ axis.tickSize = getAxisTickSize(axis.min, axis.max, axis.direction, opts, opts.tickDecimals);
+
// Flot supports base-10 axes; any other mode else is handled by a plug-in,
// like flot.time.js.
if (!axis.tickGenerator) {
-
- axis.tickGenerator = function (axis) {
-
- var ticks = [],
- start = floorInBase(axis.min, axis.tickSize),
- i = 0,
- v = Number.NaN,
- prev;
-
- do {
- prev = v;
- v = start + i * axis.tickSize;
- ticks.push(v);
- ++i;
- } while (v < axis.max && v != prev);
- return ticks;
- };
-
- axis.tickFormatter = function (value, axis) {
-
- var factor = axis.tickDecimals ? Math.pow(10, axis.tickDecimals) : 1;
- var formatted = "" + Math.round(value * factor) / factor;
-
- // If tickDecimals was specified, ensure that we have exactly that
- // much precision; otherwise default to the value's own precision.
-
- if (axis.tickDecimals != null) {
- var decimal = formatted.indexOf(".");
- var precision = decimal == -1 ? 0 : formatted.length - decimal - 1;
- if (precision < axis.tickDecimals) {
- return (precision ? formatted : formatted + ".") + ("" + factor).substr(1, axis.tickDecimals - precision);
- }
- }
-
- return formatted;
- };
+ if (typeof opts.tickGenerator === 'function') {
+ axis.tickGenerator = opts.tickGenerator;
+ } else {
+ axis.tickGenerator = defaultTickGenerator;
+ }
}
- if ($.isFunction(opts.tickFormatter))
- axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); };
-
if (opts.alignTicksWithAxis != null) {
- var otherAxis = (axis.direction == "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1];
- if (otherAxis && otherAxis.used && otherAxis != axis) {
+ var otherAxis = (axis.direction === "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1];
+ if (otherAxis && otherAxis.used && otherAxis !== axis) {
// consider snapping min/max to outermost nice ticks
- var niceTicks = axis.tickGenerator(axis);
+ var niceTicks = axis.tickGenerator(axis, plot);
if (niceTicks.length > 0) {
- if (opts.min == null)
+ if (opts.min == null) {
axis.min = Math.min(axis.min, niceTicks[0]);
- if (opts.max == null && niceTicks.length > 1)
+ }
+
+ if (opts.max == null && niceTicks.length > 1) {
axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]);
+ }
}
- axis.tickGenerator = function (axis) {
+ axis.tickGenerator = function(axis) {
// copy ticks, scaled to this axis
- var ticks = [], v, i;
+ var ticks = [],
+ v, i;
for (i = 0; i < otherAxis.ticks.length; ++i) {
v = (otherAxis.ticks[i].v - otherAxis.min) / (otherAxis.max - otherAxis.min);
v = axis.min + v * (axis.max - axis.min);
@@ -1808,28 +1658,31 @@
// ticks don't necessarily fit naturally
if (!axis.mode && opts.tickDecimals == null) {
var extraDec = Math.max(0, -Math.floor(Math.log(axis.delta) / Math.LN10) + 1),
- ts = axis.tickGenerator(axis);
+ ts = axis.tickGenerator(axis, plot);
// only proceed if the tick interval rounded
// with an extra decimal doesn't give us a
// zero at end
- if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec))))
+ if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec)))) {
axis.tickDecimals = extraDec;
+ }
}
}
}
}
- function setTicks(axis) {
- var oticks = axis.options.ticks, ticks = [];
- if (oticks == null || (typeof oticks == "number" && oticks > 0))
- ticks = axis.tickGenerator(axis);
- else if (oticks) {
- if ($.isFunction(oticks))
- // generate the ticks
+ function setMajorTicks(axis) {
+ var oticks = axis.options.ticks,
+ ticks = [];
+ if (oticks == null || (typeof oticks === "number" && oticks > 0)) {
+ ticks = axis.tickGenerator(axis, plot);
+ } else if (oticks) {
+ if ($.isFunction(oticks)) {
+ // generate the ticks
ticks = oticks(axis);
- else
+ } else {
ticks = oticks;
+ }
}
// clean up/labelify the supplied ticks, copy them over
@@ -1838,48 +1691,105 @@
for (i = 0; i < ticks.length; ++i) {
var label = null;
var t = ticks[i];
- if (typeof t == "object") {
+ if (typeof t === "object") {
v = +t[0];
- if (t.length > 1)
+ if (t.length > 1) {
label = t[1];
+ }
+ } else {
+ v = +t;
}
- else
- v = +t;
- if (label == null)
- label = axis.tickFormatter(v, axis);
- if (!isNaN(v))
- axis.ticks.push({ v: v, label: label });
+
+ if (!isNaN(v)) {
+ axis.ticks.push(
+ newTick(v, label, axis, 'major'));
+ }
}
}
- function snapRangeToTicks(axis, ticks) {
- if (axis.options.autoscaleMargin && ticks.length > 0) {
+ function newTick(v, label, axis, type) {
+ if (label === null) {
+ switch (type) {
+ case 'min':
+ case 'max':
+ //improving the precision of endpoints
+ var precision = getEndpointPrecision(v, axis);
+ label = isFinite(precision) ? axis.tickFormatter(v, axis, precision, plot) : axis.tickFormatter(v, axis, precision, plot);
+ break;
+ case 'major':
+ label = axis.tickFormatter(v, axis, undefined, plot);
+ }
+ }
+ return {
+ v: v,
+ label: label
+ };
+ }
+
+ function snapRangeToTicks(axis, ticks, series) {
+ var anyDataInSeries = function(series) {
+ return series.some(e => e.datapoints.points.length > 0);
+ }
+
+ if (axis.options.autoScale === "loose" && ticks.length > 0 && anyDataInSeries(series)) {
// snap to ticks
- if (axis.options.min == null)
- axis.min = Math.min(axis.min, ticks[0].v);
- if (axis.options.max == null && ticks.length > 1)
- axis.max = Math.max(axis.max, ticks[ticks.length - 1].v);
+ axis.min = Math.min(axis.min, ticks[0].v);
+ axis.max = Math.max(axis.max, ticks[ticks.length - 1].v);
+ }
+ }
+
+ function getEndpointPrecision(value, axis) {
+ var canvas1 = Math.floor(axis.p2c(value)),
+ canvas2 = axis.direction === "x" ? canvas1 + 1 : canvas1 - 1,
+ point1 = axis.c2p(canvas1),
+ point2 = axis.c2p(canvas2),
+ precision = computeValuePrecision(point1, point2, axis.direction, 1);
+
+ return precision;
+ }
+
+ function setEndpointTicks(axis, series) {
+ if (isValidEndpointTick(axis, series)) {
+ axis.ticks.unshift(newTick(axis.min, null, axis, 'min'));
+ axis.ticks.push(newTick(axis.max, null, axis, 'max'));
+ }
+ }
+
+ function isValidEndpointTick(axis, series) {
+ if (axis.options.showTickLabels === 'endpoints') {
+ return true;
+ }
+ if (axis.options.showTickLabels === 'all') {
+ var associatedSeries = series.filter(function(s) {
+ return s.xaxis === axis;
+ }),
+ notAllBarSeries = associatedSeries.some(function(s) {
+ return !s.bars.show;
+ });
+ return associatedSeries.length === 0 || notAllBarSeries;
+ }
+ if (axis.options.showTickLabels === 'major' || axis.options.showTickLabels === 'none') {
+ return false;
}
}
function draw() {
-
surface.clear();
-
executeHooks(hooks.drawBackground, [ctx]);
var grid = options.grid;
// draw background, if any
- if (grid.show && grid.backgroundColor)
+ if (grid.show && grid.backgroundColor) {
drawBackground();
+ }
if (grid.show && !grid.aboveData) {
drawGrid();
}
for (var i = 0; i < series.length; ++i) {
- executeHooks(hooks.drawSeries, [ctx, series[i]]);
+ executeHooks(hooks.drawSeries, [ctx, series[i], i, getColorOrGradient]);
drawSeries(series[i]);
}
@@ -1893,7 +1803,6 @@
// A draw implies that either the axes or data have changed, so we
// should probably update the overlay highlights as well.
-
triggerRedrawOverlay();
}
@@ -1902,10 +1811,13 @@
for (var i = 0; i < axes.length; ++i) {
axis = axes[i];
- if (axis.direction == coord) {
+ if (axis.direction === coord) {
key = coord + axis.n + "axis";
- if (!ranges[key] && axis.n == 1)
- key = coord + "axis"; // support x1axis as xaxis
+ if (!ranges[key] && axis.n === 1) {
+ // support x1axis as xaxis
+ key = coord + "axis";
+ }
+
if (ranges[key]) {
from = ranges[key].from;
to = ranges[key].to;
@@ -1916,7 +1828,7 @@
// backwards-compat stuff - to be removed in future
if (!ranges[key]) {
- axis = coord == "x" ? xaxes[0] : yaxes[0];
+ axis = coord === "x" ? xaxes[0] : yaxes[0];
from = ranges[coord + "1"];
to = ranges[coord + "2"];
}
@@ -1928,7 +1840,11 @@
to = tmp;
}
- return { from: from, to: to, axis: axis };
+ return {
+ from: from,
+ to: to,
+ axis: axis
+ };
}
function drawBackground() {
@@ -1940,14 +1856,11 @@
ctx.restore();
}
- function drawGrid() {
- var i, axes, bw, bc;
-
- ctx.save();
- ctx.translate(plotOffset.left, plotOffset.top);
-
+ function drawMarkings() {
// draw markings
- var markings = options.grid.markings;
+ var markings = options.grid.markings,
+ axes;
+
if (markings) {
if ($.isFunction(markings)) {
axes = plot.getAxes();
@@ -1961,25 +1874,34 @@
markings = markings(axes);
}
+ var i;
for (i = 0; i < markings.length; ++i) {
var m = markings[i],
xrange = extractRange(m, "x"),
yrange = extractRange(m, "y");
// fill in missing
- if (xrange.from == null)
+ if (xrange.from == null) {
xrange.from = xrange.axis.min;
- if (xrange.to == null)
+ }
+
+ if (xrange.to == null) {
xrange.to = xrange.axis.max;
- if (yrange.from == null)
+ }
+
+ if (yrange.from == null) {
yrange.from = yrange.axis.min;
- if (yrange.to == null)
+ }
+
+ if (yrange.to == null) {
yrange.to = yrange.axis.max;
+ }
// clip
if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max ||
- yrange.to < yrange.axis.min || yrange.from > yrange.axis.max)
+ yrange.to < yrange.axis.min || yrange.from > yrange.axis.max) {
continue;
+ }
xrange.from = Math.max(xrange.from, xrange.axis.min);
xrange.to = Math.min(xrange.to, xrange.axis.max);
@@ -2010,183 +1932,369 @@
ctx.lineTo(xrange.to + subPixel, yrange.to);
} else {
ctx.moveTo(xrange.from, yrange.to + subPixel);
- ctx.lineTo(xrange.to, yrange.to + subPixel);
+ ctx.lineTo(xrange.to, yrange.to + subPixel);
}
ctx.stroke();
} else {
ctx.fillStyle = m.color || options.grid.markingsColor;
ctx.fillRect(xrange.from, yrange.to,
- xrange.to - xrange.from,
- yrange.from - yrange.to);
+ xrange.to - xrange.from,
+ yrange.from - yrange.to);
}
}
}
-
- // draw the ticks
- axes = allAxes();
- bw = options.grid.borderWidth;
-
- for (var j = 0; j < axes.length; ++j) {
- var axis = axes[j], box = axis.box,
- t = axis.tickLength, x, y, xoff, yoff;
- if (!axis.show || axis.ticks.length == 0)
- continue;
-
- ctx.lineWidth = 1;
-
- // find the edges
- if (axis.direction == "x") {
- x = 0;
- if (t == "full")
- y = (axis.position == "top" ? 0 : plotHeight);
- else
- y = box.top - plotOffset.top + (axis.position == "top" ? box.height : 0);
+ }
+
+ function findEdges(axis) {
+ var box = axis.box,
+ x = 0,
+ y = 0;
+
+ // find the edges
+ if (axis.direction === "x") {
+ x = 0;
+ y = box.top - plotOffset.top + (axis.position === "top" ? box.height : 0);
+ } else {
+ y = 0;
+ x = box.left - plotOffset.left + (axis.position === "left" ? box.width : 0) + axis.boxPosition.centerX;
+ }
+
+ return {
+ x: x,
+ y: y
+ };
+ };
+
+ function alignPosition(lineWidth, pos) {
+ return ((lineWidth % 2) !== 0) ? Math.floor(pos) + 0.5 : pos;
+ };
+
+ function drawTickBar(axis) {
+ ctx.lineWidth = 1;
+ var edges = findEdges(axis),
+ x = edges.x,
+ y = edges.y;
+
+ // draw tick bar
+ if (axis.show) {
+ var xoff = 0,
+ yoff = 0;
+
+ ctx.strokeStyle = axis.options.color;
+ ctx.beginPath();
+ if (axis.direction === "x") {
+ xoff = plotWidth + 1;
+ } else {
+ yoff = plotHeight + 1;
}
- else {
- y = 0;
- if (t == "full")
- x = (axis.position == "left" ? 0 : plotWidth);
- else
- x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0);
+
+ if (axis.direction === "x") {
+ y = alignPosition(ctx.lineWidth, y);
+ } else {
+ x = alignPosition(ctx.lineWidth, x);
}
- // draw tick bar
- if (!axis.innermost) {
- ctx.strokeStyle = axis.options.color;
- ctx.beginPath();
- xoff = yoff = 0;
- if (axis.direction == "x")
- xoff = plotWidth + 1;
- else
- yoff = plotHeight + 1;
-
- if (ctx.lineWidth == 1) {
- if (axis.direction == "x") {
- y = Math.floor(y) + 0.5;
- } else {
- x = Math.floor(x) + 0.5;
+ ctx.moveTo(x, y);
+ ctx.lineTo(x + xoff, y + yoff);
+ ctx.stroke();
+ }
+ };
+
+ function drawTickMarks(axis) {
+ var t = axis.tickLength,
+ minorTicks = axis.showMinorTicks,
+ minorTicksNr = MINOR_TICKS_COUNT_CONSTANT,
+ edges = findEdges(axis),
+ x = edges.x,
+ y = edges.y,
+ i = 0;
+
+ // draw major tick marks
+ ctx.strokeStyle = axis.options.color;
+ ctx.beginPath();
+
+ for (i = 0; i < axis.ticks.length; ++i) {
+ var v = axis.ticks[i].v,
+ xoff = 0,
+ yoff = 0,
+ xminor = 0,
+ yminor = 0,
+ j;
+
+ if (!isNaN(v) && v >= axis.min && v <= axis.max) {
+ if (axis.direction === "x") {
+ x = axis.p2c(v);
+ yoff = t;
+
+ if (axis.position === "top") {
+ yoff = -yoff;
+ }
+ } else {
+ y = axis.p2c(v);
+ xoff = t;
+
+ if (axis.position === "left") {
+ xoff = -xoff;
}
}
- ctx.moveTo(x, y);
- ctx.lineTo(x + xoff, y + yoff);
- ctx.stroke();
- }
-
- // draw ticks
-
- ctx.strokeStyle = axis.options.tickColor;
-
- ctx.beginPath();
- for (i = 0; i < axis.ticks.length; ++i) {
- var v = axis.ticks[i].v;
-
- xoff = yoff = 0;
-
- if (isNaN(v) || v < axis.min || v > axis.max
- // skip those lying on the axes if we got a border
- || (t == "full"
- && ((typeof bw == "object" && bw[axis.position] > 0) || bw > 0)
- && (v == axis.min || v == axis.max)))
- continue;
-
- if (axis.direction == "x") {
- x = axis.p2c(v);
- yoff = t == "full" ? -plotHeight : t;
-
- if (axis.position == "top")
- yoff = -yoff;
- }
- else {
- y = axis.p2c(v);
- xoff = t == "full" ? -plotWidth : t;
-
- if (axis.position == "left")
- xoff = -xoff;
- }
-
- if (ctx.lineWidth == 1) {
- if (axis.direction == "x")
- x = Math.floor(x) + 0.5;
- else
- y = Math.floor(y) + 0.5;
+ if (axis.direction === "x") {
+ x = alignPosition(ctx.lineWidth, x);
+ } else {
+ y = alignPosition(ctx.lineWidth, y);
}
ctx.moveTo(x, y);
ctx.lineTo(x + xoff, y + yoff);
}
- ctx.stroke();
+ //draw minor tick marks
+ if (minorTicks === true && i < axis.ticks.length - 1) {
+ var v1 = axis.ticks[i].v,
+ v2 = axis.ticks[i + 1].v,
+ step = (v2 - v1) / (minorTicksNr + 1);
+
+ for (j = 1; j <= minorTicksNr; j++) {
+ // compute minor tick position
+ if (axis.direction === "x") {
+ yminor = t / 2; // minor ticks are half length
+ x = alignPosition(ctx.lineWidth, axis.p2c(v1 + j * step))
+
+ if (axis.position === "top") {
+ yminor = -yminor;
+ }
+
+ // don't go over the plot borders
+ if ((x < 0) || (x > plotWidth)) {
+ continue;
+ }
+ } else {
+ xminor = t / 2; // minor ticks are half length
+ y = alignPosition(ctx.lineWidth, axis.p2c(v1 + j * step));
+
+ if (axis.position === "left") {
+ xminor = -xminor;
+ }
+
+ // don't go over the plot borders
+ if ((y < 0) || (y > plotHeight)) {
+ continue;
+ }
+ }
+
+ ctx.moveTo(x, y);
+ ctx.lineTo(x + xminor, y + yminor);
+ }
+ }
+ }
+
+ ctx.stroke();
+ };
+
+ function drawGridLines(axis) {
+ // check if the line will be overlapped with a border
+ var overlappedWithBorder = function (value) {
+ var bw = options.grid.borderWidth;
+ return (((typeof bw === "object" && bw[axis.position] > 0) || bw > 0) && (value === axis.min || value === axis.max));
+ };
+
+ ctx.strokeStyle = options.grid.tickColor;
+ ctx.beginPath();
+ var i;
+ for (i = 0; i < axis.ticks.length; ++i) {
+ var v = axis.ticks[i].v,
+ xoff = 0,
+ yoff = 0,
+ x = 0,
+ y = 0;
+
+ if (isNaN(v) || v < axis.min || v > axis.max) continue;
+
+ // skip those lying on the axes if we got a border
+ if (overlappedWithBorder(v)) continue;
+
+ if (axis.direction === "x") {
+ x = axis.p2c(v);
+ y = plotHeight;
+ yoff = -plotHeight;
+ } else {
+ x = 0;
+ y = axis.p2c(v);
+ xoff = plotWidth;
+ }
+
+ if (axis.direction === "x") {
+ x = alignPosition(ctx.lineWidth, x);
+ } else {
+ y = alignPosition(ctx.lineWidth, y);
+ }
+
+ ctx.moveTo(x, y);
+ ctx.lineTo(x + xoff, y + yoff);
}
+ ctx.stroke();
+ };
+
+ function drawBorder() {
+ // If either borderWidth or borderColor is an object, then draw the border
+ // line by line instead of as one rectangle
+ var bw = options.grid.borderWidth,
+ bc = options.grid.borderColor;
+
+ if (typeof bw === "object" || typeof bc === "object") {
+ if (typeof bw !== "object") {
+ bw = {
+ top: bw,
+ right: bw,
+ bottom: bw,
+ left: bw
+ };
+ }
+ if (typeof bc !== "object") {
+ bc = {
+ top: bc,
+ right: bc,
+ bottom: bc,
+ left: bc
+ };
+ }
+
+ if (bw.top > 0) {
+ ctx.strokeStyle = bc.top;
+ ctx.lineWidth = bw.top;
+ ctx.beginPath();
+ ctx.moveTo(0 - bw.left, 0 - bw.top / 2);
+ ctx.lineTo(plotWidth, 0 - bw.top / 2);
+ ctx.stroke();
+ }
+
+ if (bw.right > 0) {
+ ctx.strokeStyle = bc.right;
+ ctx.lineWidth = bw.right;
+ ctx.beginPath();
+ ctx.moveTo(plotWidth + bw.right / 2, 0 - bw.top);
+ ctx.lineTo(plotWidth + bw.right / 2, plotHeight);
+ ctx.stroke();
+ }
+
+ if (bw.bottom > 0) {
+ ctx.strokeStyle = bc.bottom;
+ ctx.lineWidth = bw.bottom;
+ ctx.beginPath();
+ ctx.moveTo(plotWidth + bw.right, plotHeight + bw.bottom / 2);
+ ctx.lineTo(0, plotHeight + bw.bottom / 2);
+ ctx.stroke();
+ }
+
+ if (bw.left > 0) {
+ ctx.strokeStyle = bc.left;
+ ctx.lineWidth = bw.left;
+ ctx.beginPath();
+ ctx.moveTo(0 - bw.left / 2, plotHeight + bw.bottom);
+ ctx.lineTo(0 - bw.left / 2, 0);
+ ctx.stroke();
+ }
+ } else {
+ ctx.lineWidth = bw;
+ ctx.strokeStyle = options.grid.borderColor;
+ ctx.strokeRect(-bw / 2, -bw / 2, plotWidth + bw, plotHeight + bw);
+ }
+ };
+
+ function drawGrid() {
+ var axes, bw;
+
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+
+ drawMarkings();
+
+ axes = allAxes();
+ bw = options.grid.borderWidth;
+
+ for (var j = 0; j < axes.length; ++j) {
+ var axis = axes[j];
+
+ if (!axis.show) {
+ continue;
+ }
+
+ drawTickBar(axis);
+ if (axis.showTicks === true) {
+ drawTickMarks(axis);
+ }
+
+ if (axis.gridLines === true) {
+ drawGridLines(axis, bw);
+ }
+ }
// draw border
if (bw) {
- // If either borderWidth or borderColor is an object, then draw the border
- // line by line instead of as one rectangle
- bc = options.grid.borderColor;
- if(typeof bw == "object" || typeof bc == "object") {
- if (typeof bw !== "object") {
- bw = {top: bw, right: bw, bottom: bw, left: bw};
- }
- if (typeof bc !== "object") {
- bc = {top: bc, right: bc, bottom: bc, left: bc};
- }
-
- if (bw.top > 0) {
- ctx.strokeStyle = bc.top;
- ctx.lineWidth = bw.top;
- ctx.beginPath();
- ctx.moveTo(0 - bw.left, 0 - bw.top/2);
- ctx.lineTo(plotWidth, 0 - bw.top/2);
- ctx.stroke();
- }
-
- if (bw.right > 0) {
- ctx.strokeStyle = bc.right;
- ctx.lineWidth = bw.right;
- ctx.beginPath();
- ctx.moveTo(plotWidth + bw.right / 2, 0 - bw.top);
- ctx.lineTo(plotWidth + bw.right / 2, plotHeight);
- ctx.stroke();
- }
-
- if (bw.bottom > 0) {
- ctx.strokeStyle = bc.bottom;
- ctx.lineWidth = bw.bottom;
- ctx.beginPath();
- ctx.moveTo(plotWidth + bw.right, plotHeight + bw.bottom / 2);
- ctx.lineTo(0, plotHeight + bw.bottom / 2);
- ctx.stroke();
- }
-
- if (bw.left > 0) {
- ctx.strokeStyle = bc.left;
- ctx.lineWidth = bw.left;
- ctx.beginPath();
- ctx.moveTo(0 - bw.left/2, plotHeight + bw.bottom);
- ctx.lineTo(0- bw.left/2, 0);
- ctx.stroke();
- }
- }
- else {
- ctx.lineWidth = bw;
- ctx.strokeStyle = options.grid.borderColor;
- ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw);
- }
+ drawBorder();
}
ctx.restore();
}
function drawAxisLabels() {
-
- $.each(allAxes(), function (_, axis) {
+ $.each(allAxes(), function(_, axis) {
var box = axis.box,
legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis",
layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles,
font = axis.options.font || "flot-tick-label tickLabel",
- tick, x, y, halign, valign;
+ i, x, y, halign, valign, info,
+ margin = 3,
+ nullBox = {x: NaN, y: NaN, width: NaN, height: NaN}, newLabelBox, labelBoxes = [],
+ overlapping = function(x11, y11, x12, y12, x21, y21, x22, y22) {
+ return ((x11 <= x21 && x21 <= x12) || (x21 <= x11 && x11 <= x22)) &&
+ ((y11 <= y21 && y21 <= y12) || (y21 <= y11 && y11 <= y22));
+ },
+ overlapsOtherLabels = function(newLabelBox, previousLabelBoxes) {
+ return previousLabelBoxes.some(function(labelBox) {
+ return overlapping(
+ newLabelBox.x, newLabelBox.y, newLabelBox.x + newLabelBox.width, newLabelBox.y + newLabelBox.height,
+ labelBox.x, labelBox.y, labelBox.x + labelBox.width, labelBox.y + labelBox.height);
+ });
+ },
+ drawAxisLabel = function (tick, labelBoxes) {
+ if (!tick || !tick.label || tick.v < axis.min || tick.v > axis.max) {
+ return nullBox;
+ }
+
+ info = surface.getTextInfo(layer, tick.label, font);
+
+ if (axis.direction === "x") {
+ halign = "center";
+ x = plotOffset.left + axis.p2c(tick.v);
+ if (axis.position === "bottom") {
+ y = box.top + box.padding - axis.boxPosition.centerY;
+ } else {
+ y = box.top + box.height - box.padding + axis.boxPosition.centerY;
+ valign = "bottom";
+ }
+ newLabelBox = {x: x - info.width / 2 - margin, y: y - margin, width: info.width + 2 * margin, height: info.height + 2 * margin};
+ } else {
+ valign = "middle";
+ y = plotOffset.top + axis.p2c(tick.v);
+ if (axis.position === "left") {
+ x = box.left + box.width - box.padding - axis.boxPosition.centerX;
+ halign = "right";
+ } else {
+ x = box.left + box.padding + axis.boxPosition.centerX;
+ }
+ newLabelBox = {x: x - info.width / 2 - margin, y: y - margin, width: info.width + 2 * margin, height: info.height + 2 * margin};
+ }
+
+ if (overlapsOtherLabels(newLabelBox, labelBoxes)) {
+ return nullBox;
+ }
+
+ surface.addText(layer, x, y, tick.label, font, null, null, halign, valign);
+
+ return newLabelBox;
+ };
// Remove text before checking for axis.show and ticks.length;
// otherwise plugins, like flot-tickrotor, that draw their own
@@ -2194,928 +2302,439 @@
surface.removeText(layer);
- if (!axis.show || axis.ticks.length == 0)
+ executeHooks(hooks.drawAxis, [axis, surface]);
+
+ if (!axis.show) {
return;
-
- for (var i = 0; i < axis.ticks.length; ++i) {
-
- tick = axis.ticks[i];
- if (!tick.label || tick.v < axis.min || tick.v > axis.max)
- continue;
-
- if (axis.direction == "x") {
- halign = "center";
- x = plotOffset.left + axis.p2c(tick.v);
- if (axis.position == "bottom") {
- y = box.top + box.padding;
- } else {
- y = box.top + box.height - box.padding;
- valign = "bottom";
+ }
+
+ switch (axis.options.showTickLabels) {
+ case 'none':
+ break;
+ case 'endpoints':
+ labelBoxes.push(drawAxisLabel(axis.ticks[0], labelBoxes));
+ labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
+ break;
+ case 'major':
+ labelBoxes.push(drawAxisLabel(axis.ticks[0], labelBoxes));
+ labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
+ for (i = 1; i < axis.ticks.length - 1; ++i) {
+ labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
}
- } else {
- valign = "middle";
- y = plotOffset.top + axis.p2c(tick.v);
- if (axis.position == "left") {
- x = box.left + box.width - box.padding;
- halign = "right";
- } else {
- x = box.left + box.padding;
+ break;
+ case 'all':
+ labelBoxes.push(drawAxisLabel(axis.ticks[0], []));
+ labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
+ for (i = 1; i < axis.ticks.length - 1; ++i) {
+ labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
}
- }
-
- surface.addText(layer, x, y, tick.label, font, null, null, halign, valign);
+ break;
}
});
}
function drawSeries(series) {
- if (series.lines.show)
- drawSeriesLines(series);
- if (series.bars.show)
- drawSeriesBars(series);
- if (series.points.show)
- drawSeriesPoints(series);
+ if (series.lines.show) {
+ $.plot.drawSeries.drawSeriesLines(series, ctx, plotOffset, plotWidth, plotHeight, plot.drawSymbol, getColorOrGradient);
+ }
+
+ if (series.bars.show) {
+ $.plot.drawSeries.drawSeriesBars(series, ctx, plotOffset, plotWidth, plotHeight, plot.drawSymbol, getColorOrGradient);
+ }
+
+ if (series.points.show) {
+ $.plot.drawSeries.drawSeriesPoints(series, ctx, plotOffset, plotWidth, plotHeight, plot.drawSymbol, getColorOrGradient);
+ }
}
- function drawSeriesLines(series) {
- function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
- var points = datapoints.points,
- ps = datapoints.pointsize,
- prevx = null, prevy = null;
-
- ctx.beginPath();
- for (var i = ps; i < points.length; i += ps) {
- var x1 = points[i - ps], y1 = points[i - ps + 1],
- x2 = points[i], y2 = points[i + 1];
-
- if (x1 == null || x2 == null)
+ function computeRangeForDataSeries(series, force, isValid) {
+ var points = series.datapoints.points,
+ ps = series.datapoints.pointsize,
+ format = series.datapoints.format,
+ topSentry = Number.POSITIVE_INFINITY,
+ bottomSentry = Number.NEGATIVE_INFINITY,
+ range = {
+ xmin: topSentry,
+ ymin: topSentry,
+ xmax: bottomSentry,
+ ymax: bottomSentry
+ };
+
+ for (var j = 0; j < points.length; j += ps) {
+ if (points[j] === null) {
+ continue;
+ }
+
+ if (typeof (isValid) === 'function' && !isValid(points[j])) {
+ continue;
+ }
+
+ for (var m = 0; m < ps; ++m) {
+ var val = points[j + m],
+ f = format[m];
+ if (f === null || f === undefined) {
continue;
-
- // clip with ymin
- if (y1 <= y2 && y1 < axisy.min) {
- if (y2 < axisy.min)
- continue; // line segment is outside
- // compute new intersection point
- x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
- y1 = axisy.min;
- }
- else if (y2 <= y1 && y2 < axisy.min) {
- if (y1 < axisy.min)
- continue;
- x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
- y2 = axisy.min;
- }
-
- // clip with ymax
- if (y1 >= y2 && y1 > axisy.max) {
- if (y2 > axisy.max)
- continue;
- x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
- y1 = axisy.max;
- }
- else if (y2 >= y1 && y2 > axisy.max) {
- if (y1 > axisy.max)
- continue;
- x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
- y2 = axisy.max;
- }
-
- // clip with xmin
- if (x1 <= x2 && x1 < axisx.min) {
- if (x2 < axisx.min)
- continue;
- y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
- x1 = axisx.min;
}
- else if (x2 <= x1 && x2 < axisx.min) {
- if (x1 < axisx.min)
- continue;
- y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
- x2 = axisx.min;
+
+ if (typeof (isValid) === 'function' && !isValid(val)) {
+ continue;
}
- // clip with xmax
- if (x1 >= x2 && x1 > axisx.max) {
- if (x2 > axisx.max)
- continue;
- y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
- x1 = axisx.max;
- }
- else if (x2 >= x1 && x2 > axisx.max) {
- if (x1 > axisx.max)
- continue;
- y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
- x2 = axisx.max;
+ if ((!force && !f.computeRange) || val === Infinity || val === -Infinity) {
+ continue;
}
- if (x1 != prevx || y1 != prevy)
- ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
-
- prevx = x2;
- prevy = y2;
- ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
- }
- ctx.stroke();
- }
-
- function plotLineArea(datapoints, axisx, axisy) {
- var points = datapoints.points,
- ps = datapoints.pointsize,
- bottom = Math.min(Math.max(0, axisy.min), axisy.max),
- i = 0, top, areaOpen = false,
- ypos = 1, segmentStart = 0, segmentEnd = 0;
-
- // we process each segment in two turns, first forward
- // direction to sketch out top, then once we hit the
- // end we go backwards to sketch the bottom
- while (true) {
- if (ps > 0 && i > points.length + ps)
- break;
-
- i += ps; // ps is negative if going backwards
-
- var x1 = points[i - ps],
- y1 = points[i - ps + ypos],
- x2 = points[i], y2 = points[i + ypos];
-
- if (areaOpen) {
- if (ps > 0 && x1 != null && x2 == null) {
- // at turning point
- segmentEnd = i;
- ps = -ps;
- ypos = 2;
- continue;
+ if (f.x === true) {
+ if (val < range.xmin) {
+ range.xmin = val;
}
- if (ps < 0 && i == segmentStart + ps) {
- // done with the reverse sweep
- ctx.fill();
- areaOpen = false;
- ps = -ps;
- ypos = 1;
- i = segmentStart = segmentEnd + ps;
- continue;
+ if (val > range.xmax) {
+ range.xmax = val;
}
}
- if (x1 == null || x2 == null)
- continue;
-
- // clip x values
-
- // clip with xmin
- if (x1 <= x2 && x1 < axisx.min) {
- if (x2 < axisx.min)
- continue;
- y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
- x1 = axisx.min;
- }
- else if (x2 <= x1 && x2 < axisx.min) {
- if (x1 < axisx.min)
- continue;
- y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
- x2 = axisx.min;
- }
-
- // clip with xmax
- if (x1 >= x2 && x1 > axisx.max) {
- if (x2 > axisx.max)
- continue;
- y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
- x1 = axisx.max;
- }
- else if (x2 >= x1 && x2 > axisx.max) {
- if (x1 > axisx.max)
- continue;
- y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
- x2 = axisx.max;
- }
-
- if (!areaOpen) {
- // open area
- ctx.beginPath();
- ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
- areaOpen = true;
- }
-
- // now first check the case where both is outside
- if (y1 >= axisy.max && y2 >= axisy.max) {
- ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
- ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max));
- continue;
- }
- else if (y1 <= axisy.min && y2 <= axisy.min) {
- ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min));
- ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
- continue;
- }
-
- // else it's a bit more complicated, there might
- // be a flat maxed out rectangle first, then a
- // triangular cutout or reverse; to find these
- // keep track of the current x values
- var x1old = x1, x2old = x2;
-
- // clip the y values, without shortcutting, we
- // go through all cases in turn
-
- // clip with ymin
- if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
- x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
- y1 = axisy.min;
- }
- else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
- x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
- y2 = axisy.min;
- }
-
- // clip with ymax
- if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
- x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
- y1 = axisy.max;
- }
- else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
- x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
- y2 = axisy.max;
- }
-
- // if the x value was changed we got a rectangle
- // to fill
- if (x1 != x1old) {
- ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1));
- // it goes to (x1, y1), but we fill that below
- }
-
- // fill triangular section, this sometimes result
- // in redundant points if (x1, y1) hasn't changed
- // from previous line to, but we just ignore that
- ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
- ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
-
- // fill the other rectangle if it's there
- if (x2 != x2old) {
- ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
- ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2));
+ if (f.y === true) {
+ if (val < range.ymin) {
+ range.ymin = val;
+ }
+
+ if (val > range.ymax) {
+ range.ymax = val;
+ }
}
}
}
- ctx.save();
- ctx.translate(plotOffset.left, plotOffset.top);
- ctx.lineJoin = "round";
-
- var lw = series.lines.lineWidth,
- sw = series.shadowSize;
- // FIXME: consider another form of shadow when filling is turned on
- if (lw > 0 && sw > 0) {
- // draw shadow as a thick and thin line with transparency
- ctx.lineWidth = sw;
- ctx.strokeStyle = "rgba(0,0,0,0.1)";
- // position shadow at angle from the mid of line
- var angle = Math.PI/18;
- plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis);
- ctx.lineWidth = sw/2;
- plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis);
- }
-
- ctx.lineWidth = lw;
- ctx.strokeStyle = series.color;
- var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight);
- if (fillStyle) {
- ctx.fillStyle = fillStyle;
- plotLineArea(series.datapoints, series.xaxis, series.yaxis);
+ return range;
+ };
+
+ function adjustSeriesDataRange(series, range) {
+ if (series.bars.show) {
+ // make sure we got room for the bar on the dancing floor
+ var delta;
+
+ // update bar width if needed
+ var useAbsoluteBarWidth = series.bars.barWidth[1];
+ if (series.datapoints && series.datapoints.points && !useAbsoluteBarWidth) {
+ computeBarWidth(series);
+ }
+
+ var barWidth = series.bars.barWidth[0] || series.bars.barWidth;
+ switch (series.bars.align) {
+ case "left":
+ delta = 0;
+ break;
+ case "right":
+ delta = -barWidth;
+ break;
+ default:
+ delta = -barWidth / 2;
+ }
+
+ if (series.bars.horizontal) {
+ range.ymin += delta;
+ range.ymax += delta + barWidth;
+ }
+ else {
+ range.xmin += delta;
+ range.xmax += delta + barWidth;
+ }
}
- if (lw > 0)
- plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis);
- ctx.restore();
- }
-
- function drawSeriesPoints(series) {
- function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) {
- var points = datapoints.points, ps = datapoints.pointsize;
-
- for (var i = 0; i < points.length; i += ps) {
- var x = points[i], y = points[i + 1];
- if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
- continue;
-
- ctx.beginPath();
- x = axisx.p2c(x);
- y = axisy.p2c(y) + offset;
- if (symbol == "circle")
- ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false);
- else
- symbol(ctx, x, y, radius, shadow);
- ctx.closePath();
-
- if (fillStyle) {
- ctx.fillStyle = fillStyle;
- ctx.fill();
- }
- ctx.stroke();
+ if ((series.bars.show && series.bars.zero) || (series.lines.show && series.lines.zero)) {
+ var ps = series.datapoints.pointsize;
+
+ // make sure the 0 point is included in the computed y range when requested
+ if (ps <= 2) {
+ /*if ps > 0 the points were already taken into account for autoScale */
+ range.ymin = Math.min(0, range.ymin);
+ range.ymax = Math.max(0, range.ymax);
+ }
+ }
+
+ return range;
+ };
+
+ function computeBarWidth(series) {
+ var xValues = [];
+ var pointsize = series.datapoints.pointsize, minDistance = Number.MAX_VALUE;
+
+ if (series.datapoints.points.length <= pointsize) {
+ minDistance = 1;
+ }
+
+ var start = series.bars.horizontal ? 1 : 0;
+ for (var j = start; j < series.datapoints.points.length; j += pointsize) {
+ if (isFinite(series.datapoints.points[j]) && series.datapoints.points[j] !== null) {
+ xValues.push(series.datapoints.points[j]);
+ }
+ }
+
+ function onlyUnique(value, index, self) {
+ return self.indexOf(value) === index;
+ }
+
+ xValues = xValues.filter( onlyUnique );
+ xValues.sort(function(a, b){return a - b});
+
+ for (var j = 1; j < xValues.length; j++) {
+ var distance = Math.abs(xValues[j] - xValues[j - 1]);
+ if (distance < minDistance && isFinite(distance)) {
+ minDistance = distance;
}
}
- ctx.save();
- ctx.translate(plotOffset.left, plotOffset.top);
-
- var lw = series.points.lineWidth,
- sw = series.shadowSize,
- radius = series.points.radius,
- symbol = series.points.symbol;
-
- // If the user sets the line width to 0, we change it to a very
- // small value. A line width of 0 seems to force the default of 1.
- // Doing the conditional here allows the shadow setting to still be
- // optional even with a lineWidth of 0.
-
- if( lw == 0 )
- lw = 0.0001;
-
- if (lw > 0 && sw > 0) {
- // draw shadow in two steps
- var w = sw / 2;
- ctx.lineWidth = w;
- ctx.strokeStyle = "rgba(0,0,0,0.1)";
- plotPoints(series.datapoints, radius, null, w + w/2, true,
- series.xaxis, series.yaxis, symbol);
-
- ctx.strokeStyle = "rgba(0,0,0,0.2)";
- plotPoints(series.datapoints, radius, null, w/2, true,
- series.xaxis, series.yaxis, symbol);
+ if (typeof series.bars.barWidth === "number") {
+ series.bars.barWidth = series.bars.barWidth * minDistance;
+ } else {
+ series.bars.barWidth[0] = series.bars.barWidth[0] * minDistance;
}
-
- ctx.lineWidth = lw;
- ctx.strokeStyle = series.color;
- plotPoints(series.datapoints, radius,
- getFillStyle(series.points, series.color), 0, false,
- series.xaxis, series.yaxis, symbol);
- ctx.restore();
}
- function drawBar(x, y, b, barLeft, barRight, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) {
- var left, right, bottom, top,
- drawLeft, drawRight, drawTop, drawBottom,
- tmp;
-
- // in horizontal mode, we start the bar from the left
- // instead of from the bottom so it appears to be
- // horizontal rather than vertical
- if (horizontal) {
- drawBottom = drawRight = drawTop = true;
- drawLeft = false;
- left = b;
- right = x;
- top = y + barLeft;
- bottom = y + barRight;
-
- // account for negative bars
- if (right < left) {
- tmp = right;
- right = left;
- left = tmp;
- drawLeft = true;
- drawRight = false;
+ // returns the data item the mouse is over/ the cursor is closest to, or null if none is found
+ function findNearbyItem(mouseX, mouseY, seriesFilter, radius, computeDistance) {
+ var i, j,
+ item = null,
+ smallestDistance = radius * radius + 1;
+
+ for (var i = series.length - 1; i >= 0; --i) {
+ if (!seriesFilter(i)) continue;
+
+ var s = series[i];
+ if (!s.datapoints) return;
+
+ if (s.lines.show || s.points.show) {
+ var found = findNearbyPoint(s, mouseX, mouseY, radius, smallestDistance, computeDistance);
+ if (found) {
+ smallestDistance = found.distance;
+ item = [i, found.dataIndex];
+ }
}
- }
- else {
- drawLeft = drawRight = drawTop = true;
- drawBottom = false;
- left = x + barLeft;
- right = x + barRight;
- bottom = b;
- top = y;
-
- // account for negative bars
- if (top < bottom) {
- tmp = top;
- top = bottom;
- bottom = tmp;
- drawBottom = true;
- drawTop = false;
+
+ if (s.bars.show && !item) { // no other point can be nearby
+ var foundIndex = findNearbyBar(s, mouseX, mouseY);
+ if (foundIndex >= 0) item = [i, foundIndex];
}
}
- // clip
- if (right < axisx.min || left > axisx.max ||
- top < axisy.min || bottom > axisy.max)
- return;
-
- if (left < axisx.min) {
- left = axisx.min;
- drawLeft = false;
- }
-
- if (right > axisx.max) {
- right = axisx.max;
- drawRight = false;
+ if (item) {
+ i = item[0];
+ j = item[1];
+ var ps = series[i].datapoints.pointsize;
+
+ return {
+ datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
+ dataIndex: j,
+ series: series[i],
+ seriesIndex: i
+ };
}
- if (bottom < axisy.min) {
- bottom = axisy.min;
- drawBottom = false;
- }
-
- if (top > axisy.max) {
- top = axisy.max;
- drawTop = false;
- }
-
- left = axisx.p2c(left);
- bottom = axisy.p2c(bottom);
- right = axisx.p2c(right);
- top = axisy.p2c(top);
-
- // fill the bar
- if (fillStyleCallback) {
- c.fillStyle = fillStyleCallback(bottom, top);
- c.fillRect(left, top, right - left, bottom - top)
+ return null;
+ }
+
+ function findNearbyPoint (series, mouseX, mouseY, maxDistance, smallestDistance, computeDistance) {
+ var mx = series.xaxis.c2p(mouseX),
+ my = series.yaxis.c2p(mouseY),
+ maxx = maxDistance / series.xaxis.scale,
+ maxy = maxDistance / series.yaxis.scale,
+ points = series.datapoints.points,
+ ps = series.datapoints.pointsize;
+
+ // with inverse transforms, we can't use the maxx/maxy
+ // optimization, sadly
+ if (series.xaxis.options.inverseTransform) {
+ maxx = Number.MAX_VALUE;
}
- // draw outline
- if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) {
- c.beginPath();
-
- // FIXME: inline moveTo is buggy with excanvas
- c.moveTo(left, bottom);
- if (drawLeft)
- c.lineTo(left, top);
- else
- c.moveTo(left, top);
- if (drawTop)
- c.lineTo(right, top);
- else
- c.moveTo(right, top);
- if (drawRight)
- c.lineTo(right, bottom);
- else
- c.moveTo(right, bottom);
- if (drawBottom)
- c.lineTo(left, bottom);
- else
- c.moveTo(left, bottom);
- c.stroke();
+ if (series.yaxis.options.inverseTransform) {
+ maxy = Number.MAX_VALUE;
}
- }
-
- function drawSeriesBars(series) {
- function plotBars(datapoints, barLeft, barRight, fillStyleCallback, axisx, axisy) {
- var points = datapoints.points, ps = datapoints.pointsize;
-
- for (var i = 0; i < points.length; i += ps) {
- if (points[i] == null)
- continue;
- drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth);
+
+ var found = null;
+ for (var j = 0; j < points.length; j += ps) {
+ var x = points[j];
+ var y = points[j + 1];
+ if (x == null) {
+ continue;
+ }
+
+ if (x - mx > maxx || x - mx < -maxx ||
+ y - my > maxy || y - my < -maxy) {
+ continue;
+ }
+
+ // We have to calculate distances in pixels, not in
+ // data units, because the scales of the axes may be different
+ var dx = Math.abs(series.xaxis.p2c(x) - mouseX);
+ var dy = Math.abs(series.yaxis.p2c(y) - mouseY);
+ var dist = computeDistance ? computeDistance(dx, dy) : dx * dx + dy * dy;
+
+ // use <= to ensure last point takes precedence
+ // (last generally means on top of)
+ if (dist < smallestDistance) {
+ smallestDistance = dist;
+ found = { dataIndex: j / ps, distance: dist };
}
}
- ctx.save();
- ctx.translate(plotOffset.left, plotOffset.top);
-
- // FIXME: figure out a way to add shadows (for instance along the right edge)
- ctx.lineWidth = series.bars.lineWidth;
- ctx.strokeStyle = series.color;
-
- var barLeft;
+ return found;
+ }
+
+ function findNearbyBar (series, mouseX, mouseY) {
+ var barLeft, barRight,
+ barWidth = series.bars.barWidth[0] || series.bars.barWidth,
+ mx = series.xaxis.c2p(mouseX),
+ my = series.yaxis.c2p(mouseY),
+ points = series.datapoints.points,
+ ps = series.datapoints.pointsize;
switch (series.bars.align) {
case "left":
barLeft = 0;
break;
case "right":
- barLeft = -series.bars.barWidth;
+ barLeft = -barWidth;
break;
default:
- barLeft = -series.bars.barWidth / 2;
+ barLeft = -barWidth / 2;
}
- var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null;
- plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, fillStyleCallback, series.xaxis, series.yaxis);
- ctx.restore();
- }
-
- function getFillStyle(filloptions, seriesColor, bottom, top) {
- var fill = filloptions.fill;
- if (!fill)
- return null;
-
- if (filloptions.fillColor)
- return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor);
-
- var c = $.color.parse(seriesColor);
- c.a = typeof fill == "number" ? fill : 0.4;
- c.normalize();
- return c.toString();
+ barRight = barLeft + barWidth;
+
+ var fillTowards = series.bars.fillTowards || 0;
+ var bottom = fillTowards > series.yaxis.min ? Math.min(series.yaxis.max, fillTowards) : series.yaxis.min;
+
+ var foundIndex = -1;
+ for (var j = 0; j < points.length; j += ps) {
+ var x = points[j], y = points[j + 1];
+ if (x == null)
+ continue;
+
+ // for a bar graph, the cursor must be inside the bar
+ if (series.bars.horizontal ?
+ (mx <= Math.max(bottom, x) && mx >= Math.min(bottom, x) &&
+ my >= y + barLeft && my <= y + barRight) :
+ (mx >= x + barLeft && mx <= x + barRight &&
+ my >= Math.min(bottom, y) && my <= Math.max(bottom, y)))
+ foundIndex = j / ps;
+ }
+
+ return foundIndex;
}
- function insertLegend() {
-
- if (options.legend.container != null) {
- $(options.legend.container).html("");
- } else {
- placeholder.find(".legend").remove();
- }
-
- if (!options.legend.show) {
- return;
- }
-
- var fragments = [], entries = [], rowStarted = false,
- lf = options.legend.labelFormatter, s, label;
-
- // Build a list of legend entries, with each having a label and a color
-
- for (var i = 0; i < series.length; ++i) {
- s = series[i];
- if (s.label) {
- label = lf ? lf(s.label, s) : s.label;
- if (label) {
- entries.push({
- label: label,
- color: s.color
- });
+ function findNearbyInterpolationPoint(posX, posY, seriesFilter) {
+ var i, j, dist, dx, dy, ps,
+ item,
+ smallestDistance = Number.MAX_VALUE;
+
+ for (i = 0; i < series.length; ++i) {
+ if (!seriesFilter(i)) {
+ continue;
+ }
+ var points = series[i].datapoints.points;
+ ps = series[i].datapoints.pointsize;
+
+ // if the data is coming from positive -> negative, reverse the comparison
+ const comparer = points[points.length - ps] < points[0]
+ ? function (x1, x2) { return x1 > x2 }
+ : function (x1, x2) { return x2 > x1 };
+
+ // do not interpolate outside the bounds of the data.
+ if (comparer(posX, points[0])) {
+ continue;
+ }
+
+ // Find the nearest points, x-wise
+ for (j = ps; j < points.length; j += ps) {
+ if (comparer(posX, points[j])) {
+ break;
}
}
- }
-
- // Sort the legend using either the default or a custom comparator
-
- if (options.legend.sorted) {
- if ($.isFunction(options.legend.sorted)) {
- entries.sort(options.legend.sorted);
- } else if (options.legend.sorted == "reverse") {
- entries.reverse();
- } else {
- var ascending = options.legend.sorted != "descending";
- entries.sort(function(a, b) {
- return a.label == b.label ? 0 : (
- (a.label < b.label) != ascending ? 1 : -1 // Logical XOR
- );
- });
- }
- }
-
- // Generate markup for the list of entries, in their final order
-
- for (var i = 0; i < entries.length; ++i) {
-
- var entry = entries[i];
-
- if (i % options.legend.noColumns == 0) {
- if (rowStarted)
- fragments.push('</tr>');
- fragments.push('<tr>');
- rowStarted = true;
- }
-
- fragments.push(
- '<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + entry.color + ';overflow:hidden"></div></div></td>' +
- '<td class="legendLabel">' + entry.label + '</td>'
- );
- }
-
- if (rowStarted)
- fragments.push('</tr>');
-
- if (fragments.length == 0)
- return;
-
- var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + '</table>';
- if (options.legend.container != null)
- $(options.legend.container).html(table);
- else {
- var pos = "",
- p = options.legend.position,
- m = options.legend.margin;
- if (m[0] == null)
- m = [m, m];
- if (p.charAt(0) == "n")
- pos += 'top:' + (m[1] + plotOffset.top) + 'px;';
- else if (p.charAt(0) == "s")
- pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;';
- if (p.charAt(1) == "e")
- pos += 'right:' + (m[0] + plotOffset.right) + 'px;';
- else if (p.charAt(1) == "w")
- pos += 'left:' + (m[0] + plotOffset.left) + 'px;';
- var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder);
- if (options.legend.backgroundOpacity != 0.0) {
- // put in the transparent background
- // separately to avoid blended labels and
- // label boxes
- var c = options.legend.backgroundColor;
- if (c == null) {
- c = options.grid.backgroundColor;
- if (c && typeof c == "string")
- c = $.color.parse(c);
- else
- c = $.color.extract(legend, 'background-color');
- c.a = 1;
- c = c.toString();
- }
- var div = legend.children();
- $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
+
+ // Now Interpolate
+ var y,
+ p1x = points[j - ps],
+ p1y = points[j - ps + 1],
+ p2x = points[j],
+ p2y = points[j + 1];
+
+ if ((p1x === undefined) || (p2x === undefined) ||
+ (p1y === undefined) || (p2y === undefined)) {
+ continue;
}
- }
- }
-
-
- // interactive features
-
- var highlights = [],
- redrawTimeout = null;
-
- // returns the data item the mouse is over, or null if none is found
- function findNearbyItem(mouseX, mouseY, seriesFilter) {
- var maxDistance = options.grid.mouseActiveRadius,
- smallestDistance = maxDistance * maxDistance + 1,
- item = null, foundPoint = false, i, j, ps;
-
- for (i = series.length - 1; i >= 0; --i) {
- if (!seriesFilter(series[i]))
- continue;
-
- var s = series[i],
- axisx = s.xaxis,
- axisy = s.yaxis,
- points = s.datapoints.points,
- mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster
- my = axisy.c2p(mouseY),
- maxx = maxDistance / axisx.scale,
- maxy = maxDistance / axisy.scale;
-
- ps = s.datapoints.pointsize;
- // with inverse transforms, we can't use the maxx/maxy
- // optimization, sadly
- if (axisx.options.inverseTransform)
- maxx = Number.MAX_VALUE;
- if (axisy.options.inverseTransform)
- maxy = Number.MAX_VALUE;
-
- if (s.lines.show || s.points.show) {
- for (j = 0; j < points.length; j += ps) {
- var x = points[j], y = points[j + 1];
- if (x == null)
- continue;
-
- // For points and lines, the cursor must be within a
- // certain distance to the data point
- if (x - mx > maxx || x - mx < -maxx ||
- y - my > maxy || y - my < -maxy)
- continue;
-
- // We have to calculate distances in pixels, not in
- // data units, because the scales of the axes may be different
- var dx = Math.abs(axisx.p2c(x) - mouseX),
- dy = Math.abs(axisy.p2c(y) - mouseY),
- dist = dx * dx + dy * dy; // we save the sqrt
-
- // use <= to ensure last point takes precedence
- // (last generally means on top of)
- if (dist < smallestDistance) {
- smallestDistance = dist;
- item = [i, j / ps];
- }
- }
+
+ if (p1x === p2x) {
+ y = p2y
+ } else {
+ y = p1y + (p2y - p1y) * (posX - p1x) / (p2x - p1x);
}
- if (s.bars.show && !item) { // no other point can be nearby
-
- var barLeft, barRight;
-
- switch (s.bars.align) {
- case "left":
- barLeft = 0;
- break;
- case "right":
- barLeft = -s.bars.barWidth;
- break;
- default:
- barLeft = -s.bars.barWidth / 2;
- }
-
- barRight = barLeft + s.bars.barWidth;
-
- for (j = 0; j < points.length; j += ps) {
- var x = points[j], y = points[j + 1], b = points[j + 2];
- if (x == null)
- continue;
-
- // for a bar graph, the cursor must be inside the bar
- if (series[i].bars.horizontal ?
- (mx <= Math.max(b, x) && mx >= Math.min(b, x) &&
- my >= y + barLeft && my <= y + barRight) :
- (mx >= x + barLeft && mx <= x + barRight &&
- my >= Math.min(b, y) && my <= Math.max(b, y)))
- item = [i, j / ps];
- }
+ posY = y;
+
+ dx = Math.abs(series[i].xaxis.p2c(p2x) - posX);
+ dy = Math.abs(series[i].yaxis.p2c(p2y) - posY);
+ dist = dx * dx + dy * dy;
+
+ if (dist < smallestDistance) {
+ smallestDistance = dist;
+ item = [posX, posY, i, j];
}
}
if (item) {
- i = item[0];
- j = item[1];
+ i = item[2];
+ j = item[3];
ps = series[i].datapoints.pointsize;
-
- return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
- dataIndex: j,
- series: series[i],
- seriesIndex: i };
+ points = series[i].datapoints.points;
+ p1x = points[j - ps];
+ p1y = points[j - ps + 1];
+ p2x = points[j];
+ p2y = points[j + 1];
+
+ return {
+ datapoint: [item[0], item[1]],
+ leftPoint: [p1x, p1y],
+ rightPoint: [p2x, p2y],
+ seriesIndex: i
+ };
}
return null;
}
- function onMouseMove(e) {
- if (options.grid.hoverable)
- triggerClickHoverEvent("plothover", e,
- function (s) { return s["hoverable"] != false; });
- }
-
- function onMouseLeave(e) {
- if (options.grid.hoverable)
- triggerClickHoverEvent("plothover", e,
- function (s) { return false; });
- }
-
- function onClick(e) {
- triggerClickHoverEvent("plotclick", e,
- function (s) { return s["clickable"] != false; });
- }
-
- // trigger click or hover event (they send the same parameters
- // so we share their code)
- function triggerClickHoverEvent(eventname, event, seriesFilter) {
- var offset = eventHolder.offset(),
- canvasX = event.pageX - offset.left - plotOffset.left,
- canvasY = event.pageY - offset.top - plotOffset.top,
- pos = canvasToAxisCoords({ left: canvasX, top: canvasY });
-
- pos.pageX = event.pageX;
- pos.pageY = event.pageY;
-
- var item = findNearbyItem(canvasX, canvasY, seriesFilter);
-
- if (item) {
- // fill in mouse pos for any listeners out there
- item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left, 10);
- item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top, 10);
- }
-
- if (options.grid.autoHighlight) {
- // clear auto-highlights
- for (var i = 0; i < highlights.length; ++i) {
- var h = highlights[i];
- if (h.auto == eventname &&
- !(item && h.series == item.series &&
- h.point[0] == item.datapoint[0] &&
- h.point[1] == item.datapoint[1]))
- unhighlight(h.series, h.point);
- }
-
- if (item)
- highlight(item.series, item.datapoint, eventname);
- }
-
- placeholder.trigger(eventname, [ pos, item ]);
- }
-
function triggerRedrawOverlay() {
var t = options.interaction.redrawOverlayInterval;
- if (t == -1) { // skip event queue
+ if (t === -1) { // skip event queue
drawOverlay();
return;
}
- if (!redrawTimeout)
- redrawTimeout = setTimeout(drawOverlay, t);
- }
-
- function drawOverlay() {
- redrawTimeout = null;
-
- // draw highlights
- octx.save();
- overlay.clear();
- octx.translate(plotOffset.left, plotOffset.top);
-
- var i, hi;
- for (i = 0; i < highlights.length; ++i) {
- hi = highlights[i];
-
- if (hi.series.bars.show)
- drawBarHighlight(hi.series, hi.point);
- else
- drawPointHighlight(hi.series, hi.point);
+ if (!redrawTimeout) {
+ redrawTimeout = setTimeout(function() {
+ drawOverlay(plot);
+ }, t);
}
- octx.restore();
-
- executeHooks(hooks.drawOverlay, [octx]);
}
- function highlight(s, point, auto) {
- if (typeof s == "number")
- s = series[s];
-
- if (typeof point == "number") {
- var ps = s.datapoints.pointsize;
- point = s.datapoints.points.slice(ps * point, ps * (point + 1));
- }
-
- var i = indexOfHighlight(s, point);
- if (i == -1) {
- highlights.push({ series: s, point: point, auto: auto });
-
- triggerRedrawOverlay();
- }
- else if (!auto)
- highlights[i].auto = false;
- }
-
- function unhighlight(s, point) {
- if (s == null && point == null) {
- highlights = [];
- triggerRedrawOverlay();
+ function drawOverlay(plot) {
+ redrawTimeout = null;
+
+ if (!octx) {
return;
}
-
- if (typeof s == "number")
- s = series[s];
-
- if (typeof point == "number") {
- var ps = s.datapoints.pointsize;
- point = s.datapoints.points.slice(ps * point, ps * (point + 1));
- }
-
- var i = indexOfHighlight(s, point);
- if (i != -1) {
- highlights.splice(i, 1);
-
- triggerRedrawOverlay();
- }
- }
-
- function indexOfHighlight(s, p) {
- for (var i = 0; i < highlights.length; ++i) {
- var h = highlights[i];
- if (h.series == s && h.point[0] == p[0]
- && h.point[1] == p[1])
- return i;
- }
- return -1;
- }
-
- function drawPointHighlight(series, point) {
- var x = point[0], y = point[1],
- axisx = series.xaxis, axisy = series.yaxis,
- highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString();
-
- if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
- return;
-
- var pointRadius = series.points.radius + series.points.lineWidth / 2;
- octx.lineWidth = pointRadius;
- octx.strokeStyle = highlightColor;
- var radius = 1.5 * pointRadius;
- x = axisx.p2c(x);
- y = axisy.p2c(y);
-
- octx.beginPath();
- if (series.points.symbol == "circle")
- octx.arc(x, y, radius, 0, 2 * Math.PI, false);
- else
- series.points.symbol(octx, x, y, radius, false);
- octx.closePath();
- octx.stroke();
- }
-
- function drawBarHighlight(series, point) {
- var highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString(),
- fillStyle = highlightColor,
- barLeft;
-
- switch (series.bars.align) {
- case "left":
- barLeft = 0;
- break;
- case "right":
- barLeft = -series.bars.barWidth;
- break;
- default:
- barLeft = -series.bars.barWidth / 2;
- }
-
- octx.lineWidth = series.bars.lineWidth;
- octx.strokeStyle = highlightColor;
-
- drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth,
- function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth);
+ overlay.clear();
+ executeHooks(hooks.drawOverlay, [octx, overlay]);
+ var event = new CustomEvent('onDrawingDone');
+ plot.getEventHolder().dispatchEvent(event);
+ plot.getPlaceholder().trigger('drawingdone');
}
function getColorOrGradient(spec, bottom, top, defaultColor) {
- if (typeof spec == "string")
+ if (typeof spec === "string") {
return spec;
- else {
+ } else {
// assume this is a gradient spec; IE currently only
// supports a simple vertical gradient properly, so that's
// what we support too
@@ -3123,12 +2742,16 @@
for (var i = 0, l = spec.colors.length; i < l; ++i) {
var c = spec.colors[i];
- if (typeof c != "string") {
+ if (typeof c !== "string") {
var co = $.color.parse(defaultColor);
- if (c.brightness != null)
+ if (c.brightness != null) {
co = co.scale('rgb', c.brightness);
- if (c.opacity != null)
+ }
+
+ if (c.opacity != null) {
co.a *= c.opacity;
+ }
+
c = co.toString();
}
gradient.addColorStop(i / (l - 1), c);
@@ -3142,27 +2765,22 @@
// Add the plot function to the top level of the jQuery object
$.plot = function(placeholder, data, options) {
- //var t0 = new Date();
var plot = new Plot($(placeholder), data, options, $.plot.plugins);
- //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime()));
return plot;
};
- $.plot.version = "0.8.3";
+ $.plot.version = "3.0.0";
$.plot.plugins = [];
// Also add the plot function as a chainable property
-
$.fn.plot = function(data, options) {
return this.each(function() {
$.plot(this, data, options);
});
};
- // round to nearby lower multiple of base
- function floorInBase(n, base) {
- return base * Math.floor(n / base);
- }
-
+ $.plot.linearTickGenerator = defaultTickGenerator;
+ $.plot.defaultTickFormatter = defaultTickFormatter;
+ $.plot.expRepTickFormatter = expRepTickFormatter;
})(jQuery);