X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-combined.js;h=96a2b140f591fda481b2616d8d149e8c53725ddf;hb=9148174ba7625a06277b5ead599b7d8ee9fa463c;hp=57a5e6a15f4947edfdb1394c1bb98d41f376010c;hpb=165759fa5c38d38d67fbd93def8beb62017dc0af;p=dygraphs.git diff --git a/dygraph-combined.js b/dygraph-combined.js index 57a5e6a..96a2b14 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -4176,155 +4176,108 @@ _11.push(_10[i]); } } return _11; -},colorScheme:function(){ -var mb=MochiKit.Base; -var mc=MochiKit.Color; -var _15=["red","orange","yellow","green","cyan","blue","purple","magenta"]; -var _16=function(_17){ -return mc.Color[_17+"Color"](); -}; -return mb.map(_16,_15); -},baseDarkPrimaryColors:function(){ -var _18=MochiKit.Color.Color.fromHexString; -return [_18("#ad3f40"),_18("#ddac2c"),_18("#dfdd0c"),_18("#5276c4"),_18("#739c5a")]; -},basePrimaryColors:function(){ -var _19=MochiKit.Color.Color.fromHexString; -return [_19("#d24c4d"),_19("#f2b32f"),_19("#ece90e"),_19("#5d83da"),_19("#78a15d")]; -},baseBlueColors:function(){ -var _20=MochiKit.Color.Color.fromHexString; -return [_20("#4b6b94"),_20("#5d81b4"),_20("#acbad2")]; -},palette:function(_21,_22,_23,_24){ -var _25=MochiKit.Base.isUndefinedOrNull; -var _26=new Array(); -if(_25(_24)){ -_24=0.1; -} -if(_25(_23)){ -_23=0.4; -} -if(_25(_22)){ -_22=-0.2; -} -var _27=_22; -while(_27<=_23){ -_26.push(_27); -_27+=_24; -} -var _28=function(_29,_30){ -return _29.lighterColorWithLevel(_30); -}; -return MochiKit.Base.map(partial(_28,_21),_26); +},palette:function(_13,_14,_15,_16){ +var _17=MochiKit.Base.isUndefinedOrNull; +var _18=new Array(); +if(_17(_16)){ +_16=0.1; +} +if(_17(_15)){ +_15=0.4; +} +if(_17(_14)){ +_14=-0.2; +} +var _19=_14; +while(_19<=_15){ +_18.push(_19); +_19+=_16; +} +var _20=function(_21,_22){ +return _21.lighterColorWithLevel(_22); +}; +return MochiKit.Base.map(partial(_20,_13),_18); },excanvasSupported:function(){ if(/MSIE/.test(navigator.userAgent)&&!window.opera){ return true; } return false; },findPosX:function(obj){ -var _32=0; +var _24=0; if(obj.offsetParent){ while(obj.offsetParent){ -_32+=obj.offsetLeft; +_24+=obj.offsetLeft; obj=obj.offsetParent; } }else{ if(obj.x){ -_32+=obj.x; +_24+=obj.x; } } -return _32; +return _24; },findPosY:function(obj){ -var _33=0; +var _25=0; if(obj.offsetParent){ while(obj.offsetParent){ -_33+=obj.offsetTop; +_25+=obj.offsetTop; obj=obj.offsetParent; } }else{ if(obj.y){ -_33+=obj.y; +_25+=obj.y; } } -return _33; +return _25; },isFuncLike:function(obj){ return (typeof (obj)=="function"); }}); PlotKit.Base.map=function(fn,lst){ if(PlotKit.Base.usingPrototype()){ -var _36=[]; +var _28=[]; for(var x in lst){ if(typeof (lst[x])=="function"){ continue; } -_36.push(fn(lst[x])); +_28.push(fn(lst[x])); } -return _36; +return _28; }else{ return MochiKit.Base.map(fn,lst); } }; PlotKit.Base.items=function(lst){ if(PlotKit.Base.usingPrototype()){ -var _38=[]; +var _30=[]; for(var x in lst){ if(typeof (lst[x])=="function"){ continue; } -_38.push([x,lst[x]]); +_30.push([x,lst[x]]); } -return _38; +return _30; }else{ return MochiKit.Base.items(lst); } }; PlotKit.Base.keys=function(lst){ if(PlotKit.Base.usingPrototype()){ -var _39=[]; +var _31=[]; for(var x in lst){ if(typeof (lst[x])=="function"){ continue; } -_39.push(x); +_31.push(x); } -return _39; +return _31; }else{ return MochiKit.Base.keys(lst); } }; PlotKit.Base.baseColors=function(){ -var _40=MochiKit.Color.Color.fromHexString; -return [_40("#476fb2"),_40("#be2c2b"),_40("#85b730"),_40("#734a99"),_40("#26a1c5"),_40("#fb8707"),_40("#000000")]; -}; -PlotKit.Base.officeBaseStyle={"axisLineWidth":2,"axisLabelColor":Color.grayColor(),"axisLineColor":Color.whiteColor(),"padding":{top:5,bottom:10,left:30,right:30}}; -MochiKit.Base.update(PlotKit.Base,{officeBlue:function(){ -var r={"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"backgroundColor":PlotKit.Base.baseColors()[0].lighterColorWithLevel(0.45)}; -MochiKit.Base.update(r,PlotKit.Base.officeBaseStyle); -return r; -},officeRed:function(){ -var r={"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[1]),"backgroundColor":PlotKit.Base.baseColors()[1].lighterColorWithLevel(0.5)}; -MochiKit.Base.update(r,PlotKit.Base.officeBaseStyle); -return r; -},officeGreen:function(){ -var r={"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[2]),"backgroundColor":PlotKit.Base.baseColors()[2].lighterColorWithLevel(0.5)}; -MochiKit.Base.update(r,PlotKit.Base.officeBaseStyle); -return r; -},officePurple:function(){ -var r={"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[3]),"backgroundColor":PlotKit.Base.baseColors()[3].lighterColorWithLevel(0.5)}; -MochiKit.Base.update(r,PlotKit.Base.officeBaseStyle); -return r; -},officeCyan:function(){ -var r={"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[4]),"backgroundColor":PlotKit.Base.baseColors()[4].lighterColorWithLevel(0.5)}; -MochiKit.Base.update(r,PlotKit.Base.officeBaseStyle); -return r; -},officeOrange:function(){ -var r={"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[5]),"backgroundColor":PlotKit.Base.baseColors()[5].lighterColorWithLevel(0.4)}; -MochiKit.Base.update(r,PlotKit.Base.officeBaseStyle); -return r; -},officeBlack:function(){ -var r={"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[6],0,0.6),"backgroundColor":PlotKit.Base.baseColors()[6].lighterColorWithLevel(0.9)}; -MochiKit.Base.update(r,PlotKit.Base.officeBaseStyle); -return r; -}}); -PlotKit.Base.EXPORT=["baseColors","collapse","colorScheme","findPosX","findPosY","officeBaseStyle","officeBlue","officeRed","officeGreen","officePurple","officeCyan","officeOrange","officeBlack","roundInterval","uniq","isFuncLike","excanvasSupported"]; +var _32=MochiKit.Color.Color.fromHexString; +return [_32("#476fb2"),_32("#be2c2b"),_32("#85b730"),_32("#734a99"),_32("#26a1c5"),_32("#fb8707"),_32("#000000")]; +}; +PlotKit.Base.EXPORT=["baseColors","collapse","findPosX","findPosY","roundInterval","uniq","isFuncLike","excanvasSupported"]; PlotKit.Base.EXPORT_OK=[]; PlotKit.Base.__new__=function(){ var m=MochiKit.Base; @@ -4353,10 +4306,10 @@ PlotKit.Layout.toString=function(){ return this.__repr__(); }; PlotKit.Layout.valid_styles=["bar","line","pie","point"]; -PlotKit.Layout=function(_42,_43){ +PlotKit.Layout=function(_33,_34){ 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=_42; -MochiKit.Base.update(this.options,_43?_43:{}); +this.style=_33; +MochiKit.Base.update(this.options,_34?_34:{}); if(!MochiKit.Base.isUndefinedOrNull(this.options.xAxis)){ this.minxval=this.options.xAxis[0]; this.maxxval=this.options.xAxis[1]; @@ -4386,38 +4339,38 @@ this.xrange=1; this.yrange=1; this.hitTestCache={x2maxy:null}; }; -PlotKit.Layout.prototype.addDataset=function(_44,_45){ -this.datasets[_44]=_45; +PlotKit.Layout.prototype.addDataset=function(_35,_36){ +this.datasets[_35]=_36; }; -PlotKit.Layout.prototype.removeDataset=function(_46,_47){ -delete this.datasets[_46]; +PlotKit.Layout.prototype.removeDataset=function(_37,_38){ +delete this.datasets[_37]; }; -PlotKit.Layout.prototype.addDatasetFromTable=function(_48,_49,_50,_51,_52){ -var _53=MochiKit.Base.isUndefinedOrNull; -var _54=MochiKit.DOM.scrapeText; -var _55=MochiKit.Format.strip; -if(_53(_50)){ -_50=0; +PlotKit.Layout.prototype.addDatasetFromTable=function(_39,_40,_41,_42,_43){ +var _44=MochiKit.Base.isUndefinedOrNull; +var _45=MochiKit.DOM.scrapeText; +var _46=MochiKit.Format.strip; +if(_44(_41)){ +_41=0; } -if(_53(_51)){ -_51=1; +if(_44(_42)){ +_42=1; } -if(_53(_52)){ -_52=-1; +if(_44(_43)){ +_43=-1; } -var _56=_49.tBodies[0].rows; -var _57=new Array(); -var _58=new Array(); -if(!_53(_56)){ -for(var i=0;i<_56.length;i++){ -_57.push([parseFloat(_55(_54(_56[i].cells[_50]))),parseFloat(_55(_54(_56[i].cells[_51])))]); -if(_52>=0){ -_58.push({v:parseFloat(_55(_54(_56[i].cells[_50]))),label:_55(_54(_56[i].cells[_52]))}); +var _47=_40.tBodies[0].rows; +var _48=new Array(); +var _49=new Array(); +if(!_44(_47)){ +for(var i=0;i<_47.length;i++){ +_48.push([parseFloat(_46(_45(_47[i].cells[_41]))),parseFloat(_46(_45(_47[i].cells[_42])))]); +if(_43>=0){ +_49.push({v:parseFloat(_46(_45(_47[i].cells[_41]))),label:_46(_45(_47[i].cells[_43]))}); } } -this.addDataset(_48,_57); -if(_52>=0){ -this.options.xTicks=_58; +this.addDataset(_39,_48); +if(_43>=0){ +this.options.xTicks=_49; } return true; } @@ -4426,113 +4379,39 @@ return false; PlotKit.Layout.prototype.evaluate=function(){ this._evaluateLimits(); this._evaluateScales(); -if(this.style=="bar"){ -if(this.options.barOrientation=="horizontal"){ -this._evaluateHorizBarCharts(); -}else{ -this._evaluateBarCharts(); -} -this._evaluateBarTicks(); -}else{ if(this.style=="line"){ this._evaluateLineCharts(); this._evaluateLineTicks(); -}else{ -if(this.style=="pie"){ -this._evaluatePieCharts(); -this._evaluatePieTicks(); -} -} -} -}; -PlotKit.Layout.prototype.hitTest=function(x,y){ -var f=MochiKit.Format.twoDigitFloat; -if((this.style=="bar")&&this.bars&&(this.bars.length>0)){ -for(var i=0;i=bar.x)&&(x<=bar.x+bar.w)&&(y>=bar.y)&&(y-bar.y<=bar.h)){ -return bar; -} -} -}else{ -if(this.style=="line"){ -if(this.hitTestCache.x2maxy==null){ -this._regenerateHitTestCache(); -} -var _62=x/this.xscale; -var _63=this.hitTestCache.xvalues; -var _64=null; -var _65=null; -for(var i=1;i<_63.length;i++){ -if(_63[i]>_62){ -_64=_63[i-1]; -_65=_63[i]; -break; -} -} -if((_64!=null)){ -var _66=this.hitTestCache.x2maxy[_64]; -var _67=this.hitTestCache.x2maxy[_65]; -var _68=(1-y)/this.yscale; -var _69=(_67-_66)/(_65-_64); -var _70=_66+_69*(_62-_64); -if(_70>=_68){ -var obj={xval:_62,yval:_68,xafter:_65,yafter:_67,xbefore:_64,ybefore:_66,yprojected:_70}; -return obj; -} -} -}else{ -if(this.style=="pie"){ -var _71=Math.sqrt((y-0.5)*(y-0.5)+(x-0.5)*(x-0.5)); -if(_71>this.options.pieRadius){ -return null; -} -var _72=Math.atan2(y-0.5,x-0.5)-Math.PI/2; -for(var i=0;i=_72){ -return _73; } -} -} -} -} -return null; -}; -PlotKit.Layout.prototype.rectForX=function(x){ -return null; -}; -PlotKit.Layout.prototype.angleRangeForX=function(x){ -return null; }; PlotKit.Layout.prototype._evaluateLimits=function(){ var map=PlotKit.Base.map; -var _75=PlotKit.Base.items; -var _76=MochiKit.Base.itemgetter; -var _77=PlotKit.Base.collapse; -var _78=MochiKit.Base.listMin; -var _79=MochiKit.Base.listMax; -var _80=MochiKit.Base.isUndefinedOrNull; -var all=_77(map(_76(1),_75(this.datasets))); -if(_80(this.options.xAxis)){ +var _51=PlotKit.Base.items; +var _52=MochiKit.Base.itemgetter; +var _53=PlotKit.Base.collapse; +var _54=MochiKit.Base.listMin; +var _55=MochiKit.Base.listMax; +var _56=MochiKit.Base.isUndefinedOrNull; +var all=_53(map(_52(1),_51(this.datasets))); +if(_56(this.options.xAxis)){ if(this.options.xOriginIsZero){ this.minxval=0; }else{ -this.minxval=_78(map(parseFloat,map(_76(0),all))); +this.minxval=_54(map(parseFloat,map(_52(0),all))); } -this.maxxval=_79(map(parseFloat,map(_76(0),all))); +this.maxxval=_55(map(parseFloat,map(_52(0),all))); }else{ this.minxval=this.options.xAxis[0]; this.maxxval=this.options.xAxis[1]; this.xscale=this.maxval-this.minxval; } -if(_80(this.options.yAxis)){ +if(_56(this.options.yAxis)){ if(this.options.yOriginIsZero){ this.minyval=0; }else{ -this.minyval=_78(map(parseFloat,map(_76(1),all))); +this.minyval=_54(map(parseFloat,map(_52(1),all))); } -this.maxyval=_79(map(parseFloat,map(_76(1),all))); +this.maxyval=_55(map(parseFloat,map(_52(1),all))); }else{ this.minyval=this.options.yAxis[0]; this.maxyval=this.options.yAxis[1]; @@ -4540,7 +4419,7 @@ this.yscale=this.maxyval-this.minyval; } }; PlotKit.Layout.prototype._evaluateScales=function(){ -var _82=MochiKit.Base.isUndefinedOrNull; +var _58=MochiKit.Base.isUndefinedOrNull; this.xrange=this.maxxval-this.minxval; if(this.xrange==0){ this.xscale=1; @@ -4555,193 +4434,75 @@ this.yscale=1/this.yrange; } }; PlotKit.Layout.prototype._uniqueXValues=function(){ -var _83=PlotKit.Base.collapse; +var _59=PlotKit.Base.collapse; var map=PlotKit.Base.map; -var _84=PlotKit.Base.uniq; -var _85=MochiKit.Base.itemgetter; -var _86=PlotKit.Base.items; -var _87=map(parseFloat,map(_85(0),_83(map(_85(1),_86(this.datasets))))); -_87.sort(MochiKit.Base.compare); -return _84(_87); -}; -PlotKit.Layout.prototype._evaluateBarCharts=function(){ -var _88=PlotKit.Base.items; -var _89=_88(this.datasets).length; -var _90=10000000; -var _91=this._uniqueXValues(); -for(var i=1;i<_91.length;i++){ -_90=Math.min(Math.abs(_91[i]-_91[i-1]),_90); -} -var _92=0; -var _93=0; -var _94=0; -if(_91.length==1){ -_90=1; -this.xscale=1; -this.minxval=_91[0]; -_92=1*this.options.barWidthFillFraction; -_93=_92/_89; -_94=(1-this.options.barWidthFillFraction)/2; -}else{ -if(this.xrange==1){ -this.xscale=0.5; -}else{ -if(this.xrange==2){ -this.xscale=1/3; -}else{ -this.xscale=(1-_90/this.xrange)/this.xrange; -} -} -_92=_90*this.xscale*this.options.barWidthFillFraction; -_93=_92/_89; -_94=_90*this.xscale*(1-this.options.barWidthFillFraction)/2; -} -this.minxdelta=_90; -this.bars=new Array(); -var i=0; -for(var _95 in this.datasets){ -var _96=this.datasets[_95]; -if(PlotKit.Base.isFuncLike(_96)){ -continue; -} -for(var j=0;j<_96.length;j++){ -var _98=_96[j]; -var _99={x:((parseFloat(_98[0])-this.minxval)*this.xscale)+(i*_93)+_94,y:1-((parseFloat(_98[1])-this.minyval)*this.yscale),w:_93,h:((parseFloat(_98[1])-this.minyval)*this.yscale),xval:parseFloat(_98[0]),yval:parseFloat(_98[1]),name:_95}; -if((_99.x>=0)&&(_99.x<=1)&&(_99.y>=0)&&(_99.y<=1)){ -this.bars.push(_99); -} -} -i++; -} -}; -PlotKit.Layout.prototype._evaluateHorizBarCharts=function(){ -var _100=PlotKit.Base.items; -var _101=_100(this.datasets).length; -var _102=10000000; -var _103=this._uniqueXValues(); -for(var i=1;i<_103.length;i++){ -_102=Math.min(Math.abs(_103[i]-_103[i-1]),_102); -} -var _104=0; -var _105=0; -var _106=0; -if(_103.length==1){ -_102=1; -this.xscale=1; -this.minxval=_103[0]; -_104=1*this.options.barWidthFillFraction; -_105=_104/_101; -_106=(1-this.options.barWidthFillFraction)/2; -}else{ -this.xscale=(1-_102/this.xrange)/this.xrange; -_104=_102*this.xscale*this.options.barWidthFillFraction; -_105=_104/_101; -_106=_102*this.xscale*(1-this.options.barWidthFillFraction)/2; -} -this.minxdelta=_102; -this.bars=new Array(); -var i=0; -for(var _107 in this.datasets){ -var _108=this.datasets[_107]; -if(PlotKit.Base.isFuncLike(_108)){ -continue; -} -for(var j=0;j<_108.length;j++){ -var item=_108[j]; -var rect={y:((parseFloat(item[0])-this.minxval)*this.xscale)+(i*_105)+_106,x:0,h:_105,w:((parseFloat(item[1])-this.minyval)*this.yscale),xval:parseFloat(item[0]),yval:parseFloat(item[1]),name:_107}; -if(rect.y<=0){ -rect.y=0; -} -if(rect.y>=1){ -rect.y=1; -} -if((rect.x>=0)&&(rect.x<=1)){ -this.bars.push(rect); -} -} -i++; -} +var _60=PlotKit.Base.uniq; +var _61=MochiKit.Base.itemgetter; +var _62=PlotKit.Base.items; +var _63=map(parseFloat,map(_61(0),_59(map(_61(1),_62(this.datasets))))); +_63.sort(MochiKit.Base.compare); +return _60(_63); }; PlotKit.Layout.prototype._evaluateLineCharts=function(){ -var _111=PlotKit.Base.items; -var _112=_111(this.datasets).length; +var _64=PlotKit.Base.items; +var _65=_64(this.datasets).length; this.points=new Array(); var i=0; -for(var _113 in this.datasets){ -var _114=this.datasets[_113]; -if(PlotKit.Base.isFuncLike(_114)){ +for(var _66 in this.datasets){ +var _67=this.datasets[_66]; +if(PlotKit.Base.isFuncLike(_67)){ continue; } -_114.sort(function(a,b){ +_67.sort(function(a,b){ return compare(parseFloat(a[0]),parseFloat(b[0])); }); -for(var j=0;j<_114.length;j++){ -var item=_114[j]; -var _117={x:((parseFloat(item[0])-this.minxval)*this.xscale),y:1-((parseFloat(item[1])-this.minyval)*this.yscale),xval:parseFloat(item[0]),yval:parseFloat(item[1]),name:_113}; -if(_117.y<=0){ -_117.y=0; +for(var j=0;j<_67.length;j++){ +var _71=_67[j]; +var _72={x:((parseFloat(_71[0])-this.minxval)*this.xscale),y:1-((parseFloat(_71[1])-this.minyval)*this.yscale),xval:parseFloat(_71[0]),yval:parseFloat(_71[1]),name:_66}; +if(_72.y<=0){ +_72.y=0; } -if(_117.y>=1){ -_117.y=1; +if(_72.y>=1){ +_72.y=1; } -if((_117.x>=0)&&(_117.x<=1)){ -this.points.push(_117); +if((_72.x>=0)&&(_72.x<=1)){ +this.points.push(_72); } } i++; } }; -PlotKit.Layout.prototype._evaluatePieCharts=function(){ -var _118=PlotKit.Base.items; -var sum=MochiKit.Iter.sum; -var _120=MochiKit.Base.itemgetter; -var _121=_118(this.datasets).length; -var _122=_118(this.datasets)[0][1]; -var _123=sum(map(_120(1),_122)); -this.slices=new Array(); -var _124=0; -for(var i=0;i<_122.length;i++){ -var _125=_122[i][1]/_123; -var _126=_124*Math.PI*2; -var _127=(_124+_125)*Math.PI*2; -var _128={fraction:_125,xval:_122[i][0],yval:_122[i][1],startAngle:_126,endAngle:_127}; -if(_122[i][1]!=0){ -this.slices.push(_128); -} -_124+=_125; -} -}; PlotKit.Layout.prototype._evaluateLineTicksForXAxis=function(){ -var _129=MochiKit.Base.isUndefinedOrNull; +var _73=MochiKit.Base.isUndefinedOrNull; if(this.options.xTicks){ this.xticks=new Array(); -var _130=function(tick){ -var _132=tick.label; -if(_129(_132)){ -_132=tick.v.toString(); +var _74=function(_75){ +var _76=_75.label; +if(_73(_76)){ +_76=_75.v.toString(); } -var pos=this.xscale*(tick.v-this.minxval); +var pos=this.xscale*(_75.v-this.minxval); if((pos>=0)&&(pos<=1)){ -this.xticks.push([pos,_132]); +this.xticks.push([pos,_76]); } }; -MochiKit.Iter.forEach(this.options.xTicks,bind(_130,this)); +MochiKit.Iter.forEach(this.options.xTicks,bind(_74,this)); }else{ if(this.options.xNumberOfTicks){ -var _134=this._uniqueXValues(); -var _135=this.xrange/this.options.xNumberOfTicks; -var _136=0; +var _78=this._uniqueXValues(); +var _79=this.xrange/this.options.xNumberOfTicks; +var _80=0; this.xticks=new Array(); -for(var i=0;i<=_134.length;i++){ -if((_134[i]-this.minxval)>=(_136*_135)){ -var pos=this.xscale*(_134[i]-this.minxval); +for(var i=0;i<=_78.length;i++){ +if((_78[i]-this.minxval)>=(_80*_79)){ +var pos=this.xscale*(_78[i]-this.minxval); if((pos>1)||(pos<0)){ continue; } -this.xticks.push([pos,_134[i]]); -_136++; +this.xticks.push([pos,_78[i]]); +_80++; } -if(_136>this.options.xNumberOfTicks){ +if(_80>this.options.xNumberOfTicks){ break; } } @@ -4749,33 +4510,33 @@ break; } }; PlotKit.Layout.prototype._evaluateLineTicksForYAxis=function(){ -var _137=MochiKit.Base.isUndefinedOrNull; +var _81=MochiKit.Base.isUndefinedOrNull; if(this.options.yTicks){ this.yticks=new Array(); -var _138=function(tick){ -var _139=tick.label; -if(_137(_139)){ -_139=tick.v.toString(); +var _82=function(_83){ +var _84=_83.label; +if(_81(_84)){ +_84=_83.v.toString(); } -var pos=1-(this.yscale*(tick.v-this.minyval)); +var pos=1-(this.yscale*(_83.v-this.minyval)); if((pos>=0)&&(pos<=1)){ -this.yticks.push([pos,_139]); +this.yticks.push([pos,_84]); } }; -MochiKit.Iter.forEach(this.options.yTicks,bind(_138,this)); +MochiKit.Iter.forEach(this.options.yTicks,bind(_82,this)); }else{ if(this.options.yNumberOfTicks){ this.yticks=new Array(); -var _140=PlotKit.Base.roundInterval; -var prec=this.options.yTickPrecision; -var _142=_140(this.yrange,this.options.yNumberOfTicks,prec); +var _85=PlotKit.Base.roundInterval; +var _86=this.options.yTickPrecision; +var _87=_85(this.yrange,this.options.yNumberOfTicks,_86); for(var i=0;i<=this.options.yNumberOfTicks;i++){ -var yval=this.minyval+(i*_142); -var pos=1-((yval-this.minyval)*this.yscale); +var _88=this.minyval+(i*_87); +var pos=1-((_88-this.minyval)*this.yscale); if((pos>1)||(pos<0)){ continue; } -this.yticks.push([pos,MochiKit.Format.roundToFixed(yval,prec)]); +this.yticks.push([pos,MochiKit.Format.roundToFixed(_88,_86)]); } } } @@ -4784,76 +4545,6 @@ PlotKit.Layout.prototype._evaluateLineTicks=function(){ this._evaluateLineTicksForXAxis(); this._evaluateLineTicksForYAxis(); }; -PlotKit.Layout.prototype._evaluateBarTicks=function(){ -this._evaluateLineTicks(); -var _144=function(tick){ -return [tick[0]+(this.minxdelta*this.xscale)/2,tick[1]]; -}; -this.xticks=MochiKit.Base.map(bind(_144,this),this.xticks); -if(this.options.barOrientation=="horizontal"){ -var _145=this.xticks; -this.xticks=this.yticks; -this.yticks=_145; -var _146=function(tick){ -return [1-tick[0],tick[1]]; -}; -this.xticks=MochiKit.Base.map(_146,this.xticks); -} -}; -PlotKit.Layout.prototype._evaluatePieTicks=function(){ -var _147=MochiKit.Base.isUndefinedOrNull; -var _148=MochiKit.Format.numberFormatter("#%"); -this.xticks=new Array(); -if(this.options.xTicks){ -var _149=new Array(); -for(var i=0;i0){ -this.__init__(_158,_159,_160); +this.__init__(_89,_90,_91); } }; -PlotKit.CanvasRenderer.prototype.__init__=function(_161,_162,_163){ -var _164=MochiKit.Base.isUndefinedOrNull; -var _165=MochiKit.Color.Color; -this.options={"drawBackground":true,"backgroundColor":_165.whiteColor(),"padding":{left:30,right:30,top:5,bottom:10},"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"strokeColor":_165.whiteColor(),"strokeColorTransform":"asStrokeColor","strokeWidth":0.5,"shouldFill":true,"shouldStroke":true,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_165.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_165.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"pieRadius":0.4,"enableEvents":true}; -MochiKit.Base.update(this.options,_163?_163:{}); -this.layout=_162; -this.element=MochiKit.DOM.getElement(_161); +PlotKit.CanvasRenderer.prototype.__init__=function(_92,_93,_94){ +var _95=MochiKit.Base.isUndefinedOrNull; +var _96=MochiKit.Color.Color; +this.options={"drawBackground":true,"backgroundColor":_96.whiteColor(),"padding":{left:30,right:30,top:5,bottom:10},"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"strokeColor":_96.whiteColor(),"strokeColorTransform":"asStrokeColor","strokeWidth":0.5,"shouldFill":true,"shouldStroke":true,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_96.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_96.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"pieRadius":0.4,"enableEvents":true}; +MochiKit.Base.update(this.options,_94?_94:{}); +this.layout=_93; +this.element=MochiKit.DOM.getElement(_92); this.container=this.element.parentNode; this.isIE=PlotKit.Base.excanvasSupported(); -if(this.isIE&&!_164(G_vmlCanvasManager)){ +if(this.isIE&&!_95(G_vmlCanvasManager)){ this.IEDelay=0.5; this.maxTries=5; this.renderDelay=null; @@ -4907,13 +4598,13 @@ this.element=G_vmlCanvasManager.initElement(this.element); } this.height=this.element.height; this.width=this.element.width; -if(_164(this.element)){ +if(_95(this.element)){ throw "CanvasRenderer() - passed canvas is not found"; } if(!this.isIE&&!(PlotKit.CanvasRenderer.isSupported(this.element))){ throw "CanvasRenderer() - Canvas is not supported."; } -if(_164(this.container)||(this.container.nodeName.toLowerCase()!="div")){ +if(_95(this.container)||(this.container.nodeName.toLowerCase()!="div")){ throw "CanvasRenderer() - needs to be enclosed in
"; } this.xlabels=new Array(); @@ -4929,7 +4620,7 @@ if(this.renderDelay){ this.renderDelay.cancel(); this.renderDelay=null; } -var _166=this.element.getContext("2d"); +var _97=this.element.getContext("2d"); } catch(e){ this.isFirstRender=false; @@ -4943,161 +4634,57 @@ return; if(this.options.drawBackground){ this._renderBackground(); } -if(this.layout.style=="bar"){ -this._renderBarChart(); -this._renderBarAxis(); -}else{ -if(this.layout.style=="pie"){ -this._renderPieChart(); -this._renderPieAxis(); -}else{ if(this.layout.style=="line"){ this._renderLineChart(); this._renderLineAxis(); } -} -} -}; -PlotKit.CanvasRenderer.prototype._renderBarChartWrap=function(data,_168){ -var _169=this.element.getContext("2d"); -var _170=this.options.colorScheme.length; -var _171=this.options.colorScheme; -var _172=MochiKit.Base.keys(this.layout.datasets); -var _173=_172.length; -for(var i=0;i<_173;i++){ -var _174=_172[i]; -var _175=_171[i%_170]; -_169.save(); -_169.fillStyle=_175.toRGBString(); -if(this.options.strokeColor){ -_169.strokeStyle=this.options.strokeColor.toRGBString(); -}else{ -if(this.options.strokeColorTransform){ -_169.strokeStyle=_175[this.options.strokeColorTransform]().toRGBString(); -} -} -_169.lineWidth=this.options.strokeWidth; -var _176=function(obj){ -if(obj.name==_174){ -_168(_169,obj); -} -}; -MochiKit.Iter.forEach(data,bind(_176,this)); -_169.restore(); -} -}; -PlotKit.CanvasRenderer.prototype._renderBarChart=function(){ -var bind=MochiKit.Base.bind; -var _178=function(_179,bar){ -var x=this.area.w*bar.x+this.area.x; -var y=this.area.h*bar.y+this.area.y; -var w=this.area.w*bar.w; -var h=this.area.h*bar.h; -if((w<1)||(h<1)){ -return; -} -if(this.options.shouldFill){ -_179.fillRect(x,y,w,h); -} -if(this.options.shouldStroke){ -_179.strokeRect(x,y,w,h); -} -}; -this._renderBarChartWrap(this.layout.bars,bind(_178,this)); }; PlotKit.CanvasRenderer.prototype._renderLineChart=function(){ -var _182=this.element.getContext("2d"); -var _183=this.options.colorScheme.length; -var _184=this.options.colorScheme; -var _185=MochiKit.Base.keys(this.layout.datasets); -var _186=_185.length; +var _98=this.element.getContext("2d"); +var _99=this.options.colorScheme.length; +var _100=this.options.colorScheme; +var _101=MochiKit.Base.keys(this.layout.datasets); +var _102=_101.length; var bind=MochiKit.Base.bind; -var _187=MochiKit.Base.partial; -for(var i=0;i<_186;i++){ -var _188=_185[i]; -var _189=_184[i%_183]; -var _190=this.options.strokeColorTransform; -_182.save(); -_182.fillStyle=_189.toRGBString(); +var _104=MochiKit.Base.partial; +for(var i=0;i<_102;i++){ +var _105=_101[i]; +var _106=_100[i%_99]; +var _107=this.options.strokeColorTransform; +_98.save(); +_98.fillStyle=_106.toRGBString(); if(this.options.strokeColor){ -_182.strokeStyle=this.options.strokeColor.toRGBString(); +_98.strokeStyle=this.options.strokeColor.toRGBString(); }else{ if(this.options.strokeColorTransform){ -_182.strokeStyle=_189[_190]().toRGBString(); +_98.strokeStyle=_106[_107]().toRGBString(); } } -_182.lineWidth=this.options.strokeWidth; -var _191=function(ctx){ +_98.lineWidth=this.options.strokeWidth; +var _108=function(ctx){ ctx.beginPath(); ctx.moveTo(this.area.x,this.area.y+this.area.h); -var _193=function(ctx_,_195){ -if(_195.name==_188){ -ctx_.lineTo(this.area.w*_195.x+this.area.x,this.area.h*_195.y+this.area.y); +var _110=function(ctx_,_112){ +if(_112.name==_105){ +ctx_.lineTo(this.area.w*_112.x+this.area.x,this.area.h*_112.y+this.area.y); } }; -MochiKit.Iter.forEach(this.layout.points,_187(_193,ctx),this); +MochiKit.Iter.forEach(this.layout.points,_104(_110,ctx),this); ctx.lineTo(this.area.w+this.area.x,this.area.h+this.area.y); ctx.lineTo(this.area.x,this.area.y+this.area.h); ctx.closePath(); }; if(this.options.shouldFill){ -bind(_191,this)(_182); -_182.fill(); +bind(_108,this)(_98); +_98.fill(); } if(this.options.shouldStroke){ -bind(_191,this)(_182); -_182.stroke(); +bind(_108,this)(_98); +_98.stroke(); } -_182.restore(); +_98.restore(); } }; -PlotKit.CanvasRenderer.prototype._renderPieChart=function(){ -var _196=this.element.getContext("2d"); -var _197=this.options.colorScheme.length; -var _198=this.layout.slices; -var _199=this.area.x+this.area.w*0.5; -var _200=this.area.y+this.area.h*0.5; -var _201=Math.min(this.area.w*this.options.pieRadius,this.area.h*this.options.pieRadius); -if(this.isIE){ -_199=parseInt(_199); -_200=parseInt(_200); -_201=parseInt(_201); -} -for(var i=0;i<_198.length;i++){ -var _202=this.options.colorScheme[i%_197]; -_196.save(); -_196.fillStyle=_202.toRGBString(); -var _203=function(){ -_196.beginPath(); -_196.moveTo(_199,_200); -_196.arc(_199,_200,_201,_198[i].startAngle-Math.PI/2,_198[i].endAngle-Math.PI/2,false); -_196.lineTo(_199,_200); -_196.closePath(); -}; -if(Math.abs(_198[i].startAngle-_198[i].endAngle)>0.001){ -if(this.options.shouldFill){ -_203(); -_196.fill(); -} -if(this.options.shouldStroke){ -_203(); -_196.lineWidth=this.options.strokeWidth; -if(this.options.strokeColor){ -_196.strokeStyle=this.options.strokeColor.toRGBString(); -}else{ -if(this.options.strokeColorTransform){ -_196.strokeStyle=_202[this.options.strokeColorTransform]().toRGBString(); -} -} -_196.stroke(); -} -} -_196.restore(); -} -}; -PlotKit.CanvasRenderer.prototype._renderBarAxis=function(){ -this._renderAxis(); -}; PlotKit.CanvasRenderer.prototype._renderLineAxis=function(){ this._renderAxis(); }; @@ -5105,138 +4692,77 @@ PlotKit.CanvasRenderer.prototype._renderAxis=function(){ if(!this.options.drawXAxis&&!this.options.drawYAxis){ return; } -var _204=this.element.getContext("2d"); -var _205={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}}; -_204.save(); -_204.strokeStyle=this.options.axisLineColor.toRGBString(); -_204.lineWidth=this.options.axisLineWidth; +var _113=this.element.getContext("2d"); +var _114={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}}; +_113.save(); +_113.strokeStyle=this.options.axisLineColor.toRGBString(); +_113.lineWidth=this.options.axisLineWidth; if(this.options.drawYAxis){ if(this.layout.yticks){ -var _206=function(tick){ +var _115=function(tick){ if(typeof (tick)=="function"){ return; } var x=this.area.x; var y=this.area.y+tick[0]*this.area.h; -_204.beginPath(); -_204.moveTo(x,y); -_204.lineTo(x-this.options.axisTickSize,y); -_204.closePath(); -_204.stroke(); -var _207=DIV(_205,tick[1]); -_207.style.top=(y-this.options.axisLabelFontSize)+"px"; -_207.style.left=(x-this.options.padding.left-this.options.axisTickSize)+"px"; -_207.style.textAlign="right"; -_207.style.width=(this.options.padding.left-this.options.axisTickSize*2)+"px"; -MochiKit.DOM.appendChildNodes(this.container,_207); -this.ylabels.push(_207); -}; -MochiKit.Iter.forEach(this.layout.yticks,bind(_206,this)); -} -_204.beginPath(); -_204.moveTo(this.area.x,this.area.y); -_204.lineTo(this.area.x,this.area.y+this.area.h); -_204.closePath(); -_204.stroke(); +_113.beginPath(); +_113.moveTo(x,y); +_113.lineTo(x-this.options.axisTickSize,y); +_113.closePath(); +_113.stroke(); +var _118=DIV(_114,tick[1]); +_118.style.top=(y-this.options.axisLabelFontSize)+"px"; +_118.style.left=(x-this.options.padding.left-this.options.axisTickSize)+"px"; +_118.style.textAlign="right"; +_118.style.width=(this.options.padding.left-this.options.axisTickSize*2)+"px"; +MochiKit.DOM.appendChildNodes(this.container,_118); +this.ylabels.push(_118); +}; +MochiKit.Iter.forEach(this.layout.yticks,bind(_115,this)); +} +_113.beginPath(); +_113.moveTo(this.area.x,this.area.y); +_113.lineTo(this.area.x,this.area.y+this.area.h); +_113.closePath(); +_113.stroke(); } if(this.options.drawXAxis){ if(this.layout.xticks){ -var _206=function(tick){ +var _115=function(tick){ if(typeof (dataset)=="function"){ return; } var x=this.area.x+tick[0]*this.area.w; var y=this.area.y+this.area.h; -_204.beginPath(); -_204.moveTo(x,y); -_204.lineTo(x,y+this.options.axisTickSize); -_204.closePath(); -_204.stroke(); -var _208=DIV(_205,tick[1]); -_208.style.top=(y+this.options.axisTickSize)+"px"; -_208.style.left=(x-this.options.axisLabelWidth/2)+"px"; -_208.style.textAlign="center"; -_208.style.width=this.options.axisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_208); -this.xlabels.push(_208); -}; -MochiKit.Iter.forEach(this.layout.xticks,bind(_206,this)); -} -_204.beginPath(); -_204.moveTo(this.area.x,this.area.y+this.area.h); -_204.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); -_204.closePath(); -_204.stroke(); -} -_204.restore(); -}; -PlotKit.CanvasRenderer.prototype._renderPieAxis=function(){ -if(!this.options.drawXAxis){ -return; -} -if(this.layout.xticks){ -var _209=new Array(); -for(var i=0;iMath.PI*2){ -_216=_216-Math.PI*2; -}else{ -if(_216<0){ -_216=_216+Math.PI*2; -} -} -var _217=_210+Math.sin(_216)*(_212+10); -var _218=_211-Math.cos(_216)*(_212+10); -var _219={"position":"absolute","zIndex":11,"width":_213+"px","fontSize":this.options.axisLabelFontSize+"px","overflow":"hidden","color":this.options.axisLabelColor.toHexString()}; -if(_216<=Math.PI*0.5){ -_219["textAlign"]="left"; -_219["verticalAlign"]="top"; -_219["left"]=_217+"px"; -_219["top"]=(_218-this.options.axisLabelFontSize)+"px"; -}else{ -if((_216>Math.PI*0.5)&&(_216<=Math.PI)){ -_219["textAlign"]="left"; -_219["verticalAlign"]="bottom"; -_219["left"]=_217+"px"; -_219["top"]=_218+"px"; -}else{ -if((_216>Math.PI)&&(_216<=Math.PI*1.5)){ -_219["textAlign"]="right"; -_219["verticalAlign"]="bottom"; -_219["left"]=(_217-_213)+"px"; -_219["top"]=_218+"px"; -}else{ -_219["textAlign"]="right"; -_219["verticalAlign"]="bottom"; -_219["left"]=(_217-_213)+"px"; -_219["top"]=(_218-this.options.axisLabelFontSize)+"px"; -} -} -} -var _220=DIV({"style":_219},this.layout.xticks[i][1]); -this.xlabels.push(_220); -MochiKit.DOM.appendChildNodes(this.container,_220); -} -} +_113.beginPath(); +_113.moveTo(x,y); +_113.lineTo(x,y+this.options.axisTickSize); +_113.closePath(); +_113.stroke(); +var _119=DIV(_114,tick[1]); +_119.style.top=(y+this.options.axisTickSize)+"px"; +_119.style.left=(x-this.options.axisLabelWidth/2)+"px"; +_119.style.textAlign="center"; +_119.style.width=this.options.axisLabelWidth+"px"; +MochiKit.DOM.appendChildNodes(this.container,_119); +this.xlabels.push(_119); +}; +MochiKit.Iter.forEach(this.layout.xticks,bind(_115,this)); +} +_113.beginPath(); +_113.moveTo(this.area.x,this.area.y+this.area.h); +_113.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); +_113.closePath(); +_113.stroke(); +} +_113.restore(); }; PlotKit.CanvasRenderer.prototype._renderBackground=function(){ -var _221=this.element.getContext("2d"); -_221.save(); -_221.fillStyle=this.options.backgroundColor.toRGBString(); -_221.fillRect(0,0,this.width,this.height); -_221.restore(); +var _120=this.element.getContext("2d"); +_120.save(); +_120.fillStyle=this.options.backgroundColor.toRGBString(); +_120.fillRect(0,0,this.width,this.height); +_120.restore(); }; PlotKit.CanvasRenderer.prototype.clear=function(){ if(this.isIE){ @@ -5245,7 +4771,7 @@ if(this.clearDelay){ this.clearDelay.cancel(); this.clearDelay=null; } -var _222=this.element.getContext("2d"); +var _121=this.element.getContext("2d"); } catch(e){ this.isFirstRender=false; @@ -5254,88 +4780,88 @@ this.clearDelay.addCallback(bind(this.clear,this)); return; } } -var _222=this.element.getContext("2d"); -_222.clearRect(0,0,this.width,this.height); +var _121=this.element.getContext("2d"); +_121.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.prototype._initialiseEvents=function(){ -var _223=MochiKit.Signal.connect; +var _122=MochiKit.Signal.connect; var bind=MochiKit.Base.bind; -_223(this.element,"onclick",bind(this.onclick,this)); +_122(this.element,"onclick",bind(this.onclick,this)); }; PlotKit.CanvasRenderer.prototype._resolveObject=function(e){ var x=(e.mouse().page.x-PlotKit.Base.findPosX(this.element)-this.area.x)/this.area.w; var y=(e.mouse().page.y-PlotKit.Base.findPosY(this.element)-this.area.y)/this.area.h; -var _225=this.layout.hitTest(x,y); -if(_225){ -return _225; +var _124=this.layout.hitTest(x,y); +if(_124){ +return _124; } return null; }; -PlotKit.CanvasRenderer.prototype._createEventObject=function(_226,e){ -if(_226==null){ +PlotKit.CanvasRenderer.prototype._createEventObject=function(_125,e){ +if(_125==null){ return null; } -e.chart=_226; +e.chart=_125; return e; }; PlotKit.CanvasRenderer.prototype.onclick=function(e){ -var _227=this._resolveObject(e); -var _228=this._createEventObject(_227,e); -if(_228!=null){ -MochiKit.Signal.signal(this,"onclick",_228); +var _126=this._resolveObject(e); +var _127=this._createEventObject(_126,e); +if(_127!=null){ +MochiKit.Signal.signal(this,"onclick",_127); } }; PlotKit.CanvasRenderer.prototype.onmouseover=function(e){ -var _229=this._resolveObject(e); -var _230=this._createEventObject(_229,e); -if(_230!=null){ -signal(this,"onmouseover",_230); +var _128=this._resolveObject(e); +var _129=this._createEventObject(_128,e); +if(_129!=null){ +signal(this,"onmouseover",_129); } }; PlotKit.CanvasRenderer.prototype.onmouseout=function(e){ -var _231=this._resolveObject(e); -var _232=this._createEventObject(_231,e); -if(_232==null){ +var _130=this._resolveObject(e); +var _131=this._createEventObject(_130,e); +if(_131==null){ signal(this,"onmouseout",e); }else{ -signal(this,"onmouseout",_232); +signal(this,"onmouseout",_131); } }; PlotKit.CanvasRenderer.prototype.onmousemove=function(e){ -var _233=this._resolveObject(e); -var _234=this._createEventObject(_233,e); -if((_233==null)&&(this.event_isinside==null)){ +var _132=this._resolveObject(e); +var _133=this._createEventObject(_132,e); +if((_132==null)&&(this.event_isinside==null)){ return; } -if((_233!=null)&&(this.event_isinside==null)){ -signal(this,"onmouseover",_234); +if((_132!=null)&&(this.event_isinside==null)){ +signal(this,"onmouseover",_133); } -if((_233==null)&&(this.event_isinside!=null)){ -signal(this,"onmouseout",_234); +if((_132==null)&&(this.event_isinside!=null)){ +signal(this,"onmouseout",_133); } -if((_233!=null)&&(this.event_isinside!=null)){ -signal(this,"onmousemove",_234); +if((_132!=null)&&(this.event_isinside!=null)){ +signal(this,"onmousemove",_133); } -this.event_isinside=_233; +this.event_isinside=_132; }; -PlotKit.CanvasRenderer.isSupported=function(_235){ -var _236=null; +PlotKit.CanvasRenderer.isSupported=function(_134){ +var _135=null; try{ -if(MochiKit.Base.isUndefinedOrNull(_235)){ -_236=MochiKit.DOM.CANVAS({}); +if(MochiKit.Base.isUndefinedOrNull(_134)){ +_135=MochiKit.DOM.CANVAS({}); }else{ -_236=MochiKit.DOM.getElement(_235); +_135=MochiKit.DOM.getElement(_134); } -var _237=_236.getContext("2d"); +var _136=_135.getContext("2d"); } catch(e){ var ie=navigator.appVersion.match(/MSIE (\d\.\d)/); -var _239=(navigator.userAgent.toLowerCase().indexOf("opera")!=-1); -if((!ie)||(ie[1]<6)||(_239)){ +var _138=(navigator.userAgent.toLowerCase().indexOf("opera")!=-1); +if((!ie)||(ie[1]<6)||(_138)){ return false; } return true; @@ -5355,1296 +4881,865 @@ PlotKit.Canvas.__new__(); MochiKit.Base._exportSymbols(this,PlotKit.Canvas); -// Copyright 2006 Dan Vanderkam (danvdk@gmail.com) -// All Rights Reserved. - -/** - * @fileoverview Subclasses various parts of PlotKit to meet the additional - * needs of DateGraph: grid overlays and error bars - */ - -// Subclass PlotKit.Layout to add: -// 1. Sigma/errorBars properties -// 2. Copy error terms for PlotKit.CanvasRenderer._renderLineChart - -/** - * Creates a new DateGraphLayout object. Options are the same as those allowed - * by the PlotKit.Layout constructor. - * @param {Object} options Options for PlotKit.Layout - * @return {Object} The DateGraphLayout object - */ -DateGraphLayout = function(options) { - PlotKit.Layout.call(this, "line", options); -}; -DateGraphLayout.prototype = new PlotKit.Layout(); - -/** - * Behaves the same way as PlotKit.Layout, but also copies the errors - * @private - */ -DateGraphLayout.prototype.evaluateWithError = function() { - this.evaluate(); - if (!this.options.errorBars) return; - - // Copy over the error terms - var i = 0; // index in this.points - for (var setName in this.datasets) { - var j = 0; - var dataset = this.datasets[setName]; - if (PlotKit.Base.isFuncLike(dataset)) continue; - for (var j = 0; j < dataset.length; j++, i++) { - var item = dataset[j]; - var xv = parseFloat(item[0]); - var yv = parseFloat(item[1]); - - if (xv == this.points[i].xval && - yv == this.points[i].yval) { - this.points[i].errorMinus = parseFloat(item[2]); - this.points[i].errorPlus = parseFloat(item[3]); - } - } - } +DateGraphLayout=function(_1){ +PlotKit.Layout.call(this,"line",_1); }; - -/** - * Convenience function to remove all the data sets from a graph - */ -DateGraphLayout.prototype.removeAllDatasets = function() { - delete this.datasets; - this.datasets = new Array(); +DateGraphLayout.prototype=new PlotKit.Layout(); +DateGraphLayout.prototype.evaluateWithError=function(){ +this.evaluate(); +if(!this.options.errorBars){ +return; +} +var i=0; +for(var _3 in this.datasets){ +var j=0; +var _5=this.datasets[_3]; +if(PlotKit.Base.isFuncLike(_5)){ +continue; +} +for(var j=0;j<_5.length;j++,i++){ +var _6=_5[j]; +var xv=parseFloat(_6[0]); +var yv=parseFloat(_6[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]); +} +} +} }; - -/** - * Change the values of various layout options - * @param {Object} new_options an associative array of new properties - */ -DateGraphLayout.prototype.updateOptions = function(new_options) { - MochiKit.Base.update(this.options, new_options ? new_options : {}); +DateGraphLayout.prototype.removeAllDatasets=function(){ +delete this.datasets; +this.datasets=new Array(); }; - -// Subclass PlotKit.CanvasRenderer to add: -// 1. X/Y grid overlay -// 2. Ability to draw error bars (if required) - -/** - * Sets some PlotKit.CanvasRenderer options - * @param {Object} element The canvas to attach to - * @param {Layout} layout The DateGraphLayout object for this graph. - * @param {Object} options Options to pass on to CanvasRenderer - */ -DateGraphCanvasRenderer = function(element, layout, options) { - PlotKit.CanvasRenderer.call(this, element, layout, options); - this.options.shouldFill = false; - this.options.shouldStroke = true; - this.options.drawYGrid = true; - this.options.drawXGrid = true; - this.options.gridLineColor = MochiKit.Color.Color.grayColor(); - MochiKit.Base.update(this.options, options); - - // TODO(danvk) This shouldn't be necessary: effects should be overlaid - this.options.drawBackground = false; +DateGraphLayout.prototype.updateOptions=function(_9){ +MochiKit.Base.update(this.options,_9?_9:{}); +}; +DateGraphCanvasRenderer=function(_10,_11,_12){ +PlotKit.CanvasRenderer.call(this,_10,_11,_12); +this.options.shouldFill=false; +this.options.shouldStroke=true; +this.options.drawYGrid=true; +this.options.drawXGrid=true; +this.options.gridLineColor=MochiKit.Color.Color.grayColor(); +MochiKit.Base.update(this.options,_12); +this.options.drawBackground=false; +}; +DateGraphCanvasRenderer.prototype=new PlotKit.CanvasRenderer(); +DateGraphCanvasRenderer.prototype.render=function(){ +this._renderLineChart(); +this._renderLineAxis(); +var ctx=this.element.getContext("2d"); +if(this.options.drawYGrid){ +var _14=this.layout.yticks; +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; +var y=this.area.y+_14[i][0]*this.area.h; +ctx.beginPath(); +ctx.moveTo(x,y); +ctx.lineTo(x+this.area.w,y); +ctx.closePath(); +ctx.stroke(); +} +} +if(this.options.drawXGrid){ +var _14=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; +var y=this.area.y+this.area.h; +ctx.beginPath(); +ctx.moveTo(x,y); +ctx.lineTo(x,this.area.y); +ctx.closePath(); +ctx.stroke(); +} +} +}; +DateGraphCanvasRenderer.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(_32){ +_34.moveTo(_31.canvasx,_31.canvasy); +}else{ +_34.lineTo(_31.canvasx,_31.canvasy); +} +_32=false; +} +}; +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){ +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(); +} +_40[0]=_46[0]; +_40[1]=_46[1]; +_39=_45.canvasx; +} +}; +var _47=_37.colorWithAlpha(0.15); +ctx.fillStyle=_47.toRGBString(); +ctx.beginPath(); +MochiKit.Iter.forEach(this.layout.points,_24(_43,ctx),this); +ctx.fill(); +} }; -DateGraphCanvasRenderer.prototype = new PlotKit.CanvasRenderer(); - -/** - * Draw an X/Y grid on top of the existing plot - */ -DateGraphCanvasRenderer.prototype.render = function() { - // Do the ordinary rendering, as before - // TODO(danvk) Call super.render() - this._renderLineChart(); - this._renderLineAxis(); - - // Draw the new X/Y grid - var ctx = this.element.getContext("2d"); - if (this.options.drawYGrid) { - var ticks = this.layout.yticks; - ctx.save(); - ctx.strokeStyle = this.options.gridLineColor.toRGBString(); - ctx.lineWidth = this.options.axisLineWidth; - for (var i = 0; i < ticks.length; i++) { - var x = this.area.x; - var y = this.area.y + ticks[i][0] * this.area.h; - ctx.beginPath(); - ctx.moveTo(x, y); - ctx.lineTo(x + this.area.w, y); - ctx.closePath(); - ctx.stroke(); - } - } - - if (this.options.drawXGrid) { - var ticks = this.layout.xticks; - ctx.save(); - ctx.strokeStyle = this.options.gridLineColor.toRGBString(); - ctx.lineWidth = this.options.axisLineWidth; - for (var i=0; i= 0) { - ctx_.moveTo(prevX, prevYs[0]); - ctx_.lineTo(point.canvasx, newYs[0]); - ctx_.lineTo(point.canvasx, newYs[1]); - ctx_.lineTo(prevX, prevYs[1]); - ctx_.closePath(); - } - prevYs[0] = newYs[0]; - prevYs[1] = newYs[1]; - prevX = point.canvasx; - } - }; - // should be same color as the lines - var err_color = color.colorWithAlpha(0.15); - ctx.fillStyle = err_color.toRGBString(); - ctx.beginPath(); - MochiKit.Iter.forEach(this.layout.points, partial(errorTrapezoid, ctx), this); - ctx.fill(); - } - }; - - if (errorBars) - bind(makeErrorBars, this)(context); - bind(makePath, this)(context); - context.restore(); +DateGraph=function(div,_49,_50,_51){ +if(arguments.length>0){ +this.__init__(div,_49,_50,_51); +} }; -// Copyright 2006 Dan Vanderkam (danvdk@gmail.com) -// All Rights Reserved. - -/** - * @fileoverview Creates an interactive, zoomable graph based on a CSV file or - * string. DateGraph can handle multiple series with or without error bars. The - * date/value ranges will be automatically set. DateGraph uses the - * <canvas> tag, so it only works in FF1.5+. - * @author danvdk@gmail.com (Dan Vanderkam) - - Usage: -
- - - The CSV file is of the form - - YYYYMMDD,A1,B1,C1 - YYYYMMDD,A2,B2,C2 - - If null is passed as the third parameter (series names), then the first line - of the CSV file is assumed to contain names for each series. - - If the 'errorBars' option is set in the constructor, the input should be of - the form - - YYYYMMDD,A1,sigmaA1,B1,sigmaB1,... - YYYYMMDD,A2,sigmaA2,B2,sigmaB2,... - - If the 'fractions' option is set, the input should be of the form: - - YYYYMMDD,A1/B1,A2/B2,... - YYYYMMDD,A1/B1,A2/B2,... - - And error bars will be calculated automatically using a binomial distribution. - - For further documentation and examples, see http://www/~danvk/dg/ - - */ - -/** - * An interactive, zoomable graph - * @param {String | Function} file A file containing CSV data or a function that - * returns this data. The expected format for each line is - * YYYYMMDD,val1,val2,... or, if attrs.errorBars is set, - * YYYYMMDD,val1,stddev1,val2,stddev2,... - * @param {Array.} labels Labels for the data series - * @param {Object} attrs Various other attributes, e.g. errorBars determines - * whether the input data contains error ranges. - */ -DateGraph = function(div, file, labels, attrs) { - if (arguments.length > 0) - this.__init__(div, file, labels, attrs); +DateGraph.NAME="DateGraph"; +DateGraph.VERSION="1.1"; +DateGraph.__repr__=function(){ +return "["+this.NAME+" "+this.VERSION+"]"; }; - -DateGraph.NAME = "DateGraph"; -DateGraph.VERSION = "1.1"; -DateGraph.__repr__ = function() { - return "[" + this.NAME + " " + this.VERSION + "]"; +DateGraph.toString=function(){ +return this.__repr__(); }; -DateGraph.toString = function() { - return this.__repr__(); +DateGraph.DEFAULT_ROLL_PERIOD=1; +DateGraph.DEFAULT_WIDTH=480; +DateGraph.DEFAULT_HEIGHT=320; +DateGraph.DEFAULT_STROKE_WIDTH=1; +DateGraph.AXIS_LINE_WIDTH=0.3; +DateGraph.prototype.__init__=function(div,_52,_53,_54){ +this.maindiv_=div; +this.labels_=_53; +this.file_=_52; +this.rollPeriod_=_54.rollPeriod||DateGraph.DEFAULT_ROLL_PERIOD; +this.previousVerticalX_=-1; +this.width_=parseInt(div.style.width,10); +this.height_=parseInt(div.style.height,10); +this.errorBars_=_54.errorBars||false; +this.fractions_=_54.fractions||false; +this.strokeWidth_=_54.strokeWidth||DateGraph.DEFAULT_STROKE_WIDTH; +this.dateWindow_=_54.dateWindow||null; +this.valueRange_=_54.valueRange||null; +this.labelsSeparateLines=_54.labelsSeparateLines||false; +this.labelsDiv_=_54.labelsDiv||null; +this.labelsKMB_=_54.labelsKMB||false; +this.minTickSize_=_54.minTickSize||0; +this.xValueParser_=_54.xValueParser||DateGraph.prototype.dateParser; +this.xValueFormatter_=_54.xValueFormatter||DateGraph.prototype.dateString_; +this.xTicker_=_54.xTicker||DateGraph.prototype.dateTicker; +this.sigma_=_54.sigma||2; +this.wilsonInterval_=_54.wilsonInterval||true; +this.customBars_=_54.customBars||false; +this.attrs_=_54; +this.labelsFromCSV_=(this.labels_==null); +if(this.labels_==null){ +this.labels_=[]; +} +this.clickCallback_=_54.clickCallback||null; +this.zoomCallback_=_54.zoomCallback||null; +this.createInterface_(); +this.layoutOptions_={"errorBars":(this.errorBars_||this.customBars_),"xOriginIsZero":false}; +MochiKit.Base.update(this.layoutOptions_,_54); +this.setColors_(_54); +this.layout_=new DateGraphLayout(this.layoutOptions_); +this.renderOptions_={colorScheme:this.colors_,strokeColor:null,strokeWidth:this.strokeWidth_,axisLabelFontSize:14,axisLineWidth:DateGraph.AXIS_LINE_WIDTH}; +MochiKit.Base.update(this.renderOptions_,_54); +this.plotter_=new DateGraphCanvasRenderer(this.hidden_,this.layout_,this.renderOptions_); +this.createStatusMessage_(); +this.createRollInterface_(); +this.createDragInterface_(); +connect(window,"onload",this,function(e){ +this.start_(); +}); }; - -// Various default values -DateGraph.DEFAULT_ROLL_PERIOD = 1; -DateGraph.DEFAULT_WIDTH = 480; -DateGraph.DEFAULT_HEIGHT = 320; -DateGraph.DEFAULT_STROKE_WIDTH = 1.0; -DateGraph.AXIS_LINE_WIDTH = 0.3; - -/** - * Initializes the DateGraph. This creates a new DIV and constructs the PlotKit - * and interaction <canvas> inside of it. See the constructor for details - * on the parameters. - * @param {String | Function} file Source data - * @param {Array.} labels Names of the data series - * @param {Object} attrs Miscellaneous other options - * @private - */ -DateGraph.prototype.__init__ = function(div, file, labels, attrs) { - // Copy the important bits into the object - this.maindiv_ = div; - this.labels_ = labels; - this.file_ = file; - this.rollPeriod_ = attrs.rollPeriod || DateGraph.DEFAULT_ROLL_PERIOD; - this.previousVerticalX_ = -1; - this.width_ = parseInt(div.style.width, 10); - this.height_ = parseInt(div.style.height, 10); - this.errorBars_ = attrs.errorBars || false; - this.fractions_ = attrs.fractions || false; - this.strokeWidth_ = attrs.strokeWidth || DateGraph.DEFAULT_STROKE_WIDTH; - this.dateWindow_ = attrs.dateWindow || null; - this.valueRange_ = attrs.valueRange || null; - this.labelsSeparateLines = attrs.labelsSeparateLines || false; - this.labelsDiv_ = attrs.labelsDiv || null; - this.labelsKMB_ = attrs.labelsKMB || false; - this.minTickSize_ = attrs.minTickSize || 0; - this.xValueParser_ = attrs.xValueParser || DateGraph.prototype.dateParser; - this.xValueFormatter_ = attrs.xValueFormatter || - DateGraph.prototype.dateString_; - this.xTicker_ = attrs.xTicker || DateGraph.prototype.dateTicker; - this.sigma_ = attrs.sigma || 2.0; - this.wilsonInterval_ = attrs.wilsonInterval || true; - this.customBars_ = attrs.customBars || false; - this.attrs_ = attrs; - - // Make a note of whether labels will be pulled from the CSV file. - this.labelsFromCSV_ = (this.labels_ == null); - if (this.labels_ == null) - this.labels_ = []; - - // Prototype of the callback is "void clickCallback(event, date)" - this.clickCallback_ = attrs.clickCallback || null; - - // Prototype of zoom callback is "void dragCallback(minDate, maxDate)" - this.zoomCallback_ = attrs.zoomCallback || null; - - // Create the containing DIV and other interactive elements - this.createInterface_(); - - // Create the PlotKit grapher - this.layoutOptions_ = { 'errorBars': (this.errorBars_ || this.customBars_), - 'xOriginIsZero': false }; - MochiKit.Base.update(this.layoutOptions_, attrs); - this.setColors_(attrs); - - this.layout_ = new DateGraphLayout(this.layoutOptions_); - - this.renderOptions_ = { colorScheme: this.colors_, - strokeColor: null, - strokeWidth: this.strokeWidth_, - axisLabelFontSize: 14, - axisLineWidth: DateGraph.AXIS_LINE_WIDTH }; - MochiKit.Base.update(this.renderOptions_, attrs); - this.plotter_ = new DateGraphCanvasRenderer(this.hidden_, this.layout_, - this.renderOptions_); - - this.createStatusMessage_(); - this.createRollInterface_(); - this.createDragInterface_(); - - connect(window, 'onload', this, function(e) { this.start_(); }); +DateGraph.prototype.rollPeriod=function(){ +return this.rollPeriod_; +}; +DateGraph.prototype.createInterface_=function(){ +var _56=this.maindiv_; +this.graphDiv=MochiKit.DOM.DIV({style:{"width":this.width_+"px","height":this.height_+"px"}}); +appendChildNodes(_56,this.graphDiv); +var _57=MochiKit.DOM.CANVAS; +this.canvas_=_57({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){ +this.mouseMove_(e); +}); +connect(this.hidden_,"onmouseout",this,function(e){ +this.mouseOut_(e); +}); }; - -/** - * Returns the current rolling period, as set by the user or an option. - * @return {Number} The number of days in the rolling window - */ -DateGraph.prototype.rollPeriod = function() { - return this.rollPeriod_; +DateGraph.prototype.createPlotKitCanvas_=function(_58){ +var h=document.createElement("canvas"); +h.style.position="absolute"; +h.style.top=_58.style.top; +h.style.left=_58.style.left; +h.width=this.width_; +h.height=this.height_; +MochiKit.DOM.appendChildNodes(this.graphDiv,h); +return h; +}; +DateGraph.prototype.setColors_=function(_60){ +var num=this.labels_.length; +this.colors_=[]; +if(!_60.colors){ +var sat=_60.colorSaturation||1; +var val=_60.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)); +} +}else{ +for(var i=0;i= 10 pixels) - connect(this.hidden_, 'onmouseup', this, function(event) { - if (mouseDown) { - mouseDown = false; - dragEndX = getX(event); - dragEndY = getY(event); - var regionWidth = Math.abs(dragEndX - dragStartX); - var regionHeight = Math.abs(dragEndY - dragStartY); - - if (regionWidth < 2 && regionHeight < 2 && - self.clickCallback_ != null && - self.lastx_ != undefined) { - self.clickCallback_(event, new Date(self.lastx_)); - } - - if (regionWidth >= 10) { - self.doZoom_(Math.min(dragStartX, dragEndX), - Math.max(dragStartX, dragEndX)); - } else { - self.canvas_.getContext("2d").clearRect(0, 0, - self.canvas_.width, - self.canvas_.height); - } - - dragStartX = null; - dragStartY = null; - } - }); - - // Double-clicking zooms back out - connect(this.hidden_, 'ondblclick', this, function(event) { - self.dateWindow_ = null; - self.drawGraph_(self.rawData_); - var minDate = self.rawData_[0][0]; - var maxDate = self.rawData_[self.rawData_.length - 1][0]; - self.zoomCallback_(minDate, maxDate); - }); +if(_88>=10){ +_72.doZoom_(Math.min(_74,_76),Math.max(_74,_76)); +}else{ +_72.canvas_.getContext("2d").clearRect(0,0,_72.canvas_.width,_72.canvas_.height); +} +_74=null; +_75=null; +} +}); +connect(this.hidden_,"ondblclick",this,function(_90){ +_72.dateWindow_=null; +_72.drawGraph_(_72.rawData_); +var _91=_72.rawData_[0][0]; +var _92=_72.rawData_[_72.rawData_.length-1][0]; +_72.zoomCallback_(_91,_92); +}); }; - -/** - * Draw a gray zoom rectangle over the desired area of the canvas. Also clears - * up any previous zoom rectangles that were drawn. This could be optimized to - * avoid extra redrawing, but it's tricky to avoid interactions with the status - * dots. - * @param {Number} startX The X position where the drag started, in canvas - * coordinates. - * @param {Number} endX The current X position of the drag, in canvas coords. - * @param {Number} prevEndX The value of endX on the previous call to this - * function. Used to avoid excess redrawing - * @private - */ -DateGraph.prototype.drawZoomRect_ = function(startX, endX, prevEndX) { - var ctx = this.canvas_.getContext("2d"); - - // Clean up from the previous rect if necessary - if (prevEndX) { - ctx.clearRect(Math.min(startX, prevEndX), 0, - Math.abs(startX - prevEndX), this.height_); - } - - // Draw a light-grey rectangle to show the new viewing area - if (endX && startX) { - ctx.fillStyle = "rgba(128,128,128,0.33)"; - ctx.fillRect(Math.min(startX, endX), 0, - Math.abs(endX - startX), this.height_); - } +DateGraph.prototype.drawZoomRect_=function(_93,_94,_95){ +var ctx=this.canvas_.getContext("2d"); +if(_95){ +ctx.clearRect(Math.min(_93,_95),0,Math.abs(_93-_95),this.height_); +} +if(_94&&_93){ +ctx.fillStyle="rgba(128,128,128,0.33)"; +ctx.fillRect(Math.min(_93,_94),0,Math.abs(_94-_93),this.height_); +} +}; +DateGraph.prototype.doZoom_=function(_96,_97){ +var _98=this.layout_.points; +var _99=null; +var _100=null; +for(var i=0;i<_98.length;i++){ +var cx=_98[i].canvasx; +var x=_98[i].xval; +if(cx<_96&&(_99==null||x>_99)){ +_99=x; +} +if(cx>_97&&(_100==null||x<_100)){ +_100=x; +} +} +if(_99==null){ +_99=_98[0].xval; +} +if(_100==null){ +_100=_98[_98.length-1].xval; +} +this.dateWindow_=[_99,_100]; +this.drawGraph_(this.rawData_); +this.zoomCallback_(_99,_100); +}; +DateGraph.prototype.mouseMove_=function(_102){ +var _103=_102.mouse().page.x-PlotKit.Base.findPosX(this.hidden_); +var _104=this.layout_.points; +var _105=-1; +var _106=-1; +var _107=1e+100; +var idx=-1; +for(var i=0;i<_104.length;i++){ +var dist=Math.abs(_104[i].canvasx-_103); +if(dist>_107){ +break; +} +_107=dist; +idx=i; +} +if(idx>=0){ +_105=_104[idx].xval; +} +if(_103>_104[_104.length-1].canvasx){ +_105=_104[_104.length-1].xval; +} +var _110=[]; +for(var i=0;i<_104.length;i++){ +if(_104[i].xval==_105){ +_110.push(_104[i]); +} +} +var _111=3; +var ctx=this.canvas_.getContext("2d"); +if(this.previousVerticalX_>=0){ +var px=this.previousVerticalX_; +ctx.clearRect(px-_111-1,0,2*_111+2,this.height_); +} +if(_110.length>0){ +var _103=_110[0].canvasx; +var _112=this.xValueFormatter_(_105)+":"; +var clen=this.colors_.length; +for(var i=0;i<_110.length;i++){ +if(this.labelsSeparateLines){ +_112+="
"; +} +var _114=_110[i]; +_112+=" "+_114.name+":"+this.round_(_114.yval,2); +} +this.labelsDiv_.innerHTML=_112; +this.lastx_=_105; +ctx.save(); +for(var i=0;i<_110.length;i++){ +ctx.beginPath(); +ctx.fillStyle=this.colors_[i%clen].toRGBString(); +ctx.arc(_103,_110[i%clen].canvasy,_111,0,360,false); +ctx.fill(); +} +ctx.restore(); +this.previousVerticalX_=_103; +} }; - -/** - * Zoom to something containing [lowX, highX]. These are pixel coordinates - * in the canvas. The exact zoom window may be slightly larger if there are no - * data points near lowX or highX. This function redraws the graph. - * @param {Number} lowX The leftmost pixel value that should be visible. - * @param {Number} highX The rightmost pixel value that should be visible. - * @private - */ -DateGraph.prototype.doZoom_ = function(lowX, highX) { - // Find the earliest and latest dates contained in this canvasx range. - var points = this.layout_.points; - var minDate = null; - var maxDate = null; - // Find the nearest [minDate, maxDate] that contains [lowX, highX] - for (var i = 0; i < points.length; i++) { - var cx = points[i].canvasx; - var x = points[i].xval; - if (cx < lowX && (minDate == null || x > minDate)) minDate = x; - if (cx > highX && (maxDate == null || x < maxDate)) maxDate = x; - } - // Use the extremes if either is missing - if (minDate == null) minDate = points[0].xval; - if (maxDate == null) maxDate = points[points.length-1].xval; - - this.dateWindow_ = [minDate, maxDate]; - this.drawGraph_(this.rawData_); - this.zoomCallback_(minDate, maxDate); +DateGraph.prototype.mouseOut_=function(_115){ +var ctx=this.canvas_.getContext("2d"); +ctx.clearRect(0,0,this.width_,this.height_); +this.labelsDiv_.innerHTML=""; }; - -/** - * When the mouse moves in the canvas, display information about a nearby data - * point and draw dots over those points in the data series. This function - * takes care of cleanup of previously-drawn dots. - * @param {Object} event The mousemove event from the browser. - * @private - */ -DateGraph.prototype.mouseMove_ = function(event) { - var canvasx = event.mouse().page.x - PlotKit.Base.findPosX(this.hidden_); - var points = this.layout_.points; - - var lastx = -1; - var lasty = -1; - - // Loop through all the points and find the date nearest to our current - // location. - var minDist = 1e+100; - var idx = -1; - for (var i = 0; i < points.length; i++) { - var dist = Math.abs(points[i].canvasx - canvasx); - if (dist > minDist) break; - minDist = dist; - idx = i; - } - if (idx >= 0) lastx = points[idx].xval; - // Check that you can really highlight the last day's data - if (canvasx > points[points.length-1].canvasx) - lastx = points[points.length-1].xval; - - // Extract the points we've selected - var selPoints = []; - for (var i = 0; i < points.length; i++) { - if (points[i].xval == lastx) { - selPoints.push(points[i]); - } - } - - // Clear the previously drawn vertical, if there is one - var circleSize = 3; - var ctx = this.canvas_.getContext("2d"); - if (this.previousVerticalX_ >= 0) { - var px = this.previousVerticalX_; - ctx.clearRect(px - circleSize - 1, 0, 2 * circleSize + 2, this.height_); - } - - if (selPoints.length > 0) { - var canvasx = selPoints[0].canvasx; - - // Set the status message to indicate the selected point(s) - var replace = this.xValueFormatter_(lastx) + ":"; - var clen = this.colors_.length; - for (var i = 0; i < selPoints.length; i++) { - if (this.labelsSeparateLines) { - replace += "
"; - } - var point = selPoints[i]; - replace += " " - + point.name + ":" - + this.round_(point.yval, 2); - } - this.labelsDiv_.innerHTML = replace; - - // Save last x position for callbacks. - this.lastx_ = lastx; - - // Draw colored circles over the center of each selected point - ctx.save() - for (var i = 0; i < selPoints.length; i++) { - ctx.beginPath(); - ctx.fillStyle = this.colors_[i%clen].toRGBString(); - ctx.arc(canvasx, selPoints[i%clen].canvasy, circleSize, 0, 360, false); - ctx.fill(); - } - ctx.restore(); - - this.previousVerticalX_ = canvasx; - } +DateGraph.prototype.dateString_=function(date){ +var d=new Date(date); +var year=""+d.getFullYear(); +var _119=""+(d.getMonth()+1); +if(_119.length<2){ +_119="0"+_119; +} +var day=""+d.getDate(); +if(day.length<2){ +day="0"+day; +} +return year+"/"+_119+"/"+day; }; - -/** - * The mouse has left the canvas. Clear out whatever artifacts remain - * @param {Object} event the mouseout event from the browser. - * @private - */ -DateGraph.prototype.mouseOut_ = function(event) { - // Get rid of the overlay data - var ctx = this.canvas_.getContext("2d"); - ctx.clearRect(0, 0, this.width_, this.height_); - this.labelsDiv_.innerHTML = ""; +DateGraph.prototype.round_=function(num,_121){ +var _122=Math.pow(10,_121); +return Math.round(num*_122)/_122; }; - -/** - * Convert a JS date (millis since epoch) to YYYY/MM/DD - * @param {Number} date The JavaScript date (ms since epoch) - * @return {String} A date of the form "YYYY/MM/DD" - * @private - */ -DateGraph.prototype.dateString_ = function(date) { - var d = new Date(date); - - // Get the year: - var year = "" + d.getFullYear(); - // Get a 0 padded month string - var month = "" + (d.getMonth() + 1); //months are 0-offset, sigh - if (month.length < 2) month = "0" + month; - // Get a 0 padded day string - var day = "" + d.getDate(); - if (day.length < 2) day = "0" + day; - - return year + "/" + month + "/" + day; +DateGraph.prototype.loadedEvent_=function(data){ +this.rawData_=this.parseCSV_(data); +this.drawGraph_(this.rawData_); }; - -/** - * Round a number to the specified number of digits past the decimal point. - * @param {Number} num The number to round - * @param {Number} places The number of decimals to which to round - * @return {Number} The rounded number - * @private - */ -DateGraph.prototype.round_ = function(num, places) { - var shift = Math.pow(10, places); - return Math.round(num * shift)/shift; +DateGraph.prototype.months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]; +DateGraph.prototype.quarters=["Jan","Apr","Jul","Oct"]; +DateGraph.prototype.addXTicks_=function(){ +var _124,endDate; +if(this.dateWindow_){ +_124=this.dateWindow_[0]; +endDate=this.dateWindow_[1]; +}else{ +_124=this.rawData_[0][0]; +endDate=this.rawData_[this.rawData_.length-1][0]; +} +var _125=this.xTicker_(_124,endDate); +this.layout_.updateOptions({xTicks:_125}); }; - -/** - * Fires when there's data available to be graphed. - * @param {String} data Raw CSV data to be plotted - * @private - */ -DateGraph.prototype.loadedEvent_ = function(data) { - this.rawData_ = this.parseCSV_(data); - this.drawGraph_(this.rawData_); +DateGraph.prototype.dateTicker=function(_126,_127){ +var _128=24*60*60*1000; +_126=_126/_128; +_127=_127/_128; +var _129=_127-_126; +var _130=[]; +var _131=false; +var _132=1; +if(_129>30*366){ +_131=true; +_130=["Jan"]; +_132=10; +}else{ +if(_129>4*366){ +_130=["Jan"]; +_131=true; +}else{ +if(_129>366){ +_130=this.quarters; +_131=true; +}else{ +if(_129>40){ +_130=this.months; +_131=true; +}else{ +if(_129>10){ +for(var week=_126-14;week<_127+14;week+=7){ +_130.push(week*_128); +} +}else{ +for(var day=_126-14;day<_127+14;day+=1){ +_130.push(day*_128); +} +} +} +} +} +} +var _134=[]; +if(_131){ +var _135=1900+(new Date(_126*_128)).getYear(); +var _136=1900+(new Date(_127*_128)).getYear(); +for(var i=_135;i<=_136;i++){ +if(i%_132!=0){ +continue; +} +for(var j=0;j<_130.length;j++){ +var date=Date.parse(_130[j]+" 1, "+i); +_134.push({label:_130[j]+"'"+(""+i).substr(2,2),v:date}); +} +} +}else{ +for(var i=0;i<_130.length;i++){ +var date=new Date(_130[i]); +var year=date.getFullYear().toString(); +var _137=this.months[date.getMonth()]+date.getDate(); +_137+="'"+year.substr(year.length-2,2); +_134.push({label:_137,v:date}); +} +} +return _134; }; - -DateGraph.prototype.months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; -DateGraph.prototype.quarters = ["Jan", "Apr", "Jul", "Oct"]; - -/** - * Add ticks on the x-axis representing years, months, quarters, weeks, or days - * @private - */ -DateGraph.prototype.addXTicks_ = function() { - // Determine the correct ticks scale on the x-axis: quarterly, monthly, ... - var startDate, endDate; - if (this.dateWindow_) { - startDate = this.dateWindow_[0]; - endDate = this.dateWindow_[1]; - } else { - startDate = this.rawData_[0][0]; - endDate = this.rawData_[this.rawData_.length - 1][0]; - } - - var xTicks = this.xTicker_(startDate, endDate); - this.layout_.updateOptions({xTicks: xTicks}); +DateGraph.prototype.numericTicks=function(minV,maxV){ +var _140; +if(maxV<=0){ +_140=1; +}else{ +_140=Math.pow(10,Math.floor(Math.log(maxV)/Math.log(10))); } - -/** - * Add ticks to the x-axis based on a date range. - * @param {Number} startDate Start of the date window (millis since epoch) - * @param {Number} endDate End of the date window (millis since epoch) - * @return {Array.} Array of {label, value} tuples. - * @public - */ -DateGraph.prototype.dateTicker = function(startDate, endDate) { - var ONE_DAY = 24*60*60*1000; - startDate = startDate / ONE_DAY; - endDate = endDate / ONE_DAY; - var dateSpan = endDate - startDate; - - var scale = []; - var isMonthly = false; - var yearMod = 1; - if (dateSpan > 30 * 366) { // decadal - isMonthly = true; - scale = ["Jan"]; - yearMod = 10; - } else if (dateSpan > 4*366) { // annual - scale = ["Jan"]; - isMonthly = true; - } else if (dateSpan > 366) { // quarterly - scale = this.quarters; - isMonthly = true; - } else if (dateSpan > 40) { // monthly - scale = this.months; - isMonthly = true; - } else if (dateSpan > 10) { // weekly - for (var week = startDate - 14; week < endDate + 14; week += 7) { - scale.push(week * ONE_DAY); - } - } else { // daily - for (var day = startDate - 14; day < endDate + 14; day += 1) { - scale.push(day * ONE_DAY); - } - } - - var xTicks = []; - - if (isMonthly) { - var startYear = 1900 + (new Date(startDate* ONE_DAY)).getYear(); - var endYear = 1900 + (new Date(endDate * ONE_DAY)).getYear(); - for (var i = startYear; i <= endYear; i++) { - if (i % yearMod != 0) continue; - for (var j = 0; j < scale.length; j++ ) { - var date = Date.parse(scale[j] + " 1, " + i); - xTicks.push( {label: scale[j] + "'" + ("" + i).substr(2,2), v: date } ); - } - } - } else { - for (var i = 0; i < scale.length; i++) { - var date = new Date(scale[i]); - var year = date.getFullYear().toString(); - var label = this.months[date.getMonth()] + date.getDate(); - label += "'" + year.substr(year.length - 2, 2); - xTicks.push( {label: label, v: date} ); - } - } - return xTicks; +var _141=(maxV-minV)/_140; +while(2*_141<20){ +_141*=2; +} +if((maxV-minV)/_141=k*k*k){ +_144=this.round_(_143/(k*k*k),1)+"B"; +}else{ +if(_143>=k*k){ +_144=this.round_(_143/(k*k),1)+"M"; +}else{ +if(_143>=k){ +_144=this.round_(_143/k,1)+"K"; +} +} +} +} +_142.push({label:_144,v:_143}); +} +return _142; }; - -/** - * Add ticks when the x axis has numbers on it (instead of dates) - * @param {Number} startDate Start of the date window (millis since epoch) - * @param {Number} endDate End of the date window (millis since epoch) - * @return {Array.} Array of {label, value} tuples. - * @public - */ -DateGraph.prototype.numericTicks = function(minV, maxV) { - var scale; - if (maxV <= 0.0) { - scale = 1.0; - } else { - scale = Math.pow( 10, Math.floor(Math.log(maxV)/Math.log(10.0)) ); - } - - // Add a smallish number of ticks at human-friendly points - var nTicks = (maxV - minV) / scale; - while (2 * nTicks < 20) { - nTicks *= 2; - } - if ((maxV - minV) / nTicks < this.minTickSize_) { - nTicks = this.round_((maxV - minV) / this.minTickSize_, 1); - } - - // Construct labels for the ticks - var ticks = []; - for (var i = 0; i <= nTicks; i++) { - var tickV = minV + i * (maxV - minV) / nTicks; - var label = this.round_(tickV, 2); - if (this.labelsKMB_) { - var k = 1000; - if (tickV >= k*k*k) { - label = this.round_(tickV/(k*k*k), 1) + "B"; - } else if (tickV >= k*k) { - label = this.round_(tickV/(k*k), 1) + "M"; - } else if (tickV >= k) { - label = this.round_(tickV/k, 1) + "K"; - } - } - ticks.push( {label: label, v: tickV} ); - } - return ticks; +DateGraph.prototype.addYTicks_=function(minY,maxY){ +var _148=this.numericTicks(minY,maxY); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_148}); }; - -/** - * Adds appropriate ticks on the y-axis - * @param {Number} minY The minimum Y value in the data set - * @param {Number} maxY The maximum Y value in the data set - * @private - */ -DateGraph.prototype.addYTicks_ = function(minY, maxY) { - // Set the number of ticks so that the labels are human-friendly. - var ticks = this.numericTicks(minY, maxY); - this.layout_.updateOptions( { yAxis: [minY, maxY], - yTicks: ticks } ); +DateGraph.prototype.drawGraph_=function(data){ +var maxY=null; +this.layout_.removeAllDatasets(); +for(var i=1;i=low&&_149[k][0]<=high){ +_153.push(_149[k]); +var y=bars?_149[k][1][0]:_149[k][1]; +if(maxY==null||y>maxY){ +maxY=y; +} +} +} +_149=_153; +}else{ +for(var j=0;j<_149.length;j++){ +var y=bars?_149[j][1][0]:_149[j][1]; +if(maxY==null||y>maxY){ +maxY=bars?y+_149[j][1][1]:y; +} +} +} +if(bars){ +var vals=[]; +for(var j=0;j<_149.length;j++){ +vals[j]=[_149[j][0],_149[j][1][0],_149[j][1][1],_149[j][1][2]]; +} +this.layout_.addDataset(this.labels_[i-1],vals); +}else{ +this.layout_.addDataset(this.labels_[i-1],_149); +} +} +if(this.valueRange_!=null){ +this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); +}else{ +maxY*=1.1; +if(maxY<=0){ +maxY=1; +}else{ +var _155=Math.pow(10,Math.floor(Math.log(maxY)/Math.log(10))); +maxY=_155*Math.ceil(maxY/_155); +} +this.addYTicks_(0,maxY); +} +this.addXTicks_(); +this.layout_.evaluateWithError(); +this.plotter_.clear(); +this.plotter_.render(); +this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); }; - -/** - * Update the graph with new data. Data is in the format - * [ [date1, val1, val2, ...], [date2, val1, val2, ...] if errorBars=false - * or, if errorBars=true, - * [ [date1, [val1,stddev1], [val2,stddev2], ...], [date2, ...], ...] - * @param {Array.} data The data (see above) - * @private - */ -DateGraph.prototype.drawGraph_ = function(data) { - var maxY = null; - this.layout_.removeAllDatasets(); - // Loop over all fields in the dataset - for (var i = 1; i < data[0].length; i++) { - var series = []; - for (var j = 0; j < data.length; j++) { - var date = data[j][0]; - series[j] = [date, data[j][i]]; - } - series = this.rollingAverage(series, this.rollPeriod_); - - // Prune down to the desired range, if necessary (for zooming) - var bars = this.errorBars_ || this.customBars_; - if (this.dateWindow_) { - var low = this.dateWindow_[0]; - var high= this.dateWindow_[1]; - var pruned = []; - for (var k = 0; k < series.length; k++) { - if (series[k][0] >= low && series[k][0] <= high) { - pruned.push(series[k]); - var y = bars ? series[k][1][0] : series[k][1]; - if (maxY == null || y > maxY) maxY = y; - } - } - series = pruned; - } else { - for (var j = 0; j < series.length; j++) { - var y = bars ? series[j][1][0] : series[j][1]; - if (maxY == null || y > maxY) { - maxY = bars ? y + series[j][1][1] : y; - } - } - } - - if (bars) { - var vals = []; - for (var j=0; j=0){ +num-=_156[i-_157][1][0]; +den-=_156[i-_157][1][1]; +} +var date=_156[i][0]; +var _162=den?num/den:0; +if(this.errorBars_){ +if(this.wilsonInterval_){ +if(den){ +var p=_162<0?0:_162,n=den; +var pm=_159*Math.sqrt(p*(1-p)/n+_159*_159/(4*n*n)); +var _165=1+_159*_159/den; +var low=(p+_159*_159/(2*den)-pm)/_165; +var high=(p+_159*_159/(2*den)+pm)/_165; +_158[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; +}else{ +_158[i]=[date,[0,0,0]]; +} +}else{ +var _166=den?_159*Math.sqrt(_162*(1-_162)/den):1; +_158[i]=[date,[mult*_162,mult*_166,mult*_166]]; +} +}else{ +_158[i]=[date,mult*_162]; +} +} +}else{ +if(this.customBars_){ +for(var i=0;i<_156.length;i++){ +var data=_156[i][1]; +var y=data[1]; +_158[i]=[_156[i][0],[y,y-data[0],data[2]-y]]; +} +}else{ +var _167=Math.min(_157-1,_156.length-2); +if(!this.errorBars_){ +for(var i=0;i<_167;i++){ +var sum=0; +for(var j=0;j= 0) { - num -= originalData[i - rollPeriod][1][0]; - den -= originalData[i - rollPeriod][1][1]; - } - - var date = originalData[i][0]; - var value = den ? num / den : 0.0; - if (this.errorBars_) { - if (this.wilsonInterval_) { - // For more details on this confidence interval, see: - // http://en.wikipedia.org/wiki/Binomial_confidence_interval - if (den) { - var p = value < 0 ? 0 : value, n = den; - var pm = sigma * Math.sqrt(p*(1-p)/n + sigma*sigma/(4*n*n)); - var denom = 1 + sigma * sigma / den; - var low = (p + sigma * sigma / (2 * den) - pm) / denom; - var high = (p + sigma * sigma / (2 * den) + pm) / denom; - rollingData[i] = [date, - [p * mult, (p - low) * mult, (high - p) * mult]]; - } else { - rollingData[i] = [date, [0, 0, 0]]; - } - } else { - var stddev = den ? sigma * Math.sqrt(value * (1 - value) / den) : 1.0; - rollingData[i] = [date, [mult * value, mult * stddev, mult * stddev]]; - } - } else { - rollingData[i] = [date, mult * value]; - } - } - } else if (this.customBars_) { - // just ignore the rolling for now. - // TODO(danvk): do something reasonable. - for (var i = 0; i < originalData.length; i++) { - var data = originalData[i][1]; - var y = data[1]; - rollingData[i] = [originalData[i][0], [y, y - data[0], data[2] - y]]; - } - } else { - // Calculate the rolling average for the first rollPeriod - 1 points where - // there is not enough data to roll over the full number of days - var num_init_points = Math.min(rollPeriod - 1, originalData.length - 2); - if (!this.errorBars_){ - for (var i = 0; i < num_init_points; i++) { - var sum = 0; - for (var j = 0; j < i + 1; j++) - sum += originalData[j][1]; - rollingData[i] = [originalData[i][0], sum / (i + 1)]; - } - // Calculate the rolling average for the remaining points - for (var i = Math.min(rollPeriod - 1, originalData.length - 2); - i < originalData.length; - i++) { - var sum = 0; - for (var j = i - rollPeriod + 1; j < i + 1; j++) - sum += originalData[j][1]; - rollingData[i] = [originalData[i][0], sum / rollPeriod]; - } - } else { - for (var i = 0; i < num_init_points; i++) { - var sum = 0; - var variance = 0; - for (var j = 0; j < i + 1; j++) { - sum += originalData[j][1][0]; - variance += Math.pow(originalData[j][1][1], 2); - } - var stddev = Math.sqrt(variance)/(i+1); - rollingData[i] = [originalData[i][0], - [sum/(i+1), sigma * stddev, sigma * stddev]]; - } - // Calculate the rolling average for the remaining points - for (var i = Math.min(rollPeriod - 1, originalData.length - 2); - i < originalData.length; - i++) { - var sum = 0; - var variance = 0; - for (var j = i - rollPeriod + 1; j < i + 1; j++) { - sum += originalData[j][1][0]; - variance += Math.pow(originalData[j][1][1], 2); - } - var stddev = Math.sqrt(variance) / rollPeriod; - rollingData[i] = [originalData[i][0], - [sum / rollPeriod, sigma * stddev, sigma * stddev]]; - } - } - } - - return rollingData; +DateGraph.prototype.dateParser=function(_170){ +var _171; +if(_170.search("-")!=-1){ +_171=_170.replace("-","/","g"); +}else{ +if(_170.search("/")!=-1){ +return Date.parse(_170); +}else{ +_171=_170.substr(0,4)+"/"+_170.substr(4,2)+"/"+_170.substr(6,2); +} +} +return Date.parse(_171); }; - -/** - * Parses a date, returning the number of milliseconds since epoch. This can be - * passed in as an xValueParser in the DateGraph constructor. - * @param {String} A date in YYYYMMDD format. - * @return {Number} Milliseconds since epoch. - * @public - */ -DateGraph.prototype.dateParser = function(dateStr) { - var dateStrSlashed; - if (dateStr.search("-") != -1) { - dateStrSlashed = dateStr.replace("-", "/", "g"); - } else if (dateStr.search("/") != -1) { - return Date.parse(dateStr); - } else { - dateStrSlashed = dateStr.substr(0,4) + "/" + dateStr.substr(4,2) - + "/" + dateStr.substr(6,2); - } - return Date.parse(dateStrSlashed); +DateGraph.prototype.parseCSV_=function(data){ +var ret=[]; +var _173=data.split("\n"); +var _174=this.labelsFromCSV_?1:0; +if(this.labelsFromCSV_){ +var _175=_173[0].split(","); +_175.shift(); +this.labels_=_175; +this.setColors_(this.attrs_); +this.renderOptions_.colorScheme=this.colors_; +MochiKit.Base.update(this.plotter_.options,this.renderOptions_); +MochiKit.Base.update(this.layoutOptions_,this.attrs_); +} +for(var i=_174;i<_173.length;i++){ +var line=_173[i]; +if(line.length==0){ +continue; +} +var _177=line.split(","); +if(_177.length<2){ +continue; +} +var _178=[]; +_178[0]=this.xValueParser_(_177[0]); +if(this.fractions_){ +for(var j=1;j<_177.length;j++){ +var vals=_177[j].split("/"); +_178[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; +} +}else{ +if(this.errorBars_){ +for(var j=1;j<_177.length;j+=2){ +_178[(j+1)/2]=[parseFloat(_177[j]),parseFloat(_177[j+1])]; +} +}else{ +if(this.customBars_){ +for(var j=1;j<_177.length;j++){ +var vals=_177[j].split(";"); +_178[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; +} +}else{ +for(var j=1;j<_177.length;j++){ +_178[j]=parseFloat(_177[j]); +} +} +} +} +ret.push(_178); +} +return ret; }; - -/** - * Parses a string in a special csv format. We expect a csv file where each - * line is a date point, and the first field in each line is the date string. - * We also expect that all remaining fields represent series. - * if this.errorBars_ is set, then interpret the fields as: - * date, series1, stddev1, series2, stddev2, ... - * @param {Array.} data See above. - * @private - */ -DateGraph.prototype.parseCSV_ = function(data) { - var ret = []; - var lines = data.split("\n"); - var start = this.labelsFromCSV_ ? 1 : 0; - if (this.labelsFromCSV_) { - var labels = lines[0].split(","); - labels.shift(); // a "date" parameter is assumed. - this.labels_ = labels; - // regenerate automatic colors. - this.setColors_(this.attrs_); - this.renderOptions_.colorScheme = this.colors_; - MochiKit.Base.update(this.plotter_.options, this.renderOptions_); - MochiKit.Base.update(this.layoutOptions_, this.attrs_); - } - - for (var i = start; i < lines.length; i++) { - var line = lines[i]; - if (line.length == 0) continue; // skip blank lines - var inFields = line.split(','); - if (inFields.length < 2) - continue; - - var fields = []; - fields[0] = this.xValueParser_(inFields[0]); - - // If fractions are expected, parse the numbers as "A/B" - if (this.fractions_) { - for (var j = 1; j < inFields.length; j++) { - // TODO(danvk): figure out an appropriate way to flag parse errors. - var vals = inFields[j].split("/"); - fields[j] = [parseFloat(vals[0]), parseFloat(vals[1])]; - } - } else if (this.errorBars_) { - // If there are error bars, values are (value, stddev) pairs - for (var j = 1; j < inFields.length; j += 2) - fields[(j + 1) / 2] = [parseFloat(inFields[j]), - parseFloat(inFields[j + 1])]; - } else if (this.customBars_) { - // Bars are a low;center;high tuple - for (var j = 1; j < inFields.length; j++) { - var vals = inFields[j].split(";"); - fields[j] = [ parseFloat(vals[0]), - parseFloat(vals[1]), - parseFloat(vals[2]) ]; - } - } else { - // Values are just numbers - for (var j = 1; j < inFields.length; j++) - fields[j] = parseFloat(inFields[j]); - } - ret.push(fields); - } - return ret; +DateGraph.prototype.start_=function(){ +if(typeof this.file_=="function"){ +this.loadedEvent_(this.file_()); +}else{ +var req=new XMLHttpRequest(); +var _180=this; +req.onreadystatechange=function(){ +if(req.readyState==4){ +if(req.status==200){ +_180.loadedEvent_(req.responseText); +} +} }; - -/** - * Get the CSV data. If it's in a function, call that function. If it's in a - * file, do an XMLHttpRequest to get it. - * @private - */ -DateGraph.prototype.start_ = function() { - if (typeof this.file_ == 'function') { - // Stubbed out to allow this to run off a filesystem - this.loadedEvent_(this.file_()); - } else { - var req = new XMLHttpRequest(); - var caller = this; - req.onreadystatechange = function () { - if (req.readyState == 4) { - if (req.status == 200) { - caller.loadedEvent_(req.responseText); - } - } - }; - - req.open("GET", this.file_, true); - req.send(null); - } +req.open("GET",this.file_,true); +req.send(null); +} }; - -/** - * Changes various properties of the graph. These can include: - *
    - *
  • file: changes the source data for the graph
    • - *
  • errorBars: changes whether the data contains stddev
    • - *
- * @param {Object} attrs The new properties and values - */ -DateGraph.prototype.updateOptions = function(attrs) { - if (attrs.errorBars) { - this.errorBars_ = attrs.errorBars; - } - if (attrs.customBars) { - this.customBars_ = attrs.customBars; - } - if (attrs.strokeWidth) { - this.strokeWidth_ = attrs.strokeWidth; - } - if (attrs.rollPeriod) { - this.rollPeriod_ = attrs.rollPeriod; - } - if (attrs.dateWindow) { - this.dateWindow_ = attrs.dateWindow; - } - if (attrs.valueRange) { - this.valueRange_ = attrs.valueRange; - } - if (attrs.minTickSize) { - this.minTickSize_ = attrs.minTickSize; - } - if (typeof(attrs.labels) != 'undefined') { - this.labels_ = attrs.labels; - this.labelsFromCSV_ = (attrs.labels == null); - } - this.layout_.updateOptions({ 'errorBars': this.errorBars_ }); - if (attrs['file'] && attrs['file'] != this.file_) { - this.file_ = attrs['file']; - this.start_(); - } else { - this.drawGraph_(this.rawData_); - } +DateGraph.prototype.updateOptions=function(_181){ +if(_181.errorBars){ +this.errorBars_=_181.errorBars; +} +if(_181.customBars){ +this.customBars_=_181.customBars; +} +if(_181.strokeWidth){ +this.strokeWidth_=_181.strokeWidth; +} +if(_181.rollPeriod){ +this.rollPeriod_=_181.rollPeriod; +} +if(_181.dateWindow){ +this.dateWindow_=_181.dateWindow; +} +if(_181.valueRange){ +this.valueRange_=_181.valueRange; +} +if(_181.minTickSize){ +this.minTickSize_=_181.minTickSize; +} +if(typeof (_181.labels)!="undefined"){ +this.labels_=_181.labels; +this.labelsFromCSV_=(_181.labels==null); +} +this.layout_.updateOptions({"errorBars":this.errorBars_}); +if(_181["file"]&&_181["file"]!=this.file_){ +this.file_=_181["file"]; +this.start_(); +}else{ +this.drawGraph_(this.rawData_); +} }; - -/** - * Adjusts the number of days in the rolling average. Updates the graph to - * reflect the new averaging period. - * @param {Number} length Number of days over which to average the data. - */ -DateGraph.prototype.adjustRoll = function(length) { - this.rollPeriod_ = length; - this.drawGraph_(this.rawData_); +DateGraph.prototype.adjustRoll=function(_182){ +this.rollPeriod_=_182; +this.drawGraph_(this.rawData_); }; +