X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=dygraph-combined.js;h=13fd575f0eb8f1cf8b5f242a53bc51db687abcf5;hb=f21a0915bc0175cebbfd45ba30c98c7af324c13c;hp=946e587399d5cc1775e782ebdde11a49aa1060f8;hpb=bd597afc25767e952949ff79e8303327a02c6f82;p=dygraphs.git
diff --git a/dygraph-combined.js b/dygraph-combined.js
index 946e587..13fd575 100644
--- a/dygraph-combined.js
+++ b/dygraph-combined.js
@@ -1,1505 +1,8 @@
-/***
-
- MochiKit.MochiKit 1.4 : PACKED VERSION
-
- THIS FILE IS AUTOMATICALLY GENERATED. If creating patches, please
- diff against the source tree, not this file.
-
- See for documentation, downloads, license, etc.
-
- (c) 2005 Bob Ippolito. All rights Reserved.
-
-***/
-
-if(typeof (dojo)!="undefined"){
-dojo.provide("MochiKit.Base");
-}
-if(typeof (MochiKit)=="undefined"){
-MochiKit={};
-}
-if(typeof (MochiKit.Base)=="undefined"){
-MochiKit.Base={};
-}
-if(typeof (MochiKit.__export__)=="undefined"){
-MochiKit.__export__=(MochiKit.__compat__||(typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined"));
-}
-MochiKit.Base.VERSION="1.4";
-MochiKit.Base.NAME="MochiKit.Base";
-MochiKit.Base.update=function(_1,_2){
-if(_1===null){
-_1={};
-}
-for(var i=1;i=0;i--){
-_15.unshift(o[i]);
-}
-}else{
-res.push(o);
-}
-}
-return res;
-},extend:function(_18,obj,_1a){
-if(!_1a){
-_1a=0;
-}
-if(obj){
-var l=obj.length;
-if(typeof (l)!="number"){
-if(typeof (MochiKit.Iter)!="undefined"){
-obj=MochiKit.Iter.list(obj);
-l=obj.length;
-}else{
-throw new TypeError("Argument not an array-like and MochiKit.Iter not present");
-}
-}
-if(!_18){
-_18=[];
-}
-for(var i=_1a;i>b;
-},zrshift:function(a,b){
-return a>>>b;
-},eq:function(a,b){
-return a==b;
-},ne:function(a,b){
-return a!=b;
-},gt:function(a,b){
-return a>b;
-},ge:function(a,b){
-return a>=b;
-},lt:function(a,b){
-return al){
-_90=l;
-}
-}
-_8e=[];
-for(i=0;i<_90;i++){
-var _92=[];
-for(var j=1;j=0;i--){
-_af=[_ab[i].apply(this,_af)];
-}
-return _af[0];
-};
-},bind:function(_b1,_b2){
-if(typeof (_b1)=="string"){
-_b1=_b2[_b1];
-}
-var _b3=_b1.im_func;
-var _b4=_b1.im_preargs;
-var _b5=_b1.im_self;
-var m=MochiKit.Base;
-if(typeof (_b1)=="function"&&typeof (_b1.apply)=="undefined"){
-_b1=m._wrapDumbFunction(_b1);
-}
-if(typeof (_b3)!="function"){
-_b3=_b1;
-}
-if(typeof (_b2)!="undefined"){
-_b5=_b2;
-}
-if(typeof (_b4)=="undefined"){
-_b4=[];
-}else{
-_b4=_b4.slice();
-}
-m.extend(_b4,arguments,2);
-var _b7=function(){
-var _b8=arguments;
-var me=arguments.callee;
-if(me.im_preargs.length>0){
-_b8=m.concat(me.im_preargs,_b8);
-}
-var _ba=me.im_self;
-if(!_ba){
-_ba=this;
-}
-return me.im_func.apply(_ba,_b8);
-};
-_b7.im_self=_b5;
-_b7.im_func=_b3;
-_b7.im_preargs=_b4;
-return _b7;
-},bindMethods:function(_bb){
-var _bc=MochiKit.Base.bind;
-for(var k in _bb){
-var _be=_bb[k];
-if(typeof (_be)=="function"){
-_bb[k]=_bc(_be,_bb);
-}
-}
-},registerComparator:function(_bf,_c0,_c1,_c2){
-MochiKit.Base.comparatorRegistry.register(_bf,_c0,_c1,_c2);
-},_primitives:{"boolean":true,"string":true,"number":true},compare:function(a,b){
-if(a==b){
-return 0;
-}
-var _c5=(typeof (a)=="undefined"||a===null);
-var _c6=(typeof (b)=="undefined"||b===null);
-if(_c5&&_c6){
-return 0;
-}else{
-if(_c5){
-return -1;
-}else{
-if(_c6){
-return 1;
-}
-}
-}
-var m=MochiKit.Base;
-var _c8=m._primitives;
-if(!(typeof (a) in _c8&&typeof (b) in _c8)){
-try{
-return m.comparatorRegistry.match(a,b);
-}
-catch(e){
-if(e!=m.NotFound){
-throw e;
-}
-}
-}
-if(ab){
-return 1;
-}
-}
-var _c9=m.repr;
-throw new TypeError(_c9(a)+" and "+_c9(b)+" can not be compared");
-},compareDateLike:function(a,b){
-return MochiKit.Base.compare(a.getTime(),b.getTime());
-},compareArrayLike:function(a,b){
-var _ce=MochiKit.Base.compare;
-var _cf=a.length;
-var _d0=0;
-if(_cf>b.length){
-_d0=1;
-_cf=b.length;
-}else{
-if(_cf=0;i--){
-sum+=o[i];
-}
-}else{
-sum+=o;
-}
-}
-if(_113<=0){
-throw new TypeError("mean() requires at least one argument");
-}
-return sum/_113;
-},median:function(){
-var data=MochiKit.Base.flattenArguments(arguments);
-if(data.length===0){
-throw new TypeError("median() requires at least one argument");
-}
-data.sort(compare);
-if(data.length%2==0){
-var _117=data.length/2;
-return (data[_117]+data[_117-1])/2;
-}else{
-return data[(data.length-1)/2];
-}
-},findValue:function(lst,_119,_11a,end){
-if(typeof (end)=="undefined"||end===null){
-end=lst.length;
-}
-if(typeof (_11a)=="undefined"||_11a===null){
-_11a=0;
-}
-var cmp=MochiKit.Base.compare;
-for(var i=_11a;i0))){
-var kv=MochiKit.DOM.formContents(_127);
-_127=kv[0];
-_128=kv[1];
-}else{
-if(arguments.length==1){
-if(typeof (_127.length)=="number"&&_127.length==2){
-return arguments.callee(_127[0],_127[1]);
-}
-var o=_127;
-_127=[];
-_128=[];
-for(var k in o){
-var v=o[k];
-if(typeof (v)=="function"){
-continue;
-}else{
-if(typeof (v)!="string"&&typeof (v.length)=="number"){
-for(var i=0;i0.5;
-},isDark:function(){
-return (!this.isLight());
-},toHSLString:function(){
-var c=this.asHSL();
-var ccc=MochiKit.Color.clampColorComponent;
-var rval=this._hslString;
-if(!rval){
-var mid=(ccc(c.h,360).toFixed(0)+","+ccc(c.s,100).toPrecision(4)+"%"+","+ccc(c.l,100).toPrecision(4)+"%");
-var a=c.a;
-if(a>=1){
-a=1;
-rval="hsl("+mid+")";
-}else{
-if(a<=0){
-a=0;
-}
-rval="hsla("+mid+","+a+")";
-}
-this._hslString=rval;
-}
-return rval;
-},toRGBString:function(){
-var c=this.rgb;
-var ccc=MochiKit.Color.clampColorComponent;
-var rval=this._rgbString;
-if(!rval){
-var mid=(ccc(c.r,255).toFixed(0)+","+ccc(c.g,255).toFixed(0)+","+ccc(c.b,255).toFixed(0));
-if(c.a!=1){
-rval="rgba("+mid+","+c.a+")";
-}else{
-rval="rgb("+mid+")";
-}
-this._rgbString=rval;
-}
-return rval;
-},asRGB:function(){
-return MochiKit.Base.clone(this.rgb);
-},toHexString:function(){
-var m=MochiKit.Color;
-var c=this.rgb;
-var ccc=MochiKit.Color.clampColorComponent;
-var rval=this._hexString;
-if(!rval){
-rval=("#"+m.toColorPart(ccc(c.r,255))+m.toColorPart(ccc(c.g,255))+m.toColorPart(ccc(c.b,255)));
-this._hexString=rval;
-}
-return rval;
-},asHSV:function(){
-var hsv=this.hsv;
-var c=this.rgb;
-if(typeof (hsv)=="undefined"||hsv===null){
-hsv=MochiKit.Color.rgbToHSV(this.rgb);
-this.hsv=hsv;
-}
-return MochiKit.Base.clone(hsv);
-},asHSL:function(){
-var hsl=this.hsl;
-var c=this.rgb;
-if(typeof (hsl)=="undefined"||hsl===null){
-hsl=MochiKit.Color.rgbToHSL(this.rgb);
-this.hsl=hsl;
-}
-return MochiKit.Base.clone(hsl);
-},toString:function(){
-return this.toRGBString();
-},repr:function(){
-var c=this.rgb;
-var col=[c.r,c.g,c.b,c.a];
-return this.__class__.NAME+"("+col.join(", ")+")";
-}};
-MochiKit.Base.update(MochiKit.Color.Color,{fromRGB:function(red,_180,blue,_182){
-var _183=MochiKit.Color.Color;
-if(arguments.length==1){
-var rgb=red;
-red=rgb.r;
-_180=rgb.g;
-blue=rgb.b;
-if(typeof (rgb.a)=="undefined"){
-_182=undefined;
-}else{
-_182=rgb.a;
-}
-}
-return new _183(red,_180,blue,_182);
-},fromHSL:function(hue,_186,_187,_188){
-var m=MochiKit.Color;
-return m.Color.fromRGB(m.hslToRGB.apply(m,arguments));
-},fromHSV:function(hue,_18b,_18c,_18d){
-var m=MochiKit.Color;
-return m.Color.fromRGB(m.hsvToRGB.apply(m,arguments));
-},fromName:function(name){
-var _190=MochiKit.Color.Color;
-if(name.charAt(0)=="\""){
-name=name.substr(1,name.length-2);
-}
-var _191=_190._namedColors[name.toLowerCase()];
-if(typeof (_191)=="string"){
-return _190.fromHexString(_191);
-}else{
-if(name=="transparent"){
-return _190.transparentColor();
-}
-}
-return null;
-},fromString:function(_192){
-var self=MochiKit.Color.Color;
-var _194=_192.substr(0,3);
-if(_194=="rgb"){
-return self.fromRGBString(_192);
-}else{
-if(_194=="hsl"){
-return self.fromHSLString(_192);
-}else{
-if(_192.charAt(0)=="#"){
-return self.fromHexString(_192);
-}
-}
-}
-return self.fromName(_192);
-},fromHexString:function(_195){
-if(_195.charAt(0)=="#"){
-_195=_195.substring(1);
-}
-var _196=[];
-var i,hex;
-if(_195.length==3){
-for(i=0;i<3;i++){
-hex=_195.substr(i,1);
-_196.push(parseInt(hex+hex,16)/255);
-}
-}else{
-for(i=0;i<6;i+=2){
-hex=_195.substr(i,2);
-_196.push(parseInt(hex,16)/255);
-}
-}
-var _199=MochiKit.Color.Color;
-return _199.fromRGB.apply(_199,_196);
-},_fromColorString:function(pre,_19b,_19c,_19d){
-if(_19d.indexOf(pre)===0){
-_19d=_19d.substring(_19d.indexOf("(",3)+1,_19d.length-1);
-}
-var _19e=_19d.split(/\s*,\s*/);
-var _19f=[];
-for(var i=0;i<_19e.length;i++){
-var c=_19e[i];
-var val;
-var _1a3=c.substring(c.length-3);
-if(c.charAt(c.length-1)=="%"){
-val=0.01*parseFloat(c.substring(0,c.length-1));
-}else{
-if(_1a3=="deg"){
-val=parseFloat(c)/360;
-}else{
-if(_1a3=="rad"){
-val=parseFloat(c)/(Math.PI*2);
-}else{
-val=_19c[i]*parseFloat(c);
-}
-}
-}
-_19f.push(val);
-}
-return this[_19b].apply(this,_19f);
-},fromBackground:function(elem){
-var cls=MochiKit.Color.Color;
-return cls.fromComputedStyle(elem,"backgroundColor","background-color")||cls.whiteColor();
-},fromText:function(elem){
-var cls=MochiKit.Color.Color;
-return cls.fromComputedStyle(elem,"color","color")||cls.blackColor();
-},namedColors:function(){
-return MochiKit.Base.clone(MochiKit.Color.Color._namedColors);
-}});
-MochiKit.Base.update(MochiKit.Color,{clampColorComponent:function(v,_1a9){
-v*=_1a9;
-if(v<0){
-return 0;
-}else{
-if(v>_1a9){
-return _1a9;
-}else{
-return v;
-}
-}
-},_hslValue:function(n1,n2,hue){
-if(hue>6){
-hue-=6;
-}else{
-if(hue<0){
-hue+=6;
-}
-}
-var val;
-if(hue<1){
-val=n1+(n2-n1)*hue;
-}else{
-if(hue<3){
-val=n2;
-}else{
-if(hue<4){
-val=n1+(n2-n1)*(4-hue);
-}else{
-val=n1;
-}
-}
-}
-return val;
-},hsvToRGB:function(hue,_1af,_1b0,_1b1){
-if(arguments.length==1){
-var hsv=hue;
-hue=hsv.h;
-_1af=hsv.s;
-_1b0=hsv.v;
-_1b1=hsv.a;
-}
-var red;
-var _1b4;
-var blue;
-if(_1af===0){
-red=_1b0;
-_1b4=_1b0;
-blue=_1b0;
-}else{
-var i=Math.floor(hue*6);
-var f=(hue*6)-i;
-var p=_1b0*(1-_1af);
-var q=_1b0*(1-(_1af*f));
-var t=_1b0*(1-(_1af*(1-f)));
-switch(i){
-case 1:
-red=q;
-_1b4=_1b0;
-blue=p;
-break;
-case 2:
-red=p;
-_1b4=_1b0;
-blue=t;
-break;
-case 3:
-red=p;
-_1b4=q;
-blue=_1b0;
-break;
-case 4:
-red=t;
-_1b4=p;
-blue=_1b0;
-break;
-case 5:
-red=_1b0;
-_1b4=p;
-blue=q;
-break;
-case 6:
-case 0:
-red=_1b0;
-_1b4=t;
-blue=p;
-break;
-}
-}
-return {r:red,g:_1b4,b:blue,a:_1b1};
-},hslToRGB:function(hue,_1bc,_1bd,_1be){
-if(arguments.length==1){
-var hsl=hue;
-hue=hsl.h;
-_1bc=hsl.s;
-_1bd=hsl.l;
-_1be=hsl.a;
-}
-var red;
-var _1c1;
-var blue;
-if(_1bc===0){
-red=_1bd;
-_1c1=_1bd;
-blue=_1bd;
-}else{
-var m2;
-if(_1bd<=0.5){
-m2=_1bd*(1+_1bc);
-}else{
-m2=_1bd+_1bc-(_1bd*_1bc);
-}
-var m1=(2*_1bd)-m2;
-var f=MochiKit.Color._hslValue;
-var h6=hue*6;
-red=f(m1,m2,h6+2);
-_1c1=f(m1,m2,h6);
-blue=f(m1,m2,h6-2);
-}
-return {r:red,g:_1c1,b:blue,a:_1be};
-},rgbToHSV:function(red,_1c8,blue,_1ca){
-if(arguments.length==1){
-var rgb=red;
-red=rgb.r;
-_1c8=rgb.g;
-blue=rgb.b;
-_1ca=rgb.a;
-}
-var max=Math.max(Math.max(red,_1c8),blue);
-var min=Math.min(Math.min(red,_1c8),blue);
-var hue;
-var _1cf;
-var _1d0=max;
-if(min==max){
-hue=0;
-_1cf=0;
-}else{
-var _1d1=(max-min);
-_1cf=_1d1/max;
-if(red==max){
-hue=(_1c8-blue)/_1d1;
-}else{
-if(_1c8==max){
-hue=2+((blue-red)/_1d1);
-}else{
-hue=4+((red-_1c8)/_1d1);
-}
-}
-hue/=6;
-if(hue<0){
-hue+=1;
-}
-if(hue>1){
-hue-=1;
-}
-}
-return {h:hue,s:_1cf,v:_1d0,a:_1ca};
-},rgbToHSL:function(red,_1d3,blue,_1d5){
-if(arguments.length==1){
-var rgb=red;
-red=rgb.r;
-_1d3=rgb.g;
-blue=rgb.b;
-_1d5=rgb.a;
-}
-var max=Math.max(red,Math.max(_1d3,blue));
-var min=Math.min(red,Math.min(_1d3,blue));
-var hue;
-var _1da;
-var _1db=(max+min)/2;
-var _1dc=max-min;
-if(_1dc===0){
-hue=0;
-_1da=0;
-}else{
-if(_1db<=0.5){
-_1da=_1dc/(max+min);
-}else{
-_1da=_1dc/(2-max-min);
-}
-if(red==max){
-hue=(_1d3-blue)/_1dc;
-}else{
-if(_1d3==max){
-hue=2+((blue-red)/_1dc);
-}else{
-hue=4+((red-_1d3)/_1dc);
-}
-}
-hue/=6;
-if(hue<0){
-hue+=1;
-}
-if(hue>1){
-hue-=1;
-}
-}
-return {h:hue,s:_1da,l:_1db,a:_1d5};
-},toColorPart:function(num){
-num=Math.round(num);
-var _1de=num.toString(16);
-if(num<16){
-return "0"+_1de;
-}
-return _1de;
-},__new__:function(){
-var m=MochiKit.Base;
-this.Color.fromRGBString=m.bind(this.Color._fromColorString,this.Color,"rgb","fromRGB",[1/255,1/255,1/255,1]);
-this.Color.fromHSLString=m.bind(this.Color._fromColorString,this.Color,"hsl","fromHSL",[1/360,0.01,0.01,1]);
-var _1e0=1/3;
-var _1e1={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_1e0,_1e0,_1e0],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_1e0,2*_1e0,2*_1e0],magenta:[1,0,1],orange:[1,0.5,0],purple:[0.5,0,0.5],red:[1,0,0],transparent:[0,0,0,0],white:[1,1,1],yellow:[1,1,0]};
-var _1e2=function(name,r,g,b,a){
-var rval=this.fromRGB(r,g,b,a);
-this[name]=function(){
-return rval;
-};
-return rval;
-};
-for(var k in _1e1){
-var name=k+"Color";
-var _1eb=m.concat([_1e2,this.Color,name],_1e1[k]);
-this.Color[name]=m.bind.apply(null,_1eb);
-}
-var _1ec=function(){
-for(var i=0;i1;r/=10){x=pad.toString()+x}return x.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(d){return Date.ext.locales[d.locale].a[d.getDay()]},A:function(d){return Date.ext.locales[d.locale].A[d.getDay()]},b:function(d){return Date.ext.locales[d.locale].b[d.getMonth()]},B:function(d){return Date.ext.locales[d.locale].B[d.getMonth()]},c:"toLocaleString",C:function(d){return Date.ext.util.xPad(parseInt(d.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(d){return Date.ext.util.xPad(parseInt(Date.ext.util.G(d)/100,10),0)},G:function(d){var y=d.getFullYear();var V=parseInt(Date.ext.formats.V(d),10);var W=parseInt(Date.ext.formats.W(d),10);if(W>V){y++}else{if(W===0&&V>=52){y--}}return y},H:["getHours","0"],I:function(d){var I=d.getHours()%12;return Date.ext.util.xPad(I===0?12:I,0)},j:function(d){var ms=d-new Date(""+d.getFullYear()+"/1/1 GMT");ms+=d.getTimezoneOffset()*60000;var doy=parseInt(ms/60000/60/24,10)+1;return Date.ext.util.xPad(doy,0,100)},m:function(d){return Date.ext.util.xPad(d.getMonth()+1,0)},M:["getMinutes","0"],p:function(d){return Date.ext.locales[d.locale].p[d.getHours()>=12?1:0]},P:function(d){return Date.ext.locales[d.locale].P[d.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(d){var dow=d.getDay();return dow===0?7:dow},U:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=6-d.getDay();var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0)},V:function(d){var woy=parseInt(Date.ext.formats.W(d),10);var dow1_1=(new Date(""+d.getFullYear()+"/1/1")).getDay();var idow=woy+(dow1_1>4||dow1_1<=1?0:1);if(idow==53&&(new Date(""+d.getFullYear()+"/12/31")).getDay()<4){idow=1}else{if(idow===0){idow=Date.ext.formats.V(new Date(""+(d.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(idow,0)},w:"getDay",W:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=7-Date.ext.formats.u(d);var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0,10)},y:function(d){return Date.ext.util.xPad(d.getFullYear()%100,0)},Y:"getFullYear",z:function(d){var o=d.getTimezoneOffset();var H=Date.ext.util.xPad(parseInt(Math.abs(o/60),10),0);var M=Date.ext.util.xPad(o%60,0);return(o>0?"-":"+")+H+M},Z:function(d){return d.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(d){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(fmt){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var d=this;while(fmt.match(/%[cDhnrRtTxXzZ]/)){fmt=fmt.replace(/%([cDhnrRtTxXzZ])/g,function(m0,m1){var f=Date.ext.aggregates[m1];return(f=="locale"?Date.ext.locales[d.locale][m1]:f)})}var str=fmt.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(m0,m1){var f=Date.ext.formats[m1];if(typeof (f)=="string"){return d[f]()}else{if(typeof (f)=="function"){return f.call(d,d)}else{if(typeof (f)=="object"&&typeof (f[0])=="string"){return Date.ext.util.xPad(d[f[0]](),f[1])}else{return m1}}}});d=null;return str};
DygraphLayout=function(_1,_2){
this.dygraph_=_1;
this.options={};
-MochiKit.Base.update(this.options,_2?_2:{});
+Dygraph.update(this.options,_2?_2:{});
this.datasets=new Array();
};
DygraphLayout.prototype.attr_=function(_3){
@@ -1597,12 +100,12 @@ delete this.datasets;
this.datasets=new Array();
};
DygraphLayout.prototype.updateOptions=function(_24){
-MochiKit.Base.update(this.options,_24?_24:{});
+Dygraph.update(this.options,_24?_24:{});
};
DygraphCanvasRenderer=function(_25,_26,_27,_28){
this.dygraph_=_25;
-this.options={"strokeWidth":0.5,"drawXAxis":true,"drawYAxis":true,"axisLineColor":Color.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":Color.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"drawYGrid":true,"drawXGrid":true,"gridLineColor":MochiKit.Color.Color.grayColor()};
-MochiKit.Base.update(this.options,_28);
+this.options={"strokeWidth":0.5,"drawXAxis":true,"drawYAxis":true,"axisLineColor":"black","axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":"black","axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"drawYGrid":true,"drawXGrid":true,"gridLineColor":"rgb(128,128,128)"};
+Dygraph.update(this.options,_28);
this.layout=_27;
this.element=_26;
this.container=this.element.parentNode;
@@ -1658,7 +161,7 @@ this.ylabels=new Array();
DygraphCanvasRenderer.isSupported=function(_31){
var _32=null;
try{
-if(MochiKit.Base.isUndefinedOrNull(_31)){
+if(typeof (_31)=="undefined"||_31==null){
_32=document.createElement("canvas");
}else{
_32=_31;
@@ -1680,7 +183,7 @@ var ctx=this.element.getContext("2d");
if(this.options.drawYGrid){
var _37=this.layout.yticks;
ctx.save();
-ctx.strokeStyle=this.options.gridLineColor.toRGBString();
+ctx.strokeStyle=this.options.gridLineColor;
ctx.lineWidth=this.options.axisLineWidth;
for(var i=0;i<_37.length;i++){
var x=this.area.x;
@@ -1695,7 +198,7 @@ ctx.stroke();
if(this.options.drawXGrid){
var _37=this.layout.xticks;
ctx.save();
-ctx.strokeStyle=this.options.gridLineColor.toRGBString();
+ctx.strokeStyle=this.options.gridLineColor;
ctx.lineWidth=this.options.axisLineWidth;
for(var i=0;i<_37.length;i++){
var x=this.area.x+_37[i][0]*this.area.w;
@@ -1715,7 +218,7 @@ if(!this.options.drawXAxis&&!this.options.drawYAxis){
return;
}
var _40=this.element.getContext("2d");
-var _41={"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"};
+var _41={"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor,"width":this.options.axisLabelWidth+"px","overflow":"hidden"};
var _42=function(txt){
var div=document.createElement("div");
for(var _45 in _41){
@@ -1725,7 +228,7 @@ div.appendChild(document.createTextNode(txt));
return div;
};
_40.save();
-_40.strokeStyle=this.options.axisLineColor.toRGBString();
+_40.strokeStyle=this.options.axisLineColor;
_40.lineWidth=this.options.axisLineWidth;
if(this.options.drawYAxis){
if(this.layout.yticks){
@@ -1814,115 +317,110 @@ DygraphCanvasRenderer.prototype._renderLineChart=function(){
var _53=this.element.getContext("2d");
var _54=this.options.colorScheme.length;
var _55=this.options.colorScheme;
-var _56=MochiKit.Base.keys(this.layout.datasets);
-var _57=this.layout.options.errorBars;
-var _58=_56.length;
-var _59=MochiKit.Base.bind;
-var _60=MochiKit.Base.partial;
+var _56=this.layout.options.errorBars;
+var _57=[];
+for(var _58 in this.layout.datasets){
+_57.push(_58);
+}
+var _59=_57.length;
for(var i=0;i=0){
+ctx.moveTo(_64,_65[0]);
+ctx.lineTo(_60.canvasx,_70[0]);
+ctx.lineTo(_60.canvasx,_70[1]);
+ctx.lineTo(_64,_65[1]);
+ctx.closePath();
}
+_65[0]=_70[0];
+_65[1]=_70[1];
+_64=_60.canvasx;
}
}
+ctx.fill();
}
}
-};
-var _72=function(ctx){
-for(var i=0;i<_58;i++){
-var _73=_56[i];
-var _74=_55[i%_54];
-var _75=this.options.strokeColorTransform;
+for(var i=0;i<_59;i++){
+var _62=_57[i];
+var _63=_55[i%_54];
_53.save();
-_53.strokeStyle=_74.toRGBString();
-_53.lineWidth=this.options.strokeWidth;
-var _76=-1;
-var _77=[-1,-1];
-var _78=0;
-var _79=this.layout.yscale;
-var _80=_74.colorWithAlpha(0.15);
-ctx.fillStyle=_80.toRGBString();
+var _60=this.layout.points[0];
+var _71=this.dygraph_.attr_("pointSize");
+var _64=null,prevY=null;
+var _72=this.dygraph_.attr_("drawPoints");
+var _73=this.layout.points;
+for(var j=0;j<_73.length;j++){
+var _60=_73[j];
+if(_60.name==_62){
+if(!_61(_60.canvasy)){
+_64=prevY=null;
+}else{
+var _74=(!_64&&(j==_73.length-1||!_61(_73[j+1].canvasy)));
+if(!_64){
+_64=_60.canvasx;
+prevY=_60.canvasy;
+}else{
ctx.beginPath();
-for(var j=0;j=0){
-ctx.moveTo(_76,_77[0]);
-ctx.lineTo(_81.canvasx,_82[0]);
-ctx.lineTo(_81.canvasx,_82[1]);
-ctx.lineTo(_76,_77[1]);
-ctx.closePath();
+if(_72||_74){
+ctx.beginPath();
+ctx.fillStyle=_63;
+ctx.arc(_60.canvasx,_60.canvasy,_71,0,360,false);
+ctx.fill();
}
-_77[0]=_82[0];
-_77[1]=_82[1];
-_76=_81.canvasx;
}
}
-ctx.fill();
}
-};
-if(_57){
-_59(_72,this)(_53);
}
-_59(_63,this)(_53);
_53.restore();
};
-Dygraph=function(div,_83,_84){
+Dygraph=function(div,_75,_76){
if(arguments.length>0){
if(arguments.length==4){
this.warn("Using deprecated four-argument dygraph constructor");
-this.__old_init__(div,_83,arguments[2],arguments[3]);
+this.__old_init__(div,_75,arguments[2],arguments[3]);
}else{
-this.__init__(div,_83,_84);
+this.__init__(div,_75,_76);
}
}
};
@@ -1943,28 +441,28 @@ Dygraph.DEBUG=1;
Dygraph.INFO=2;
Dygraph.WARNING=3;
Dygraph.ERROR=3;
-Dygraph.prototype.__old_init__=function(div,_85,_86,_87){
-if(_86!=null){
-var _88=["Date"];
-for(var i=0;i<_86.length;i++){
-_88.push(_86[i]);
+Dygraph.prototype.__old_init__=function(div,_77,_78,_79){
+if(_78!=null){
+var _80=["Date"];
+for(var i=0;i<_78.length;i++){
+_80.push(_78[i]);
}
-MochiKit.Base.update(_87,{"labels":_88});
+Dygraph.update(_79,{"labels":_80});
}
-this.__init__(div,_85,_87);
+this.__init__(div,_77,_79);
};
-Dygraph.prototype.__init__=function(div,_89,_90){
-if(_90==null){
-_90={};
+Dygraph.prototype.__init__=function(div,_81,_82){
+if(_82==null){
+_82={};
}
this.maindiv_=div;
-this.file_=_89;
-this.rollPeriod_=_90.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD;
+this.file_=_81;
+this.rollPeriod_=_82.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD;
this.previousVerticalX_=-1;
-this.fractions_=_90.fractions||false;
-this.dateWindow_=_90.dateWindow||null;
-this.valueRange_=_90.valueRange||null;
-this.wilsonInterval_=_90.wilsonInterval||true;
+this.fractions_=_82.fractions||false;
+this.dateWindow_=_82.dateWindow||null;
+this.valueRange_=_82.valueRange||null;
+this.wilsonInterval_=_82.wilsonInterval||true;
div.innerHTML="";
if(div.style.width==""){
div.style.width=Dygraph.DEFAULT_WIDTH+"px";
@@ -1975,188 +473,241 @@ div.style.height=Dygraph.DEFAULT_HEIGHT+"px";
this.width_=parseInt(div.style.width,10);
this.height_=parseInt(div.style.height,10);
this.user_attrs_={};
-MochiKit.Base.update(this.user_attrs_,_90);
+Dygraph.update(this.user_attrs_,_82);
this.attrs_={};
-MochiKit.Base.update(this.attrs_,Dygraph.DEFAULT_ATTRS);
+Dygraph.update(this.attrs_,Dygraph.DEFAULT_ATTRS);
this.labelsFromCSV_=(this.attr_("labels")==null);
this.createInterface_();
this.layoutOptions_={"errorBars":(this.attr_("errorBars")||this.attr_("customBars")),"xOriginIsZero":false};
-MochiKit.Base.update(this.layoutOptions_,this.attrs_);
-MochiKit.Base.update(this.layoutOptions_,this.user_attrs_);
+Dygraph.update(this.layoutOptions_,this.attrs_);
+Dygraph.update(this.layoutOptions_,this.user_attrs_);
this.layout_=new DygraphLayout(this,this.layoutOptions_);
this.renderOptions_={colorScheme:this.colors_,strokeColor:null,axisLineWidth:Dygraph.AXIS_LINE_WIDTH};
-MochiKit.Base.update(this.renderOptions_,this.attrs_);
-MochiKit.Base.update(this.renderOptions_,this.user_attrs_);
+Dygraph.update(this.renderOptions_,this.attrs_);
+Dygraph.update(this.renderOptions_,this.user_attrs_);
this.plotter_=new DygraphCanvasRenderer(this,this.hidden_,this.layout_,this.renderOptions_);
this.createStatusMessage_();
this.createRollInterface_();
this.createDragInterface_();
this.start_();
};
-Dygraph.prototype.attr_=function(_91){
-if(typeof (this.user_attrs_[_91])!="undefined"){
-return this.user_attrs_[_91];
+Dygraph.prototype.attr_=function(_83){
+if(typeof (this.user_attrs_[_83])!="undefined"){
+return this.user_attrs_[_83];
}else{
-if(typeof (this.attrs_[_91])!="undefined"){
-return this.attrs_[_91];
+if(typeof (this.attrs_[_83])!="undefined"){
+return this.attrs_[_83];
}else{
return null;
}
}
};
-Dygraph.prototype.log=function(_92,_93){
+Dygraph.prototype.log=function(_84,_85){
if(typeof (console)!="undefined"){
-switch(_92){
+switch(_84){
case Dygraph.DEBUG:
-console.debug("dygraphs: "+_93);
+console.debug("dygraphs: "+_85);
break;
case Dygraph.INFO:
-console.info("dygraphs: "+_93);
+console.info("dygraphs: "+_85);
break;
case Dygraph.WARNING:
-console.warn("dygraphs: "+_93);
+console.warn("dygraphs: "+_85);
break;
case Dygraph.ERROR:
-console.error("dygraphs: "+_93);
+console.error("dygraphs: "+_85);
break;
}
}
};
-Dygraph.prototype.info=function(_94){
-this.log(Dygraph.INFO,_94);
+Dygraph.prototype.info=function(_86){
+this.log(Dygraph.INFO,_86);
};
-Dygraph.prototype.warn=function(_95){
-this.log(Dygraph.WARNING,_95);
+Dygraph.prototype.warn=function(_87){
+this.log(Dygraph.WARNING,_87);
};
-Dygraph.prototype.error=function(_96){
-this.log(Dygraph.ERROR,_96);
+Dygraph.prototype.error=function(_88){
+this.log(Dygraph.ERROR,_88);
};
Dygraph.prototype.rollPeriod=function(){
return this.rollPeriod_;
};
Dygraph.addEvent=function(el,evt,fn){
-var _99=function(e){
+var _91=function(e){
if(!e){
var e=window.event;
}
fn(e);
};
if(window.addEventListener){
-el.addEventListener(evt,_99,false);
+el.addEventListener(evt,_91,false);
}else{
-el.attachEvent("on"+evt,_99);
+el.attachEvent("on"+evt,_91);
}
};
Dygraph.prototype.createInterface_=function(){
-var _101=this.maindiv_;
+var _93=this.maindiv_;
this.graphDiv=document.createElement("div");
this.graphDiv.style.width=this.width_+"px";
this.graphDiv.style.height=this.height_+"px";
-_101.appendChild(this.graphDiv);
+_93.appendChild(this.graphDiv);
this.canvas_=document.createElement("canvas");
this.canvas_.style.position="absolute";
this.canvas_.width=this.width_;
this.canvas_.height=this.height_;
this.graphDiv.appendChild(this.canvas_);
this.hidden_=this.createPlotKitCanvas_(this.canvas_);
-var _102=this;
+var _94=this;
Dygraph.addEvent(this.hidden_,"mousemove",function(e){
-_102.mouseMove_(e);
+_94.mouseMove_(e);
});
Dygraph.addEvent(this.hidden_,"mouseout",function(e){
-_102.mouseOut_(e);
+_94.mouseOut_(e);
});
};
-Dygraph.prototype.createPlotKitCanvas_=function(_103){
+Dygraph.prototype.createPlotKitCanvas_=function(_95){
var h=document.createElement("canvas");
h.style.position="absolute";
-h.style.top=_103.style.top;
-h.style.left=_103.style.left;
+h.style.top=_95.style.top;
+h.style.left=_95.style.left;
h.width=this.width_;
h.height=this.height_;
this.graphDiv.appendChild(h);
return h;
};
+Dygraph.hsvToRGB=function(hue,_98,_99){
+var red;
+var _101;
+var blue;
+if(_98===0){
+red=_99;
+_101=_99;
+blue=_99;
+}else{
+var i=Math.floor(hue*6);
+var f=(hue*6)-i;
+var p=_99*(1-_98);
+var q=_99*(1-(_98*f));
+var t=_99*(1-(_98*(1-f)));
+switch(i){
+case 1:
+red=q;
+_101=_99;
+blue=p;
+break;
+case 2:
+red=p;
+_101=_99;
+blue=t;
+break;
+case 3:
+red=p;
+_101=q;
+blue=_99;
+break;
+case 4:
+red=t;
+_101=p;
+blue=_99;
+break;
+case 5:
+red=_99;
+_101=p;
+blue=q;
+break;
+case 6:
+case 0:
+red=_99;
+_101=t;
+blue=p;
+break;
+}
+}
+red=Math.floor(255*red+0.5);
+_101=Math.floor(255*_101+0.5);
+blue=Math.floor(255*blue+0.5);
+return "rgb("+red+","+_101+","+blue+")";
+};
Dygraph.prototype.setColors_=function(){
var num=this.attr_("labels").length-1;
this.colors_=[];
-var _106=this.attr_("colors");
-if(!_106){
+var _108=this.attr_("colors");
+if(!_108){
var sat=this.attr_("colorSaturation")||1;
var val=this.attr_("colorValue")||0.5;
for(var i=1;i<=num;i++){
var hue=(1*i/(1+num));
-this.colors_.push(MochiKit.Color.Color.fromHSV(hue,sat,val));
+this.colors_.push(Dygraph.hsvToRGB(hue,sat,val));
}
}else{
for(var i=0;i=10){
-self.doZoom_(Math.min(_126,_128),Math.max(_126,_128));
+if(_141>=10){
+self.doZoom_(Math.min(_127,_129),Math.max(_127,_129));
}else{
self.canvas_.getContext("2d").clearRect(0,0,self.canvas_.width,self.canvas_.height);
}
-_126=null;
_127=null;
+_128=null;
}
});
-Dygraph.addEvent(this.hidden_,"dblclick",function(_142){
+Dygraph.addEvent(this.hidden_,"dblclick",function(_143){
self.dateWindow_=null;
self.drawGraph_(self.rawData_);
-var _143=self.rawData_[0][0];
-var _144=self.rawData_[self.rawData_.length-1][0];
+var _144=self.rawData_[0][0];
+var _145=self.rawData_[self.rawData_.length-1][0];
if(self.attr_("zoomCallback")){
-self.attr_("zoomCallback")(_143,_144);
+self.attr_("zoomCallback")(_144,_145);
}
});
};
-Dygraph.prototype.drawZoomRect_=function(_145,endX,_147){
+Dygraph.prototype.drawZoomRect_=function(_146,endX,_148){
var ctx=this.canvas_.getContext("2d");
-if(_147){
-ctx.clearRect(Math.min(_145,_147),0,Math.abs(_145-_147),this.height_);
+if(_148){
+ctx.clearRect(Math.min(_146,_148),0,Math.abs(_146-_148),this.height_);
}
-if(endX&&_145){
+if(endX&&_146){
ctx.fillStyle="rgba(128,128,128,0.33)";
-ctx.fillRect(Math.min(_145,endX),0,Math.abs(endX-_145),this.height_);
+ctx.fillRect(Math.min(_146,endX),0,Math.abs(endX-_146),this.height_);
}
};
-Dygraph.prototype.doZoom_=function(lowX,_149){
-var _150=this.layout_.points;
-var _151=null;
+Dygraph.prototype.doZoom_=function(lowX,_150){
+var _151=this.layout_.points;
var _152=null;
-for(var i=0;i<_150.length;i++){
-var cx=_150[i].canvasx;
-var x=_150[i].xval;
-if(cx_151)){
-_151=x;
-}
-if(cx>_149&&(_152==null||x<_152)){
+var _153=null;
+for(var i=0;i<_151.length;i++){
+var cx=_151[i].canvasx;
+var x=_151[i].xval;
+if(cx_152)){
_152=x;
}
+if(cx>_150&&(_153==null||x<_153)){
+_153=x;
}
-if(_151==null){
-_151=_150[0].xval;
}
if(_152==null){
-_152=_150[_150.length-1].xval;
+_152=_151[0].xval;
}
-this.dateWindow_=[_151,_152];
+if(_153==null){
+_153=_151[_151.length-1].xval;
+}
+this.dateWindow_=[_152,_153];
this.drawGraph_(this.rawData_);
if(this.attr_("zoomCallback")){
-this.attr_("zoomCallback")(_151,_152);
+this.attr_("zoomCallback")(_152,_153);
}
};
-Dygraph.prototype.mouseMove_=function(_154){
-var _155=Dygraph.pageX(_154)-Dygraph.findPosX(this.hidden_);
-var _156=this.layout_.points;
-var _157=-1;
+Dygraph.prototype.mouseMove_=function(_155){
+var _156=Dygraph.pageX(_155)-Dygraph.findPosX(this.hidden_);
+var _157=this.layout_.points;
var _158=-1;
-var _159=1e+100;
+var _159=-1;
+var _160=1e+100;
var idx=-1;
-for(var i=0;i<_156.length;i++){
-var dist=Math.abs(_156[i].canvasx-_155);
-if(dist>_159){
+for(var i=0;i<_157.length;i++){
+var dist=Math.abs(_157[i].canvasx-_156);
+if(dist>_160){
break;
}
-_159=dist;
+_160=dist;
idx=i;
}
if(idx>=0){
-_157=_156[idx].xval;
+_158=_157[idx].xval;
}
-if(_155>_156[_156.length-1].canvasx){
-_157=_156[_156.length-1].xval;
+if(_156>_157[_157.length-1].canvasx){
+_158=_157[_157.length-1].xval;
}
-var _162=[];
-for(var i=0;i<_156.length;i++){
-if(_156[i].xval==_157){
-_162.push(_156[i]);
+var _163=[];
+for(var i=0;i<_157.length;i++){
+if(_157[i].xval==_158){
+_163.push(_157[i]);
}
}
-var _163=this.attr_("highlightCircleSize");
+var _164=this.attr_("highlightCircleSize");
var ctx=this.canvas_.getContext("2d");
if(this.previousVerticalX_>=0){
var px=this.previousVerticalX_;
-ctx.clearRect(px-_163-1,0,2*_163+2,this.height_);
+ctx.clearRect(px-_164-1,0,2*_164+2,this.height_);
}
var isOK=function(x){
return x&&!isNaN(x);
};
-if(_162.length>0){
-var _155=_162[0].canvasx;
-var _165=this.attr_("xValueFormatter")(_157,this)+":";
+if(_163.length>0){
+var _156=_163[0].canvasx;
+var _166=this.attr_("xValueFormatter")(_158,this)+":";
var clen=this.colors_.length;
-for(var i=0;i<_162.length;i++){
-if(!isOK(_162[i].canvasy)){
+for(var i=0;i<_163.length;i++){
+if(!isOK(_163[i].canvasy)){
continue;
}
if(this.attr_("labelsSeparateLines")){
-_165+="
";
+_166+="
";
}
-var _167=_162[i];
-_165+=" "+_167.name+":"+this.round_(_167.yval,2);
+var _168=_163[i];
+var c=new RGBColor(this.colors_[i%clen]);
+_166+=" "+_168.name+":"+this.round_(_168.yval,2);
}
-this.attr_("labelsDiv").innerHTML=_165;
-this.lastx_=_157;
+this.attr_("labelsDiv").innerHTML=_166;
+this.lastx_=_158;
ctx.save();
-for(var i=0;i<_162.length;i++){
-if(!isOK(_162[i%clen].canvasy)){
+for(var i=0;i<_163.length;i++){
+if(!isOK(_163[i%clen].canvasy)){
continue;
}
ctx.beginPath();
-ctx.fillStyle=this.colors_[i%clen].toRGBString();
-ctx.arc(_155,_162[i%clen].canvasy,_163,0,360,false);
+ctx.fillStyle=this.colors_[i%clen];
+ctx.arc(_156,_163[i%clen].canvasy,_164,0,360,false);
ctx.fill();
}
ctx.restore();
-this.previousVerticalX_=_155;
+this.previousVerticalX_=_156;
}
};
-Dygraph.prototype.mouseOut_=function(_168){
+Dygraph.prototype.mouseOut_=function(_170){
var ctx=this.canvas_.getContext("2d");
ctx.clearRect(0,0,this.width_,this.height_);
this.attr_("labelsDiv").innerHTML="";
@@ -2364,34 +916,34 @@ return ""+x;
}
};
Dygraph.prototype.hmsString_=function(date){
-var _170=Dygraph.zeropad;
+var _172=Dygraph.zeropad;
var d=new Date(date);
if(d.getSeconds()){
-return _170(d.getHours())+":"+_170(d.getMinutes())+":"+_170(d.getSeconds());
+return _172(d.getHours())+":"+_172(d.getMinutes())+":"+_172(d.getSeconds());
}else{
if(d.getMinutes()){
-return _170(d.getHours())+":"+_170(d.getMinutes());
+return _172(d.getHours())+":"+_172(d.getMinutes());
}else{
-return _170(d.getHours());
+return _172(d.getHours());
}
}
};
Dygraph.dateString_=function(date,self){
-var _172=Dygraph.zeropad;
+var _174=Dygraph.zeropad;
var d=new Date(date);
var year=""+d.getFullYear();
-var _174=_172(d.getMonth()+1);
-var day=_172(d.getDate());
+var _176=_174(d.getMonth()+1);
+var day=_174(d.getDate());
var ret="";
var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds();
if(frac){
ret=" "+self.hmsString_(date);
}
-return year+"/"+_174+"/"+day+ret;
+return year+"/"+_176+"/"+day+ret;
};
-Dygraph.prototype.round_=function(num,_178){
-var _179=Math.pow(10,_178);
-return Math.round(num*_179)/_179;
+Dygraph.prototype.round_=function(num,_180){
+var _181=Math.pow(10,_180);
+return Math.round(num*_181)/_181;
};
Dygraph.prototype.loadedEvent_=function(data){
this.rawData_=this.parseCSV_(data);
@@ -2400,16 +952,16 @@ this.drawGraph_(this.rawData_);
Dygraph.prototype.months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
Dygraph.prototype.quarters=["Jan","Apr","Jul","Oct"];
Dygraph.prototype.addXTicks_=function(){
-var _181,endDate;
+var _183,endDate;
if(this.dateWindow_){
-_181=this.dateWindow_[0];
+_183=this.dateWindow_[0];
endDate=this.dateWindow_[1];
}else{
-_181=this.rawData_[0][0];
+_183=this.rawData_[0][0];
endDate=this.rawData_[this.rawData_.length-1][0];
}
-var _182=this.attr_("xTicker")(_181,endDate,this);
-this.layout_.updateOptions({xTicks:_182});
+var _184=this.attr_("xTicker")(_183,endDate,this);
+this.layout_.updateOptions({xTicks:_184});
};
Dygraph.SECONDLY=0;
Dygraph.TEN_SECONDLY=1;
@@ -2438,161 +990,161 @@ Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600;
Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600*6;
Dygraph.SHORT_SPACINGS[Dygraph.DAILY]=1000*86400;
Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY]=1000*604800;
-Dygraph.prototype.NumXTicks=function(_183,_184,_185){
-if(_185=Dygraph.DAILY){
-_194.push({v:t,label:new Date(t+3600*1000).strftime(_196)});
+if(frac==0||_195>=Dygraph.DAILY){
+_196.push({v:t,label:new Date(t+3600*1000).strftime(_198)});
}else{
-_194.push({v:t,label:this.hmsString_(t)});
+_196.push({v:t,label:this.hmsString_(t)});
}
}
}else{
-var _198;
-var _199=1;
-if(_193==Dygraph.MONTHLY){
-_198=[0,1,2,3,4,5,6,7,8,9,10,11,12];
+var _199;
+var _200=1;
+if(_195==Dygraph.MONTHLY){
+_199=[0,1,2,3,4,5,6,7,8,9,10,11,12];
}else{
-if(_193==Dygraph.QUARTERLY){
-_198=[0,3,6,9];
+if(_195==Dygraph.QUARTERLY){
+_199=[0,3,6,9];
}else{
-if(_193==Dygraph.BIANNUAL){
-_198=[0,6];
+if(_195==Dygraph.BIANNUAL){
+_199=[0,6];
}else{
-if(_193==Dygraph.ANNUAL){
-_198=[0];
+if(_195==Dygraph.ANNUAL){
+_199=[0];
}else{
-if(_193==Dygraph.DECADAL){
-_198=[0];
-_199=10;
+if(_195==Dygraph.DECADAL){
+_199=[0];
+_200=10;
}
}
}
}
}
-var _200=new Date(_191).getFullYear();
-var _201=new Date(_192).getFullYear();
-var _202=Dygraph.zeropad;
-for(var i=_200;i<=_201;i++){
-if(i%_199!=0){
+var _201=new Date(_193).getFullYear();
+var _202=new Date(_194).getFullYear();
+var _203=Dygraph.zeropad;
+for(var i=_201;i<=_202;i++){
+if(i%_200!=0){
continue;
}
-for(var j=0;j<_198.length;j++){
-var _203=i+"/"+_202(1+_198[j])+"/01";
-var t=Date.parse(_203);
-if(t<_191||t>_192){
+for(var j=0;j<_199.length;j++){
+var _204=i+"/"+_203(1+_199[j])+"/01";
+var t=Date.parse(_204);
+if(t<_193||t>_194){
continue;
}
-_194.push({v:t,label:new Date(t).strftime("%b %y")});
+_196.push({v:t,label:new Date(t).strftime("%b %y")});
}
}
}
-return _194;
+return _196;
};
-Dygraph.dateTicker=function(_204,_205,self){
-var _206=-1;
+Dygraph.dateTicker=function(_205,_206,self){
+var _207=-1;
for(var i=0;i=self.attr_("pixelsPerXLabel")){
-_206=i;
+var _208=self.NumXTicks(_205,_206,i);
+if(self.width_/_208>=self.attr_("pixelsPerXLabel")){
+_207=i;
break;
}
}
-if(_206>=0){
-return self.GetXAxis(_204,_205,_206);
+if(_207>=0){
+return self.GetXAxis(_205,_206,_207);
}else{
}
};
Dygraph.numericTicks=function(minV,maxV,self){
-var _210=[1,2,5];
-var _211,low_val,high_val,nTicks;
-var _212=self.attr_("pixelsPerYLabel");
+var _211=[1,2,5];
+var _212,low_val,high_val,nTicks;
+var _213=self.attr_("pixelsPerYLabel");
for(var i=-10;i<50;i++){
-var _213=Math.pow(10,i);
-for(var j=0;j<_210.length;j++){
-_211=_213*_210[j];
-low_val=Math.floor(minV/_211)*_211;
-high_val=Math.ceil(maxV/_211)*_211;
-nTicks=(high_val-low_val)/_211;
-var _214=self.height_/nTicks;
-if(_214>_212){
+var _214=Math.pow(10,i);
+for(var j=0;j<_211.length;j++){
+_212=_214*_211[j];
+low_val=Math.floor(minV/_212)*_212;
+high_val=Math.ceil(maxV/_212)*_212;
+nTicks=(high_val-low_val)/_212;
+var _215=self.height_/nTicks;
+if(_215>_213){
break;
}
}
-if(_214>_212){
+if(_215>_213){
break;
}
}
-var _215=[];
+var _216=[];
for(var i=0;i=k*k*k){
-_217=self.round_(_216/(k*k*k),1)+"B";
+if(_217>=k*k*k){
+_218=self.round_(_217/(k*k*k),1)+"B";
}else{
-if(_216>=k*k){
-_217=self.round_(_216/(k*k),1)+"M";
+if(_217>=k*k){
+_218=self.round_(_217/(k*k),1)+"M";
}else{
-if(_216>=k){
-_217=self.round_(_216/k,1)+"K";
+if(_217>=k){
+_218=self.round_(_217/k,1)+"K";
}
}
}
}
-_215.push({label:_217,v:_216});
+_216.push({label:_218,v:_217});
}
-return _215;
+return _216;
};
Dygraph.prototype.addYTicks_=function(minY,maxY){
-var _221=Dygraph.numericTicks(minY,maxY,this);
-this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_221});
+var _222=Dygraph.numericTicks(minY,maxY,this);
+this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_222});
};
-Dygraph.prototype.extremeValues_=function(_222){
+Dygraph.prototype.extremeValues_=function(_223){
var minY=null,maxY=null;
var bars=this.attr_("errorBars")||this.attr_("customBars");
if(bars){
-for(var j=0;j<_222.length;j++){
-var y=_222[j][1][0];
+for(var j=0;j<_223.length;j++){
+var y=_223[j][1][0];
if(!y){
continue;
}
-var low=y-_222[j][1][1];
-var high=y+_222[j][1][2];
+var low=y-_223[j][1][1];
+var high=y+_223[j][1][2];
if(low>y){
low=y;
}
@@ -2607,8 +1159,8 @@ minY=low;
}
}
}else{
-for(var j=0;j<_222.length;j++){
-var y=_222[j][1];
+for(var j=0;j<_223.length;j++){
+var y=_223[j][1];
if(!y){
continue;
}
@@ -2628,64 +1180,64 @@ this.layout_.removeAllDatasets();
this.setColors_();
this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize");
for(var i=1;i=low&&_226[k][0]<=high){
-_227.push(_226[k]);
+var _228=[];
+for(var k=0;k<_227.length;k++){
+if(_227[k][0]>=low&&_227[k][0]<=high){
+_228.push(_227[k]);
}
}
-_226=_227;
+_227=_228;
}
-var _228=this.extremeValues_(_226);
-var _229=_228[0];
-var _230=_228[1];
-if(!minY||_229maxY){
-maxY=_230;
+if(!maxY||_231>maxY){
+maxY=_231;
}
if(bars){
var vals=[];
-for(var j=0;j<_226.length;j++){
-vals[j]=[_226[j][0],_226[j][1][0],_226[j][1][1],_226[j][1][2]];
+for(var j=0;j<_227.length;j++){
+vals[j]=[_227[j][0],_227[j][1][0],_227[j][1][1],_227[j][1][2]];
}
this.layout_.addDataset(this.attr_("labels")[i],vals);
}else{
-this.layout_.addDataset(this.attr_("labels")[i],_226);
+this.layout_.addDataset(this.attr_("labels")[i],_227);
}
}
if(this.valueRange_!=null){
this.addYTicks_(this.valueRange_[0],this.valueRange_[1]);
}else{
var span=maxY-minY;
-var _233=maxY+0.1*span;
-var _234=minY-0.1*span;
-if(_234<0&&minY>=0){
-_234=0;
+var _234=maxY+0.1*span;
+var _235=minY-0.1*span;
+if(_235<0&&minY>=0){
+_235=0;
}
-if(_233>0&&maxY<=0){
-_233=0;
+if(_234>0&&maxY<=0){
+_234=0;
}
if(this.attr_("includeZero")){
if(maxY<0){
-_233=0;
+_234=0;
}
if(minY>0){
-_234=0;
+_235=0;
}
}
-this.addYTicks_(_234,_233);
+this.addYTicks_(_235,_234);
}
this.addXTicks_();
this.layout_.evaluateWithError();
@@ -2693,44 +1245,44 @@ this.plotter_.clear();
this.plotter_.render();
this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height);
};
-Dygraph.prototype.rollingAverage=function(_235,_236){
-if(_235.length<2){
-return _235;
+Dygraph.prototype.rollingAverage=function(_236,_237){
+if(_236.length<2){
+return _236;
}
-var _236=Math.min(_236,_235.length-1);
-var _237=[];
-var _238=this.attr_("sigma");
+var _237=Math.min(_237,_236.length-1);
+var _238=[];
+var _239=this.attr_("sigma");
if(this.fractions_){
var num=0;
var den=0;
var mult=100;
-for(var i=0;i<_235.length;i++){
-num+=_235[i][1][0];
-den+=_235[i][1][1];
-if(i-_236>=0){
-num-=_235[i-_236][1][0];
-den-=_235[i-_236][1][1];
-}
-var date=_235[i][0];
-var _241=den?num/den:0;
+for(var i=0;i<_236.length;i++){
+num+=_236[i][1][0];
+den+=_236[i][1][1];
+if(i-_237>=0){
+num-=_236[i-_237][1][0];
+den-=_236[i-_237][1][1];
+}
+var date=_236[i][0];
+var _242=den?num/den:0;
if(this.attr_("errorBars")){
if(this.wilsonInterval_){
if(den){
-var p=_241<0?0:_241,n=den;
-var pm=_238*Math.sqrt(p*(1-p)/n+_238*_238/(4*n*n));
-var _244=1+_238*_238/den;
-var low=(p+_238*_238/(2*den)-pm)/_244;
-var high=(p+_238*_238/(2*den)+pm)/_244;
-_237[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]];
+var p=_242<0?0:_242,n=den;
+var pm=_239*Math.sqrt(p*(1-p)/n+_239*_239/(4*n*n));
+var _244=1+_239*_239/den;
+var low=(p+_239*_239/(2*den)-pm)/_244;
+var high=(p+_239*_239/(2*den)+pm)/_244;
+_238[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]];
}else{
-_237[i]=[date,[0,0,0]];
+_238[i]=[date,[0,0,0]];
}
}else{
-var _245=den?_238*Math.sqrt(_241*(1-_241)/den):1;
-_237[i]=[date,[mult*_241,mult*_245,mult*_245]];
+var _245=den?_239*Math.sqrt(_242*(1-_242)/den):1;
+_238[i]=[date,[mult*_242,mult*_245,mult*_245]];
}
}else{
-_237[i]=[date,mult*_241];
+_238[i]=[date,mult*_242];
}
}
}else{
@@ -2739,71 +1291,71 @@ var low=0;
var mid=0;
var high=0;
var _247=0;
-for(var i=0;i<_235.length;i++){
-var data=_235[i][1];
+for(var i=0;i<_236.length;i++){
+var data=_236[i][1];
var y=data[1];
-_237[i]=[_235[i][0],[y,y-data[0],data[2]-y]];
+_238[i]=[_236[i][0],[y,y-data[0],data[2]-y]];
low+=data[0];
mid+=y;
high+=data[2];
_247+=1;
-if(i-_236>=0){
-var prev=_235[i-_236];
+if(i-_237>=0){
+var prev=_236[i-_237];
low-=prev[1][0];
mid-=prev[1][1];
high-=prev[1][2];
_247-=1;
}
-_237[i]=[_235[i][0],[1*mid/_247,1*(mid-low)/_247,1*(high-mid)/_247]];
+_238[i]=[_236[i][0],[1*mid/_247,1*(mid-low)/_247,1*(high-mid)/_247]];
}
}else{
-var _249=Math.min(_236-1,_235.length-2);
+var _249=Math.min(_237-1,_236.length-2);
if(!this.attr_("errorBars")){
-if(_236==1){
-return _235;
+if(_237==1){
+return _236;
}
-for(var i=0;i<_235.length;i++){
+for(var i=0;i<_236.length;i++){
var sum=0;
var _251=0;
-for(var j=Math.max(0,i-_236+1);j=0){
this.loadedEvent_(this.file_);
}else{
var req=new XMLHttpRequest();
-var _272=this;
+var _275=this;
req.onreadystatechange=function(){
if(req.readyState==4){
if(req.status==200){
-_272.loadedEvent_(req.responseText);
+_275.loadedEvent_(req.responseText);
}
}
};
@@ -3027,36 +1611,90 @@ this.error("Unknown data format: "+(typeof this.file_));
}
}
};
-Dygraph.prototype.updateOptions=function(_273){
-if(_273.rollPeriod){
-this.rollPeriod_=_273.rollPeriod;
+Dygraph.prototype.updateOptions=function(_276){
+if(_276.rollPeriod){
+this.rollPeriod_=_276.rollPeriod;
}
-if(_273.dateWindow){
-this.dateWindow_=_273.dateWindow;
+if(_276.dateWindow){
+this.dateWindow_=_276.dateWindow;
}
-if(_273.valueRange){
-this.valueRange_=_273.valueRange;
+if(_276.valueRange){
+this.valueRange_=_276.valueRange;
}
-MochiKit.Base.update(this.user_attrs_,_273);
+Dygraph.update(this.user_attrs_,_276);
this.labelsFromCSV_=(this.attr_("labels")==null);
this.layout_.updateOptions({"errorBars":this.attr_("errorBars")});
-if(_273["file"]&&_273["file"]!=this.file_){
-this.file_=_273["file"];
+if(_276["file"]&&_276["file"]!=this.file_){
+this.file_=_276["file"];
this.start_();
}else{
this.drawGraph_(this.rawData_);
}
};
-Dygraph.prototype.adjustRoll=function(_274){
-this.rollPeriod_=_274;
+Dygraph.prototype.adjustRoll=function(_277){
+this.rollPeriod_=_277;
this.drawGraph_(this.rawData_);
};
-Dygraph.GVizChart=function(_275){
-this.container=_275;
+Dygraph.GVizChart=function(_278){
+this.container=_278;
};
-Dygraph.GVizChart.prototype.draw=function(data,_276){
+Dygraph.GVizChart.prototype.draw=function(data,_279){
this.container.innerHTML="";
-this.date_graph=new Dygraph(this.container,data,_276);
+this.date_graph=new Dygraph(this.container,data,_279);
};
DateGraph=Dygraph;
+function RGBColor(_280){
+this.ok=false;
+if(_280.charAt(0)=="#"){
+_280=_280.substr(1,6);
+}
+_280=_280.replace(/ /g,"");
+_280=_280.toLowerCase();
+var _281={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"};
+for(var key in _281){
+if(_280==key){
+_280=_281[key];
+}
+}
+var _283=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(bits){
+return [parseInt(bits[1]),parseInt(bits[2]),parseInt(bits[3])];
+}},{re:/^(\w{2})(\w{2})(\w{2})$/,example:["#00ff00","336699"],process:function(bits){
+return [parseInt(bits[1],16),parseInt(bits[2],16),parseInt(bits[3],16)];
+}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(bits){
+return [parseInt(bits[1]+bits[1],16),parseInt(bits[2]+bits[2],16),parseInt(bits[3]+bits[3],16)];
+}}];
+for(var i=0;i<_283.length;i++){
+var re=_283[i].re;
+var _286=_283[i].process;
+var bits=re.exec(_280);
+if(bits){
+channels=_286(bits);
+this.r=channels[0];
+this.g=channels[1];
+this.b=channels[2];
+this.ok=true;
+}
+}
+this.r=(this.r<0||isNaN(this.r))?0:((this.r>255)?255:this.r);
+this.g=(this.g<0||isNaN(this.g))?0:((this.g>255)?255:this.g);
+this.b=(this.b<0||isNaN(this.b))?0:((this.b>255)?255:this.b);
+this.toRGB=function(){
+return "rgb("+this.r+", "+this.g+", "+this.b+")";
+};
+this.toHex=function(){
+var r=this.r.toString(16);
+var g=this.g.toString(16);
+var b=this.b.toString(16);
+if(r.length==1){
+r="0"+r;
+}
+if(g.length==1){
+g="0"+g;
+}
+if(b.length==1){
+b="0"+b;
+}
+return "#"+r+g+b;
+};
+}