X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-combined.js;h=ffb56fbd6d4166d61cc1bb6ff2861ba717a6826c;hb=61b5e92517f97823bf3a1f385a505002ff05fd4b;hp=873160db070ecfaf7fc68cfd383ab003660634e1;hpb=7617164833913c65544c5686d4170d7a57f060ba;p=dygraphs.git diff --git a/dygraph-combined.js b/dygraph-combined.js index 873160d..ffb56fb 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -1,2680 +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;i=0){ -var opt=elem.options[elem.selectedIndex]; -var v=opt.value; -if(!v){ -var h=opt.outerHTML; -if(h&&!h.match(/^[^>]+\svalue\s*=/i)){ -v=opt.text; -} -} -_1f8.push(name); -_1f9.push(v); -return null; -} -_1f8.push(name); -_1f9.push(""); -return null; -}else{ -var opts=elem.options; -if(!opts.length){ -_1f8.push(name); -_1f9.push(""); -return null; -} -for(var i=0;i]+\svalue\s*=/i)){ -v=opt.text; -} -} -_1f8.push(name); -_1f9.push(v); -} -return null; -} -} -if(_1fe==="FORM"||_1fe==="P"||_1fe==="SPAN"||_1fe==="DIV"){ -return elem.childNodes; -} -_1f8.push(name); -_1f9.push(elem.value||""); -return null; -} -return elem.childNodes; -}); -return [_1f8,_1f9]; -},withDocument:function(doc,func){ -var self=MochiKit.DOM; -var _207=self._document; -var rval; -try{ -self._document=doc; -rval=func(); -} -catch(e){ -self._document=_207; -throw e; -} -self._document=_207; -return rval; -},registerDOMConverter:function(name,_20a,wrap,_20c){ -MochiKit.DOM.domConverters.register(name,_20a,wrap,_20c); -},coerceToDOM:function(node,ctx){ -var m=MochiKit.Base; -var im=MochiKit.Iter; -var self=MochiKit.DOM; -if(im){ -var iter=im.iter; -var _213=im.repeat; -var map=m.map; -} -var _215=self.domConverters; -var _216=arguments.callee; -var _217=m.NotFound; -while(true){ -if(typeof (node)=="undefined"||node===null){ -return null; -} -if(typeof (node)=="function"&&typeof (node.length)=="number"&&!(node instanceof Function)){ -node=im.list(node); -} -if(typeof (node.nodeType)!="undefined"&&node.nodeType>0){ -return node; -} -if(typeof (node)=="number"||typeof (node)=="boolean"){ -node=node.toString(); -} -if(typeof (node)=="string"){ -return self._document.createTextNode(node); -} -if(typeof (node.__dom__)=="function"){ -node=node.__dom__(ctx); -continue; -} -if(typeof (node.dom)=="function"){ -node=node.dom(ctx); -continue; -} -if(typeof (node)=="function"){ -node=node.apply(ctx,[ctx]); -continue; -} -if(im){ -var _218=null; -try{ -_218=iter(node); -} -catch(e){ -} -if(_218){ -return map(_216,_218,_213(ctx)); -} -} -try{ -node=_215.match(node,ctx); -continue; -} -catch(e){ -if(e!=_217){ -throw e; -} -} -return self._document.createTextNode(node.toString()); -} -return undefined; -},isChildNode:function(node,_21a){ -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -node=self.getElement(node); -} -if(typeof (_21a)=="string"){ -_21a=self.getElement(_21a); -} -if(node===_21a){ -return true; -} -while(node&&node.tagName.toUpperCase()!="BODY"){ -node=node.parentNode; -if(node===_21a){ -return true; -} -} -return false; -},setNodeAttribute:function(node,attr,_21e){ -var o={}; -o[attr]=_21e; -try{ -return MochiKit.DOM.updateNodeAttributes(node,o); -} -catch(e){ -} -return null; -},getNodeAttribute:function(node,attr){ -var self=MochiKit.DOM; -var _223=self.attributeArray.renames[attr]; -node=self.getElement(node); -try{ -if(_223){ -return node[_223]; -} -return node.getAttribute(attr); -} -catch(e){ -} -return null; -},removeNodeAttribute:function(node,attr){ -var self=MochiKit.DOM; -var _227=self.attributeArray.renames[attr]; -node=self.getElement(node); -try{ -if(_227){ -return node[_227]; -} -return node.removeAttribute(attr); -} -catch(e){ -} -return null; -},updateNodeAttributes:function(node,_229){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -if(_229){ -var _22c=MochiKit.Base.updatetree; -if(self.attributeArray.compliant){ -for(var k in _229){ -var v=_229[k]; -if(typeof (v)=="object"&&typeof (elem[k])=="object"){ -if(k=="style"&&MochiKit.Style){ -MochiKit.Style.setStyle(elem,v); -}else{ -_22c(elem[k],v); -} -}else{ -if(k.substring(0,2)=="on"){ -if(typeof (v)=="string"){ -v=new Function(v); -} -elem[k]=v; -}else{ -elem.setAttribute(k,v); -} -} -} -}else{ -var _22f=self.attributeArray.renames; -for(var k in _229){ -v=_229[k]; -var _230=_22f[k]; -if(k=="style"&&typeof (v)=="string"){ -elem.style.cssText=v; -}else{ -if(typeof (_230)=="string"){ -elem[_230]=v; -}else{ -if(typeof (elem[k])=="object"&&typeof (v)=="object"){ -if(k=="style"&&MochiKit.Style){ -MochiKit.Style.setStyle(elem,v); -}else{ -_22c(elem[k],v); -} -}else{ -if(k.substring(0,2)=="on"){ -if(typeof (v)=="string"){ -v=new Function(v); -} -elem[k]=v; -}else{ -elem.setAttribute(k,v); -} -} -} -} -} -} -} -return elem; -},appendChildNodes:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -var _234=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -var _235=MochiKit.Base.concat; -while(_234.length){ -var n=_234.shift(); -if(typeof (n)=="undefined"||n===null){ -}else{ -if(typeof (n.nodeType)=="number"){ -elem.appendChild(n); -}else{ -_234=_235(n,_234); -} -} -} -return elem; -},insertSiblingNodesBefore:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -var _23a=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -var _23b=elem.parentNode; -var _23c=MochiKit.Base.concat; -while(_23a.length){ -var n=_23a.shift(); -if(typeof (n)=="undefined"||n===null){ -}else{ -if(typeof (n.nodeType)=="number"){ -_23b.insertBefore(n,elem); -}else{ -_23a=_23c(n,_23a); -} -} -} -return _23b; -},insertSiblingNodesAfter:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -var _241=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -if(elem.nextSibling){ -return self.insertSiblingNodesBefore(elem.nextSibling,_241); -}else{ -return self.appendChildNodes(elem.parentNode,_241); -} -},replaceChildNodes:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -arguments[0]=elem; -} -var _245; -while((_245=elem.firstChild)){ -elem.removeChild(_245); -} -if(arguments.length<2){ -return elem; -}else{ -return self.appendChildNodes.apply(this,arguments); -} -},createDOM:function(name,_247){ -var elem; -var self=MochiKit.DOM; -var m=MochiKit.Base; -if(typeof (_247)=="string"||typeof (_247)=="number"){ -var args=m.extend([name,null],arguments,1); -return arguments.callee.apply(this,args); -} -if(typeof (name)=="string"){ -var _24c=self._xhtml; -if(_247&&!self.attributeArray.compliant){ -var _24d=""; -if("name" in _247){ -_24d+=" name=\""+self.escapeHTML(_247.name)+"\""; -} -if(name=="input"&&"type" in _247){ -_24d+=" type=\""+self.escapeHTML(_247.type)+"\""; -} -if(_24d){ -name="<"+name+_24d+">"; -_24c=false; -} -} -var d=self._document; -if(_24c&&d===document){ -elem=d.createElementNS("http://www.w3.org/1999/xhtml",name); -}else{ -elem=d.createElement(name); -} -}else{ -elem=name; -} -if(_247){ -self.updateNodeAttributes(elem,_247); -} -if(arguments.length<=2){ -return elem; -}else{ -var args=m.extend([elem],arguments,2); -return self.appendChildNodes.apply(this,args); -} -},createDOMFunc:function(){ -var m=MochiKit.Base; -return m.partial.apply(this,m.extend([MochiKit.DOM.createDOM],arguments)); -},removeElement:function(elem){ -var e=MochiKit.DOM.getElement(elem); -e.parentNode.removeChild(e); -return e; -},swapDOM:function(dest,src){ -var self=MochiKit.DOM; -dest=self.getElement(dest); -var _255=dest.parentNode; -if(src){ -src=self.getElement(src); -_255.replaceChild(src,dest); -}else{ -_255.removeChild(dest); -} -return src; -},getElement:function(id){ -var self=MochiKit.DOM; -if(arguments.length==1){ -return ((typeof (id)=="string")?self._document.getElementById(id):id); -}else{ -return MochiKit.Base.map(self.getElement,arguments); -} -},getElementsByTagAndClassName:function(_258,_259,_25a){ -var self=MochiKit.DOM; -if(typeof (_258)=="undefined"||_258===null){ -_258="*"; -} -if(typeof (_25a)=="undefined"||_25a===null){ -_25a=self._document; -} -_25a=self.getElement(_25a); -var _25c=(_25a.getElementsByTagName(_258)||self._document.all); -if(typeof (_259)=="undefined"||_259===null){ -return MochiKit.Base.extend(null,_25c); -} -var _25d=[]; -for(var i=0;i<_25c.length;i++){ -var _25f=_25c[i]; -var cls=_25f.className; -if(!cls){ -continue; -} -var _261=cls.split(" "); -for(var j=0;j<_261.length;j++){ -if(_261[j]==_259){ -_25d.push(_25f); -break; -} -} -} -return _25d; -},_newCallStack:function(path,once){ -var rval=function(){ -var _266=arguments.callee.callStack; -for(var i=0;i<_266.length;i++){ -if(_266[i].apply(this,arguments)===false){ -break; -} -} -if(once){ -try{ -this[path]=null; -} -catch(e){ -} -} -}; -rval.callStack=[]; -return rval; -},addToCallStack:function(_268,path,func,once){ -var self=MochiKit.DOM; -var _26d=_268[path]; -var _26e=_26d; -if(!(typeof (_26d)=="function"&&typeof (_26d.callStack)=="object"&&_26d.callStack!==null)){ -_26e=self._newCallStack(path,once); -if(typeof (_26d)=="function"){ -_26e.callStack.push(_26d); -} -_268[path]=_26e; -} -_26e.callStack.push(func); -},addLoadEvent:function(func){ -var self=MochiKit.DOM; -self.addToCallStack(self._window,"onload",func,true); -},focusOnLoad:function(_271){ -var self=MochiKit.DOM; -self.addLoadEvent(function(){ -_271=self.getElement(_271); -if(_271){ -_271.focus(); -} -}); -},setElementClass:function(_273,_274){ -var self=MochiKit.DOM; -var obj=self.getElement(_273); -if(self.attributeArray.compliant){ -obj.setAttribute("class",_274); -}else{ -obj.setAttribute("className",_274); -} -},toggleElementClass:function(_277){ -var self=MochiKit.DOM; -for(var i=1;i/g,">"); -},toHTML:function(dom){ -return MochiKit.DOM.emitHTML(dom).join(""); -},emitHTML:function(dom,lst){ -if(typeof (lst)=="undefined"||lst===null){ -lst=[]; -} -var _29a=[dom]; -var self=MochiKit.DOM; -var _29c=self.escapeHTML; -var _29d=self.attributeArray; -while(_29a.length){ -dom=_29a.pop(); -if(typeof (dom)=="string"){ -lst.push(dom); -}else{ -if(dom.nodeType==1){ -lst.push("<"+dom.tagName.toLowerCase()); -var _29e=[]; -var _29f=_29d(dom); -for(var i=0;i<_29f.length;i++){ -var a=_29f[i]; -_29e.push([" ",a.name,"=\"",_29c(a.value),"\""]); -} -_29e.sort(); -for(i=0;i<_29e.length;i++){ -var _2a2=_29e[i]; -for(var j=0;j<_2a2.length;j++){ -lst.push(_2a2[j]); -} -} -if(dom.hasChildNodes()){ -lst.push(">"); -_29a.push(""); -var _2a4=dom.childNodes; -for(i=_2a4.length-1;i>=0;i--){ -_29a.push(_2a4[i]); -} -}else{ -lst.push("/>"); -} -}else{ -if(dom.nodeType==3){ -lst.push(_29c(dom.nodeValue)); -} -} -} -} -return lst; -},scrapeText:function(node,_2a6){ -var rval=[]; -(function(node){ -var cn=node.childNodes; -if(cn){ -for(var i=0;i0){ -var _2cd=m.filter; -_2cc=function(node){ -return _2cd(_2cc.ignoreAttrFilter,node.attributes); -}; -_2cc.ignoreAttr={}; -var _2cf=_2cb.attributes; -var _2d0=_2cc.ignoreAttr; -for(var i=0;i<_2cf.length;i++){ -var a=_2cf[i]; -_2d0[a.name]=a.value; -} -_2cc.ignoreAttrFilter=function(a){ -return (_2cc.ignoreAttr[a.name]!=a.value); -}; -_2cc.compliant=false; -_2cc.renames={"class":"className","checked":"defaultChecked","usemap":"useMap","for":"htmlFor","readonly":"readOnly","colspan":"colSpan","bgcolor":"bgColor","cellspacing":"cellSpacing","cellpadding":"cellPadding"}; -}else{ -_2cc=function(node){ -return node.attributes; -}; -_2cc.compliant=true; -_2cc.renames={}; -} -this.attributeArray=_2cc; -var _2d5=function(_2d6,arr){ -var _2d8=arr[1].split("."); -var str=""; -var obj={}; -str+="if (!MochiKit."+_2d8[1]+") { throw new Error(\""; -str+="This function has been deprecated and depends on MochiKit."; -str+=_2d8[1]+".\");}"; -str+="return MochiKit."+_2d8[1]+"."+arr[0]; -str+=".apply(this, arguments);"; -obj[_2d8[2]]=new Function(str); -MochiKit.Base.update(MochiKit[_2d6],obj); -}; -for(var i;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){ @@ -2690,7 +18,14 @@ this._evaluateLineTicks(); }; DygraphLayout.prototype._evaluateLimits=function(){ this.minxval=this.maxxval=null; +if(this.options.dateWindow){ +this.minxval=this.options.dateWindow[0]; +this.maxxval=this.options.dateWindow[1]; +}else{ for(var _6 in this.datasets){ +if(!this.datasets.hasOwnProperty(_6)){ +continue; +} var _7=this.datasets[_6]; var x1=_7[0][0]; if(!this.minxval||x1this.maxxval){ this.maxxval=x2; } } +} this.xrange=this.maxxval-this.minxval; this.xscale=(this.xrange!=0?1/this.xrange:1); this.minyval=this.options.yAxis[0]; @@ -2711,6 +47,9 @@ this.yscale=(this.yrange!=0?1/this.yrange:1); DygraphLayout.prototype._evaluateLineCharts=function(){ this.points=new Array(); for(var _10 in this.datasets){ +if(!this.datasets.hasOwnProperty(_10)){ +continue; +} var _11=this.datasets[_10]; for(var j=0;j<_11.length;j++){ var _13=_11[j]; @@ -2754,6 +93,9 @@ return; } var i=0; for(var _19 in this.datasets){ +if(!this.datasets.hasOwnProperty(_19)){ +continue; +} var j=0; var _20=this.datasets[_19]; for(var j=0;j<_20.length;j++,i++){ @@ -2772,23 +114,15 @@ 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; -this.isIE=(/MSIE/.test(navigator.userAgent)&&!window.opera); -if(this.isIE&&!isNil(G_vmlCanvasManager)){ -this.IEDelay=0.5; -this.maxTries=5; -this.renderDelay=null; -this.clearDelay=null; -this.element=G_vmlCanvasManager.initElement(this.element); -} this.height=this.element.height; this.width=this.element.width; if(!this.isIE&&!(DygraphCanvasRenderer.isSupported(this.element))){ @@ -2833,7 +167,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; @@ -2855,7 +189,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; @@ -2870,7 +204,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; @@ -2890,45 +224,55 @@ if(!this.options.drawXAxis&&!this.options.drawYAxis){ return; } var _40=this.element.getContext("2d"); -var _41={"style":{"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){ +if(_41.hasOwnProperty(_45)){ +div.style[_45]=_41[_45]; +} +} +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){ +if(this.layout.yticks&&this.layout.yticks.length>0){ for(var i=0;ithis.height){ -_43.style.bottom="0px"; +_47.style.bottom="0px"; }else{ -_43.style.top=top+"px"; +_47.style.top=top+"px"; } -_43.style.left="0px"; -_43.style.textAlign="right"; -_43.style.width=this.options.yAxisLabelWidth+"px"; -this.container.appendChild(_43); -this.ylabels.push(_43); +_47.style.left="0px"; +_47.style.textAlign="right"; +_47.style.width=this.options.yAxisLabelWidth+"px"; +this.container.appendChild(_47); +this.ylabels.push(_47); } -var _45=this.ylabels[0]; -var _46=this.options.axisLabelFontSize; -var _47=parseInt(_45.style.top)+_46; -if(_47>this.height-_46){ -_45.style.top=(parseInt(_45.style.top)-_46/2)+"px"; +var _49=this.ylabels[0]; +var _50=this.options.axisLabelFontSize; +var _51=parseInt(_49.style.top)+_50; +if(_51>this.height-_50){ +_49.style.top=(parseInt(_49.style.top)-_50/2)+"px"; } } _40.beginPath(); @@ -2940,33 +284,33 @@ _40.stroke(); if(this.options.drawXAxis){ if(this.layout.xticks){ for(var i=0;ithis.width){ -_48=this.width-this.options.xAxisLabelWidth; -_43.style.textAlign="right"; +var _47=_42(_46[1]); +_47.style.textAlign="center"; +_47.style.bottom="0px"; +var _52=(x-this.options.axisLabelWidth/2); +if(_52+this.options.axisLabelWidth>this.width){ +_52=this.width-this.options.xAxisLabelWidth; +_47.style.textAlign="right"; } -if(_48<0){ -_48=0; -_43.style.textAlign="left"; +if(_52<0){ +_52=0; +_47.style.textAlign="left"; } -_43.style.left=_48+"px"; -_43.style.width=this.options.xAxisLabelWidth+"px"; -this.container.appendChild(_43); -this.xlabels.push(_43); +_47.style.left=_52+"px"; +_47.style.width=this.options.xAxisLabelWidth+"px"; +this.container.appendChild(_47); +this.xlabels.push(_47); } } _40.beginPath(); @@ -2978,118 +322,115 @@ _40.stroke(); _40.restore(); }; DygraphCanvasRenderer.prototype._renderLineChart=function(){ -var _49=this.element.getContext("2d"); -var _50=this.options.colorScheme.length; -var _51=this.options.colorScheme; -var _52=MochiKit.Base.keys(this.layout.datasets); -var _53=this.layout.options.errorBars; -var _54=_52.length; -var _55=MochiKit.Base.bind; -var _56=MochiKit.Base.partial; +var _53=this.element.getContext("2d"); +var _54=this.options.colorScheme.length; +var _55=this.options.colorScheme; +var _56=this.layout.options.errorBars; +var _57=[]; +for(var _58 in this.layout.datasets){ +if(this.layout.datasets.hasOwnProperty(_58)){ +_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(); +} +} +for(var i=0;i<_59;i++){ +var _62=_57[i]; +var _63=_55[i%_54]; +_53.save(); +var _60=this.layout.points[0]; +var _71=this.dygraph_.attr_("pointSize"); var _64=null,prevY=null; -var _65=this.dygraph_.attr_("drawPoints"); -var _66=this.layout.points; -for(var j=0;j<_66.length;j++){ -var _57=_66[j]; -if(_57.name==_60){ -if(!_58(_57.canvasy)){ +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 _67=(!_64&&(j==_66.length-1||!_58(_66[j+1].canvasy))); +var _74=(!_64&&(j==_73.length-1||!_61(_73[j+1].canvasy))); if(!_64){ -_64=_57.canvasx; -prevY=_57.canvasy; +_64=_60.canvasx; +prevY=_60.canvasy; }else{ ctx.beginPath(); +ctx.strokeStyle=_63; +ctx.lineWidth=this.options.strokeWidth; ctx.moveTo(_64,prevY); -_64=_57.canvasx; -prevY=_57.canvasy; +_64=_60.canvasx; +prevY=_60.canvasy; ctx.lineTo(_64,prevY); ctx.stroke(); } -if(_65||_67){ +if(_72||_74){ ctx.beginPath(); -ctx.fillStyle=_61.toRGBString(); -ctx.arc(_57.canvasx,_57.canvasy,_63,0,360,false); +ctx.fillStyle=_63; +ctx.arc(_60.canvasx,_60.canvasy,_71,0,2*Math.PI,false); ctx.fill(); } } } } } +_53.restore(); }; -var _68=function(ctx){ -for(var i=0;i<_54;i++){ -var _69=_52[i]; -var _70=_51[i%_50]; -var _71=this.options.strokeColorTransform; -_49.save(); -_49.strokeStyle=_70.toRGBString(); -_49.lineWidth=this.options.strokeWidth; -var _72=-1; -var _73=[-1,-1]; -var _74=0; -var _75=this.layout.yscale; -var _76=_70.colorWithAlpha(0.15); -ctx.fillStyle=_76.toRGBString(); -ctx.beginPath(); -for(var j=0;j=0){ -ctx.moveTo(_72,_73[0]); -ctx.lineTo(_77.canvasx,_78[0]); -ctx.lineTo(_77.canvasx,_78[1]); -ctx.lineTo(_72,_73[1]); -ctx.closePath(); -} -_73[0]=_78[0]; -_73[1]=_78[1]; -_72=_77.canvasx; -} -} -ctx.fill(); -} -}; -if(_53){ -_55(_68,this)(_49); -} -_55(_59,this)(_49); -_49.restore(); -}; -Dygraph=function(div,_80,_81){ +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,_80,arguments[2],arguments[3]); +this.__old_init__(div,_75,arguments[2],arguments[3]); }else{ -this.__init__(div,_80,_81); +this.__init__(div,_75,_76); } } }; @@ -3105,33 +446,33 @@ Dygraph.DEFAULT_ROLL_PERIOD=1; Dygraph.DEFAULT_WIDTH=480; Dygraph.DEFAULT_HEIGHT=320; Dygraph.AXIS_LINE_WIDTH=0.3; -Dygraph.DEFAULT_ATTRS={highlightCircleSize:3,pixelsPerXLabel:60,pixelsPerYLabel:30,labelsDivWidth:250,labelsDivStyles:{},labelsSeparateLines:false,labelsKMB:false,strokeWidth:1,axisTickSize:3,axisLabelFontSize:14,xAxisLabelWidth:50,yAxisLabelWidth:50,rightGap:5,showRoller:false,xValueFormatter:Dygraph.dateString_,xValueParser:Dygraph.dateParser,xTicker:Dygraph.dateTicker,sigma:2,errorBars:false,fractions:false,wilsonInterval:true,customBars:false}; +Dygraph.DEFAULT_ATTRS={highlightCircleSize:3,pixelsPerXLabel:60,pixelsPerYLabel:30,labelsDivWidth:250,labelsDivStyles:{},labelsSeparateLines:false,labelsKMB:false,labelsKMG2:false,strokeWidth:1,axisTickSize:3,axisLabelFontSize:14,xAxisLabelWidth:50,yAxisLabelWidth:50,rightGap:5,showRoller:false,xValueFormatter:Dygraph.dateString_,xValueParser:Dygraph.dateParser,xTicker:Dygraph.dateTicker,delimiter:",",sigma:2,errorBars:false,fractions:false,wilsonInterval:true,customBars:false}; Dygraph.DEBUG=1; Dygraph.INFO=2; Dygraph.WARNING=3; Dygraph.ERROR=3; -Dygraph.prototype.__old_init__=function(div,_82,_83,_84){ -if(_83!=null){ -var _85=["Date"]; -for(var i=0;i<_83.length;i++){ -_85.push(_83[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(_84,{"labels":_85}); +Dygraph.update(_79,{"labels":_80}); } -this.__init__(div,_82,_84); +this.__init__(div,_77,_79); }; -Dygraph.prototype.__init__=function(div,_86,_87){ -if(_87==null){ -_87={}; +Dygraph.prototype.__init__=function(div,_81,_82){ +if(_82==null){ +_82={}; } this.maindiv_=div; -this.file_=_86; -this.rollPeriod_=_87.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; +this.file_=_81; +this.rollPeriod_=_82.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; this.previousVerticalX_=-1; -this.fractions_=_87.fractions||false; -this.dateWindow_=_87.dateWindow||null; -this.valueRange_=_87.valueRange||null; -this.wilsonInterval_=_87.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"; @@ -3142,188 +483,250 @@ 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_,_87); +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_); -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_); -this.plotter_=new DygraphCanvasRenderer(this,this.hidden_,this.layout_,this.renderOptions_); -this.createStatusMessage_(); -this.createRollInterface_(); -this.createDragInterface_(); this.start_(); }; -Dygraph.prototype.attr_=function(_88){ -if(typeof (this.user_attrs_[_88])!="undefined"){ -return this.user_attrs_[_88]; +Dygraph.prototype.attr_=function(_83){ +if(typeof (this.user_attrs_[_83])!="undefined"){ +return this.user_attrs_[_83]; }else{ -if(typeof (this.attrs_[_88])!="undefined"){ -return this.attrs_[_88]; +if(typeof (this.attrs_[_83])!="undefined"){ +return this.attrs_[_83]; }else{ return null; } } }; -Dygraph.prototype.log=function(_89,_90){ +Dygraph.prototype.log=function(_84,_85){ if(typeof (console)!="undefined"){ -switch(_89){ +switch(_84){ case Dygraph.DEBUG: -console.debug("dygraphs: "+_90); +console.debug("dygraphs: "+_85); break; case Dygraph.INFO: -console.info("dygraphs: "+_90); +console.info("dygraphs: "+_85); break; case Dygraph.WARNING: -console.warn("dygraphs: "+_90); +console.warn("dygraphs: "+_85); break; case Dygraph.ERROR: -console.error("dygraphs: "+_90); +console.error("dygraphs: "+_85); break; } } }; -Dygraph.prototype.info=function(_91){ -this.log(Dygraph.INFO,_91); +Dygraph.prototype.info=function(_86){ +this.log(Dygraph.INFO,_86); }; -Dygraph.prototype.warn=function(_92){ -this.log(Dygraph.WARNING,_92); +Dygraph.prototype.warn=function(_87){ +this.log(Dygraph.WARNING,_87); }; -Dygraph.prototype.error=function(_93){ -this.log(Dygraph.ERROR,_93); +Dygraph.prototype.error=function(_88){ +this.log(Dygraph.ERROR,_88); }; Dygraph.prototype.rollPeriod=function(){ return this.rollPeriod_; }; Dygraph.addEvent=function(el,evt,fn){ -var _96=function(e){ +var _91=function(e){ if(!e){ var e=window.event; } fn(e); }; if(window.addEventListener){ -el.addEventListener(evt,_96,false); +el.addEventListener(evt,_91,false); }else{ -el.attachEvent("on"+evt,_96); +el.attachEvent("on"+evt,_91); } }; Dygraph.prototype.createInterface_=function(){ -var _98=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"; -_98.appendChild(this.graphDiv); -this.canvas_=document.createElement("canvas"); +_93.appendChild(this.graphDiv); +this.canvas_=Dygraph.createCanvas(); this.canvas_.style.position="absolute"; this.canvas_.width=this.width_; this.canvas_.height=this.height_; +this.canvas_.style.width=this.width_+"px"; +this.canvas_.style.height=this.height_+"px"; this.graphDiv.appendChild(this.canvas_); this.hidden_=this.createPlotKitCanvas_(this.canvas_); -var _99=this; +var _94=this; Dygraph.addEvent(this.hidden_,"mousemove",function(e){ -_99.mouseMove_(e); +_94.mouseMove_(e); }); Dygraph.addEvent(this.hidden_,"mouseout",function(e){ -_99.mouseOut_(e); +_94.mouseOut_(e); }); +this.layoutOptions_={"xOriginIsZero":false}; +Dygraph.update(this.layoutOptions_,this.attrs_); +Dygraph.update(this.layoutOptions_,this.user_attrs_); +Dygraph.update(this.layoutOptions_,{"errorBars":(this.attr_("errorBars")||this.attr_("customBars"))}); +this.layout_=new DygraphLayout(this,this.layoutOptions_); +this.renderOptions_={colorScheme:this.colors_,strokeColor:null,axisLineWidth:Dygraph.AXIS_LINE_WIDTH}; +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_(); }; -Dygraph.prototype.createPlotKitCanvas_=function(_100){ -var h=document.createElement("canvas"); +Dygraph.prototype.createPlotKitCanvas_=function(_95){ +var h=Dygraph.createCanvas(); h.style.position="absolute"; -h.style.top=_100.style.top; -h.style.left=_100.style.left; +h.style.top=_95.style.top; +h.style.left=_95.style.left; h.width=this.width_; h.height=this.height_; +h.style.width=this.width_+"px"; +h.style.height=this.height_+"px"; 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 _103=this.attr_("colors"); -if(!_103){ +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(_123,_125),Math.max(_123,_125)); +Dygraph.addEvent(this.hidden_,"mouseup",function(_143){ +if(_126){ +_126=false; +_130=getX(_143); +_131=getY(_143); +var _144=Math.abs(_130-_128); +var _145=Math.abs(_131-_129); +if(_144<2&&_145<2&&self.attr_("clickCallback")!=null&&self.lastx_!=undefined){ +self.attr_("clickCallback")(_143,self.lastx_,self.selPoints_); +} +if(_144>=10){ +self.doZoom_(Math.min(_128,_130),Math.max(_128,_130)); }else{ self.canvas_.getContext("2d").clearRect(0,0,self.canvas_.width,self.canvas_.height); } -_123=null; -_124=null; +_128=null; +_129=null; +} +if(_127){ +_127=false; +_133=null; +_134=null; } }); -Dygraph.addEvent(this.hidden_,"dblclick",function(_139){ +Dygraph.addEvent(this.hidden_,"dblclick",function(_146){ +if(self.dateWindow_==null){ +return; +} self.dateWindow_=null; self.drawGraph_(self.rawData_); -var _140=self.rawData_[0][0]; -var _141=self.rawData_[self.rawData_.length-1][0]; +var _147=self.rawData_[0][0]; +var _148=self.rawData_[self.rawData_.length-1][0]; if(self.attr_("zoomCallback")){ -self.attr_("zoomCallback")(_140,_141); +self.attr_("zoomCallback")(_147,_148); } }); }; -Dygraph.prototype.drawZoomRect_=function(_142,endX,_144){ +Dygraph.prototype.drawZoomRect_=function(_149,endX,_151){ var ctx=this.canvas_.getContext("2d"); -if(_144){ -ctx.clearRect(Math.min(_142,_144),0,Math.abs(_142-_144),this.height_); +if(_151){ +ctx.clearRect(Math.min(_149,_151),0,Math.abs(_149-_151),this.height_); } -if(endX&&_142){ +if(endX&&_149){ ctx.fillStyle="rgba(128,128,128,0.33)"; -ctx.fillRect(Math.min(_142,endX),0,Math.abs(endX-_142),this.height_); +ctx.fillRect(Math.min(_149,endX),0,Math.abs(endX-_149),this.height_); } }; -Dygraph.prototype.doZoom_=function(lowX,_146){ -var _147=this.layout_.points; -var _148=null; -var _149=null; -for(var i=0;i<_147.length;i++){ -var cx=_147[i].canvasx; -var x=_147[i].xval; -if(cx_148)){ -_148=x; +Dygraph.prototype.doZoom_=function(lowX,_153){ +var _154=this.layout_.points; +var _155=null; +var _156=null; +for(var i=0;i<_154.length;i++){ +var cx=_154[i].canvasx; +var x=_154[i].xval; +if(cx_155)){ +_155=x; } -if(cx>_146&&(_149==null||x<_149)){ -_149=x; +if(cx>_153&&(_156==null||x<_156)){ +_156=x; } } -if(_148==null){ -_148=_147[0].xval; +if(_155==null){ +_155=_154[0].xval; } -if(_149==null){ -_149=_147[_147.length-1].xval; +if(_156==null){ +_156=_154[_154.length-1].xval; } -this.dateWindow_=[_148,_149]; +this.dateWindow_=[_155,_156]; this.drawGraph_(this.rawData_); if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_148,_149); +this.attr_("zoomCallback")(_155,_156); } }; -Dygraph.prototype.mouseMove_=function(_151){ -var _152=Dygraph.pageX(_151)-Dygraph.findPosX(this.hidden_); -var _153=this.layout_.points; -var _154=-1; -var _155=-1; -var _156=1e+100; +Dygraph.prototype.mouseMove_=function(_158){ +var _159=Dygraph.pageX(_158)-Dygraph.findPosX(this.hidden_); +var _160=this.layout_.points; +var _161=-1; +var _162=-1; +var _163=1e+100; var idx=-1; -for(var i=0;i<_153.length;i++){ -var dist=Math.abs(_153[i].canvasx-_152); -if(dist>_156){ +for(var i=0;i<_160.length;i++){ +var dist=Math.abs(_160[i].canvasx-_159); +if(dist>_163){ break; } -_156=dist; +_163=dist; idx=i; } if(idx>=0){ -_154=_153[idx].xval; +_161=_160[idx].xval; } -if(_152>_153[_153.length-1].canvasx){ -_154=_153[_153.length-1].xval; +if(_159>_160[_160.length-1].canvasx){ +_161=_160[_160.length-1].xval; } -var _159=[]; -for(var i=0;i<_153.length;i++){ -if(_153[i].xval==_154){ -_159.push(_153[i]); +this.selPoints_=[]; +for(var i=0;i<_160.length;i++){ +if(_160[i].xval==_161){ +this.selPoints_.push(_160[i]); } } -var _160=this.attr_("highlightCircleSize"); +if(this.attr_("highlightCallback")){ +this.attr_("highlightCallback")(_158,_161,this.selPoints_); +} +var _166=this.attr_("highlightCircleSize"); var ctx=this.canvas_.getContext("2d"); if(this.previousVerticalX_>=0){ var px=this.previousVerticalX_; -ctx.clearRect(px-_160-1,0,2*_160+2,this.height_); +ctx.clearRect(px-_166-1,0,2*_166+2,this.height_); } var isOK=function(x){ return x&&!isNaN(x); }; -if(_159.length>0){ -var _152=_159[0].canvasx; -var _162=this.attr_("xValueFormatter")(_154,this)+":"; +if(this.selPoints_.length>0){ +var _159=this.selPoints_[0].canvasx; +var _168=this.attr_("xValueFormatter")(_161,this)+":"; var clen=this.colors_.length; -for(var i=0;i<_159.length;i++){ -if(!isOK(_159[i].canvasy)){ +for(var i=0;i"+_164.name+":"+this.round_(_164.yval,2); +var _170=this.selPoints_[i]; +var c=new RGBColor(this.colors_[i%clen]); +_168+=" "+_170.name+":"+this.round_(_170.yval,2); } -this.attr_("labelsDiv").innerHTML=_162; -this.lastx_=_154; +this.attr_("labelsDiv").innerHTML=_168; +this.lastx_=_161; ctx.save(); -for(var i=0;i<_159.length;i++){ -if(!isOK(_159[i%clen].canvasy)){ +for(var i=0;i=Dygraph.DAILY){ -_191.push({v:t,label:new Date(t+3600*1000).strftime(_193)}); +if(frac==0||_197>=Dygraph.DAILY){ +_198.push({v:t,label:new Date(t+3600*1000).strftime(_200)}); }else{ -_191.push({v:t,label:this.hmsString_(t)}); +_198.push({v:t,label:this.hmsString_(t)}); } } }else{ -var _195; -var _196=1; -if(_190==Dygraph.MONTHLY){ -_195=[0,1,2,3,4,5,6,7,8,9,10,11,12]; +var _201; +var _202=1; +if(_197==Dygraph.MONTHLY){ +_201=[0,1,2,3,4,5,6,7,8,9,10,11,12]; }else{ -if(_190==Dygraph.QUARTERLY){ -_195=[0,3,6,9]; +if(_197==Dygraph.QUARTERLY){ +_201=[0,3,6,9]; }else{ -if(_190==Dygraph.BIANNUAL){ -_195=[0,6]; +if(_197==Dygraph.BIANNUAL){ +_201=[0,6]; }else{ -if(_190==Dygraph.ANNUAL){ -_195=[0]; +if(_197==Dygraph.ANNUAL){ +_201=[0]; }else{ -if(_190==Dygraph.DECADAL){ -_195=[0]; -_196=10; +if(_197==Dygraph.DECADAL){ +_201=[0]; +_202=10; } } } } } -var _197=new Date(_188).getFullYear(); -var _198=new Date(_189).getFullYear(); -var _199=Dygraph.zeropad; -for(var i=_197;i<=_198;i++){ -if(i%_196!=0){ +var _203=new Date(_195).getFullYear(); +var _204=new Date(_196).getFullYear(); +var _205=Dygraph.zeropad; +for(var i=_203;i<=_204;i++){ +if(i%_202!=0){ continue; } -for(var j=0;j<_195.length;j++){ -var _200=i+"/"+_199(1+_195[j])+"/01"; -var t=Date.parse(_200); -if(t<_188||t>_189){ +for(var j=0;j<_201.length;j++){ +var _206=i+"/"+_205(1+_201[j])+"/01"; +var t=Date.parse(_206); +if(t<_195||t>_196){ continue; } -_191.push({v:t,label:new Date(t).strftime("%b %y")}); +_198.push({v:t,label:new Date(t).strftime("%b %y")}); } } } -return _191; +return _198; }; -Dygraph.dateTicker=function(_201,_202,self){ -var _203=-1; +Dygraph.dateTicker=function(_207,_208,self){ +var _209=-1; for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_203=i; +var _210=self.NumXTicks(_207,_208,i); +if(self.width_/_210>=self.attr_("pixelsPerXLabel")){ +_209=i; break; } } -if(_203>=0){ -return self.GetXAxis(_201,_202,_203); +if(_209>=0){ +return self.GetXAxis(_207,_208,_209); }else{ } }; Dygraph.numericTicks=function(minV,maxV,self){ -var _207=[1,2,5]; -var _208,low_val,high_val,nTicks; -var _209=self.attr_("pixelsPerYLabel"); +if(self.attr_("labelsKMG2")){ +var _213=[1,2,4,8]; +}else{ +var _213=[1,2,5]; +} +var _214,low_val,high_val,nTicks; +var _215=self.attr_("pixelsPerYLabel"); for(var i=-10;i<50;i++){ -var _210=Math.pow(10,i); -for(var j=0;j<_207.length;j++){ -_208=_210*_207[j]; -low_val=Math.floor(minV/_208)*_208; -high_val=Math.ceil(maxV/_208)*_208; -nTicks=(high_val-low_val)/_208; -var _211=self.height_/nTicks; -if(_211>_209){ +if(self.attr_("labelsKMG2")){ +var _216=Math.pow(16,i); +}else{ +var _216=Math.pow(10,i); +} +for(var j=0;j<_213.length;j++){ +_214=_216*_213[j]; +low_val=Math.floor(minV/_214)*_214; +high_val=Math.ceil(maxV/_214)*_214; +nTicks=(high_val-low_val)/_214; +var _217=self.height_/nTicks; +if(_217>_215){ break; } } -if(_211>_209){ +if(_217>_215){ break; } } -var _212=[]; -for(var i=0;i=k*k*k){ -_214=self.round_(_213/(k*k*k),1)+"B"; -}else{ -if(_213>=k*k){ -_214=self.round_(_213/(k*k),1)+"M"; -}else{ -if(_213>=k){ -_214=self.round_(_213/k,1)+"K"; +k=1000; +_220=["K","M","B","T"]; +} +if(self.attr_("labelsKMG2")){ +if(k){ +self.warn("Setting both labelsKMB and labelsKMG2. Pick one!"); } +k=1024; +_220=["k","M","G","T"]; +} +for(var i=0;i=0;j--,n/=k){ +if(_222>=n){ +_223=self.round_(_221/n,1)+_220[j]; +break; } } } -_212.push({label:_214,v:_213}); +_218.push({label:_223,v:_221}); } -return _212; +return _218; }; Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _218=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_218}); +var _227=Dygraph.numericTicks(minY,maxY,this); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_227}); }; -Dygraph.prototype.extremeValues_=function(_219){ +Dygraph.prototype.extremeValues_=function(_228){ var minY=null,maxY=null; var bars=this.attr_("errorBars")||this.attr_("customBars"); if(bars){ -for(var j=0;j<_219.length;j++){ -var y=_219[j][1][0]; +for(var j=0;j<_228.length;j++){ +var y=_228[j][1][0]; if(!y){ continue; } -var low=y-_219[j][1][1]; -var high=y+_219[j][1][2]; +var low=y-_228[j][1][1]; +var high=y+_228[j][1][2]; if(low>y){ low=y; } @@ -3774,9 +1231,9 @@ minY=low; } } }else{ -for(var j=0;j<_219.length;j++){ -var y=_219[j][1]; -if(!y){ +for(var j=0;j<_228.length;j++){ +var y=_228[j][1]; +if(y===null||isNaN(y)){ continue; } if(maxY==null||y>maxY){ @@ -3795,109 +1252,110 @@ this.layout_.removeAllDatasets(); this.setColors_(); this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize"); for(var i=1;i=low&&_223[k][0]<=high){ -_224.push(_223[k]); +var _233=[]; +for(var k=0;k<_232.length;k++){ +if(_232[k][0]>=low&&_232[k][0]<=high){ +_233.push(_232[k]); } } -_223=_224; +_232=_233; } -var _225=this.extremeValues_(_223); -var _226=_225[0]; -var _227=_225[1]; -if(!minY||_226maxY){ -maxY=_227; +if(!maxY||_236>maxY){ +maxY=_236; } if(bars){ var vals=[]; -for(var j=0;j<_223.length;j++){ -vals[j]=[_223[j][0],_223[j][1][0],_223[j][1][1],_223[j][1][2]]; +for(var j=0;j<_232.length;j++){ +vals[j]=[_232[j][0],_232[j][1][0],_232[j][1][1],_232[j][1][2]]; } this.layout_.addDataset(this.attr_("labels")[i],vals); }else{ -this.layout_.addDataset(this.attr_("labels")[i],_223); +this.layout_.addDataset(this.attr_("labels")[i],_232); } } if(this.valueRange_!=null){ this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); }else{ var span=maxY-minY; -var _230=maxY+0.1*span; -var _231=minY-0.1*span; -if(_231<0&&minY>=0){ -_231=0; +var _239=maxY+0.1*span; +var _240=minY-0.1*span; +if(_240<0&&minY>=0){ +_240=0; } -if(_230>0&&maxY<=0){ -_230=0; +if(_239>0&&maxY<=0){ +_239=0; } if(this.attr_("includeZero")){ if(maxY<0){ -_230=0; +_239=0; } if(minY>0){ -_231=0; +_240=0; } } -this.addYTicks_(_231,_230); +this.addYTicks_(_240,_239); } this.addXTicks_(); +this.layout_.updateOptions({dateWindow:this.dateWindow_}); this.layout_.evaluateWithError(); this.plotter_.clear(); this.plotter_.render(); this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); }; -Dygraph.prototype.rollingAverage=function(_232,_233){ -if(_232.length<2){ -return _232; +Dygraph.prototype.rollingAverage=function(_241,_242){ +if(_241.length<2){ +return _241; } -var _233=Math.min(_233,_232.length-1); -var _234=[]; -var _235=this.attr_("sigma"); +var _242=Math.min(_242,_241.length-1); +var _243=[]; +var _244=this.attr_("sigma"); if(this.fractions_){ var num=0; var den=0; var mult=100; -for(var i=0;i<_232.length;i++){ -num+=_232[i][1][0]; -den+=_232[i][1][1]; -if(i-_233>=0){ -num-=_232[i-_233][1][0]; -den-=_232[i-_233][1][1]; -} -var date=_232[i][0]; -var _238=den?num/den:0; +for(var i=0;i<_241.length;i++){ +num+=_241[i][1][0]; +den+=_241[i][1][1]; +if(i-_242>=0){ +num-=_241[i-_242][1][0]; +den-=_241[i-_242][1][1]; +} +var date=_241[i][0]; +var _247=den?num/den:0; if(this.attr_("errorBars")){ if(this.wilsonInterval_){ if(den){ -var p=_238<0?0:_238,n=den; -var pm=_235*Math.sqrt(p*(1-p)/n+_235*_235/(4*n*n)); -var _241=1+_235*_235/den; -var low=(p+_235*_235/(2*den)-pm)/_241; -var high=(p+_235*_235/(2*den)+pm)/_241; -_234[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; +var p=_247<0?0:_247,n=den; +var pm=_244*Math.sqrt(p*(1-p)/n+_244*_244/(4*n*n)); +var _249=1+_244*_244/den; +var low=(p+_244*_244/(2*den)-pm)/_249; +var high=(p+_244*_244/(2*den)+pm)/_249; +_243[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; }else{ -_234[i]=[date,[0,0,0]]; +_243[i]=[date,[0,0,0]]; } }else{ -var _242=den?_235*Math.sqrt(_238*(1-_238)/den):1; -_234[i]=[date,[mult*_238,mult*_242,mult*_242]]; +var _250=den?_244*Math.sqrt(_247*(1-_247)/den):1; +_243[i]=[date,[mult*_247,mult*_250,mult*_250]]; } }else{ -_234[i]=[date,mult*_238]; +_243[i]=[date,mult*_247]; } } }else{ @@ -3905,105 +1363,109 @@ if(this.attr_("customBars")){ var low=0; var mid=0; var high=0; -var _244=0; -for(var i=0;i<_232.length;i++){ -var data=_232[i][1]; +var _252=0; +for(var i=0;i<_241.length;i++){ +var data=_241[i][1]; var y=data[1]; -_234[i]=[_232[i][0],[y,y-data[0],data[2]-y]]; +_243[i]=[_241[i][0],[y,y-data[0],data[2]-y]]; +if(y!=null&&!isNaN(y)){ low+=data[0]; mid+=y; high+=data[2]; -_244+=1; -if(i-_233>=0){ -var prev=_232[i-_233]; +_252+=1; +} +if(i-_242>=0){ +var prev=_241[i-_242]; +if(prev[1][1]!=null&&!isNaN(prev[1][1])){ low-=prev[1][0]; mid-=prev[1][1]; high-=prev[1][2]; -_244-=1; +_252-=1; +} } -_234[i]=[_232[i][0],[1*mid/_244,1*(mid-low)/_244,1*(high-mid)/_244]]; +_243[i]=[_241[i][0],[1*mid/_252,1*(mid-low)/_252,1*(high-mid)/_252]]; } }else{ -var _246=Math.min(_233-1,_232.length-2); +var _254=Math.min(_242-1,_241.length-2); if(!this.attr_("errorBars")){ -if(_233==1){ -return _232; +if(_242==1){ +return _241; } -for(var i=0;i<_232.length;i++){ +for(var i=0;i<_241.length;i++){ var sum=0; -var _248=0; -for(var j=Math.max(0,i-_233+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_253=true; +_261=true; }else{ if(str.length==8&&str>"19700101"&&str<"20371231"){ -_253=true; +_261=true; } } -if(_253){ +if(_261){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xValueParser=Dygraph.dateParser; this.attrs_.xTicker=Dygraph.dateTicker; @@ -4019,57 +1481,64 @@ this.attrs_.xTicker=Dygraph.numericTicks; }; Dygraph.prototype.parseCSV_=function(data){ var ret=[]; -var _254=data.split("\n"); -var _255=0; +var _262=data.split("\n"); +var _263=this.attr_("delimiter"); +if(_262[0].indexOf(_263)==-1&&_262[0].indexOf("\t")>=0){ +_263="\t"; +} +var _264=0; if(this.labelsFromCSV_){ -_255=1; -this.attrs_.labels=_254[0].split(","); -} -var _256; -var _257=false; -var _258=this.attr_("labels").length; -for(var i=_255;i<_254.length;i++){ -var line=_254[i]; +_264=1; +this.attrs_.labels=_262[0].split(_263); +} +var _265; +var _266=false; +var _267=this.attr_("labels").length; +for(var i=_264;i<_262.length;i++){ +var line=_262[i]; if(line.length==0){ continue; } -var _260=line.split(","); -if(_260.length<2){ +if(line[0]=="#"){ +continue; +} +var _269=line.split(_263); +if(_269.length<2){ continue; } -var _261=[]; -if(!_257){ -this.detectTypeFromString_(_260[0]); -_256=this.attr_("xValueParser"); -_257=true; +var _270=[]; +if(!_266){ +this.detectTypeFromString_(_269[0]); +_265=this.attr_("xValueParser"); +_266=true; } -_261[0]=_256(_260[0],this); +_270[0]=_265(_269[0],this); if(this.fractions_){ -for(var j=1;j<_260.length;j++){ -var vals=_260[j].split("/"); -_261[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; +for(var j=1;j<_269.length;j++){ +var vals=_269[j].split("/"); +_270[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; } }else{ if(this.attr_("errorBars")){ -for(var j=1;j<_260.length;j+=2){ -_261[(j+1)/2]=[parseFloat(_260[j]),parseFloat(_260[j+1])]; +for(var j=1;j<_269.length;j+=2){ +_270[(j+1)/2]=[parseFloat(_269[j]),parseFloat(_269[j+1])]; } }else{ if(this.attr_("customBars")){ -for(var j=1;j<_260.length;j++){ -var vals=_260[j].split(";"); -_261[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; +for(var j=1;j<_269.length;j++){ +var vals=_269[j].split(";"); +_270[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; } }else{ -for(var j=1;j<_260.length;j++){ -_261[j]=parseFloat(_260[j]); +for(var j=1;j<_269.length;j++){ +_270[j]=parseFloat(_269[j]); } } } } -ret.push(_261); -if(_261.length!=_258){ -this.error("Number of columns in line "+i+" ("+_261.length+") does not agree with number of labels ("+_258+") "+line); +ret.push(_270); +if(_270.length!=_267){ +this.error("Number of columns in line "+i+" ("+_270.length+") does not agree with number of labels ("+_267+") "+line); } } return ret; @@ -4090,22 +1559,22 @@ for(var i=1;i=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _269=this; +var _281=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_269.loadedEvent_(req.responseText); +_281.loadedEvent_(req.responseText); } } }; @@ -4194,36 +1708,117 @@ this.error("Unknown data format: "+(typeof this.file_)); } } }; -Dygraph.prototype.updateOptions=function(_270){ -if(_270.rollPeriod){ -this.rollPeriod_=_270.rollPeriod; +Dygraph.prototype.updateOptions=function(_282){ +if(_282.rollPeriod){ +this.rollPeriod_=_282.rollPeriod; } -if(_270.dateWindow){ -this.dateWindow_=_270.dateWindow; +if(_282.dateWindow){ +this.dateWindow_=_282.dateWindow; } -if(_270.valueRange){ -this.valueRange_=_270.valueRange; +if(_282.valueRange){ +this.valueRange_=_282.valueRange; } -MochiKit.Base.update(this.user_attrs_,_270); +Dygraph.update(this.user_attrs_,_282); this.labelsFromCSV_=(this.attr_("labels")==null); this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_270["file"]&&_270["file"]!=this.file_){ -this.file_=_270["file"]; +if(_282["file"]&&_282["file"]!=this.file_){ +this.file_=_282["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_271){ -this.rollPeriod_=_271; +Dygraph.prototype.resize=function(_283,_284){ +if((_283===null)!=(_284===null)){ +this.warn("Dygraph.resize() should be called with zero parameters or "+"two non-NULL parameters. Pretending it was zero."); +_283=_284=null; +} +this.maindiv_.innerHTML=""; +this.attrs_.labelsDiv=null; +if(_283){ +this.maindiv_.style.width=_283+"px"; +this.maindiv_.style.height=_284+"px"; +this.width_=_283; +this.height_=_284; +}else{ +this.width_=this.maindiv_.offsetWidth; +this.height_=this.maindiv_.offsetHeight; +} +this.createInterface_(); +this.drawGraph_(this.rawData_); +}; +Dygraph.prototype.adjustRoll=function(_285){ +this.rollPeriod_=_285; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_272){ -this.container=_272; +Dygraph.createCanvas=function(){ +var _286=document.createElement("canvas"); +isIE=(/MSIE/.test(navigator.userAgent)&&!window.opera); +if(isIE){ +_286=G_vmlCanvasManager.initElement(_286); +} +return _286; +}; +Dygraph.GVizChart=function(_287){ +this.container=_287; }; -Dygraph.GVizChart.prototype.draw=function(data,_273){ +Dygraph.GVizChart.prototype.draw=function(data,_288){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_273); +this.date_graph=new Dygraph(this.container,data,_288); }; DateGraph=Dygraph; +function RGBColor(_289){ +this.ok=false; +if(_289.charAt(0)=="#"){ +_289=_289.substr(1,6); +} +_289=_289.replace(/ /g,""); +_289=_289.toLowerCase(); +var _290={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 _290){ +if(_289==key){ +_289=_290[key]; +} +} +var _292=[{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<_292.length;i++){ +var re=_292[i].re; +var _295=_292[i].process; +var bits=re.exec(_289); +if(bits){ +channels=_295(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; +}; +}