X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-combined.js;h=15d2e5ec3ce655511c4af671b76d69cd10802b2e;hb=b16e636940e6566cc8176c7eb4ed90fba7d118c9;hp=dc86ce750fcd436e0602742db7a9ae4a39dcc870;hpb=2160ed4ac550da045386e52c363e721cd6c44c29;p=dygraphs.git diff --git a/dygraph-combined.js b/dygraph-combined.js index dc86ce7..15d2e5e 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -1,3256 +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;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; -} -} -_154.push(name); -_155.push(v); -return null; -} -_154.push(name); -_155.push(""); -return null; -}else{ -var opts=elem.options; -if(!opts.length){ -_154.push(name); -_155.push(""); -return null; -} -for(var i=0;i]+\svalue\s*=/i)){ -v=opt.text; -} -} -_154.push(name); -_155.push(v); -} -return null; -} -} -if(_15a==="FORM"||_15a==="P"||_15a==="SPAN"||_15a==="DIV"){ -return elem.childNodes; -} -_154.push(name); -_155.push(elem.value||""); -return null; -} -return elem.childNodes; -}); -return [_154,_155]; -},withDocument:function(doc,func){ -var self=MochiKit.DOM; -var _163=self._document; -var rval; -try{ -self._document=doc; -rval=func(); -} -catch(e){ -self._document=_163; -throw e; -} -self._document=_163; -return rval; -},registerDOMConverter:function(name,_166,wrap,_168){ -MochiKit.DOM.domConverters.register(name,_166,wrap,_168); -},coerceToDOM:function(node,ctx){ -var m=MochiKit.Base; -var im=MochiKit.Iter; -var self=MochiKit.DOM; -if(im){ -var iter=im.iter; -var _16f=im.repeat; -var map=m.map; -} -var _171=self.domConverters; -var _172=arguments.callee; -var _173=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 _174=null; -try{ -_174=iter(node); -} -catch(e){ -} -if(_174){ -return map(_172,_174,_16f(ctx)); -} -} -try{ -node=_171.match(node,ctx); -continue; -} -catch(e){ -if(e!=_173){ -throw e; -} -} -return self._document.createTextNode(node.toString()); -} -return undefined; -},isChildNode:function(node,_176){ -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -node=self.getElement(node); -} -if(typeof (_176)=="string"){ -_176=self.getElement(_176); -} -if(node===_176){ -return true; -} -while(node&&node.tagName.toUpperCase()!="BODY"){ -node=node.parentNode; -if(node===_176){ -return true; -} -} -return false; -},setNodeAttribute:function(node,attr,_17a){ -var o={}; -o[attr]=_17a; -try{ -return MochiKit.DOM.updateNodeAttributes(node,o); -} -catch(e){ -} -return null; -},getNodeAttribute:function(node,attr){ -var self=MochiKit.DOM; -var _17f=self.attributeArray.renames[attr]; -node=self.getElement(node); -try{ -if(_17f){ -return node[_17f]; -} -return node.getAttribute(attr); -} -catch(e){ -} -return null; -},removeNodeAttribute:function(node,attr){ -var self=MochiKit.DOM; -var _183=self.attributeArray.renames[attr]; -node=self.getElement(node); -try{ -if(_183){ -return node[_183]; -} -return node.removeAttribute(attr); -} -catch(e){ -} -return null; -},updateNodeAttributes:function(node,_185){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -if(_185){ -var _188=MochiKit.Base.updatetree; -if(self.attributeArray.compliant){ -for(var k in _185){ -var v=_185[k]; -if(typeof (v)=="object"&&typeof (elem[k])=="object"){ -if(k=="style"&&MochiKit.Style){ -MochiKit.Style.setStyle(elem,v); -}else{ -_188(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 _18b=self.attributeArray.renames; -for(var k in _185){ -v=_185[k]; -var _18c=_18b[k]; -if(k=="style"&&typeof (v)=="string"){ -elem.style.cssText=v; -}else{ -if(typeof (_18c)=="string"){ -elem[_18c]=v; -}else{ -if(typeof (elem[k])=="object"&&typeof (v)=="object"){ -if(k=="style"&&MochiKit.Style){ -MochiKit.Style.setStyle(elem,v); -}else{ -_188(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 _190=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -var _191=MochiKit.Base.concat; -while(_190.length){ -var n=_190.shift(); -if(typeof (n)=="undefined"||n===null){ -}else{ -if(typeof (n.nodeType)=="number"){ -elem.appendChild(n); -}else{ -_190=_191(n,_190); -} -} -} -return elem; -},insertSiblingNodesBefore:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -var _196=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -var _197=elem.parentNode; -var _198=MochiKit.Base.concat; -while(_196.length){ -var n=_196.shift(); -if(typeof (n)=="undefined"||n===null){ -}else{ -if(typeof (n.nodeType)=="number"){ -_197.insertBefore(n,elem); -}else{ -_196=_198(n,_196); -} -} -} -return _197; -},insertSiblingNodesAfter:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -var _19d=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -if(elem.nextSibling){ -return self.insertSiblingNodesBefore(elem.nextSibling,_19d); -}else{ -return self.appendChildNodes(elem.parentNode,_19d); -} -},replaceChildNodes:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -arguments[0]=elem; -} -var _1a1; -while((_1a1=elem.firstChild)){ -elem.removeChild(_1a1); -} -if(arguments.length<2){ -return elem; -}else{ -return self.appendChildNodes.apply(this,arguments); -} -},createDOM:function(name,_1a3){ -var elem; -var self=MochiKit.DOM; -var m=MochiKit.Base; -if(typeof (_1a3)=="string"||typeof (_1a3)=="number"){ -var args=m.extend([name,null],arguments,1); -return arguments.callee.apply(this,args); -} -if(typeof (name)=="string"){ -var _1a8=self._xhtml; -if(_1a3&&!self.attributeArray.compliant){ -var _1a9=""; -if("name" in _1a3){ -_1a9+=" name=\""+self.escapeHTML(_1a3.name)+"\""; -} -if(name=="input"&&"type" in _1a3){ -_1a9+=" type=\""+self.escapeHTML(_1a3.type)+"\""; -} -if(_1a9){ -name="<"+name+_1a9+">"; -_1a8=false; -} -} -var d=self._document; -if(_1a8&&d===document){ -elem=d.createElementNS("http://www.w3.org/1999/xhtml",name); -}else{ -elem=d.createElement(name); -} -}else{ -elem=name; -} -if(_1a3){ -self.updateNodeAttributes(elem,_1a3); -} -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 _1b1=dest.parentNode; -if(src){ -src=self.getElement(src); -_1b1.replaceChild(src,dest); -}else{ -_1b1.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(_1b4,_1b5,_1b6){ -var self=MochiKit.DOM; -if(typeof (_1b4)=="undefined"||_1b4===null){ -_1b4="*"; -} -if(typeof (_1b6)=="undefined"||_1b6===null){ -_1b6=self._document; -} -_1b6=self.getElement(_1b6); -var _1b8=(_1b6.getElementsByTagName(_1b4)||self._document.all); -if(typeof (_1b5)=="undefined"||_1b5===null){ -return MochiKit.Base.extend(null,_1b8); -} -var _1b9=[]; -for(var i=0;i<_1b8.length;i++){ -var _1bb=_1b8[i]; -var cls=_1bb.className; -if(!cls){ -continue; -} -var _1bd=cls.split(" "); -for(var j=0;j<_1bd.length;j++){ -if(_1bd[j]==_1b5){ -_1b9.push(_1bb); -break; -} -} -} -return _1b9; -},_newCallStack:function(path,once){ -var rval=function(){ -var _1c2=arguments.callee.callStack; -for(var i=0;i<_1c2.length;i++){ -if(_1c2[i].apply(this,arguments)===false){ -break; -} -} -if(once){ -try{ -this[path]=null; -} -catch(e){ -} -} -}; -rval.callStack=[]; -return rval; -},addToCallStack:function(_1c4,path,func,once){ -var self=MochiKit.DOM; -var _1c9=_1c4[path]; -var _1ca=_1c9; -if(!(typeof (_1c9)=="function"&&typeof (_1c9.callStack)=="object"&&_1c9.callStack!==null)){ -_1ca=self._newCallStack(path,once); -if(typeof (_1c9)=="function"){ -_1ca.callStack.push(_1c9); -} -_1c4[path]=_1ca; -} -_1ca.callStack.push(func); -},addLoadEvent:function(func){ -var self=MochiKit.DOM; -self.addToCallStack(self._window,"onload",func,true); -},focusOnLoad:function(_1cd){ -var self=MochiKit.DOM; -self.addLoadEvent(function(){ -_1cd=self.getElement(_1cd); -if(_1cd){ -_1cd.focus(); -} -}); -},setElementClass:function(_1cf,_1d0){ -var self=MochiKit.DOM; -var obj=self.getElement(_1cf); -if(self.attributeArray.compliant){ -obj.setAttribute("class",_1d0); -}else{ -obj.setAttribute("className",_1d0); -} -},toggleElementClass:function(_1d3){ -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 _1f6=[dom]; -var self=MochiKit.DOM; -var _1f8=self.escapeHTML; -var _1f9=self.attributeArray; -while(_1f6.length){ -dom=_1f6.pop(); -if(typeof (dom)=="string"){ -lst.push(dom); -}else{ -if(dom.nodeType==1){ -lst.push("<"+dom.tagName.toLowerCase()); -var _1fa=[]; -var _1fb=_1f9(dom); -for(var i=0;i<_1fb.length;i++){ -var a=_1fb[i]; -_1fa.push([" ",a.name,"=\"",_1f8(a.value),"\""]); -} -_1fa.sort(); -for(i=0;i<_1fa.length;i++){ -var _1fe=_1fa[i]; -for(var j=0;j<_1fe.length;j++){ -lst.push(_1fe[j]); -} -} -if(dom.hasChildNodes()){ -lst.push(">"); -_1f6.push(""); -var _200=dom.childNodes; -for(i=_200.length-1;i>=0;i--){ -_1f6.push(_200[i]); -} -}else{ -lst.push("/>"); -} -}else{ -if(dom.nodeType==3){ -lst.push(_1f8(dom.nodeValue)); -} -} -} -} -return lst; -},scrapeText:function(node,_202){ -var rval=[]; -(function(node){ -var cn=node.childNodes; -if(cn){ -for(var i=0;i0){ -var _229=m.filter; -_228=function(node){ -return _229(_228.ignoreAttrFilter,node.attributes); -}; -_228.ignoreAttr={}; -var _22b=_227.attributes; -var _22c=_228.ignoreAttr; -for(var i=0;i<_22b.length;i++){ -var a=_22b[i]; -_22c[a.name]=a.value; -} -_228.ignoreAttrFilter=function(a){ -return (_228.ignoreAttr[a.name]!=a.value); -}; -_228.compliant=false; -_228.renames={"class":"className","checked":"defaultChecked","usemap":"useMap","for":"htmlFor","readonly":"readOnly","colspan":"colSpan","bgcolor":"bgColor","cellspacing":"cellSpacing","cellpadding":"cellPadding"}; -}else{ -_228=function(node){ -return node.attributes; -}; -_228.compliant=true; -_228.renames={}; -} -this.attributeArray=_228; -var _231=function(_232,arr){ -var _234=arr[1].split("."); -var str=""; -var obj={}; -str+="if (!MochiKit."+_234[1]+") { throw new Error(\""; -str+="This function has been deprecated and depends on MochiKit."; -str+=_234[1]+".\");}"; -str+="return MochiKit."+_234[1]+"."+arr[0]; -str+=".apply(this, arguments);"; -obj[_234[2]]=new Function(str); -MochiKit.Base.update(MochiKit[_232],obj); -}; -for(var i;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,_2ac,blue,_2ae){ -var _2af=MochiKit.Color.Color; -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_2ac=rgb.g; -blue=rgb.b; -if(typeof (rgb.a)=="undefined"){ -_2ae=undefined; -}else{ -_2ae=rgb.a; -} -} -return new _2af(red,_2ac,blue,_2ae); -},fromHSL:function(hue,_2b2,_2b3,_2b4){ -var m=MochiKit.Color; -return m.Color.fromRGB(m.hslToRGB.apply(m,arguments)); -},fromHSV:function(hue,_2b7,_2b8,_2b9){ -var m=MochiKit.Color; -return m.Color.fromRGB(m.hsvToRGB.apply(m,arguments)); -},fromName:function(name){ -var _2bc=MochiKit.Color.Color; -if(name.charAt(0)=="\""){ -name=name.substr(1,name.length-2); -} -var _2bd=_2bc._namedColors[name.toLowerCase()]; -if(typeof (_2bd)=="string"){ -return _2bc.fromHexString(_2bd); -}else{ -if(name=="transparent"){ -return _2bc.transparentColor(); -} -} -return null; -},fromString:function(_2be){ -var self=MochiKit.Color.Color; -var _2c0=_2be.substr(0,3); -if(_2c0=="rgb"){ -return self.fromRGBString(_2be); -}else{ -if(_2c0=="hsl"){ -return self.fromHSLString(_2be); -}else{ -if(_2be.charAt(0)=="#"){ -return self.fromHexString(_2be); -} -} -} -return self.fromName(_2be); -},fromHexString:function(_2c1){ -if(_2c1.charAt(0)=="#"){ -_2c1=_2c1.substring(1); -} -var _2c2=[]; -var i,hex; -if(_2c1.length==3){ -for(i=0;i<3;i++){ -hex=_2c1.substr(i,1); -_2c2.push(parseInt(hex+hex,16)/255); -} -}else{ -for(i=0;i<6;i+=2){ -hex=_2c1.substr(i,2); -_2c2.push(parseInt(hex,16)/255); -} -} -var _2c5=MochiKit.Color.Color; -return _2c5.fromRGB.apply(_2c5,_2c2); -},_fromColorString:function(pre,_2c7,_2c8,_2c9){ -if(_2c9.indexOf(pre)===0){ -_2c9=_2c9.substring(_2c9.indexOf("(",3)+1,_2c9.length-1); -} -var _2ca=_2c9.split(/\s*,\s*/); -var _2cb=[]; -for(var i=0;i<_2ca.length;i++){ -var c=_2ca[i]; -var val; -var _2cf=c.substring(c.length-3); -if(c.charAt(c.length-1)=="%"){ -val=0.01*parseFloat(c.substring(0,c.length-1)); -}else{ -if(_2cf=="deg"){ -val=parseFloat(c)/360; -}else{ -if(_2cf=="rad"){ -val=parseFloat(c)/(Math.PI*2); -}else{ -val=_2c8[i]*parseFloat(c); -} -} -} -_2cb.push(val); -} -return this[_2c7].apply(this,_2cb); -},fromComputedStyle:function(elem,_2d1){ -var d=MochiKit.DOM; -var cls=MochiKit.Color.Color; -for(elem=d.getElement(elem);elem;elem=elem.parentNode){ -var _2d4=MochiKit.Style.getStyle.apply(d,arguments); -if(!_2d4){ -continue; -} -var _2d5=cls.fromString(_2d4); -if(!_2d5){ -break; -} -if(_2d5.asRGB().a>0){ -return _2d5; -} -} -return null; -},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,_2db){ -v*=_2db; -if(v<0){ -return 0; -}else{ -if(v>_2db){ -return _2db; -}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,_2e1,_2e2,_2e3){ -if(arguments.length==1){ -var hsv=hue; -hue=hsv.h; -_2e1=hsv.s; -_2e2=hsv.v; -_2e3=hsv.a; -} -var red; -var _2e6; -var blue; -if(_2e1===0){ -red=_2e2; -_2e6=_2e2; -blue=_2e2; -}else{ -var i=Math.floor(hue*6); -var f=(hue*6)-i; -var p=_2e2*(1-_2e1); -var q=_2e2*(1-(_2e1*f)); -var t=_2e2*(1-(_2e1*(1-f))); -switch(i){ -case 1: -red=q; -_2e6=_2e2; -blue=p; -break; -case 2: -red=p; -_2e6=_2e2; -blue=t; -break; -case 3: -red=p; -_2e6=q; -blue=_2e2; -break; -case 4: -red=t; -_2e6=p; -blue=_2e2; -break; -case 5: -red=_2e2; -_2e6=p; -blue=q; -break; -case 6: -case 0: -red=_2e2; -_2e6=t; -blue=p; -break; -} -} -return {r:red,g:_2e6,b:blue,a:_2e3}; -},hslToRGB:function(hue,_2ee,_2ef,_2f0){ -if(arguments.length==1){ -var hsl=hue; -hue=hsl.h; -_2ee=hsl.s; -_2ef=hsl.l; -_2f0=hsl.a; -} -var red; -var _2f3; -var blue; -if(_2ee===0){ -red=_2ef; -_2f3=_2ef; -blue=_2ef; -}else{ -var m2; -if(_2ef<=0.5){ -m2=_2ef*(1+_2ee); -}else{ -m2=_2ef+_2ee-(_2ef*_2ee); -} -var m1=(2*_2ef)-m2; -var f=MochiKit.Color._hslValue; -var h6=hue*6; -red=f(m1,m2,h6+2); -_2f3=f(m1,m2,h6); -blue=f(m1,m2,h6-2); -} -return {r:red,g:_2f3,b:blue,a:_2f0}; -},rgbToHSV:function(red,_2fa,blue,_2fc){ -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_2fa=rgb.g; -blue=rgb.b; -_2fc=rgb.a; -} -var max=Math.max(Math.max(red,_2fa),blue); -var min=Math.min(Math.min(red,_2fa),blue); -var hue; -var _301; -var _302=max; -if(min==max){ -hue=0; -_301=0; -}else{ -var _303=(max-min); -_301=_303/max; -if(red==max){ -hue=(_2fa-blue)/_303; -}else{ -if(_2fa==max){ -hue=2+((blue-red)/_303); -}else{ -hue=4+((red-_2fa)/_303); -} -} -hue/=6; -if(hue<0){ -hue+=1; -} -if(hue>1){ -hue-=1; -} -} -return {h:hue,s:_301,v:_302,a:_2fc}; -},rgbToHSL:function(red,_305,blue,_307){ -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_305=rgb.g; -blue=rgb.b; -_307=rgb.a; -} -var max=Math.max(red,Math.max(_305,blue)); -var min=Math.min(red,Math.min(_305,blue)); -var hue; -var _30c; -var _30d=(max+min)/2; -var _30e=max-min; -if(_30e===0){ -hue=0; -_30c=0; -}else{ -if(_30d<=0.5){ -_30c=_30e/(max+min); -}else{ -_30c=_30e/(2-max-min); -} -if(red==max){ -hue=(_305-blue)/_30e; -}else{ -if(_305==max){ -hue=2+((blue-red)/_30e); -}else{ -hue=4+((red-_305)/_30e); -} -} -hue/=6; -if(hue<0){ -hue+=1; -} -if(hue>1){ -hue-=1; -} -} -return {h:hue,s:_30c,l:_30d,a:_307}; -},toColorPart:function(num){ -num=Math.round(num); -var _310=num.toString(16); -if(num<16){ -return "0"+_310; -} -return _310; -},__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 _312=1/3; -var _313={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_312,_312,_312],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_312,2*_312,2*_312],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 _314=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 _313){ -var name=k+"Color"; -var _31d=m.concat([_314,this.Color,name],_313[k]); -this.Color[name]=m.bind.apply(null,_31d); -} -var _31e=function(){ -for(var i=0;i1){ -var src=MochiKit.DOM.getElement(arguments[0]); -var sig=arguments[1]; -var obj=arguments[2]; -var func=arguments[3]; -for(var i=_360.length-1;i>=0;i--){ -var o=_360[i]; -if(o.source===src&&o.signal===sig&&o.objOrFunc===obj&&o.funcOrStr===func){ -self._disconnect(o); -if(!self._lock){ -_360.splice(i,1); -}else{ -self._dirty=true; -} -return true; -} -} -}else{ -var idx=m.findIdentical(_360,_35e); -if(idx>=0){ -self._disconnect(_35e); -if(!self._lock){ -_360.splice(idx,1); -}else{ -self._dirty=true; -} -return true; -} -} -return false; -},disconnectAllTo:function(_369,_36a){ -var self=MochiKit.Signal; -var _36c=self._observers; -var _36d=self._disconnect; -var _36e=self._lock; -var _36f=self._dirty; -if(typeof (_36a)==="undefined"){ -_36a=null; -} -for(var i=_36c.length-1;i>=0;i--){ -var _371=_36c[i]; -if(_371.objOrFunc===_369&&(_36a===null||_371.funcOrStr===_36a)){ -_36d(_371); -if(_36e){ -_36f=true; -}else{ -_36c.splice(i,1); -} -} -} -self._dirty=_36f; -},disconnectAll:function(src,sig){ -src=MochiKit.DOM.getElement(src); -var m=MochiKit.Base; -var _375=m.flattenArguments(m.extend(null,arguments,1)); -var self=MochiKit.Signal; -var _377=self._disconnect; -var _378=self._observers; -var i,_37a; -var _37b=self._lock; -var _37c=self._dirty; -if(_375.length===0){ -for(i=_378.length-1;i>=0;i--){ -_37a=_378[i]; -if(_37a.source===src){ -_377(_37a); -if(!_37b){ -_378.splice(i,1); -}else{ -_37c=true; -} -} -} -}else{ -var sigs={}; -for(i=0;i<_375.length;i++){ -sigs[_375[i]]=true; -} -for(i=_378.length-1;i>=0;i--){ -_37a=_378[i]; -if(_37a.source===src&&_37a.signal in sigs){ -_377(_37a); -if(!_37b){ -_378.splice(i,1); -}else{ -_37c=true; -} -} -} -} -self._dirty=_37c; -},signal:function(src,sig){ -var self=MochiKit.Signal; -var _381=self._observers; -src=MochiKit.DOM.getElement(src); -var args=MochiKit.Base.extend(null,arguments,2); -var _383=[]; -self._lock=true; -for(var i=0;i<_381.length;i++){ -var _385=_381[i]; -if(_385.source===src&&_385.signal===sig){ -try{ -_385.listener.apply(src,args); -} -catch(e){ -_383.push(e); -} -} -} -self._lock=false; -if(self._dirty){ -self._dirty=false; -for(var i=_381.length-1;i>=0;i--){ -if(!_381[i].connected){ -_381.splice(i,1); -} -} -} -if(_383.length==1){ -throw _383[0]; -}else{ -if(_383.length>1){ -var e=new Error("Multiple errors thrown in handling 'sig', see errors property"); -e.errors=_383; -throw e; -} -} -}}); -MochiKit.Signal.EXPORT_OK=[]; -MochiKit.Signal.EXPORT=["connect","disconnect","signal","disconnectAll","disconnectAllTo"]; -MochiKit.Signal.__new__=function(win){ -var m=MochiKit.Base; -this._document=document; -this._window=win; -this._lock=false; -this._dirty=false; -try{ -this.connect(window,"onunload",this._unloadCache); -} -catch(e){ -} -this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; -m.nameFunctions(this); -}; -MochiKit.Signal.__new__(this); -if(MochiKit.__export__){ -connect=MochiKit.Signal.connect; -disconnect=MochiKit.Signal.disconnect; -disconnectAll=MochiKit.Signal.disconnectAll; -signal=MochiKit.Signal.signal; -} -MochiKit.Base._exportSymbols(this,MochiKit.Signal); - - Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(x,pad,r){if(typeof (r)=="undefined"){r=10}for(;parseInt(x,10)1;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){ @@ -3267,6 +19,9 @@ this._evaluateLineTicks(); DygraphLayout.prototype._evaluateLimits=function(){ this.minxval=this.maxxval=null; 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||x10){ for(var i=0;ithis.height){ -_42.style.bottom="0px"; +_47.style.bottom="0px"; }else{ -_42.style.top=top+"px"; +_47.style.top=top+"px"; } -_42.style.left="0px"; -_42.style.textAlign="right"; -_42.style.width=this.options.yAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_42); -this.ylabels.push(_42); +_47.style.left="0px"; +_47.style.textAlign="right"; +_47.style.width=this.options.yAxisLabelWidth+"px"; +this.container.appendChild(_47); +this.ylabels.push(_47); } -var _44=this.ylabels[0]; -var _45=this.options.axisLabelFontSize; -var _46=parseInt(_44.style.top)+_45; -if(_46>this.height-_45){ -_44.style.top=(parseInt(_44.style.top)-_45/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"; } } -_39.beginPath(); -_39.moveTo(this.area.x,this.area.y); -_39.lineTo(this.area.x,this.area.y+this.area.h); -_39.closePath(); -_39.stroke(); +_40.beginPath(); +_40.moveTo(this.area.x,this.area.y); +_40.lineTo(this.area.x,this.area.y+this.area.h); +_40.closePath(); +_40.stroke(); } if(this.options.drawXAxis){ if(this.layout.xticks){ for(var i=0;ithis.width){ -_47=this.width-this.options.xAxisLabelWidth; -_42.style.textAlign="right"; -} -if(_47<0){ -_47=0; -_42.style.textAlign="left"; -} -_42.style.left=_47+"px"; -_42.style.width=this.options.xAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_42); -this.xlabels.push(_42); -} -} -_39.beginPath(); -_39.moveTo(this.area.x,this.area.y+this.area.h); -_39.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); -_39.closePath(); -_39.stroke(); -} -_39.restore(); +_40.beginPath(); +_40.moveTo(x,y); +_40.lineTo(x,y+this.options.axisTickSize); +_40.closePath(); +_40.stroke(); +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(_52<0){ +_52=0; +_47.style.textAlign="left"; +} +_47.style.left=_52+"px"; +_47.style.width=this.options.xAxisLabelWidth+"px"; +this.container.appendChild(_47); +this.xlabels.push(_47); +} +} +_40.beginPath(); +_40.moveTo(this.area.x,this.area.y+this.area.h); +_40.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); +_40.closePath(); +_40.stroke(); +} +_40.restore(); }; DygraphCanvasRenderer.prototype._renderLineChart=function(){ -var _48=this.element.getContext("2d"); -var _49=this.options.colorScheme.length; -var _50=this.options.colorScheme; -var _51=MochiKit.Base.keys(this.layout.datasets); -var _52=this.layout.options.errorBars; -var _53=_51.length; -var _54=MochiKit.Base.bind; -var _55=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; } } -}; -var _67=function(ctx){ -for(var i=0;i<_53;i++){ -var _68=_51[i]; -var _69=_50[i%_49]; -var _70=this.options.strokeColorTransform; -_48.save(); -_48.strokeStyle=_69.toRGBString(); -_48.lineWidth=this.options.strokeWidth; -var _71=-1; -var _72=[-1,-1]; -var _73=0; -var _74=this.layout.yscale; -var _75=function(_76,_77){ -_73++; -if(_77.name==_68){ -if(!_77.y||isNaN(_77.y)){ -_71=-1; -return; +ctx.fill(); } -var _78=[_77.y-_77.errorPlus*_74,_77.y+_77.errorMinus*_74]; -_78[0]=this.area.h*_78[0]+this.area.y; -_78[1]=this.area.h*_78[1]+this.area.y; -if(_71>=0){ -_76.moveTo(_71,_72[0]); -_76.lineTo(_77.canvasx,_78[0]); -_76.lineTo(_77.canvasx,_78[1]); -_76.lineTo(_71,_72[1]); -_76.closePath(); } -_72[0]=_78[0]; -_72[1]=_78[1]; -_71=_77.canvasx; +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 _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(); +ctx.strokeStyle=_63; +ctx.lineWidth=this.options.strokeWidth; +ctx.moveTo(_64,prevY); +_64=_60.canvasx; +prevY=_60.canvasy; +ctx.lineTo(_64,prevY); +ctx.stroke(); } -}; -var _79=_69.colorWithAlpha(0.15); -ctx.fillStyle=_79.toRGBString(); +if(_72||_74){ ctx.beginPath(); -MochiKit.Iter.forEach(this.layout.points,_55(_75,ctx),this); +ctx.fillStyle=_63; +ctx.arc(_60.canvasx,_60.canvasy,_71,0,2*Math.PI,false); ctx.fill(); } -}; -if(_52){ -_54(_67,this)(_48); } -_54(_58,this)(_48); -_48.restore(); +} +} +} +_53.restore(); }; -Dygraph=function(div,_81,_82){ +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,_81,arguments[2],arguments[3]); +this.__old_init__(div,_75,arguments[2],arguments[3]); }else{ -this.__init__(div,_81,_82); +this.__init__(div,_75,_76); } } }; @@ -3678,33 +441,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,_83,_84,_85){ -if(_84!=null){ -var _86=["Date"]; -for(var i=0;i<_84.length;i++){ -_86.push(_84[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(_85,{"labels":_86}); +Dygraph.update(_79,{"labels":_80}); } -this.__init__(div,_83,_85); +this.__init__(div,_77,_79); }; -Dygraph.prototype.__init__=function(div,_87,_88){ -if(_88==null){ -_88={}; +Dygraph.prototype.__init__=function(div,_81,_82){ +if(_82==null){ +_82={}; } this.maindiv_=div; -this.file_=_87; -this.rollPeriod_=_88.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; +this.file_=_81; +this.rollPeriod_=_82.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; this.previousVerticalX_=-1; -this.fractions_=_88.fractions||false; -this.dateWindow_=_88.dateWindow||null; -this.valueRange_=_88.valueRange||null; -this.wilsonInterval_=_88.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"; @@ -3715,337 +478,452 @@ 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_,_88); +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.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}; -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(_89){ -if(typeof (this.user_attrs_[_89])!="undefined"){ -return this.user_attrs_[_89]; +Dygraph.prototype.attr_=function(_83){ +if(typeof (this.user_attrs_[_83])!="undefined"){ +return this.user_attrs_[_83]; }else{ -if(typeof (this.attrs_[_89])!="undefined"){ -return this.attrs_[_89]; +if(typeof (this.attrs_[_83])!="undefined"){ +return this.attrs_[_83]; }else{ return null; } } }; -Dygraph.prototype.log=function(_90,_91){ +Dygraph.prototype.log=function(_84,_85){ if(typeof (console)!="undefined"){ -switch(_90){ +switch(_84){ case Dygraph.DEBUG: -console.debug("dygraphs: "+_91); +console.debug("dygraphs: "+_85); break; case Dygraph.INFO: -console.info("dygraphs: "+_91); +console.info("dygraphs: "+_85); break; case Dygraph.WARNING: -console.warn("dygraphs: "+_91); +console.warn("dygraphs: "+_85); break; case Dygraph.ERROR: -console.error("dygraphs: "+_91); +console.error("dygraphs: "+_85); break; } } }; -Dygraph.prototype.info=function(_92){ -this.log(Dygraph.INFO,_92); +Dygraph.prototype.info=function(_86){ +this.log(Dygraph.INFO,_86); }; -Dygraph.prototype.warn=function(_93){ -this.log(Dygraph.WARNING,_93); +Dygraph.prototype.warn=function(_87){ +this.log(Dygraph.WARNING,_87); }; -Dygraph.prototype.error=function(_94){ -this.log(Dygraph.ERROR,_94); +Dygraph.prototype.error=function(_88){ +this.log(Dygraph.ERROR,_88); }; Dygraph.prototype.rollPeriod=function(){ return this.rollPeriod_; }; +Dygraph.addEvent=function(el,evt,fn){ +var _91=function(e){ +if(!e){ +var e=window.event; +} +fn(e); +}; +if(window.addEventListener){ +el.addEventListener(evt,_91,false); +}else{ +el.attachEvent("on"+evt,_91); +} +}; Dygraph.prototype.createInterface_=function(){ -var _95=this.maindiv_; -this.graphDiv=MochiKit.DOM.DIV({style:{"width":this.width_+"px","height":this.height_+"px"}}); -appendChildNodes(_95,this.graphDiv); -var _96=MochiKit.DOM.CANVAS; -this.canvas_=_96({style:{"position":"absolute"},width:this.width_,height:this.height_}); -appendChildNodes(this.graphDiv,this.canvas_); +var _93=this.maindiv_; +this.graphDiv=document.createElement("div"); +this.graphDiv.style.width=this.width_+"px"; +this.graphDiv.style.height=this.height_+"px"; +_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_); -connect(this.hidden_,"onmousemove",this,function(e){ -this.mouseMove_(e); +var _94=this; +Dygraph.addEvent(this.hidden_,"mousemove",function(e){ +_94.mouseMove_(e); }); -connect(this.hidden_,"onmouseout",this,function(e){ -this.mouseOut_(e); +Dygraph.addEvent(this.hidden_,"mouseout",function(e){ +_94.mouseOut_(e); }); }; -Dygraph.prototype.createPlotKitCanvas_=function(_98){ -var h=document.createElement("canvas"); +Dygraph.prototype.createPlotKitCanvas_=function(_95){ +var h=Dygraph.createCanvas(); h.style.position="absolute"; -h.style.top=_98.style.top; -h.style.left=_98.style.left; +h.style.top=_95.style.top; +h.style.left=_95.style.left; h.width=this.width_; h.height=this.height_; -MochiKit.DOM.appendChildNodes(this.graphDiv,h); +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 _101=this.attr_("colors"); -if(!_101){ +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(_117,_119),Math.max(_117,_119)); +Dygraph.addEvent(this.hidden_,"mouseup",function(_140){ +if(_126){ +_126=false; +_129=getX(_140); +_130=getY(_140); +var _141=Math.abs(_129-_127); +var _142=Math.abs(_130-_128); +if(_141<2&&_142<2&&self.attr_("clickCallback")!=null&&self.lastx_!=undefined){ +self.attr_("clickCallback")(_140,self.lastx_,self.selPoints_); +} +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); } -_117=null; -_118=null; +_127=null; +_128=null; } }); -connect(this.hidden_,"ondblclick",this,function(_133){ +Dygraph.addEvent(this.hidden_,"dblclick",function(_143){ +if(self.dateWindow_==null){ +return; +} self.dateWindow_=null; self.drawGraph_(self.rawData_); -var _134=self.rawData_[0][0]; -var _135=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")(_134,_135); +self.attr_("zoomCallback")(_144,_145); } }); }; -Dygraph.prototype.drawZoomRect_=function(_136,endX,_138){ +Dygraph.prototype.drawZoomRect_=function(_146,endX,_148){ var ctx=this.canvas_.getContext("2d"); -if(_138){ -ctx.clearRect(Math.min(_136,_138),0,Math.abs(_136-_138),this.height_); +if(_148){ +ctx.clearRect(Math.min(_146,_148),0,Math.abs(_146-_148),this.height_); } -if(endX&&_136){ +if(endX&&_146){ ctx.fillStyle="rgba(128,128,128,0.33)"; -ctx.fillRect(Math.min(_136,endX),0,Math.abs(endX-_136),this.height_); +ctx.fillRect(Math.min(_146,endX),0,Math.abs(endX-_146),this.height_); } }; -Dygraph.prototype.doZoom_=function(lowX,_140){ -var _141=this.layout_.points; -var _142=null; -var _143=null; -for(var i=0;i<_141.length;i++){ -var cx=_141[i].canvasx; -var x=_141[i].xval; -if(cx_142)){ -_142=x; +Dygraph.prototype.doZoom_=function(lowX,_150){ +var _151=this.layout_.points; +var _152=null; +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>_140&&(_143==null||x<_143)){ -_143=x; +if(cx>_150&&(_153==null||x<_153)){ +_153=x; } } -if(_142==null){ -_142=_141[0].xval; +if(_152==null){ +_152=_151[0].xval; } -if(_143==null){ -_143=_141[_141.length-1].xval; +if(_153==null){ +_153=_151[_151.length-1].xval; } -this.dateWindow_=[_142,_143]; +this.dateWindow_=[_152,_153]; this.drawGraph_(this.rawData_); if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_142,_143); +this.attr_("zoomCallback")(_152,_153); } }; -Dygraph.prototype.mouseMove_=function(_145){ -var _146=_145.mouse().page.x-Dygraph.findPosX(this.hidden_); -var _147=this.layout_.points; -var _148=-1; -var _149=-1; -var _150=1e+100; +Dygraph.prototype.mouseMove_=function(_155){ +var _156=Dygraph.pageX(_155)-Dygraph.findPosX(this.hidden_); +var _157=this.layout_.points; +var _158=-1; +var _159=-1; +var _160=1e+100; var idx=-1; -for(var i=0;i<_147.length;i++){ -var dist=Math.abs(_147[i].canvasx-_146); -if(dist>_150){ +for(var i=0;i<_157.length;i++){ +var dist=Math.abs(_157[i].canvasx-_156); +if(dist>_160){ break; } -_150=dist; +_160=dist; idx=i; } if(idx>=0){ -_148=_147[idx].xval; +_158=_157[idx].xval; +} +if(_156>_157[_157.length-1].canvasx){ +_158=_157[_157.length-1].xval; } -if(_146>_147[_147.length-1].canvasx){ -_148=_147[_147.length-1].xval; +this.selPoints_=[]; +for(var i=0;i<_157.length;i++){ +if(_157[i].xval==_158){ +this.selPoints_.push(_157[i]); } -var _153=[]; -for(var i=0;i<_147.length;i++){ -if(_147[i].xval==_148){ -_153.push(_147[i]); } +if(this.attr_("highlightCallback")){ +this.attr_("highlightCallback")(_155,_158,this.selPoints_); } -var _154=this.attr_("highlightCircleSize"); +var _163=this.attr_("highlightCircleSize"); var ctx=this.canvas_.getContext("2d"); if(this.previousVerticalX_>=0){ var px=this.previousVerticalX_; -ctx.clearRect(px-_154-1,0,2*_154+2,this.height_); +ctx.clearRect(px-_163-1,0,2*_163+2,this.height_); } var isOK=function(x){ return x&&!isNaN(x); }; -if(_153.length>0){ -var _146=_153[0].canvasx; -var _156=this.attr_("xValueFormatter")(_148,this)+":"; +if(this.selPoints_.length>0){ +var _156=this.selPoints_[0].canvasx; +var _165=this.attr_("xValueFormatter")(_158,this)+":"; var clen=this.colors_.length; -for(var i=0;i<_153.length;i++){ -if(!isOK(_153[i].canvasy)){ +for(var i=0;i"+_158.name+":"+this.round_(_158.yval,2); +var _167=this.selPoints_[i]; +var c=new RGBColor(this.colors_[i%clen]); +_165+=" "+_167.name+":"+this.round_(_167.yval,2); } -this.attr_("labelsDiv").innerHTML=_156; -this.lastx_=_148; +this.attr_("labelsDiv").innerHTML=_165; +this.lastx_=_158; ctx.save(); -for(var i=0;i<_153.length;i++){ -if(!isOK(_153[i%clen].canvasy)){ +for(var i=0;i=Dygraph.DAILY){ -_185.push({v:t,label:new Date(t+3600*1000).strftime(_187)}); +if(frac==0||_194>=Dygraph.DAILY){ +_195.push({v:t,label:new Date(t+3600*1000).strftime(_197)}); }else{ -_185.push({v:t,label:this.hmsString_(t)}); +_195.push({v:t,label:this.hmsString_(t)}); } } }else{ -var _189; -var _190=1; -if(_184==Dygraph.MONTHLY){ -_189=[0,1,2,3,4,5,6,7,8,9,10,11,12]; +var _198; +var _199=1; +if(_194==Dygraph.MONTHLY){ +_198=[0,1,2,3,4,5,6,7,8,9,10,11,12]; }else{ -if(_184==Dygraph.QUARTERLY){ -_189=[0,3,6,9]; +if(_194==Dygraph.QUARTERLY){ +_198=[0,3,6,9]; }else{ -if(_184==Dygraph.BIANNUAL){ -_189=[0,6]; +if(_194==Dygraph.BIANNUAL){ +_198=[0,6]; }else{ -if(_184==Dygraph.ANNUAL){ -_189=[0]; +if(_194==Dygraph.ANNUAL){ +_198=[0]; }else{ -if(_184==Dygraph.DECADAL){ -_189=[0]; -_190=10; +if(_194==Dygraph.DECADAL){ +_198=[0]; +_199=10; } } } } } -var _191=new Date(_182).getFullYear(); -var _192=new Date(_183).getFullYear(); -var _193=Dygraph.zeropad; -for(var i=_191;i<=_192;i++){ -if(i%_190!=0){ +var _200=new Date(_192).getFullYear(); +var _201=new Date(_193).getFullYear(); +var _202=Dygraph.zeropad; +for(var i=_200;i<=_201;i++){ +if(i%_199!=0){ continue; } -for(var j=0;j<_189.length;j++){ -var _194=i+"/"+_193(1+_189[j])+"/01"; -var t=Date.parse(_194); -if(t<_182||t>_183){ +for(var j=0;j<_198.length;j++){ +var _203=i+"/"+_202(1+_198[j])+"/01"; +var t=Date.parse(_203); +if(t<_192||t>_193){ continue; } -_185.push({v:t,label:new Date(t).strftime("%b %y")}); +_195.push({v:t,label:new Date(t).strftime("%b %y")}); } } } -return _185; +return _195; }; -Dygraph.dateTicker=function(_195,_196,self){ -var _197=-1; +Dygraph.dateTicker=function(_204,_205,self){ +var _206=-1; for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_197=i; +var _207=self.NumXTicks(_204,_205,i); +if(self.width_/_207>=self.attr_("pixelsPerXLabel")){ +_206=i; break; } } -if(_197>=0){ -return self.GetXAxis(_195,_196,_197); +if(_206>=0){ +return self.GetXAxis(_204,_205,_206); }else{ } }; Dygraph.numericTicks=function(minV,maxV,self){ -var _201=[1,2,5]; -var _202,low_val,high_val,nTicks; -var _203=self.attr_("pixelsPerYLabel"); +var _210=[1,2,5]; +var _211,low_val,high_val,nTicks; +var _212=self.attr_("pixelsPerYLabel"); for(var i=-10;i<50;i++){ -var _204=Math.pow(10,i); -for(var j=0;j<_201.length;j++){ -_202=_204*_201[j]; -low_val=Math.floor(minV/_202)*_202; -high_val=Math.ceil(maxV/_202)*_202; -nTicks=(high_val-low_val)/_202; -var _205=self.height_/nTicks; -if(_205>_203){ +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){ break; } } -if(_205>_203){ +if(_214>_212){ break; } } -var _206=[]; -for(var i=0;i=k*k*k){ -_208=self.round_(_207/(k*k*k),1)+"B"; -}else{ -if(_207>=k*k){ -_208=self.round_(_207/(k*k),1)+"M"; -}else{ -if(_207>=k){ -_208=self.round_(_207/k,1)+"K"; +k=1000; +_217=["K","M","B","T"]; +} +if(self.attr_("labelsKMG2")){ +if(k){ +self.warn("Setting both labelsKMB and labelsKMG2. Pick one!"); } +k=1024; +_217=["k","M","G","T"]; +} +for(var i=0;i=0;j--,n/=k){ +if(_219>=n){ +_220=self.round_(_218/n,1)+_217[j]; +break; } } } -_206.push({label:_208,v:_207}); +_215.push({label:_220,v:_218}); } -return _206; +return _215; }; Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _212=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_212}); +var _224=Dygraph.numericTicks(minY,maxY,this); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_224}); }; -Dygraph.prototype.extremeValues_=function(_213){ +Dygraph.prototype.extremeValues_=function(_225){ var minY=null,maxY=null; var bars=this.attr_("errorBars")||this.attr_("customBars"); if(bars){ -for(var j=0;j<_213.length;j++){ -var y=_213[j][1][0]; +for(var j=0;j<_225.length;j++){ +var y=_225[j][1][0]; if(!y){ continue; } -var low=y-_213[j][1][1]; -var high=y+_213[j][1][2]; +var low=y-_225[j][1][1]; +var high=y+_225[j][1][2]; if(low>y){ low=y; } @@ -4301,8 +1188,8 @@ minY=low; } } }else{ -for(var j=0;j<_213.length;j++){ -var y=_213[j][1]; +for(var j=0;j<_225.length;j++){ +var y=_225[j][1]; if(!y){ continue; } @@ -4322,64 +1209,64 @@ this.layout_.removeAllDatasets(); this.setColors_(); this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize"); for(var i=1;i=low&&_217[k][0]<=high){ -_218.push(_217[k]); +var _230=[]; +for(var k=0;k<_229.length;k++){ +if(_229[k][0]>=low&&_229[k][0]<=high){ +_230.push(_229[k]); } } -_217=_218; +_229=_230; } -var _219=this.extremeValues_(_217); -var _220=_219[0]; -var _221=_219[1]; -if(!minY||_220maxY){ -maxY=_221; +if(!maxY||_233>maxY){ +maxY=_233; } if(bars){ var vals=[]; -for(var j=0;j<_217.length;j++){ -vals[j]=[_217[j][0],_217[j][1][0],_217[j][1][1],_217[j][1][2]]; +for(var j=0;j<_229.length;j++){ +vals[j]=[_229[j][0],_229[j][1][0],_229[j][1][1],_229[j][1][2]]; } this.layout_.addDataset(this.attr_("labels")[i],vals); }else{ -this.layout_.addDataset(this.attr_("labels")[i],_217); +this.layout_.addDataset(this.attr_("labels")[i],_229); } } if(this.valueRange_!=null){ this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); }else{ var span=maxY-minY; -var _224=maxY+0.1*span; -var _225=minY-0.1*span; -if(_225<0&&minY>=0){ -_225=0; +var _236=maxY+0.1*span; +var _237=minY-0.1*span; +if(_237<0&&minY>=0){ +_237=0; } -if(_224>0&&maxY<=0){ -_224=0; +if(_236>0&&maxY<=0){ +_236=0; } if(this.attr_("includeZero")){ if(maxY<0){ -_224=0; +_236=0; } if(minY>0){ -_225=0; +_237=0; } } -this.addYTicks_(_225,_224); +this.addYTicks_(_237,_236); } this.addXTicks_(); this.layout_.evaluateWithError(); @@ -4387,44 +1274,44 @@ this.plotter_.clear(); this.plotter_.render(); this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); }; -Dygraph.prototype.rollingAverage=function(_226,_227){ -if(_226.length<2){ -return _226; +Dygraph.prototype.rollingAverage=function(_238,_239){ +if(_238.length<2){ +return _238; } -var _227=Math.min(_227,_226.length-1); -var _228=[]; -var _229=this.attr_("sigma"); +var _239=Math.min(_239,_238.length-1); +var _240=[]; +var _241=this.attr_("sigma"); if(this.fractions_){ var num=0; var den=0; var mult=100; -for(var i=0;i<_226.length;i++){ -num+=_226[i][1][0]; -den+=_226[i][1][1]; -if(i-_227>=0){ -num-=_226[i-_227][1][0]; -den-=_226[i-_227][1][1]; -} -var date=_226[i][0]; -var _232=den?num/den:0; +for(var i=0;i<_238.length;i++){ +num+=_238[i][1][0]; +den+=_238[i][1][1]; +if(i-_239>=0){ +num-=_238[i-_239][1][0]; +den-=_238[i-_239][1][1]; +} +var date=_238[i][0]; +var _244=den?num/den:0; if(this.attr_("errorBars")){ if(this.wilsonInterval_){ if(den){ -var p=_232<0?0:_232,n=den; -var pm=_229*Math.sqrt(p*(1-p)/n+_229*_229/(4*n*n)); -var _235=1+_229*_229/den; -var low=(p+_229*_229/(2*den)-pm)/_235; -var high=(p+_229*_229/(2*den)+pm)/_235; -_228[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; +var p=_244<0?0:_244,n=den; +var pm=_241*Math.sqrt(p*(1-p)/n+_241*_241/(4*n*n)); +var _246=1+_241*_241/den; +var low=(p+_241*_241/(2*den)-pm)/_246; +var high=(p+_241*_241/(2*den)+pm)/_246; +_240[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; }else{ -_228[i]=[date,[0,0,0]]; +_240[i]=[date,[0,0,0]]; } }else{ -var _236=den?_229*Math.sqrt(_232*(1-_232)/den):1; -_228[i]=[date,[mult*_232,mult*_236,mult*_236]]; +var _247=den?_241*Math.sqrt(_244*(1-_244)/den):1; +_240[i]=[date,[mult*_244,mult*_247,mult*_247]]; } }else{ -_228[i]=[date,mult*_232]; +_240[i]=[date,mult*_244]; } } }else{ @@ -4432,105 +1319,109 @@ if(this.attr_("customBars")){ var low=0; var mid=0; var high=0; -var _238=0; -for(var i=0;i<_226.length;i++){ -var data=_226[i][1]; +var _249=0; +for(var i=0;i<_238.length;i++){ +var data=_238[i][1]; var y=data[1]; -_228[i]=[_226[i][0],[y,y-data[0],data[2]-y]]; +_240[i]=[_238[i][0],[y,y-data[0],data[2]-y]]; +if(y!=null&&!isNaN(y)){ low+=data[0]; mid+=y; high+=data[2]; -_238+=1; -if(i-_227>=0){ -var prev=_226[i-_227]; +_249+=1; +} +if(i-_239>=0){ +var prev=_238[i-_239]; +if(prev[1][1]!=null&&!isNaN(prev[1][1])){ low-=prev[1][0]; mid-=prev[1][1]; high-=prev[1][2]; -_238-=1; +_249-=1; } -_228[i]=[_226[i][0],[1*mid/_238,1*(mid-low)/_238,1*(high-mid)/_238]]; +} +_240[i]=[_238[i][0],[1*mid/_249,1*(mid-low)/_249,1*(high-mid)/_249]]; } }else{ -var _240=Math.min(_227-1,_226.length-2); +var _251=Math.min(_239-1,_238.length-2); if(!this.attr_("errorBars")){ -if(_227==1){ -return _226; +if(_239==1){ +return _238; } -for(var i=0;i<_226.length;i++){ +for(var i=0;i<_238.length;i++){ var sum=0; -var _242=0; -for(var j=Math.max(0,i-_227+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_247=true; +_258=true; }else{ if(str.length==8&&str>"19700101"&&str<"20371231"){ -_247=true; +_258=true; } } -if(_247){ +if(_258){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xValueParser=Dygraph.dateParser; this.attrs_.xTicker=Dygraph.dateTicker; @@ -4546,57 +1437,64 @@ this.attrs_.xTicker=Dygraph.numericTicks; }; Dygraph.prototype.parseCSV_=function(data){ var ret=[]; -var _248=data.split("\n"); -var _249=0; +var _259=data.split("\n"); +var _260=this.attr_("delimiter"); +if(_259[0].indexOf(_260)==-1&&_259[0].indexOf("\t")>=0){ +_260="\t"; +} +var _261=0; if(this.labelsFromCSV_){ -_249=1; -this.attrs_.labels=_248[0].split(","); -} -var _250; -var _251=false; -var _252=this.attr_("labels").length; -for(var i=_249;i<_248.length;i++){ -var line=_248[i]; +_261=1; +this.attrs_.labels=_259[0].split(_260); +} +var _262; +var _263=false; +var _264=this.attr_("labels").length; +for(var i=_261;i<_259.length;i++){ +var line=_259[i]; if(line.length==0){ continue; } -var _254=line.split(","); -if(_254.length<2){ +if(line[0]=="#"){ +continue; +} +var _266=line.split(_260); +if(_266.length<2){ continue; } -var _255=[]; -if(!_251){ -this.detectTypeFromString_(_254[0]); -_250=this.attr_("xValueParser"); -_251=true; +var _267=[]; +if(!_263){ +this.detectTypeFromString_(_266[0]); +_262=this.attr_("xValueParser"); +_263=true; } -_255[0]=_250(_254[0],this); +_267[0]=_262(_266[0],this); if(this.fractions_){ -for(var j=1;j<_254.length;j++){ -var vals=_254[j].split("/"); -_255[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; +for(var j=1;j<_266.length;j++){ +var vals=_266[j].split("/"); +_267[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; } }else{ if(this.attr_("errorBars")){ -for(var j=1;j<_254.length;j+=2){ -_255[(j+1)/2]=[parseFloat(_254[j]),parseFloat(_254[j+1])]; +for(var j=1;j<_266.length;j+=2){ +_267[(j+1)/2]=[parseFloat(_266[j]),parseFloat(_266[j+1])]; } }else{ if(this.attr_("customBars")){ -for(var j=1;j<_254.length;j++){ -var vals=_254[j].split(";"); -_255[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; +for(var j=1;j<_266.length;j++){ +var vals=_266[j].split(";"); +_267[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; } }else{ -for(var j=1;j<_254.length;j++){ -_255[j]=parseFloat(_254[j]); +for(var j=1;j<_266.length;j++){ +_267[j]=parseFloat(_266[j]); } } } } -ret.push(_255); -if(_255.length!=_252){ -this.error("Number of columns in line "+i+" ("+_255.length+") does not agree with number of labels ("+_252+") "+line); +ret.push(_267); +if(_267.length!=_264){ +this.error("Number of columns in line "+i+" ("+_267.length+") does not agree with number of labels ("+_264+") "+line); } } return ret; @@ -4617,22 +1515,22 @@ for(var i=1;i=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _263=this; +var _278=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_263.loadedEvent_(req.responseText); +_278.loadedEvent_(req.responseText); } } }; @@ -4721,36 +1663,98 @@ this.error("Unknown data format: "+(typeof this.file_)); } } }; -Dygraph.prototype.updateOptions=function(_264){ -if(_264.rollPeriod){ -this.rollPeriod_=_264.rollPeriod; +Dygraph.prototype.updateOptions=function(_279){ +if(_279.rollPeriod){ +this.rollPeriod_=_279.rollPeriod; } -if(_264.dateWindow){ -this.dateWindow_=_264.dateWindow; +if(_279.dateWindow){ +this.dateWindow_=_279.dateWindow; } -if(_264.valueRange){ -this.valueRange_=_264.valueRange; +if(_279.valueRange){ +this.valueRange_=_279.valueRange; } -MochiKit.Base.update(this.user_attrs_,_264); +Dygraph.update(this.user_attrs_,_279); this.labelsFromCSV_=(this.attr_("labels")==null); this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_264["file"]&&_264["file"]!=this.file_){ -this.file_=_264["file"]; +if(_279["file"]&&_279["file"]!=this.file_){ +this.file_=_279["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_265){ -this.rollPeriod_=_265; +Dygraph.prototype.adjustRoll=function(_280){ +this.rollPeriod_=_280; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_266){ -this.container=_266; +Dygraph.createCanvas=function(){ +var _281=document.createElement("canvas"); +isIE=(/MSIE/.test(navigator.userAgent)&&!window.opera); +if(isIE){ +_281=G_vmlCanvasManager.initElement(_281); +} +return _281; +}; +Dygraph.GVizChart=function(_282){ +this.container=_282; }; -Dygraph.GVizChart.prototype.draw=function(data,_267){ +Dygraph.GVizChart.prototype.draw=function(data,_283){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_267); +this.date_graph=new Dygraph(this.container,data,_283); }; DateGraph=Dygraph; +function RGBColor(_284){ +this.ok=false; +if(_284.charAt(0)=="#"){ +_284=_284.substr(1,6); +} +_284=_284.replace(/ /g,""); +_284=_284.toLowerCase(); +var _285={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 _285){ +if(_284==key){ +_284=_285[key]; +} +} +var _287=[{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<_287.length;i++){ +var re=_287[i].re; +var _290=_287[i].process; +var bits=re.exec(_284); +if(bits){ +channels=_290(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; +}; +}