X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-combined.js;h=609028ef00e4de650dfab76a3e2b7cb26d683d24;hb=e88ff79f863b8d218f6c1644c5184f1589561404;hp=dba1f2c8d276a9ff9ec57137641657a0b5bb847a;hpb=21ff17d117faed5a1654c4b5032c4a10d89fcd5a;p=dygraphs.git diff --git a/dygraph-combined.js b/dygraph-combined.js index dba1f2c..609028e 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -3879,13 +3879,6 @@ throw ""; catch(e){ throw "PlotKit depends on MochiKit.{Base,Color,DOM}"; } -MochiKit.Base.update(MochiKit.Color.Color.prototype,{asFillColor:function(){ -return this.lighterColorWithLevel(0.3); -},asStrokeColor:function(){ -return this.darkerColorWithLevel(0.1); -},asPointColor:function(){ -return this.lighterColorWithLevel(0.1); -}}); if(typeof (PlotKit)=="undefined"){ PlotKit={}; } @@ -4059,193 +4052,6 @@ throw ""; } } catch(e){ -throw "PlotKit.Layout depends on MochiKit.{Base,Color,DOM,Format} and PlotKit.Base"; -} -if(typeof (PlotKit.Layout)=="undefined"){ -PlotKit.Layout={}; -} -PlotKit.Layout.NAME="PlotKit.Layout"; -PlotKit.Layout.VERSION=PlotKit.VERSION; -PlotKit.Layout.__repr__=function(){ -return "["+this.NAME+" "+this.VERSION+"]"; -}; -PlotKit.Layout.toString=function(){ -return this.__repr__(); -}; -PlotKit.Layout.valid_styles=["bar","line","pie","point"]; -PlotKit.Layout=function(_28,_29){ -this.options={"barWidthFillFraction":0.75,"barOrientation":"vertical","xOriginIsZero":true,"yOriginIsZero":true,"xAxis":null,"yAxis":null,"xTicks":null,"yTicks":null,"xNumberOfTicks":10,"yNumberOfTicks":5,"xTickPrecision":1,"yTickPrecision":1,"pieRadius":0.4}; -this.style=_28; -MochiKit.Base.update(this.options,_29?_29:{}); -if(!MochiKit.Base.isUndefinedOrNull(this.options.xAxis)){ -this.minxval=this.options.xAxis[0]; -this.maxxval=this.options.xAxis[1]; -this.xscale=this.maxxval-this.minxval; -}else{ -this.minxval=0; -this.maxxval=null; -this.xscale=null; -} -if(!MochiKit.Base.isUndefinedOrNull(this.options.yAxis)){ -this.minyval=this.options.yAxis[0]; -this.maxyval=this.options.yAxis[1]; -this.yscale=this.maxyval-this.minyval; -}else{ -this.minyval=0; -this.maxyval=null; -this.yscale=null; -} -this.points=new Array(); -this.xticks=new Array(); -this.yticks=new Array(); -this.datasets=new Array(); -this.minxdelta=0; -this.xrange=1; -this.yrange=1; -this.hitTestCache={x2maxy:null}; -}; -PlotKit.Layout.prototype.addDataset=function(_30,_31){ -this.datasets[_30]=_31; -}; -PlotKit.Layout.prototype.removeDataset=function(_32,_33){ -delete this.datasets[_32]; -}; -PlotKit.Layout.prototype.evaluate=function(){ -this._evaluateLimits(); -this._evaluateScales(); -if(this.style=="line"){ -this._evaluateLineCharts(); -this._evaluateLineTicks(); -} -}; -PlotKit.Layout.prototype._evaluateLimits=function(){ -var map=PlotKit.Base.map; -var _35=PlotKit.Base.items; -var _36=MochiKit.Base.itemgetter; -var _37=PlotKit.Base.collapse; -var _38=MochiKit.Base.listMin; -var _39=MochiKit.Base.listMax; -var _40=MochiKit.Base.isUndefinedOrNull; -var all=_37(map(_36(1),_35(this.datasets))); -if(_40(this.options.xAxis)){ -if(this.options.xOriginIsZero){ -this.minxval=0; -}else{ -this.minxval=_38(map(parseFloat,map(_36(0),all))); -} -this.maxxval=_39(map(parseFloat,map(_36(0),all))); -}else{ -this.minxval=this.options.xAxis[0]; -this.maxxval=this.options.xAxis[1]; -this.xscale=this.maxval-this.minxval; -} -if(_40(this.options.yAxis)){ -if(this.options.yOriginIsZero){ -this.minyval=0; -}else{ -this.minyval=_38(map(parseFloat,map(_36(1),all))); -} -this.maxyval=_39(map(parseFloat,map(_36(1),all))); -}else{ -this.minyval=this.options.yAxis[0]; -this.maxyval=this.options.yAxis[1]; -this.yscale=this.maxyval-this.minyval; -} -}; -PlotKit.Layout.prototype._evaluateScales=function(){ -this.xrange=this.maxxval-this.minxval; -if(this.xrange==0){ -this.xscale=1; -}else{ -this.xscale=1/this.xrange; -} -this.yrange=this.maxyval-this.minyval; -if(this.yrange==0){ -this.yscale=1; -}else{ -this.yscale=1/this.yrange; -} -}; -PlotKit.Layout.prototype._evaluateLineCharts=function(){ -var _42=PlotKit.Base.items; -var _43=_42(this.datasets).length; -this.points=new Array(); -var i=0; -for(var _44 in this.datasets){ -var _45=this.datasets[_44]; -if(PlotKit.Base.isFuncLike(_45)){ -continue; -} -_45.sort(function(a,b){ -return compare(parseFloat(a[0]),parseFloat(b[0])); -}); -for(var j=0;j<_45.length;j++){ -var _49=_45[j]; -var _50={x:((parseFloat(_49[0])-this.minxval)*this.xscale),y:1-((parseFloat(_49[1])-this.minyval)*this.yscale),xval:parseFloat(_49[0]),yval:parseFloat(_49[1]),name:_44}; -if(_50.y<=0){ -_50.y=0; -} -if(_50.y>=1){ -_50.y=1; -} -if((_50.x>=0)&&(_50.x<=1)){ -this.points.push(_50); -} -} -i++; -} -}; -PlotKit.Layout.prototype._evaluateLineTicksForXAxis=function(){ -var _51=MochiKit.Base.isUndefinedOrNull; -this.xticks=new Array(); -var _52=function(_53){ -var _54=_53.label; -if(_51(_54)){ -_54=_53.v.toString(); -} -var pos=this.xscale*(_53.v-this.minxval); -if((pos>=0)&&(pos<=1)){ -this.xticks.push([pos,_54]); -} -}; -MochiKit.Iter.forEach(this.options.xTicks,bind(_52,this)); -}; -PlotKit.Layout.prototype._evaluateLineTicksForYAxis=function(){ -var _56=MochiKit.Base.isUndefinedOrNull; -this.yticks=new Array(); -var _57=function(_58){ -var _59=_58.label; -if(_56(_59)){ -_59=_58.v.toString(); -} -var pos=1-(this.yscale*(_58.v-this.minyval)); -if((pos>=0)&&(pos<=1)){ -this.yticks.push([pos,_59]); -} -}; -MochiKit.Iter.forEach(this.options.yTicks,bind(_57,this)); -}; -PlotKit.Layout.prototype._evaluateLineTicks=function(){ -this._evaluateLineTicksForXAxis(); -this._evaluateLineTicksForYAxis(); -}; -PlotKit.LayoutModule={}; -PlotKit.LayoutModule.Layout=PlotKit.Layout; -PlotKit.LayoutModule.EXPORT=["Layout"]; -PlotKit.LayoutModule.EXPORT_OK=[]; -PlotKit.LayoutModule.__new__=function(){ -var m=MochiKit.Base; -m.nameFunctions(this); -this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; -}; -PlotKit.LayoutModule.__new__(); -MochiKit.Base._exportSymbols(this,PlotKit.LayoutModule); -try{ -if((typeof (PlotKit.Base)=="undefined")||(typeof (PlotKit.Layout)=="undefined")){ -throw ""; -} -} -catch(e){ throw "PlotKit.Layout depends on MochiKit.{Base,Color,DOM,Format} and PlotKit.{Base,Layout}"; } if(typeof (PlotKit.CanvasRenderer)=="undefined"){ @@ -4259,21 +4065,21 @@ return "["+this.NAME+" "+this.VERSION+"]"; PlotKit.CanvasRenderer.toString=function(){ return this.__repr__(); }; -PlotKit.CanvasRenderer=function(_60,_61,_62){ +PlotKit.CanvasRenderer=function(_28,_29,_30){ if(arguments.length>0){ -this.__init__(_60,_61,_62); +this.__init__(_28,_29,_30); } }; -PlotKit.CanvasRenderer.prototype.__init__=function(_63,_64,_65){ -var _66=MochiKit.Base.isUndefinedOrNull; -var _67=MochiKit.Color.Color; -this.options={"drawBackground":true,"backgroundColor":_67.whiteColor(),"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"strokeColor":_67.whiteColor(),"strokeColorTransform":"asStrokeColor","strokeWidth":0.5,"shouldFill":true,"shouldStroke":true,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_67.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_67.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"pieRadius":0.4,"enableEvents":true}; -MochiKit.Base.update(this.options,_65?_65:{}); -this.layout=_64; -this.element=MochiKit.DOM.getElement(_63); +PlotKit.CanvasRenderer.prototype.__init__=function(_31,_32,_33){ +var _34=MochiKit.Base.isUndefinedOrNull; +var _35=MochiKit.Color.Color; +this.options={"strokeWidth":0.5,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_35.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_35.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,}; +MochiKit.Base.update(this.options,_33?_33:{}); +this.layout=_32; +this.element=MochiKit.DOM.getElement(_31); this.container=this.element.parentNode; this.isIE=PlotKit.Base.excanvasSupported(); -if(this.isIE&&!_66(G_vmlCanvasManager)){ +if(this.isIE&&!_34(G_vmlCanvasManager)){ this.IEDelay=0.5; this.maxTries=5; this.renderDelay=null; @@ -4282,13 +4088,13 @@ this.element=G_vmlCanvasManager.initElement(this.element); } this.height=this.element.height; this.width=this.element.width; -if(_66(this.element)){ +if(_34(this.element)){ throw "CanvasRenderer() - passed canvas is not found"; } if(!this.isIE&&!(PlotKit.CanvasRenderer.isSupported(this.element))){ throw "CanvasRenderer() - Canvas is not supported."; } -if(_66(this.container)||(this.container.nodeName.toLowerCase()!="div")){ +if(_34(this.container)||(this.container.nodeName.toLowerCase()!="div")){ throw "CanvasRenderer() - needs to be enclosed in
"; } this.xlabels=new Array(); @@ -4306,93 +4112,93 @@ PlotKit.CanvasRenderer.prototype._renderAxis=function(){ if(!this.options.drawXAxis&&!this.options.drawYAxis){ return; } -var _68=this.element.getContext("2d"); -var _69={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}}; -_68.save(); -_68.strokeStyle=this.options.axisLineColor.toRGBString(); -_68.lineWidth=this.options.axisLineWidth; +var _36=this.element.getContext("2d"); +var _37={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}}; +_36.save(); +_36.strokeStyle=this.options.axisLineColor.toRGBString(); +_36.lineWidth=this.options.axisLineWidth; if(this.options.drawYAxis){ if(this.layout.yticks){ -var _70=function(_71){ -if(typeof (_71)=="function"){ +var _38=function(_39){ +if(typeof (_39)=="function"){ return; } var x=this.area.x; -var y=this.area.y+_71[0]*this.area.h; -_68.beginPath(); -_68.moveTo(x,y); -_68.lineTo(x-this.options.axisTickSize,y); -_68.closePath(); -_68.stroke(); -var _73=DIV(_69,_71[1]); +var y=this.area.y+_39[0]*this.area.h; +_36.beginPath(); +_36.moveTo(x,y); +_36.lineTo(x-this.options.axisTickSize,y); +_36.closePath(); +_36.stroke(); +var _41=DIV(_37,_39[1]); var top=(y-this.options.axisLabelFontSize/2); if(top<0){ top=0; } if(top+this.options.axisLabelFontSize+3>this.height){ -_73.style.bottom="0px"; +_41.style.bottom="0px"; }else{ -_73.style.top=top+"px"; +_41.style.top=top+"px"; } -_73.style.left="0px"; -_73.style.textAlign="right"; -_73.style.width=this.options.yAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_73); -this.ylabels.push(_73); +_41.style.left="0px"; +_41.style.textAlign="right"; +_41.style.width=this.options.yAxisLabelWidth+"px"; +MochiKit.DOM.appendChildNodes(this.container,_41); +this.ylabels.push(_41); }; -MochiKit.Iter.forEach(this.layout.yticks,bind(_70,this)); -var _75=this.ylabels[0]; -var _76=this.options.axisLabelFontSize; -var _77=parseInt(_75.style.top)+_76; -if(_77>this.height-_76){ -_75.style.top=(parseInt(_75.style.top)-_76/2)+"px"; +MochiKit.Iter.forEach(this.layout.yticks,bind(_38,this)); +var _43=this.ylabels[0]; +var _44=this.options.axisLabelFontSize; +var _45=parseInt(_43.style.top)+_44; +if(_45>this.height-_44){ +_43.style.top=(parseInt(_43.style.top)-_44/2)+"px"; } } -_68.beginPath(); -_68.moveTo(this.area.x,this.area.y); -_68.lineTo(this.area.x,this.area.y+this.area.h); -_68.closePath(); -_68.stroke(); +_36.beginPath(); +_36.moveTo(this.area.x,this.area.y); +_36.lineTo(this.area.x,this.area.y+this.area.h); +_36.closePath(); +_36.stroke(); } if(this.options.drawXAxis){ if(this.layout.xticks){ -var _70=function(_78){ +var _38=function(_46){ if(typeof (dataset)=="function"){ return; } -var x=this.area.x+_78[0]*this.area.w; +var x=this.area.x+_46[0]*this.area.w; var y=this.area.y+this.area.h; -_68.beginPath(); -_68.moveTo(x,y); -_68.lineTo(x,y+this.options.axisTickSize); -_68.closePath(); -_68.stroke(); -var _79=DIV(_69,_78[1]); -_79.style.textAlign="center"; -_79.style.bottom="0px"; -var _80=(x-this.options.axisLabelWidth/2); -if(_80+this.options.axisLabelWidth>this.width){ -_80=this.width-this.options.xAxisLabelWidth; -_79.style.textAlign="right"; -} -if(_80<0){ -_80=0; -_79.style.textAlign="left"; -} -_79.style.left=_80+"px"; -_79.style.width=this.options.xAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_79); -this.xlabels.push(_79); -}; -MochiKit.Iter.forEach(this.layout.xticks,bind(_70,this)); -} -_68.beginPath(); -_68.moveTo(this.area.x,this.area.y+this.area.h); -_68.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); -_68.closePath(); -_68.stroke(); -} -_68.restore(); +_36.beginPath(); +_36.moveTo(x,y); +_36.lineTo(x,y+this.options.axisTickSize); +_36.closePath(); +_36.stroke(); +var _47=DIV(_37,_46[1]); +_47.style.textAlign="center"; +_47.style.bottom="0px"; +var _48=(x-this.options.axisLabelWidth/2); +if(_48+this.options.axisLabelWidth>this.width){ +_48=this.width-this.options.xAxisLabelWidth; +_47.style.textAlign="right"; +} +if(_48<0){ +_48=0; +_47.style.textAlign="left"; +} +_47.style.left=_48+"px"; +_47.style.width=this.options.xAxisLabelWidth+"px"; +MochiKit.DOM.appendChildNodes(this.container,_47); +this.xlabels.push(_47); +}; +MochiKit.Iter.forEach(this.layout.xticks,bind(_38,this)); +} +_36.beginPath(); +_36.moveTo(this.area.x,this.area.y+this.area.h); +_36.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); +_36.closePath(); +_36.stroke(); +} +_36.restore(); }; PlotKit.CanvasRenderer.prototype.clear=function(){ if(this.isIE){ @@ -4401,7 +4207,7 @@ if(this.clearDelay){ this.clearDelay.cancel(); this.clearDelay=null; } -var _81=this.element.getContext("2d"); +var _49=this.element.getContext("2d"); } catch(e){ this.isFirstRender=false; @@ -4410,70 +4216,131 @@ this.clearDelay.addCallback(bind(this.clear,this)); return; } } -var _81=this.element.getContext("2d"); -_81.clearRect(0,0,this.width,this.height); +var _49=this.element.getContext("2d"); +_49.clearRect(0,0,this.width,this.height); MochiKit.Iter.forEach(this.xlabels,MochiKit.DOM.removeElement); MochiKit.Iter.forEach(this.ylabels,MochiKit.DOM.removeElement); this.xlabels=new Array(); this.ylabels=new Array(); }; -PlotKit.CanvasRenderer.isSupported=function(_82){ -var _83=null; +PlotKit.CanvasRenderer.isSupported=function(_50){ +var _51=null; try{ -if(MochiKit.Base.isUndefinedOrNull(_82)){ -_83=MochiKit.DOM.CANVAS({}); +if(MochiKit.Base.isUndefinedOrNull(_50)){ +_51=MochiKit.DOM.CANVAS({}); }else{ -_83=MochiKit.DOM.getElement(_82); +_51=MochiKit.DOM.getElement(_50); } -var _84=_83.getContext("2d"); +var _52=_51.getContext("2d"); } catch(e){ var ie=navigator.appVersion.match(/MSIE (\d\.\d)/); -var _86=(navigator.userAgent.toLowerCase().indexOf("opera")!=-1); -if((!ie)||(ie[1]<6)||(_86)){ +var _54=(navigator.userAgent.toLowerCase().indexOf("opera")!=-1); +if((!ie)||(ie[1]<6)||(_54)){ return false; } return true; } return true; }; -PlotKit.Canvas={}; -PlotKit.Canvas.CanvasRenderer=PlotKit.CanvasRenderer; -PlotKit.Canvas.EXPORT=["CanvasRenderer"]; -PlotKit.Canvas.EXPORT_OK=["CanvasRenderer"]; -PlotKit.Canvas.__new__=function(){ -var m=MochiKit.Base; -m.nameFunctions(this); -this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; -}; -PlotKit.Canvas.__new__(); -MochiKit.Base._exportSymbols(this,PlotKit.Canvas); 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){ -PlotKit.Layout.call(this,"line",_1); +DygraphLayout=function(_1,_2){ +this.dygraph_=_1; +this.options={}; +MochiKit.Base.update(this.options,_2?_2:{}); +this.datasets=new Array(); +}; +DygraphLayout.prototype.attr_=function(_3){ +return this.dygraph_.attr_(_3); +}; +DygraphLayout.prototype.addDataset=function(_4,_5){ +this.datasets[_4]=_5; +}; +DygraphLayout.prototype.evaluate=function(){ +this._evaluateLimits(); +this._evaluateLineCharts(); +this._evaluateLineTicks(); +}; +DygraphLayout.prototype._evaluateLimits=function(){ +this.minxval=this.maxxval=null; +for(var _6 in this.datasets){ +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]; +this.maxyval=this.options.yAxis[1]; +this.yrange=this.maxyval-this.minyval; +this.yscale=(this.yrange!=0?1/this.yrange:1); +}; +DygraphLayout.prototype._evaluateLineCharts=function(){ +this.points=new Array(); +for(var _10 in this.datasets){ +var _11=this.datasets[_10]; +for(var j=0;j<_11.length;j++){ +var _13=_11[j]; +var _14={x:((parseFloat(_13[0])-this.minxval)*this.xscale),y:1-((parseFloat(_13[1])-this.minyval)*this.yscale),xval:parseFloat(_13[0]),yval:parseFloat(_13[1]),name:_10}; +if(_14.y<=0){ +_14.y=0; +} +if(_14.y>=1){ +_14.y=1; +} +if((_14.x>=0)&&(_14.x<=1)){ +this.points.push(_14); +} +} +} +}; +DygraphLayout.prototype._evaluateLineTicks=function(){ +this.xticks=new Array(); +for(var i=0;i=0)&&(pos<=1)){ +this.xticks.push([pos,_17]); +} +} +this.yticks=new Array(); +for(var i=0;i=0)&&(pos<=1)){ +this.yticks.push([pos,_17]); +} +} }; -DygraphLayout.prototype=new PlotKit.Layout(); DygraphLayout.prototype.evaluateWithError=function(){ this.evaluate(); if(!this.options.errorBars){ return; } var i=0; -for(var _3 in this.datasets){ +for(var _19 in this.datasets){ var j=0; -var _5=this.datasets[_3]; -if(PlotKit.Base.isFuncLike(_5)){ +var _20=this.datasets[_19]; +if(PlotKit.Base.isFuncLike(_20)){ continue; } -for(var j=0;j<_5.length;j++,i++){ -var _6=_5[j]; -var xv=parseFloat(_6[0]); -var yv=parseFloat(_6[1]); +for(var j=0;j<_20.length;j++,i++){ +var _21=_20[j]; +var xv=parseFloat(_21[0]); +var yv=parseFloat(_21[1]); if(xv==this.points[i].xval&&yv==this.points[i].yval){ -this.points[i].errorMinus=parseFloat(_6[2]); -this.points[i].errorPlus=parseFloat(_6[3]); +this.points[i].errorMinus=parseFloat(_21[2]); +this.points[i].errorPlus=parseFloat(_21[3]); } } } @@ -4482,30 +4349,29 @@ DygraphLayout.prototype.removeAllDatasets=function(){ delete this.datasets; this.datasets=new Array(); }; -DygraphLayout.prototype.updateOptions=function(_9){ -MochiKit.Base.update(this.options,_9?_9:{}); +DygraphLayout.prototype.updateOptions=function(_24){ +MochiKit.Base.update(this.options,_24?_24:{}); }; -DygraphCanvasRenderer=function(_10,_11,_12){ -PlotKit.CanvasRenderer.call(this,_10,_11,_12); -this.options.shouldFill=false; -this.options.shouldStroke=true; +DygraphCanvasRenderer=function(_25,_26,_27,_28){ +PlotKit.CanvasRenderer.call(this,_26,_27,_28); +this.dygraph_=_25; this.options.drawYGrid=true; this.options.drawXGrid=true; this.options.gridLineColor=MochiKit.Color.Color.grayColor(); -MochiKit.Base.update(this.options,_12); +MochiKit.Base.update(this.options,_28); this.options.drawBackground=false; }; DygraphCanvasRenderer.prototype=new PlotKit.CanvasRenderer(); DygraphCanvasRenderer.prototype.render=function(){ var ctx=this.element.getContext("2d"); if(this.options.drawYGrid){ -var _14=this.layout.yticks; +var _30=this.layout.yticks; ctx.save(); ctx.strokeStyle=this.options.gridLineColor.toRGBString(); ctx.lineWidth=this.options.axisLineWidth; -for(var i=0;i<_14.length;i++){ +for(var i=0;i<_30.length;i++){ var x=this.area.x; -var y=this.area.y+_14[i][0]*this.area.h; +var y=this.area.y+_30[i][0]*this.area.h; ctx.beginPath(); ctx.moveTo(x,y); ctx.lineTo(x+this.area.w,y); @@ -4514,12 +4380,12 @@ ctx.stroke(); } } if(this.options.drawXGrid){ -var _14=this.layout.xticks; +var _30=this.layout.xticks; ctx.save(); ctx.strokeStyle=this.options.gridLineColor.toRGBString(); ctx.lineWidth=this.options.axisLineWidth; -for(var i=0;i<_14.length;i++){ -var x=this.area.x+_14[i][0]*this.area.w; +for(var i=0;i<_30.length;i++){ +var x=this.area.x+_30[i][0]*this.area.w; var y=this.area.y+this.area.h; ctx.beginPath(); ctx.moveTo(x,y); @@ -4532,102 +4398,118 @@ this._renderLineChart(); this._renderLineAxis(); }; DygraphCanvasRenderer.prototype._renderLineChart=function(){ -var _17=this.element.getContext("2d"); -var _18=this.options.colorScheme.length; -var _19=this.options.colorScheme; -var _20=MochiKit.Base.keys(this.layout.datasets); -var _21=this.layout.options.errorBars; -var _22=_20.length; -var _23=MochiKit.Base.bind; -var _24=MochiKit.Base.partial; -var _25=function(_26){ -_26.canvasx=this.area.w*_26.x+this.area.x; -_26.canvasy=this.area.h*_26.y+this.area.y; -}; -MochiKit.Iter.forEach(this.layout.points,_25,this); -var _27=function(ctx){ -for(var i=0;i<_22;i++){ -var _28=_20[i]; -var _29=_19[i%_18]; -var _30=this.options.strokeColorTransform; -_17.save(); -_17.strokeStyle=_29.toRGBString(); -_17.lineWidth=this.options.strokeWidth; -ctx.beginPath(); -var _31=this.layout.points[0]; -var _32=true; -var _33=function(_34,_31){ -if(_31.name==_28){ -if(!_31.canvasy||isNaN(_31.canvasy)){ -_32=true; -}else{ -if(_32){ -_34.moveTo(_31.canvasx,_31.canvasy); -_32=false; +var _33=this.element.getContext("2d"); +var _34=this.options.colorScheme.length; +var _35=this.options.colorScheme; +var _36=MochiKit.Base.keys(this.layout.datasets); +var _37=this.layout.options.errorBars; +var _38=_36.length; +var _39=MochiKit.Base.bind; +var _40=MochiKit.Base.partial; +var _41=function(_42){ +_42.canvasx=this.area.w*_42.x+this.area.x; +_42.canvasy=this.area.h*_42.y+this.area.y; +}; +MochiKit.Iter.forEach(this.layout.points,_41,this); +var _43=function(x){ +return x&&!isNaN(x); +}; +var _44=function(ctx){ +for(var i=0;i<_38;i++){ +var _45=_36[i]; +var _46=_35[i%_34]; +var _47=this.options.strokeColorTransform; +_33.save(); +_33.strokeStyle=_46.toRGBString(); +_33.lineWidth=this.options.strokeWidth; +var _48=this.layout.points[0]; +var _49=this.dygraph_.attr_("pointSize"); +var _50=null,prevY=null; +var _51=this.dygraph_.attr_("drawPoints"); +var _52=this.layout.points; +for(var j=0;j<_52.length;j++){ +var _48=_52[j]; +if(_48.name==_45){ +if(!_43(_48.canvasy)){ +_50=prevY=null; +}else{ +var _53=(!_50&&(j==_52.length-1||!_43(_52[j+1].canvasy))); +if(!_50){ +_50=_48.canvasx; +prevY=_48.canvasy; }else{ -_34.lineTo(_31.canvasx,_31.canvasy); +ctx.beginPath(); +ctx.moveTo(_50,prevY); +_50=_48.canvasx; +prevY=_48.canvasy; +ctx.lineTo(_50,prevY); +ctx.stroke(); +} +if(_51||_53){ +ctx.beginPath(); +ctx.fillStyle=_46.toRGBString(); +ctx.arc(_48.canvasx,_48.canvasy,_49,0,360,false); +ctx.fill(); +} } } } -}; -MochiKit.Iter.forEach(this.layout.points,_24(_33,ctx),this); -ctx.stroke(); } }; -var _35=function(ctx){ -for(var i=0;i<_22;i++){ -var _36=_20[i]; -var _37=_19[i%_18]; -var _38=this.options.strokeColorTransform; -_17.save(); -_17.strokeStyle=_37.toRGBString(); -_17.lineWidth=this.options.strokeWidth; -var _39=-1; -var _40=[-1,-1]; -var _41=0; -var _42=this.layout.yscale; -var _43=function(_44,_45){ -_41++; -if(_45.name==_36){ -if(!_45.y||isNaN(_45.y)){ -_39=-1; +var _54=function(ctx){ +for(var i=0;i<_38;i++){ +var _55=_36[i]; +var _56=_35[i%_34]; +var _57=this.options.strokeColorTransform; +_33.save(); +_33.strokeStyle=_56.toRGBString(); +_33.lineWidth=this.options.strokeWidth; +var _58=-1; +var _59=[-1,-1]; +var _60=0; +var _61=this.layout.yscale; +var _62=function(_63,_64){ +_60++; +if(_64.name==_55){ +if(!_64.y||isNaN(_64.y)){ +_58=-1; return; } -var _46=[_45.y-_45.errorPlus*_42,_45.y+_45.errorMinus*_42]; -_46[0]=this.area.h*_46[0]+this.area.y; -_46[1]=this.area.h*_46[1]+this.area.y; -if(_39>=0){ -_44.moveTo(_39,_40[0]); -_44.lineTo(_45.canvasx,_46[0]); -_44.lineTo(_45.canvasx,_46[1]); -_44.lineTo(_39,_40[1]); -_44.closePath(); +var _65=[_64.y-_64.errorPlus*_61,_64.y+_64.errorMinus*_61]; +_65[0]=this.area.h*_65[0]+this.area.y; +_65[1]=this.area.h*_65[1]+this.area.y; +if(_58>=0){ +_63.moveTo(_58,_59[0]); +_63.lineTo(_64.canvasx,_65[0]); +_63.lineTo(_64.canvasx,_65[1]); +_63.lineTo(_58,_59[1]); +_63.closePath(); } -_40[0]=_46[0]; -_40[1]=_46[1]; -_39=_45.canvasx; +_59[0]=_65[0]; +_59[1]=_65[1]; +_58=_64.canvasx; } }; -var _47=_37.colorWithAlpha(0.15); -ctx.fillStyle=_47.toRGBString(); +var _66=_56.colorWithAlpha(0.15); +ctx.fillStyle=_66.toRGBString(); ctx.beginPath(); -MochiKit.Iter.forEach(this.layout.points,_24(_43,ctx),this); +MochiKit.Iter.forEach(this.layout.points,_40(_62,ctx),this); ctx.fill(); } }; -if(_21){ -_23(_35,this)(_17); +if(_37){ +_39(_54,this)(_33); } -_23(_27,this)(_17); -_17.restore(); +_39(_44,this)(_33); +_33.restore(); }; -Dygraph=function(div,_49,_50){ +Dygraph=function(div,_68,_69){ if(arguments.length>0){ if(arguments.length==4){ this.warn("Using deprecated four-argument dygraph constructor"); -this.__old_init__(div,_49,arguments[2],arguments[3]); +this.__old_init__(div,_68,arguments[2],arguments[3]); }else{ -this.__init__(div,_49,_50); +this.__init__(div,_68,_69); } } }; @@ -4648,29 +4530,28 @@ Dygraph.DEBUG=1; Dygraph.INFO=2; Dygraph.WARNING=3; Dygraph.ERROR=3; -Dygraph.prototype.__old_init__=function(div,_51,_52,_53){ -if(_52!=null){ -var _54=["Date"]; -for(var i=0;i<_52.length;i++){ -_54.push(_52[i]); +Dygraph.prototype.__old_init__=function(div,_70,_71,_72){ +if(_71!=null){ +var _73=["Date"]; +for(var i=0;i<_71.length;i++){ +_73.push(_71[i]); } -MochiKit.Base.update(_53,{"labels":_54}); +MochiKit.Base.update(_72,{"labels":_73}); } -this.__init__(div,_51,_53); +this.__init__(div,_70,_72); }; -Dygraph.prototype.__init__=function(div,_55,_56){ -if(_56==null){ -_56={}; +Dygraph.prototype.__init__=function(div,_74,_75){ +if(_75==null){ +_75={}; } this.maindiv_=div; -this.file_=_55; -this.rollPeriod_=_56.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; +this.file_=_74; +this.rollPeriod_=_75.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; this.previousVerticalX_=-1; -this.fractions_=_56.fractions||false; -this.dateWindow_=_56.dateWindow||null; -this.valueRange_=_56.valueRange||null; -this.wilsonInterval_=_56.wilsonInterval||true; -this.customBars_=_56.customBars||false; +this.fractions_=_75.fractions||false; +this.dateWindow_=_75.dateWindow||null; +this.valueRange_=_75.valueRange||null; +this.wilsonInterval_=_75.wilsonInterval||true; div.innerHTML=""; if(div.style.width==""){ div.style.width=Dygraph.DEFAULT_WIDTH+"px"; @@ -4681,71 +4562,71 @@ 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_,_56); +MochiKit.Base.update(this.user_attrs_,_75); this.attrs_={}; MochiKit.Base.update(this.attrs_,Dygraph.DEFAULT_ATTRS); this.labelsFromCSV_=(this.attr_("labels")==null); this.createInterface_(); -this.layoutOptions_={"errorBars":(this.attr_("errorBars")||this.customBars_),"xOriginIsZero":false}; +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.layoutOptions_); +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.hidden_,this.layout_,this.renderOptions_); +this.plotter_=new DygraphCanvasRenderer(this,this.hidden_,this.layout_,this.renderOptions_); this.createStatusMessage_(); this.createRollInterface_(); this.createDragInterface_(); this.start_(); }; -Dygraph.prototype.attr_=function(_57){ -if(typeof (this.user_attrs_[_57])!="undefined"){ -return this.user_attrs_[_57]; +Dygraph.prototype.attr_=function(_76){ +if(typeof (this.user_attrs_[_76])!="undefined"){ +return this.user_attrs_[_76]; }else{ -if(typeof (this.attrs_[_57])!="undefined"){ -return this.attrs_[_57]; +if(typeof (this.attrs_[_76])!="undefined"){ +return this.attrs_[_76]; }else{ return null; } } }; -Dygraph.prototype.log=function(_58,_59){ +Dygraph.prototype.log=function(_77,_78){ if(typeof (console)!="undefined"){ -switch(_58){ +switch(_77){ case Dygraph.DEBUG: -console.debug("dygraphs: "+_59); +console.debug("dygraphs: "+_78); break; case Dygraph.INFO: -console.info("dygraphs: "+_59); +console.info("dygraphs: "+_78); break; case Dygraph.WARNING: -console.warn("dygraphs: "+_59); +console.warn("dygraphs: "+_78); break; case Dygraph.ERROR: -console.error("dygraphs: "+_59); +console.error("dygraphs: "+_78); break; } } }; -Dygraph.prototype.info=function(_60){ -this.log(Dygraph.INFO,_60); +Dygraph.prototype.info=function(_79){ +this.log(Dygraph.INFO,_79); }; -Dygraph.prototype.warn=function(_61){ -this.log(Dygraph.WARNING,_61); +Dygraph.prototype.warn=function(_80){ +this.log(Dygraph.WARNING,_80); }; -Dygraph.prototype.error=function(_62){ -this.log(Dygraph.ERROR,_62); +Dygraph.prototype.error=function(_81){ +this.log(Dygraph.ERROR,_81); }; Dygraph.prototype.rollPeriod=function(){ return this.rollPeriod_; }; Dygraph.prototype.createInterface_=function(){ -var _63=this.maindiv_; +var _82=this.maindiv_; this.graphDiv=MochiKit.DOM.DIV({style:{"width":this.width_+"px","height":this.height_+"px"}}); -appendChildNodes(_63,this.graphDiv); -var _64=MochiKit.DOM.CANVAS; -this.canvas_=_64({style:{"position":"absolute"},width:this.width_,height:this.height_}); +appendChildNodes(_82,this.graphDiv); +var _83=MochiKit.DOM.CANVAS; +this.canvas_=_83({style:{"position":"absolute"},width:this.width_,height:this.height_}); appendChildNodes(this.graphDiv,this.canvas_); this.hidden_=this.createPlotKitCanvas_(this.canvas_); connect(this.hidden_,"onmousemove",this,function(e){ @@ -4755,11 +4636,11 @@ connect(this.hidden_,"onmouseout",this,function(e){ this.mouseOut_(e); }); }; -Dygraph.prototype.createPlotKitCanvas_=function(_66){ +Dygraph.prototype.createPlotKitCanvas_=function(_85){ var h=document.createElement("canvas"); h.style.position="absolute"; -h.style.top=_66.style.top; -h.style.left=_66.style.left; +h.style.top=_85.style.top; +h.style.left=_85.style.left; h.width=this.width_; h.height=this.height_; MochiKit.DOM.appendChildNodes(this.graphDiv,h); @@ -4768,8 +4649,8 @@ return h; Dygraph.prototype.setColors_=function(){ var num=this.attr_("labels").length-1; this.colors_=[]; -var _69=this.attr_("colors"); -if(!_69){ +var _88=this.attr_("colors"); +if(!_88){ var sat=this.attr_("colorSaturation")||1; var val=this.attr_("colorValue")||0.5; for(var i=1;i<=num;i++){ @@ -4778,8 +4659,8 @@ this.colors_.push(MochiKit.Color.Color.fromHSV(hue,sat,val)); } }else{ for(var i=0;i=10){ -_80.doZoom_(Math.min(_82,_84),Math.max(_82,_84)); +if(_115>=10){ +_99.doZoom_(Math.min(_101,_103),Math.max(_101,_103)); }else{ -_80.canvas_.getContext("2d").clearRect(0,0,_80.canvas_.width,_80.canvas_.height); +_99.canvas_.getContext("2d").clearRect(0,0,_99.canvas_.width,_99.canvas_.height); } -_82=null; -_83=null; +_101=null; +_102=null; } }); -connect(this.hidden_,"ondblclick",this,function(_98){ -_80.dateWindow_=null; -_80.drawGraph_(_80.rawData_); -var _99=_80.rawData_[0][0]; -var _100=_80.rawData_[_80.rawData_.length-1][0]; -if(_80.attr_("zoomCallback")){ -_80.attr_("zoomCallback")(_99,_100); +connect(this.hidden_,"ondblclick",this,function(_117){ +_99.dateWindow_=null; +_99.drawGraph_(_99.rawData_); +var _118=_99.rawData_[0][0]; +var _119=_99.rawData_[_99.rawData_.length-1][0]; +if(_99.attr_("zoomCallback")){ +_99.attr_("zoomCallback")(_118,_119); } }); }; -Dygraph.prototype.drawZoomRect_=function(_101,endX,_103){ +Dygraph.prototype.drawZoomRect_=function(_120,endX,_122){ var ctx=this.canvas_.getContext("2d"); -if(_103){ -ctx.clearRect(Math.min(_101,_103),0,Math.abs(_101-_103),this.height_); +if(_122){ +ctx.clearRect(Math.min(_120,_122),0,Math.abs(_120-_122),this.height_); } -if(endX&&_101){ +if(endX&&_120){ ctx.fillStyle="rgba(128,128,128,0.33)"; -ctx.fillRect(Math.min(_101,endX),0,Math.abs(endX-_101),this.height_); +ctx.fillRect(Math.min(_120,endX),0,Math.abs(endX-_120),this.height_); } }; -Dygraph.prototype.doZoom_=function(lowX,_105){ -var _106=this.layout_.points; -var _107=null; -var _108=null; -for(var i=0;i<_106.length;i++){ -var cx=_106[i].canvasx; -var x=_106[i].xval; -if(cx_107)){ -_107=x; +Dygraph.prototype.doZoom_=function(lowX,_124){ +var _125=this.layout_.points; +var _126=null; +var _127=null; +for(var i=0;i<_125.length;i++){ +var cx=_125[i].canvasx; +var x=_125[i].xval; +if(cx_126)){ +_126=x; } -if(cx>_105&&(_108==null||x<_108)){ -_108=x; +if(cx>_124&&(_127==null||x<_127)){ +_127=x; } } -if(_107==null){ -_107=_106[0].xval; +if(_126==null){ +_126=_125[0].xval; } -if(_108==null){ -_108=_106[_106.length-1].xval; +if(_127==null){ +_127=_125[_125.length-1].xval; } -this.dateWindow_=[_107,_108]; +this.dateWindow_=[_126,_127]; this.drawGraph_(this.rawData_); if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_107,_108); +this.attr_("zoomCallback")(_126,_127); } }; -Dygraph.prototype.mouseMove_=function(_110){ -var _111=_110.mouse().page.x-PlotKit.Base.findPosX(this.hidden_); -var _112=this.layout_.points; -var _113=-1; -var _114=-1; -var _115=1e+100; +Dygraph.prototype.mouseMove_=function(_129){ +var _130=_129.mouse().page.x-PlotKit.Base.findPosX(this.hidden_); +var _131=this.layout_.points; +var _132=-1; +var _133=-1; +var _134=1e+100; var idx=-1; -for(var i=0;i<_112.length;i++){ -var dist=Math.abs(_112[i].canvasx-_111); -if(dist>_115){ +for(var i=0;i<_131.length;i++){ +var dist=Math.abs(_131[i].canvasx-_130); +if(dist>_134){ break; } -_115=dist; +_134=dist; idx=i; } if(idx>=0){ -_113=_112[idx].xval; +_132=_131[idx].xval; } -if(_111>_112[_112.length-1].canvasx){ -_113=_112[_112.length-1].xval; +if(_130>_131[_131.length-1].canvasx){ +_132=_131[_131.length-1].xval; } -var _118=[]; -for(var i=0;i<_112.length;i++){ -if(_112[i].xval==_113){ -_118.push(_112[i]); +var _137=[]; +for(var i=0;i<_131.length;i++){ +if(_131[i].xval==_132){ +_137.push(_131[i]); } } -var _119=this.attr_("highlightCircleSize"); +var _138=this.attr_("highlightCircleSize"); var ctx=this.canvas_.getContext("2d"); if(this.previousVerticalX_>=0){ var px=this.previousVerticalX_; -ctx.clearRect(px-_119-1,0,2*_119+2,this.height_); +ctx.clearRect(px-_138-1,0,2*_138+2,this.height_); } var isOK=function(x){ return x&&!isNaN(x); }; -if(_118.length>0){ -var _111=_118[0].canvasx; -var _121=this.attr_("xValueFormatter")(_113,this)+":"; +if(_137.length>0){ +var _130=_137[0].canvasx; +var _140=this.attr_("xValueFormatter")(_132,this)+":"; var clen=this.colors_.length; -for(var i=0;i<_118.length;i++){ -if(!isOK(_118[i].canvasy)){ +for(var i=0;i<_137.length;i++){ +if(!isOK(_137[i].canvasy)){ continue; } if(this.attr_("labelsSeparateLines")){ -_121+="
"; +_140+="
"; } -var _123=_118[i]; -_121+=" "+_123.name+":"+this.round_(_123.yval,2); +var _142=_137[i]; +_140+=" "+_142.name+":"+this.round_(_142.yval,2); } -this.attr_("labelsDiv").innerHTML=_121; -this.lastx_=_113; +this.attr_("labelsDiv").innerHTML=_140; +this.lastx_=_132; ctx.save(); -for(var i=0;i<_118.length;i++){ -if(!isOK(_118[i%clen].canvasy)){ +for(var i=0;i<_137.length;i++){ +if(!isOK(_137[i%clen].canvasy)){ continue; } ctx.beginPath(); ctx.fillStyle=this.colors_[i%clen].toRGBString(); -ctx.arc(_111,_118[i%clen].canvasy,_119,0,360,false); +ctx.arc(_130,_137[i%clen].canvasy,_138,0,360,false); ctx.fill(); } ctx.restore(); -this.previousVerticalX_=_111; +this.previousVerticalX_=_130; } }; -Dygraph.prototype.mouseOut_=function(_124){ +Dygraph.prototype.mouseOut_=function(_143){ var ctx=this.canvas_.getContext("2d"); ctx.clearRect(0,0,this.width_,this.height_); this.attr_("labelsDiv").innerHTML=""; @@ -4996,34 +4877,34 @@ return ""+x; } }; Dygraph.prototype.hmsString_=function(date){ -var _126=Dygraph.zeropad; +var _145=Dygraph.zeropad; var d=new Date(date); if(d.getSeconds()){ -return _126(d.getHours())+":"+_126(d.getMinutes())+":"+_126(d.getSeconds()); +return _145(d.getHours())+":"+_145(d.getMinutes())+":"+_145(d.getSeconds()); }else{ if(d.getMinutes()){ -return _126(d.getHours())+":"+_126(d.getMinutes()); +return _145(d.getHours())+":"+_145(d.getMinutes()); }else{ -return _126(d.getHours()); +return _145(d.getHours()); } } }; Dygraph.dateString_=function(date,self){ -var _129=Dygraph.zeropad; +var _148=Dygraph.zeropad; var d=new Date(date); var year=""+d.getFullYear(); -var _131=_129(d.getMonth()+1); -var day=_129(d.getDate()); +var _150=_148(d.getMonth()+1); +var day=_148(d.getDate()); var ret=""; var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds(); if(frac){ ret=" "+self.hmsString_(date); } -return year+"/"+_131+"/"+day+ret; +return year+"/"+_150+"/"+day+ret; }; -Dygraph.prototype.round_=function(num,_135){ -var _136=Math.pow(10,_135); -return Math.round(num*_136)/_136; +Dygraph.prototype.round_=function(num,_154){ +var _155=Math.pow(10,_154); +return Math.round(num*_155)/_155; }; Dygraph.prototype.loadedEvent_=function(data){ this.rawData_=this.parseCSV_(data); @@ -5032,16 +4913,16 @@ this.drawGraph_(this.rawData_); Dygraph.prototype.months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]; Dygraph.prototype.quarters=["Jan","Apr","Jul","Oct"]; Dygraph.prototype.addXTicks_=function(){ -var _138,endDate; +var _157,endDate; if(this.dateWindow_){ -_138=this.dateWindow_[0]; +_157=this.dateWindow_[0]; endDate=this.dateWindow_[1]; }else{ -_138=this.rawData_[0][0]; +_157=this.rawData_[0][0]; endDate=this.rawData_[this.rawData_.length-1][0]; } -var _139=this.attr_("xTicker")(_138,endDate,this); -this.layout_.updateOptions({xTicks:_139}); +var _158=this.attr_("xTicker")(_157,endDate,this); +this.layout_.updateOptions({xTicks:_158}); }; Dygraph.SECONDLY=0; Dygraph.TEN_SECONDLY=1; @@ -5070,161 +4951,161 @@ Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600; Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600*6; Dygraph.SHORT_SPACINGS[Dygraph.DAILY]=1000*86400; Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY]=1000*604800; -Dygraph.prototype.NumXTicks=function(_140,_141,_142){ -if(_142=Dygraph.DAILY){ -_151.push({v:t,label:new Date(t+3600*1000).strftime(_153)}); +if(frac==0||_169>=Dygraph.DAILY){ +_170.push({v:t,label:new Date(t+3600*1000).strftime(_172)}); }else{ -_151.push({v:t,label:this.hmsString_(t)}); +_170.push({v:t,label:this.hmsString_(t)}); } } }else{ -var _155; -var _156=1; -if(_150==Dygraph.MONTHLY){ -_155=[0,1,2,3,4,5,6,7,8,9,10,11,12]; +var _174; +var _175=1; +if(_169==Dygraph.MONTHLY){ +_174=[0,1,2,3,4,5,6,7,8,9,10,11,12]; }else{ -if(_150==Dygraph.QUARTERLY){ -_155=[0,3,6,9]; +if(_169==Dygraph.QUARTERLY){ +_174=[0,3,6,9]; }else{ -if(_150==Dygraph.BIANNUAL){ -_155=[0,6]; +if(_169==Dygraph.BIANNUAL){ +_174=[0,6]; }else{ -if(_150==Dygraph.ANNUAL){ -_155=[0]; +if(_169==Dygraph.ANNUAL){ +_174=[0]; }else{ -if(_150==Dygraph.DECADAL){ -_155=[0]; -_156=10; +if(_169==Dygraph.DECADAL){ +_174=[0]; +_175=10; } } } } } -var _157=new Date(_148).getFullYear(); -var _158=new Date(_149).getFullYear(); -var _159=Dygraph.zeropad; -for(var i=_157;i<=_158;i++){ -if(i%_156!=0){ +var _176=new Date(_167).getFullYear(); +var _177=new Date(_168).getFullYear(); +var _178=Dygraph.zeropad; +for(var i=_176;i<=_177;i++){ +if(i%_175!=0){ continue; } -for(var j=0;j<_155.length;j++){ -var _160=i+"/"+_159(1+_155[j])+"/01"; -var t=Date.parse(_160); -if(t<_148||t>_149){ +for(var j=0;j<_174.length;j++){ +var _179=i+"/"+_178(1+_174[j])+"/01"; +var t=Date.parse(_179); +if(t<_167||t>_168){ continue; } -_151.push({v:t,label:new Date(t).strftime("%b %y")}); +_170.push({v:t,label:new Date(t).strftime("%b %y")}); } } } -return _151; +return _170; }; -Dygraph.dateTicker=function(_161,_162,self){ -var _163=-1; +Dygraph.dateTicker=function(_180,_181,self){ +var _182=-1; for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_163=i; +var _183=self.NumXTicks(_180,_181,i); +if(self.width_/_183>=self.attr_("pixelsPerXLabel")){ +_182=i; break; } } -if(_163>=0){ -return self.GetXAxis(_161,_162,_163); +if(_182>=0){ +return self.GetXAxis(_180,_181,_182); }else{ } }; Dygraph.numericTicks=function(minV,maxV,self){ -var _167=[1,2,5]; -var _168,low_val,high_val,nTicks; -var _169=self.attr_("pixelsPerYLabel"); +var _186=[1,2,5]; +var _187,low_val,high_val,nTicks; +var _188=self.attr_("pixelsPerYLabel"); for(var i=-10;i<50;i++){ -var _170=Math.pow(10,i); -for(var j=0;j<_167.length;j++){ -_168=_170*_167[j]; -low_val=Math.floor(minV/_168)*_168; -high_val=Math.ceil(maxV/_168)*_168; -nTicks=(high_val-low_val)/_168; -var _171=self.height_/nTicks; -if(_171>_169){ +var _189=Math.pow(10,i); +for(var j=0;j<_186.length;j++){ +_187=_189*_186[j]; +low_val=Math.floor(minV/_187)*_187; +high_val=Math.ceil(maxV/_187)*_187; +nTicks=(high_val-low_val)/_187; +var _190=self.height_/nTicks; +if(_190>_188){ break; } } -if(_171>_169){ +if(_190>_188){ break; } } -var _172=[]; +var _191=[]; for(var i=0;i=k*k*k){ -_174=self.round_(_173/(k*k*k),1)+"B"; +if(_192>=k*k*k){ +_193=self.round_(_192/(k*k*k),1)+"B"; }else{ -if(_173>=k*k){ -_174=self.round_(_173/(k*k),1)+"M"; +if(_192>=k*k){ +_193=self.round_(_192/(k*k),1)+"M"; }else{ -if(_173>=k){ -_174=self.round_(_173/k,1)+"K"; +if(_192>=k){ +_193=self.round_(_192/k,1)+"K"; } } } } -_172.push({label:_174,v:_173}); +_191.push({label:_193,v:_192}); } -return _172; +return _191; }; Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _178=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_178}); +var _197=Dygraph.numericTicks(minY,maxY,this); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_197}); }; -Dygraph.prototype.extremeValues_=function(_179){ +Dygraph.prototype.extremeValues_=function(_198){ var minY=null,maxY=null; -var bars=this.attr_("errorBars")||this.customBars_; +var bars=this.attr_("errorBars")||this.attr_("customBars"); if(bars){ -for(var j=0;j<_179.length;j++){ -var y=_179[j][1][0]; +for(var j=0;j<_198.length;j++){ +var y=_198[j][1][0]; if(!y){ continue; } -var low=y-_179[j][1][1]; -var high=y+_179[j][1][2]; +var low=y-_198[j][1][1]; +var high=y+_198[j][1][2]; if(low>y){ low=y; } @@ -5239,8 +5120,8 @@ minY=low; } } }else{ -for(var j=0;j<_179.length;j++){ -var y=_179[j][1]; +for(var j=0;j<_198.length;j++){ +var y=_198[j][1]; if(!y){ continue; } @@ -5258,65 +5139,66 @@ Dygraph.prototype.drawGraph_=function(data){ var minY=null,maxY=null; this.layout_.removeAllDatasets(); this.setColors_(); +this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize"); for(var i=1;i=low&&_183[k][0]<=high){ -_184.push(_183[k]); +var _203=[]; +for(var k=0;k<_202.length;k++){ +if(_202[k][0]>=low&&_202[k][0]<=high){ +_203.push(_202[k]); } } -_183=_184; +_202=_203; } -var _185=this.extremeValues_(_183); -var _186=_185[0]; -var _187=_185[1]; -if(!minY||_186maxY){ -maxY=_187; +if(!maxY||_206>maxY){ +maxY=_206; } if(bars){ var vals=[]; -for(var j=0;j<_183.length;j++){ -vals[j]=[_183[j][0],_183[j][1][0],_183[j][1][1],_183[j][1][2]]; +for(var j=0;j<_202.length;j++){ +vals[j]=[_202[j][0],_202[j][1][0],_202[j][1][1],_202[j][1][2]]; } this.layout_.addDataset(this.attr_("labels")[i],vals); }else{ -this.layout_.addDataset(this.attr_("labels")[i],_183); +this.layout_.addDataset(this.attr_("labels")[i],_202); } } if(this.valueRange_!=null){ this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); }else{ var span=maxY-minY; -var _190=maxY+0.1*span; -var _191=minY-0.1*span; -if(_191<0&&minY>=0){ -_191=0; +var _209=maxY+0.1*span; +var _210=minY-0.1*span; +if(_210<0&&minY>=0){ +_210=0; } -if(_190>0&&maxY<=0){ -_190=0; +if(_209>0&&maxY<=0){ +_209=0; } if(this.attr_("includeZero")){ if(maxY<0){ -_190=0; +_209=0; } if(minY>0){ -_191=0; +_210=0; } } -this.addYTicks_(_191,_190); +this.addYTicks_(_210,_209); } this.addXTicks_(); this.layout_.evaluateWithError(); @@ -5324,150 +5206,150 @@ this.plotter_.clear(); this.plotter_.render(); this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); }; -Dygraph.prototype.rollingAverage=function(_192,_193){ -if(_192.length<2){ -return _192; +Dygraph.prototype.rollingAverage=function(_211,_212){ +if(_211.length<2){ +return _211; } -var _193=Math.min(_193,_192.length-1); -var _194=[]; -var _195=this.attr_("sigma"); +var _212=Math.min(_212,_211.length-1); +var _213=[]; +var _214=this.attr_("sigma"); if(this.fractions_){ var num=0; var den=0; var mult=100; -for(var i=0;i<_192.length;i++){ -num+=_192[i][1][0]; -den+=_192[i][1][1]; -if(i-_193>=0){ -num-=_192[i-_193][1][0]; -den-=_192[i-_193][1][1]; -} -var date=_192[i][0]; -var _198=den?num/den:0; +for(var i=0;i<_211.length;i++){ +num+=_211[i][1][0]; +den+=_211[i][1][1]; +if(i-_212>=0){ +num-=_211[i-_212][1][0]; +den-=_211[i-_212][1][1]; +} +var date=_211[i][0]; +var _217=den?num/den:0; if(this.attr_("errorBars")){ if(this.wilsonInterval_){ if(den){ -var p=_198<0?0:_198,n=den; -var pm=_195*Math.sqrt(p*(1-p)/n+_195*_195/(4*n*n)); -var _201=1+_195*_195/den; -var low=(p+_195*_195/(2*den)-pm)/_201; -var high=(p+_195*_195/(2*den)+pm)/_201; -_194[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; +var p=_217<0?0:_217,n=den; +var pm=_214*Math.sqrt(p*(1-p)/n+_214*_214/(4*n*n)); +var _220=1+_214*_214/den; +var low=(p+_214*_214/(2*den)-pm)/_220; +var high=(p+_214*_214/(2*den)+pm)/_220; +_213[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; }else{ -_194[i]=[date,[0,0,0]]; +_213[i]=[date,[0,0,0]]; } }else{ -var _202=den?_195*Math.sqrt(_198*(1-_198)/den):1; -_194[i]=[date,[mult*_198,mult*_202,mult*_202]]; +var _221=den?_214*Math.sqrt(_217*(1-_217)/den):1; +_213[i]=[date,[mult*_217,mult*_221,mult*_221]]; } }else{ -_194[i]=[date,mult*_198]; +_213[i]=[date,mult*_217]; } } }else{ -if(this.customBars_){ +if(this.attr_("customBars")){ var low=0; var mid=0; var high=0; -var _204=0; -for(var i=0;i<_192.length;i++){ -var data=_192[i][1]; +var _223=0; +for(var i=0;i<_211.length;i++){ +var data=_211[i][1]; var y=data[1]; -_194[i]=[_192[i][0],[y,y-data[0],data[2]-y]]; +_213[i]=[_211[i][0],[y,y-data[0],data[2]-y]]; low+=data[0]; mid+=y; high+=data[2]; -_204+=1; -if(i-_193>=0){ -var prev=_192[i-_193]; +_223+=1; +if(i-_212>=0){ +var prev=_211[i-_212]; low-=prev[1][0]; mid-=prev[1][1]; high-=prev[1][2]; -_204-=1; +_223-=1; } -_194[i]=[_192[i][0],[1*mid/_204,1*(mid-low)/_204,1*(high-mid)/_204]]; +_213[i]=[_211[i][0],[1*mid/_223,1*(mid-low)/_223,1*(high-mid)/_223]]; } }else{ -var _206=Math.min(_193-1,_192.length-2); +var _225=Math.min(_212-1,_211.length-2); if(!this.attr_("errorBars")){ -if(_193==1){ -return _192; +if(_212==1){ +return _211; } -for(var i=0;i<_192.length;i++){ +for(var i=0;i<_211.length;i++){ var sum=0; -var _208=0; -for(var j=Math.max(0,i-_193+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_213=true; +_232=true; }else{ if(str.length==8&&str>"19700101"&&str<"20371231"){ -_213=true; +_232=true; } } -if(_213){ +if(_232){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xValueParser=Dygraph.dateParser; this.attrs_.xTicker=Dygraph.dateTicker; @@ -5483,57 +5365,57 @@ this.attrs_.xTicker=Dygraph.numericTicks; }; Dygraph.prototype.parseCSV_=function(data){ var ret=[]; -var _214=data.split("\n"); -var _215=0; +var _233=data.split("\n"); +var _234=0; if(this.labelsFromCSV_){ -_215=1; -this.attrs_.labels=_214[0].split(","); -} -var _216; -var _217=false; -var _218=this.attr_("labels").length; -for(var i=_215;i<_214.length;i++){ -var line=_214[i]; +_234=1; +this.attrs_.labels=_233[0].split(","); +} +var _235; +var _236=false; +var _237=this.attr_("labels").length; +for(var i=_234;i<_233.length;i++){ +var line=_233[i]; if(line.length==0){ continue; } -var _220=line.split(","); -if(_220.length<2){ +var _239=line.split(","); +if(_239.length<2){ continue; } -var _221=[]; -if(!_217){ -this.detectTypeFromString_(_220[0]); -_216=this.attr_("xValueParser"); -_217=true; +var _240=[]; +if(!_236){ +this.detectTypeFromString_(_239[0]); +_235=this.attr_("xValueParser"); +_236=true; } -_221[0]=_216(_220[0],this); +_240[0]=_235(_239[0],this); if(this.fractions_){ -for(var j=1;j<_220.length;j++){ -var vals=_220[j].split("/"); -_221[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; +for(var j=1;j<_239.length;j++){ +var vals=_239[j].split("/"); +_240[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; } }else{ if(this.attr_("errorBars")){ -for(var j=1;j<_220.length;j+=2){ -_221[(j+1)/2]=[parseFloat(_220[j]),parseFloat(_220[j+1])]; +for(var j=1;j<_239.length;j+=2){ +_240[(j+1)/2]=[parseFloat(_239[j]),parseFloat(_239[j+1])]; } }else{ -if(this.customBars_){ -for(var j=1;j<_220.length;j++){ -var vals=_220[j].split(";"); -_221[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; +if(this.attr_("customBars")){ +for(var j=1;j<_239.length;j++){ +var vals=_239[j].split(";"); +_240[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; } }else{ -for(var j=1;j<_220.length;j++){ -_221[j]=parseFloat(_220[j]); +for(var j=1;j<_239.length;j++){ +_240[j]=parseFloat(_239[j]); } } } } -ret.push(_221); -if(_221.length!=_218){ -this.error("Number of columns in line "+i+" ("+_221.length+") does not agree with number of labels ("+_218+") "+line); +ret.push(_240); +if(_240.length!=_237){ +this.error("Number of columns in line "+i+" ("+_240.length+") does not agree with number of labels ("+_237+") "+line); } } return ret; @@ -5557,19 +5439,19 @@ this.attrs_.labels.push("Y"+i); if(MochiKit.Base.isDateLike(data[0][0])){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xTicker=Dygraph.dateTicker; -var _222=MochiKit.Base.clone(data); +var _241=MochiKit.Base.clone(data); for(var i=0;i=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _229=this; +var _248=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_229.loadedEvent_(req.responseText); +_248.loadedEvent_(req.responseText); } } }; @@ -5658,39 +5540,36 @@ this.error("Unknown data format: "+(typeof this.file_)); } } }; -Dygraph.prototype.updateOptions=function(_230){ -if(_230.customBars){ -this.customBars_=_230.customBars; -} -if(_230.rollPeriod){ -this.rollPeriod_=_230.rollPeriod; +Dygraph.prototype.updateOptions=function(_249){ +if(_249.rollPeriod){ +this.rollPeriod_=_249.rollPeriod; } -if(_230.dateWindow){ -this.dateWindow_=_230.dateWindow; +if(_249.dateWindow){ +this.dateWindow_=_249.dateWindow; } -if(_230.valueRange){ -this.valueRange_=_230.valueRange; +if(_249.valueRange){ +this.valueRange_=_249.valueRange; } -MochiKit.Base.update(this.user_attrs_,_230); +MochiKit.Base.update(this.user_attrs_,_249); this.labelsFromCSV_=(this.attr_("labels")==null); this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_230["file"]&&_230["file"]!=this.file_){ -this.file_=_230["file"]; +if(_249["file"]&&_249["file"]!=this.file_){ +this.file_=_249["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_231){ -this.rollPeriod_=_231; +Dygraph.prototype.adjustRoll=function(_250){ +this.rollPeriod_=_250; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_232){ -this.container=_232; +Dygraph.GVizChart=function(_251){ +this.container=_251; }; -Dygraph.GVizChart.prototype.draw=function(data,_233){ +Dygraph.GVizChart.prototype.draw=function(data,_252){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_233); +this.date_graph=new Dygraph(this.container,data,_252); }; DateGraph=Dygraph;