extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-09 08:25:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update jqplot to

Browse Source 
jquery.jqplot.1.0.0b2_r947
This commit is contained in:
Nathan Gray
2011-11-07 20:37:55 +00:00
parent 78855f0652
commit f8489c0ed1
256 changed files with 13654 additions and 3389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/js/jquery/jqplot/plugins/jqplot.meterGaugeRenderer.js
View File

@ -2,7 +2,7 @@
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: 1.0.0b2_r792
* Version: 1.0.0b2_r947
*
* Copyright (c) 2009-2011 Chris Leonello
* jqPlot is currently available for use in all personal or commercial projects
@ -185,7 +185,7 @@
}
this._tickPoints = [];
// reference to label element.
this._labelElm = null;
this._labelElem = null;
// start the gauge at the beginning of the span
this.startAngle = (90 + (360 - this.span)/2) * Math.PI/180;
@ -395,7 +395,7 @@
}
this.needleThickness = this.needleThickness || 2+Math.pow(this.ringWidth, 0.8);
this.innerPad = this.ringWidth/2 + this.needleThickness/2 + this.needlePad;
this.diameter = w - 2*this.innerPad;
this.diameter = w - 2*this.innerPad - this.ringWidth - this.padding;
}
// center taking into account legend and over draw for gauge bottom below hub.
// this will be center of hub.
@ -413,6 +413,7 @@
this._center = [(cw-trans*offx)/2 + trans * offx, (ch-trans*offy)/2 + trans * offy];
}
}
if (this._labelElem && this.labelPosition == 'bottom') {
this._center[1] -= this._labelElem.outerHeight(true);
@ -983,7 +984,6 @@
options.legend = options.legend || {};
options.seriesDefaults = options.seriesDefaults || {};
options.grid = options.grid || {};
options.gridPadding = options.gridPadding || {};
// only set these if there is a gauge series
var setopts = false;
@ -1006,10 +1006,6 @@
options.grid.drawGridlines = false;
options.grid.borderWidth = (options.grid.borderWidth != null) ? options.grid.borderWidth : 0;
options.grid.shadow = (options.grid.shadow != null) ? options.grid.shadow : false;
options.gridPadding.top = (options.gridPadding.top != null) ? options.gridPadding.top : 0;
options.gridPadding.bottom = (options.gridPadding.bottom != null) ? options.gridPadding.bottom : 0;
options.gridPadding.left = (options.gridPadding.left != null) ? options.gridPadding.left : 0;
options.gridPadding.right = (options.gridPadding.right != null) ? options.gridPadding.right : 0;
}
}