From: Dan Vanderkam Date: Wed, 16 Dec 2009 15:08:18 +0000 (-0800) Subject: switch to YUI compressor for making packed JS -- 49k -> 42k X-Git-Tag: v1.0.0~772 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;ds=sidebyside;h=f18986e594ec54f8402757b9c087f6a20d611b06;p=dygraphs.git switch to YUI compressor for making packed JS -- 49k -> 42k --- diff --git a/README b/README index f78b9ca..6248472 100644 --- a/README +++ b/README @@ -43,9 +43,11 @@ dygraphs uses: - rgbcolor.js (Public Domain) - strftime.js (BSD License) - excanvas.js (Apache License) + - YUI compressor (BSD License) rgbcolor: http://www.phpied.com/rgb-color-parser-in-javascript/ strftime: http://tech.bluesmoon.info/2008/04/strftime-in-javascript.html excanvas: http://code.google.com/p/explorercanvas/ +yui compressor: http://developer.yahoo.com/yui/compressor/ dygraphs is available under the MIT license, included in LICENSE.txt. diff --git a/custom_rhino.jar b/custom_rhino.jar deleted file mode 100644 index 4391990..0000000 Binary files a/custom_rhino.jar and /dev/null differ diff --git a/dygraph-combined.js b/dygraph-combined.js index ffb56fb..0ac3e08 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -1,1824 +1 @@ -Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(x,pad,r){if(typeof (r)=="undefined"){r=10}for(;parseInt(x,10)1;r/=10){x=pad.toString()+x}return x.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(d){return Date.ext.locales[d.locale].a[d.getDay()]},A:function(d){return Date.ext.locales[d.locale].A[d.getDay()]},b:function(d){return Date.ext.locales[d.locale].b[d.getMonth()]},B:function(d){return Date.ext.locales[d.locale].B[d.getMonth()]},c:"toLocaleString",C:function(d){return Date.ext.util.xPad(parseInt(d.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(d){return Date.ext.util.xPad(parseInt(Date.ext.util.G(d)/100,10),0)},G:function(d){var y=d.getFullYear();var V=parseInt(Date.ext.formats.V(d),10);var W=parseInt(Date.ext.formats.W(d),10);if(W>V){y++}else{if(W===0&&V>=52){y--}}return y},H:["getHours","0"],I:function(d){var I=d.getHours()%12;return Date.ext.util.xPad(I===0?12:I,0)},j:function(d){var ms=d-new Date(""+d.getFullYear()+"/1/1 GMT");ms+=d.getTimezoneOffset()*60000;var doy=parseInt(ms/60000/60/24,10)+1;return Date.ext.util.xPad(doy,0,100)},m:function(d){return Date.ext.util.xPad(d.getMonth()+1,0)},M:["getMinutes","0"],p:function(d){return Date.ext.locales[d.locale].p[d.getHours()>=12?1:0]},P:function(d){return Date.ext.locales[d.locale].P[d.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(d){var dow=d.getDay();return dow===0?7:dow},U:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=6-d.getDay();var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0)},V:function(d){var woy=parseInt(Date.ext.formats.W(d),10);var dow1_1=(new Date(""+d.getFullYear()+"/1/1")).getDay();var idow=woy+(dow1_1>4||dow1_1<=1?0:1);if(idow==53&&(new Date(""+d.getFullYear()+"/12/31")).getDay()<4){idow=1}else{if(idow===0){idow=Date.ext.formats.V(new Date(""+(d.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(idow,0)},w:"getDay",W:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=7-Date.ext.formats.u(d);var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0,10)},y:function(d){return Date.ext.util.xPad(d.getFullYear()%100,0)},Y:"getFullYear",z:function(d){var o=d.getTimezoneOffset();var H=Date.ext.util.xPad(parseInt(Math.abs(o/60),10),0);var M=Date.ext.util.xPad(o%60,0);return(o>0?"-":"+")+H+M},Z:function(d){return d.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(d){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(fmt){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var d=this;while(fmt.match(/%[cDhnrRtTxXzZ]/)){fmt=fmt.replace(/%([cDhnrRtTxXzZ])/g,function(m0,m1){var f=Date.ext.aggregates[m1];return(f=="locale"?Date.ext.locales[d.locale][m1]:f)})}var str=fmt.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(m0,m1){var f=Date.ext.formats[m1];if(typeof (f)=="string"){return d[f]()}else{if(typeof (f)=="function"){return f.call(d,d)}else{if(typeof (f)=="object"&&typeof (f[0])=="string"){return Date.ext.util.xPad(d[f[0]](),f[1])}else{return m1}}}});d=null;return str}; -DygraphLayout=function(_1,_2){ -this.dygraph_=_1; -this.options={}; -Dygraph.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; -if(this.options.dateWindow){ -this.minxval=this.options.dateWindow[0]; -this.maxxval=this.options.dateWindow[1]; -}else{ -for(var _6 in this.datasets){ -if(!this.datasets.hasOwnProperty(_6)){ -continue; -} -var _7=this.datasets[_6]; -var x1=_7[0][0]; -if(!this.minxval||x1this.maxxval){ -this.maxxval=x2; -} -} -} -this.xrange=this.maxxval-this.minxval; -this.xscale=(this.xrange!=0?1/this.xrange:1); -this.minyval=this.options.yAxis[0]; -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){ -if(!this.datasets.hasOwnProperty(_10)){ -continue; -} -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.evaluateWithError=function(){ -this.evaluate(); -if(!this.options.errorBars){ -return; -} -var i=0; -for(var _19 in this.datasets){ -if(!this.datasets.hasOwnProperty(_19)){ -continue; -} -var j=0; -var _20=this.datasets[_19]; -for(var j=0;j<_20.length;j++,i++){ -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(_21[2]); -this.points[i].errorPlus=parseFloat(_21[3]); -} -} -} -}; -DygraphLayout.prototype.removeAllDatasets=function(){ -delete this.datasets; -this.datasets=new Array(); -}; -DygraphLayout.prototype.updateOptions=function(_24){ -Dygraph.update(this.options,_24?_24:{}); -}; -DygraphCanvasRenderer=function(_25,_26,_27,_28){ -this.dygraph_=_25; -this.options={"strokeWidth":0.5,"drawXAxis":true,"drawYAxis":true,"axisLineColor":"black","axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":"black","axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"drawYGrid":true,"drawXGrid":true,"gridLineColor":"rgb(128,128,128)"}; -Dygraph.update(this.options,_28); -this.layout=_27; -this.element=_26; -this.container=this.element.parentNode; -this.height=this.element.height; -this.width=this.element.width; -if(!this.isIE&&!(DygraphCanvasRenderer.isSupported(this.element))){ -throw "Canvas is not supported."; -} -this.xlabels=new Array(); -this.ylabels=new Array(); -this.area={x:this.options.yAxisLabelWidth+2*this.options.axisTickSize,y:0}; -this.area.w=this.width-this.area.x-this.options.rightGap; -this.area.h=this.height-this.options.axisLabelFontSize-2*this.options.axisTickSize; -this.container.style.position="relative"; -this.container.style.width=this.width+"px"; -}; -DygraphCanvasRenderer.prototype.clear=function(){ -if(this.isIE){ -try{ -if(this.clearDelay){ -this.clearDelay.cancel(); -this.clearDelay=null; -} -var _29=this.element.getContext("2d"); -} -catch(e){ -this.clearDelay=MochiKit.Async.wait(this.IEDelay); -this.clearDelay.addCallback(bind(this.clear,this)); -return; -} -} -var _29=this.element.getContext("2d"); -_29.clearRect(0,0,this.width,this.height); -for(var i=0;i0){ -for(var i=0;ithis.height){ -_47.style.bottom="0px"; -}else{ -_47.style.top=top+"px"; -} -_47.style.left="0px"; -_47.style.textAlign="right"; -_47.style.width=this.options.yAxisLabelWidth+"px"; -this.container.appendChild(_47); -this.ylabels.push(_47); -} -var _49=this.ylabels[0]; -var _50=this.options.axisLabelFontSize; -var _51=parseInt(_49.style.top)+_50; -if(_51>this.height-_50){ -_49.style.top=(parseInt(_49.style.top)-_50/2)+"px"; -} -} -_40.beginPath(); -_40.moveTo(this.area.x,this.area.y); -_40.lineTo(this.area.x,this.area.y+this.area.h); -_40.closePath(); -_40.stroke(); -} -if(this.options.drawXAxis){ -if(this.layout.xticks){ -for(var i=0;ithis.width){ -_52=this.width-this.options.xAxisLabelWidth; -_47.style.textAlign="right"; -} -if(_52<0){ -_52=0; -_47.style.textAlign="left"; -} -_47.style.left=_52+"px"; -_47.style.width=this.options.xAxisLabelWidth+"px"; -this.container.appendChild(_47); -this.xlabels.push(_47); -} -} -_40.beginPath(); -_40.moveTo(this.area.x,this.area.y+this.area.h); -_40.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); -_40.closePath(); -_40.stroke(); -} -_40.restore(); -}; -DygraphCanvasRenderer.prototype._renderLineChart=function(){ -var _53=this.element.getContext("2d"); -var _54=this.options.colorScheme.length; -var _55=this.options.colorScheme; -var _56=this.layout.options.errorBars; -var _57=[]; -for(var _58 in this.layout.datasets){ -if(this.layout.datasets.hasOwnProperty(_58)){ -_57.push(_58); -} -} -var _59=_57.length; -for(var i=0;i=0){ -ctx.moveTo(_64,_65[0]); -ctx.lineTo(_60.canvasx,_70[0]); -ctx.lineTo(_60.canvasx,_70[1]); -ctx.lineTo(_64,_65[1]); -ctx.closePath(); -} -_65[0]=_70[0]; -_65[1]=_70[1]; -_64=_60.canvasx; -} -} -ctx.fill(); -} -} -for(var i=0;i<_59;i++){ -var _62=_57[i]; -var _63=_55[i%_54]; -_53.save(); -var _60=this.layout.points[0]; -var _71=this.dygraph_.attr_("pointSize"); -var _64=null,prevY=null; -var _72=this.dygraph_.attr_("drawPoints"); -var _73=this.layout.points; -for(var j=0;j<_73.length;j++){ -var _60=_73[j]; -if(_60.name==_62){ -if(!_61(_60.canvasy)){ -_64=prevY=null; -}else{ -var _74=(!_64&&(j==_73.length-1||!_61(_73[j+1].canvasy))); -if(!_64){ -_64=_60.canvasx; -prevY=_60.canvasy; -}else{ -ctx.beginPath(); -ctx.strokeStyle=_63; -ctx.lineWidth=this.options.strokeWidth; -ctx.moveTo(_64,prevY); -_64=_60.canvasx; -prevY=_60.canvasy; -ctx.lineTo(_64,prevY); -ctx.stroke(); -} -if(_72||_74){ -ctx.beginPath(); -ctx.fillStyle=_63; -ctx.arc(_60.canvasx,_60.canvasy,_71,0,2*Math.PI,false); -ctx.fill(); -} -} -} -} -} -_53.restore(); -}; -Dygraph=function(div,_75,_76){ -if(arguments.length>0){ -if(arguments.length==4){ -this.warn("Using deprecated four-argument dygraph constructor"); -this.__old_init__(div,_75,arguments[2],arguments[3]); -}else{ -this.__init__(div,_75,_76); -} -} -}; -Dygraph.NAME="Dygraph"; -Dygraph.VERSION="1.2"; -Dygraph.__repr__=function(){ -return "["+this.NAME+" "+this.VERSION+"]"; -}; -Dygraph.toString=function(){ -return this.__repr__(); -}; -Dygraph.DEFAULT_ROLL_PERIOD=1; -Dygraph.DEFAULT_WIDTH=480; -Dygraph.DEFAULT_HEIGHT=320; -Dygraph.AXIS_LINE_WIDTH=0.3; -Dygraph.DEFAULT_ATTRS={highlightCircleSize:3,pixelsPerXLabel:60,pixelsPerYLabel:30,labelsDivWidth:250,labelsDivStyles:{},labelsSeparateLines:false,labelsKMB:false,labelsKMG2:false,strokeWidth:1,axisTickSize:3,axisLabelFontSize:14,xAxisLabelWidth:50,yAxisLabelWidth:50,rightGap:5,showRoller:false,xValueFormatter:Dygraph.dateString_,xValueParser:Dygraph.dateParser,xTicker:Dygraph.dateTicker,delimiter:",",sigma:2,errorBars:false,fractions:false,wilsonInterval:true,customBars:false}; -Dygraph.DEBUG=1; -Dygraph.INFO=2; -Dygraph.WARNING=3; -Dygraph.ERROR=3; -Dygraph.prototype.__old_init__=function(div,_77,_78,_79){ -if(_78!=null){ -var _80=["Date"]; -for(var i=0;i<_78.length;i++){ -_80.push(_78[i]); -} -Dygraph.update(_79,{"labels":_80}); -} -this.__init__(div,_77,_79); -}; -Dygraph.prototype.__init__=function(div,_81,_82){ -if(_82==null){ -_82={}; -} -this.maindiv_=div; -this.file_=_81; -this.rollPeriod_=_82.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; -this.previousVerticalX_=-1; -this.fractions_=_82.fractions||false; -this.dateWindow_=_82.dateWindow||null; -this.valueRange_=_82.valueRange||null; -this.wilsonInterval_=_82.wilsonInterval||true; -div.innerHTML=""; -if(div.style.width==""){ -div.style.width=Dygraph.DEFAULT_WIDTH+"px"; -} -if(div.style.height==""){ -div.style.height=Dygraph.DEFAULT_HEIGHT+"px"; -} -this.width_=parseInt(div.style.width,10); -this.height_=parseInt(div.style.height,10); -this.user_attrs_={}; -Dygraph.update(this.user_attrs_,_82); -this.attrs_={}; -Dygraph.update(this.attrs_,Dygraph.DEFAULT_ATTRS); -this.labelsFromCSV_=(this.attr_("labels")==null); -this.createInterface_(); -this.start_(); -}; -Dygraph.prototype.attr_=function(_83){ -if(typeof (this.user_attrs_[_83])!="undefined"){ -return this.user_attrs_[_83]; -}else{ -if(typeof (this.attrs_[_83])!="undefined"){ -return this.attrs_[_83]; -}else{ -return null; -} -} -}; -Dygraph.prototype.log=function(_84,_85){ -if(typeof (console)!="undefined"){ -switch(_84){ -case Dygraph.DEBUG: -console.debug("dygraphs: "+_85); -break; -case Dygraph.INFO: -console.info("dygraphs: "+_85); -break; -case Dygraph.WARNING: -console.warn("dygraphs: "+_85); -break; -case Dygraph.ERROR: -console.error("dygraphs: "+_85); -break; -} -} -}; -Dygraph.prototype.info=function(_86){ -this.log(Dygraph.INFO,_86); -}; -Dygraph.prototype.warn=function(_87){ -this.log(Dygraph.WARNING,_87); -}; -Dygraph.prototype.error=function(_88){ -this.log(Dygraph.ERROR,_88); -}; -Dygraph.prototype.rollPeriod=function(){ -return this.rollPeriod_; -}; -Dygraph.addEvent=function(el,evt,fn){ -var _91=function(e){ -if(!e){ -var e=window.event; -} -fn(e); -}; -if(window.addEventListener){ -el.addEventListener(evt,_91,false); -}else{ -el.attachEvent("on"+evt,_91); -} -}; -Dygraph.prototype.createInterface_=function(){ -var _93=this.maindiv_; -this.graphDiv=document.createElement("div"); -this.graphDiv.style.width=this.width_+"px"; -this.graphDiv.style.height=this.height_+"px"; -_93.appendChild(this.graphDiv); -this.canvas_=Dygraph.createCanvas(); -this.canvas_.style.position="absolute"; -this.canvas_.width=this.width_; -this.canvas_.height=this.height_; -this.canvas_.style.width=this.width_+"px"; -this.canvas_.style.height=this.height_+"px"; -this.graphDiv.appendChild(this.canvas_); -this.hidden_=this.createPlotKitCanvas_(this.canvas_); -var _94=this; -Dygraph.addEvent(this.hidden_,"mousemove",function(e){ -_94.mouseMove_(e); -}); -Dygraph.addEvent(this.hidden_,"mouseout",function(e){ -_94.mouseOut_(e); -}); -this.layoutOptions_={"xOriginIsZero":false}; -Dygraph.update(this.layoutOptions_,this.attrs_); -Dygraph.update(this.layoutOptions_,this.user_attrs_); -Dygraph.update(this.layoutOptions_,{"errorBars":(this.attr_("errorBars")||this.attr_("customBars"))}); -this.layout_=new DygraphLayout(this,this.layoutOptions_); -this.renderOptions_={colorScheme:this.colors_,strokeColor:null,axisLineWidth:Dygraph.AXIS_LINE_WIDTH}; -Dygraph.update(this.renderOptions_,this.attrs_); -Dygraph.update(this.renderOptions_,this.user_attrs_); -this.plotter_=new DygraphCanvasRenderer(this,this.hidden_,this.layout_,this.renderOptions_); -this.createStatusMessage_(); -this.createRollInterface_(); -this.createDragInterface_(); -}; -Dygraph.prototype.createPlotKitCanvas_=function(_95){ -var h=Dygraph.createCanvas(); -h.style.position="absolute"; -h.style.top=_95.style.top; -h.style.left=_95.style.left; -h.width=this.width_; -h.height=this.height_; -h.style.width=this.width_+"px"; -h.style.height=this.height_+"px"; -this.graphDiv.appendChild(h); -return h; -}; -Dygraph.hsvToRGB=function(hue,_98,_99){ -var red; -var _101; -var blue; -if(_98===0){ -red=_99; -_101=_99; -blue=_99; -}else{ -var i=Math.floor(hue*6); -var f=(hue*6)-i; -var p=_99*(1-_98); -var q=_99*(1-(_98*f)); -var t=_99*(1-(_98*(1-f))); -switch(i){ -case 1: -red=q; -_101=_99; -blue=p; -break; -case 2: -red=p; -_101=_99; -blue=t; -break; -case 3: -red=p; -_101=q; -blue=_99; -break; -case 4: -red=t; -_101=p; -blue=_99; -break; -case 5: -red=_99; -_101=p; -blue=q; -break; -case 6: -case 0: -red=_99; -_101=t; -blue=p; -break; -} -} -red=Math.floor(255*red+0.5); -_101=Math.floor(255*_101+0.5); -blue=Math.floor(255*blue+0.5); -return "rgb("+red+","+_101+","+blue+")"; -}; -Dygraph.prototype.setColors_=function(){ -var num=this.attr_("labels").length-1; -this.colors_=[]; -var _108=this.attr_("colors"); -if(!_108){ -var sat=this.attr_("colorSaturation")||1; -var val=this.attr_("colorValue")||0.5; -for(var i=1;i<=num;i++){ -var hue=(1*i/(1+num)); -this.colors_.push(Dygraph.hsvToRGB(hue,sat,val)); -} -}else{ -for(var i=0;i=10){ -self.doZoom_(Math.min(_128,_130),Math.max(_128,_130)); -}else{ -self.canvas_.getContext("2d").clearRect(0,0,self.canvas_.width,self.canvas_.height); -} -_128=null; -_129=null; -} -if(_127){ -_127=false; -_133=null; -_134=null; -} -}); -Dygraph.addEvent(this.hidden_,"dblclick",function(_146){ -if(self.dateWindow_==null){ -return; -} -self.dateWindow_=null; -self.drawGraph_(self.rawData_); -var _147=self.rawData_[0][0]; -var _148=self.rawData_[self.rawData_.length-1][0]; -if(self.attr_("zoomCallback")){ -self.attr_("zoomCallback")(_147,_148); -} -}); -}; -Dygraph.prototype.drawZoomRect_=function(_149,endX,_151){ -var ctx=this.canvas_.getContext("2d"); -if(_151){ -ctx.clearRect(Math.min(_149,_151),0,Math.abs(_149-_151),this.height_); -} -if(endX&&_149){ -ctx.fillStyle="rgba(128,128,128,0.33)"; -ctx.fillRect(Math.min(_149,endX),0,Math.abs(endX-_149),this.height_); -} -}; -Dygraph.prototype.doZoom_=function(lowX,_153){ -var _154=this.layout_.points; -var _155=null; -var _156=null; -for(var i=0;i<_154.length;i++){ -var cx=_154[i].canvasx; -var x=_154[i].xval; -if(cx_155)){ -_155=x; -} -if(cx>_153&&(_156==null||x<_156)){ -_156=x; -} -} -if(_155==null){ -_155=_154[0].xval; -} -if(_156==null){ -_156=_154[_154.length-1].xval; -} -this.dateWindow_=[_155,_156]; -this.drawGraph_(this.rawData_); -if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_155,_156); -} -}; -Dygraph.prototype.mouseMove_=function(_158){ -var _159=Dygraph.pageX(_158)-Dygraph.findPosX(this.hidden_); -var _160=this.layout_.points; -var _161=-1; -var _162=-1; -var _163=1e+100; -var idx=-1; -for(var i=0;i<_160.length;i++){ -var dist=Math.abs(_160[i].canvasx-_159); -if(dist>_163){ -break; -} -_163=dist; -idx=i; -} -if(idx>=0){ -_161=_160[idx].xval; -} -if(_159>_160[_160.length-1].canvasx){ -_161=_160[_160.length-1].xval; -} -this.selPoints_=[]; -for(var i=0;i<_160.length;i++){ -if(_160[i].xval==_161){ -this.selPoints_.push(_160[i]); -} -} -if(this.attr_("highlightCallback")){ -this.attr_("highlightCallback")(_158,_161,this.selPoints_); -} -var _166=this.attr_("highlightCircleSize"); -var ctx=this.canvas_.getContext("2d"); -if(this.previousVerticalX_>=0){ -var px=this.previousVerticalX_; -ctx.clearRect(px-_166-1,0,2*_166+2,this.height_); -} -var isOK=function(x){ -return x&&!isNaN(x); -}; -if(this.selPoints_.length>0){ -var _159=this.selPoints_[0].canvasx; -var _168=this.attr_("xValueFormatter")(_161,this)+":"; -var clen=this.colors_.length; -for(var i=0;i"+_170.name+":"+this.round_(_170.yval,2); -} -this.attr_("labelsDiv").innerHTML=_168; -this.lastx_=_161; -ctx.save(); -for(var i=0;i=Dygraph.DAILY){ -_198.push({v:t,label:new Date(t+3600*1000).strftime(_200)}); -}else{ -_198.push({v:t,label:this.hmsString_(t)}); -} -} -}else{ -var _201; -var _202=1; -if(_197==Dygraph.MONTHLY){ -_201=[0,1,2,3,4,5,6,7,8,9,10,11,12]; -}else{ -if(_197==Dygraph.QUARTERLY){ -_201=[0,3,6,9]; -}else{ -if(_197==Dygraph.BIANNUAL){ -_201=[0,6]; -}else{ -if(_197==Dygraph.ANNUAL){ -_201=[0]; -}else{ -if(_197==Dygraph.DECADAL){ -_201=[0]; -_202=10; -} -} -} -} -} -var _203=new Date(_195).getFullYear(); -var _204=new Date(_196).getFullYear(); -var _205=Dygraph.zeropad; -for(var i=_203;i<=_204;i++){ -if(i%_202!=0){ -continue; -} -for(var j=0;j<_201.length;j++){ -var _206=i+"/"+_205(1+_201[j])+"/01"; -var t=Date.parse(_206); -if(t<_195||t>_196){ -continue; -} -_198.push({v:t,label:new Date(t).strftime("%b %y")}); -} -} -} -return _198; -}; -Dygraph.dateTicker=function(_207,_208,self){ -var _209=-1; -for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_209=i; -break; -} -} -if(_209>=0){ -return self.GetXAxis(_207,_208,_209); -}else{ -} -}; -Dygraph.numericTicks=function(minV,maxV,self){ -if(self.attr_("labelsKMG2")){ -var _213=[1,2,4,8]; -}else{ -var _213=[1,2,5]; -} -var _214,low_val,high_val,nTicks; -var _215=self.attr_("pixelsPerYLabel"); -for(var i=-10;i<50;i++){ -if(self.attr_("labelsKMG2")){ -var _216=Math.pow(16,i); -}else{ -var _216=Math.pow(10,i); -} -for(var j=0;j<_213.length;j++){ -_214=_216*_213[j]; -low_val=Math.floor(minV/_214)*_214; -high_val=Math.ceil(maxV/_214)*_214; -nTicks=(high_val-low_val)/_214; -var _217=self.height_/nTicks; -if(_217>_215){ -break; -} -} -if(_217>_215){ -break; -} -} -var _218=[]; -var k; -var _220=[]; -if(self.attr_("labelsKMB")){ -k=1000; -_220=["K","M","B","T"]; -} -if(self.attr_("labelsKMG2")){ -if(k){ -self.warn("Setting both labelsKMB and labelsKMG2. Pick one!"); -} -k=1024; -_220=["k","M","G","T"]; -} -for(var i=0;i=0;j--,n/=k){ -if(_222>=n){ -_223=self.round_(_221/n,1)+_220[j]; -break; -} -} -} -_218.push({label:_223,v:_221}); -} -return _218; -}; -Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _227=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_227}); -}; -Dygraph.prototype.extremeValues_=function(_228){ -var minY=null,maxY=null; -var bars=this.attr_("errorBars")||this.attr_("customBars"); -if(bars){ -for(var j=0;j<_228.length;j++){ -var y=_228[j][1][0]; -if(!y){ -continue; -} -var low=y-_228[j][1][1]; -var high=y+_228[j][1][2]; -if(low>y){ -low=y; -} -if(highmaxY){ -maxY=high; -} -if(minY==null||lowmaxY){ -maxY=y; -} -if(minY==null||y=low&&_232[k][0]<=high){ -_233.push(_232[k]); -} -} -_232=_233; -} -var _234=this.extremeValues_(_232); -var _235=_234[0]; -var _236=_234[1]; -if(!minY||_235maxY){ -maxY=_236; -} -if(bars){ -var vals=[]; -for(var j=0;j<_232.length;j++){ -vals[j]=[_232[j][0],_232[j][1][0],_232[j][1][1],_232[j][1][2]]; -} -this.layout_.addDataset(this.attr_("labels")[i],vals); -}else{ -this.layout_.addDataset(this.attr_("labels")[i],_232); -} -} -if(this.valueRange_!=null){ -this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); -}else{ -var span=maxY-minY; -var _239=maxY+0.1*span; -var _240=minY-0.1*span; -if(_240<0&&minY>=0){ -_240=0; -} -if(_239>0&&maxY<=0){ -_239=0; -} -if(this.attr_("includeZero")){ -if(maxY<0){ -_239=0; -} -if(minY>0){ -_240=0; -} -} -this.addYTicks_(_240,_239); -} -this.addXTicks_(); -this.layout_.updateOptions({dateWindow:this.dateWindow_}); -this.layout_.evaluateWithError(); -this.plotter_.clear(); -this.plotter_.render(); -this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); -}; -Dygraph.prototype.rollingAverage=function(_241,_242){ -if(_241.length<2){ -return _241; -} -var _242=Math.min(_242,_241.length-1); -var _243=[]; -var _244=this.attr_("sigma"); -if(this.fractions_){ -var num=0; -var den=0; -var mult=100; -for(var i=0;i<_241.length;i++){ -num+=_241[i][1][0]; -den+=_241[i][1][1]; -if(i-_242>=0){ -num-=_241[i-_242][1][0]; -den-=_241[i-_242][1][1]; -} -var date=_241[i][0]; -var _247=den?num/den:0; -if(this.attr_("errorBars")){ -if(this.wilsonInterval_){ -if(den){ -var p=_247<0?0:_247,n=den; -var pm=_244*Math.sqrt(p*(1-p)/n+_244*_244/(4*n*n)); -var _249=1+_244*_244/den; -var low=(p+_244*_244/(2*den)-pm)/_249; -var high=(p+_244*_244/(2*den)+pm)/_249; -_243[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; -}else{ -_243[i]=[date,[0,0,0]]; -} -}else{ -var _250=den?_244*Math.sqrt(_247*(1-_247)/den):1; -_243[i]=[date,[mult*_247,mult*_250,mult*_250]]; -} -}else{ -_243[i]=[date,mult*_247]; -} -} -}else{ -if(this.attr_("customBars")){ -var low=0; -var mid=0; -var high=0; -var _252=0; -for(var i=0;i<_241.length;i++){ -var data=_241[i][1]; -var y=data[1]; -_243[i]=[_241[i][0],[y,y-data[0],data[2]-y]]; -if(y!=null&&!isNaN(y)){ -low+=data[0]; -mid+=y; -high+=data[2]; -_252+=1; -} -if(i-_242>=0){ -var prev=_241[i-_242]; -if(prev[1][1]!=null&&!isNaN(prev[1][1])){ -low-=prev[1][0]; -mid-=prev[1][1]; -high-=prev[1][2]; -_252-=1; -} -} -_243[i]=[_241[i][0],[1*mid/_252,1*(mid-low)/_252,1*(high-mid)/_252]]; -} -}else{ -var _254=Math.min(_242-1,_241.length-2); -if(!this.attr_("errorBars")){ -if(_242==1){ -return _241; -} -for(var i=0;i<_241.length;i++){ -var sum=0; -var _256=0; -for(var j=Math.max(0,i-_242+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_261=true; -}else{ -if(str.length==8&&str>"19700101"&&str<"20371231"){ -_261=true; -} -} -if(_261){ -this.attrs_.xValueFormatter=Dygraph.dateString_; -this.attrs_.xValueParser=Dygraph.dateParser; -this.attrs_.xTicker=Dygraph.dateTicker; -}else{ -this.attrs_.xValueFormatter=function(x){ -return x; -}; -this.attrs_.xValueParser=function(x){ -return parseFloat(x); -}; -this.attrs_.xTicker=Dygraph.numericTicks; -} -}; -Dygraph.prototype.parseCSV_=function(data){ -var ret=[]; -var _262=data.split("\n"); -var _263=this.attr_("delimiter"); -if(_262[0].indexOf(_263)==-1&&_262[0].indexOf("\t")>=0){ -_263="\t"; -} -var _264=0; -if(this.labelsFromCSV_){ -_264=1; -this.attrs_.labels=_262[0].split(_263); -} -var _265; -var _266=false; -var _267=this.attr_("labels").length; -for(var i=_264;i<_262.length;i++){ -var line=_262[i]; -if(line.length==0){ -continue; -} -if(line[0]=="#"){ -continue; -} -var _269=line.split(_263); -if(_269.length<2){ -continue; -} -var _270=[]; -if(!_266){ -this.detectTypeFromString_(_269[0]); -_265=this.attr_("xValueParser"); -_266=true; -} -_270[0]=_265(_269[0],this); -if(this.fractions_){ -for(var j=1;j<_269.length;j++){ -var vals=_269[j].split("/"); -_270[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; -} -}else{ -if(this.attr_("errorBars")){ -for(var j=1;j<_269.length;j+=2){ -_270[(j+1)/2]=[parseFloat(_269[j]),parseFloat(_269[j+1])]; -} -}else{ -if(this.attr_("customBars")){ -for(var j=1;j<_269.length;j++){ -var vals=_269[j].split(";"); -_270[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; -} -}else{ -for(var j=1;j<_269.length;j++){ -_270[j]=parseFloat(_269[j]); -} -} -} -} -ret.push(_270); -if(_270.length!=_267){ -this.error("Number of columns in line "+i+" ("+_270.length+") does not agree with number of labels ("+_267+") "+line); -} -} -return ret; -}; -Dygraph.prototype.parseArray_=function(data){ -if(data.length==0){ -this.error("Can't plot empty data set"); -return null; -} -if(data[0].length==0){ -this.error("Data set cannot contain an empty row"); -return null; -} -if(this.attr_("labels")==null){ -this.warn("Using default labels. Set labels explicitly via 'labels' "+"in the options parameter"); -this.attrs_.labels=["X"]; -for(var i=1;i=0){ -this.loadedEvent_(this.file_); -}else{ -var req=new XMLHttpRequest(); -var _281=this; -req.onreadystatechange=function(){ -if(req.readyState==4){ -if(req.status==200){ -_281.loadedEvent_(req.responseText); -} -} -}; -req.open("GET",this.file_,true); -req.send(null); -} -}else{ -this.error("Unknown data format: "+(typeof this.file_)); -} -} -} -} -}; -Dygraph.prototype.updateOptions=function(_282){ -if(_282.rollPeriod){ -this.rollPeriod_=_282.rollPeriod; -} -if(_282.dateWindow){ -this.dateWindow_=_282.dateWindow; -} -if(_282.valueRange){ -this.valueRange_=_282.valueRange; -} -Dygraph.update(this.user_attrs_,_282); -this.labelsFromCSV_=(this.attr_("labels")==null); -this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_282["file"]&&_282["file"]!=this.file_){ -this.file_=_282["file"]; -this.start_(); -}else{ -this.drawGraph_(this.rawData_); -} -}; -Dygraph.prototype.resize=function(_283,_284){ -if((_283===null)!=(_284===null)){ -this.warn("Dygraph.resize() should be called with zero parameters or "+"two non-NULL parameters. Pretending it was zero."); -_283=_284=null; -} -this.maindiv_.innerHTML=""; -this.attrs_.labelsDiv=null; -if(_283){ -this.maindiv_.style.width=_283+"px"; -this.maindiv_.style.height=_284+"px"; -this.width_=_283; -this.height_=_284; -}else{ -this.width_=this.maindiv_.offsetWidth; -this.height_=this.maindiv_.offsetHeight; -} -this.createInterface_(); -this.drawGraph_(this.rawData_); -}; -Dygraph.prototype.adjustRoll=function(_285){ -this.rollPeriod_=_285; -this.drawGraph_(this.rawData_); -}; -Dygraph.createCanvas=function(){ -var _286=document.createElement("canvas"); -isIE=(/MSIE/.test(navigator.userAgent)&&!window.opera); -if(isIE){ -_286=G_vmlCanvasManager.initElement(_286); -} -return _286; -}; -Dygraph.GVizChart=function(_287){ -this.container=_287; -}; -Dygraph.GVizChart.prototype.draw=function(data,_288){ -this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_288); -}; -DateGraph=Dygraph; -function RGBColor(_289){ -this.ok=false; -if(_289.charAt(0)=="#"){ -_289=_289.substr(1,6); -} -_289=_289.replace(/ /g,""); -_289=_289.toLowerCase(); -var _290={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"}; -for(var key in _290){ -if(_289==key){ -_289=_290[key]; -} -} -var _292=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(bits){ -return [parseInt(bits[1]),parseInt(bits[2]),parseInt(bits[3])]; -}},{re:/^(\w{2})(\w{2})(\w{2})$/,example:["#00ff00","336699"],process:function(bits){ -return [parseInt(bits[1],16),parseInt(bits[2],16),parseInt(bits[3],16)]; -}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(bits){ -return [parseInt(bits[1]+bits[1],16),parseInt(bits[2]+bits[2],16),parseInt(bits[3]+bits[3],16)]; -}}]; -for(var i=0;i<_292.length;i++){ -var re=_292[i].re; -var _295=_292[i].process; -var bits=re.exec(_289); -if(bits){ -channels=_295(bits); -this.r=channels[0]; -this.g=channels[1]; -this.b=channels[2]; -this.ok=true; -} -} -this.r=(this.r<0||isNaN(this.r))?0:((this.r>255)?255:this.r); -this.g=(this.g<0||isNaN(this.g))?0:((this.g>255)?255:this.g); -this.b=(this.b<0||isNaN(this.b))?0:((this.b>255)?255:this.b); -this.toRGB=function(){ -return "rgb("+this.r+", "+this.g+", "+this.b+")"; -}; -this.toHex=function(){ -var r=this.r.toString(16); -var g=this.g.toString(16); -var b=this.b.toString(16); -if(r.length==1){ -r="0"+r; -} -if(g.length==1){ -g="0"+g; -} -if(b.length==1){ -b="0"+b; -} -return "#"+r+g+b; -}; -} - +DygraphLayout=function(b,a){this.dygraph_=b;this.options={};Dygraph.update(this.options,a?a:{});this.datasets=new Array()};DygraphLayout.prototype.attr_=function(a){return this.dygraph_.attr_(a)};DygraphLayout.prototype.addDataset=function(a,b){this.datasets[a]=b};DygraphLayout.prototype.evaluate=function(){this._evaluateLimits();this._evaluateLineCharts();this._evaluateLineTicks()};DygraphLayout.prototype._evaluateLimits=function(){this.minxval=this.maxxval=null;if(this.options.dateWindow){this.minxval=this.options.dateWindow[0];this.maxxval=this.options.dateWindow[1]}else{for(var c in this.datasets){if(!this.datasets.hasOwnProperty(c)){continue}var d=this.datasets[c];var b=d[0][0];if(!this.minxval||bthis.maxxval){this.maxxval=a}}}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 e in this.datasets){if(!this.datasets.hasOwnProperty(e)){continue}var d=this.datasets[e];for(var b=0;b=1){a.y=1}if((a.x>=0)&&(a.x<=1)){this.points.push(a)}}}};DygraphLayout.prototype._evaluateLineTicks=function(){this.xticks=new Array();for(var c=0;c=0)&&(d<=1)){this.xticks.push([d,a])}}this.yticks=new Array();for(var c=0;c=0)&&(d<=1)){this.yticks.push([d,a])}}};DygraphLayout.prototype.evaluateWithError=function(){this.evaluate();if(!this.options.errorBars){return}var d=0;for(var g in this.datasets){if(!this.datasets.hasOwnProperty(g)){continue}var c=0;var f=this.datasets[g];for(var c=0;c0){for(var e=0;ethis.height){k.style.bottom="0px"}else{k.style.top=h+"px"}k.style.left="0px";k.style.textAlign="right";k.style.width=this.options.yAxisLabelWidth+"px";this.container.appendChild(k);this.ylabels.push(k)}var m=this.ylabels[0];var n=this.options.axisLabelFontSize;var a=parseInt(m.style.top)+n;if(a>this.height-n){m.style.top=(parseInt(m.style.top)-n/2)+"px"}}b.beginPath();b.moveTo(this.area.x,this.area.y);b.lineTo(this.area.x,this.area.y+this.area.h);b.closePath();b.stroke()}if(this.options.drawXAxis){if(this.layout.xticks){for(var e=0;ethis.width){c=this.width-this.options.xAxisLabelWidth;k.style.textAlign="right"}if(c<0){c=0;k.style.textAlign="left"}k.style.left=c+"px";k.style.width=this.options.xAxisLabelWidth+"px";this.container.appendChild(k);this.xlabels.push(k)}}b.beginPath();b.moveTo(this.area.x,this.area.y+this.area.h);b.lineTo(this.area.x+this.area.w,this.area.y+this.area.h);b.closePath();b.stroke()}b.restore()};DygraphCanvasRenderer.prototype._renderLineChart=function(){var b=this.element.getContext("2d");var d=this.options.colorScheme.length;var m=this.options.colorScheme;var y=this.layout.options.errorBars;var A=[];for(var B in this.layout.datasets){if(this.layout.datasets.hasOwnProperty(B)){A.push(B)}}var u=A.length;for(var w=0;w=0){p.moveTo(g,e[0]);p.lineTo(q.canvasx,o[0]);p.lineTo(q.canvasx,o[1]);p.lineTo(g,e[1]);p.closePath()}e[0]=o[0];e[1]=o[1];g=q.canvasx}}p.fill()}}for(var w=0;w0){if(arguments.length==4){this.warn("Using deprecated four-argument dygraph constructor");this.__old_init__(c,b,arguments[2],arguments[3])}else{this.__init__(c,b,a)}}};Dygraph.NAME="Dygraph";Dygraph.VERSION="1.2";Dygraph.__repr__=function(){return"["+this.NAME+" "+this.VERSION+"]"};Dygraph.toString=function(){return this.__repr__()};Dygraph.DEFAULT_ROLL_PERIOD=1;Dygraph.DEFAULT_WIDTH=480;Dygraph.DEFAULT_HEIGHT=320;Dygraph.AXIS_LINE_WIDTH=0.3;Dygraph.DEFAULT_ATTRS={highlightCircleSize:3,pixelsPerXLabel:60,pixelsPerYLabel:30,labelsDivWidth:250,labelsDivStyles:{},labelsSeparateLines:false,labelsKMB:false,labelsKMG2:false,strokeWidth:1,axisTickSize:3,axisLabelFontSize:14,xAxisLabelWidth:50,yAxisLabelWidth:50,rightGap:5,showRoller:false,xValueFormatter:Dygraph.dateString_,xValueParser:Dygraph.dateParser,xTicker:Dygraph.dateTicker,delimiter:",",sigma:2,errorBars:false,fractions:false,wilsonInterval:true,customBars:false};Dygraph.DEBUG=1;Dygraph.INFO=2;Dygraph.WARNING=3;Dygraph.ERROR=3;Dygraph.prototype.__old_init__=function(f,d,e,b){if(e!=null){var a=["Date"];for(var c=0;c=10){n.doZoom_(Math.min(b,m),Math.max(b,m))}else{n.canvas_.getContext("2d").clearRect(0,0,n.canvas_.width,n.canvas_.height)}b=null;a=null}if(e){e=false;l=null;j=null}});Dygraph.addEvent(this.hidden_,"dblclick",function(o){if(n.dateWindow_==null){return}n.dateWindow_=null;n.drawGraph_(n.rawData_);var p=n.rawData_[0][0];var q=n.rawData_[n.rawData_.length-1][0];if(n.attr_("zoomCallback")){n.attr_("zoomCallback")(p,q)}})};Dygraph.prototype.drawZoomRect_=function(c,d,b){var a=this.canvas_.getContext("2d");if(b){a.clearRect(Math.min(c,b),0,Math.abs(c-b),this.height_)}if(d&&c){a.fillStyle="rgba(128,128,128,0.33)";a.fillRect(Math.min(c,d),0,Math.abs(d-c),this.height_)}};Dygraph.prototype.doZoom_=function(g,e){var d=this.layout_.points;var f=null;var h=null;for(var c=0;cf)){f=a}if(b>e&&(h==null||ao){break}o=h;p=f}if(p>=0){l=r[p].xval}if(b>r[r.length-1].canvasx){l=r[r.length-1].xval}this.selPoints_=[];for(var f=0;f=0){var n=this.previousVerticalX_;s.clearRect(n-a-1,0,2*a+2,this.height_)}var q=function(c){return c&&!isNaN(c)};if(this.selPoints_.length>0){var b=this.selPoints_[0].canvasx;var e=this.attr_("xValueFormatter")(l,this)+":";var k=this.colors_.length;for(var f=0;f"}var m=this.selPoints_[f];var g=new RGBColor(this.colors_[f%k]);e+=" "+m.name+":"+this.round_(m.yval,2)}this.attr_("labelsDiv").innerHTML=e;this.lastx_=l;s.save();for(var f=0;f=Dygraph.DAILY){q.push({v:u,label:new Date(u+3600*1000).strftime(p)})}else{q.push({v:u,label:this.hmsString_(u)})}}}else{var a;var r=1;if(m==Dygraph.MONTHLY){a=[0,1,2,3,4,5,6,7,8,9,10,11,12]}else{if(m==Dygraph.QUARTERLY){a=[0,3,6,9]}else{if(m==Dygraph.BIANNUAL){a=[0,6]}else{if(m==Dygraph.ANNUAL){a=[0]}else{if(m==Dygraph.DECADAL){a=[0];r=10}}}}}var s=new Date(k).getFullYear();var l=new Date(c).getFullYear();var h=Dygraph.zeropad;for(var g=s;g<=l;g++){if(g%r!=0){continue}for(var f=0;fc){continue}q.push({v:u,label:new Date(u).strftime("%b %y")})}}}return q};Dygraph.dateTicker=function(a,f,d){var b=-1;for(var e=0;e=d.attr_("pixelsPerXLabel")){b=e;break}}if(b>=0){return d.GetXAxis(a,f,b)}else{}};Dygraph.numericTicks=function(v,u,l){if(l.attr_("labelsKMG2")){var f=[1,2,4,8]}else{var f=[1,2,5]}var x,p,a,q;var h=l.attr_("pixelsPerYLabel");for(var t=-10;t<50;t++){if(l.attr_("labelsKMG2")){var c=Math.pow(16,t)}else{var c=Math.pow(10,t)}for(var s=0;sh){break}}if(d>h){break}}var w=[];var r;var o=[];if(l.attr_("labelsKMB")){r=1000;o=["K","M","B","T"]}if(l.attr_("labelsKMG2")){if(r){l.warn("Setting both labelsKMB and labelsKMG2. Pick one!")}r=1024;o=["k","M","G","T"]}for(var t=0;t=0;s--,m/=r){if(b>=m){e=l.round_(g/m,1)+o[s];break}}}w.push({label:e,v:g})}return w};Dygraph.prototype.addYTicks_=function(c,b){var a=Dygraph.numericTicks(c,b,this);this.layout_.updateOptions({yAxis:[c,b],yTicks:a})};Dygraph.prototype.extremeValues_=function(d){var h=null,f=null;var b=this.attr_("errorBars")||this.attr_("customBars");if(b){for(var c=0;cg){a=g}if(ef){f=e}if(h==null||af){f=g}if(h==null||g=v&&d[m][0]<=c){g.push(d[m])}}d=g}var a=this.extremeValues_(d);var l=a[0];var h=a[1];if(!r||lq){q=h}if(f){var e=[];for(var n=0;n=0){t=0}if(b>0&&q<=0){b=0}if(this.attr_("includeZero")){if(q<0){b=0}if(r>0){t=0}}this.addYTicks_(t,b)}this.addXTicks_();this.layout_.updateOptions({dateWindow:this.dateWindow_});this.layout_.evaluateWithError();this.plotter_.clear();this.plotter_.render();this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height)};Dygraph.prototype.rollingAverage=function(m,d){if(m.length<2){return m}var d=Math.min(d,m.length-1);var b=[];var s=this.attr_("sigma");if(this.fractions_){var k=0;var h=0;var e=100;for(var x=0;x=0){k-=m[x-d][1][0];h-=m[x-d][1][1]}var B=m[x][0];var v=h?k/h:0;if(this.attr_("errorBars")){if(this.wilsonInterval_){if(h){var t=v<0?0:v,u=h;var A=s*Math.sqrt(t*(1-t)/u+s*s/(4*u*u));var a=1+s*s/h;var F=(t+s*s/(2*h)-A)/a;var o=(t+s*s/(2*h)+A)/a;b[x]=[B,[t*e,(t-F)*e,(o-t)*e]]}else{b[x]=[B,[0,0,0]]}}else{var z=h?s*Math.sqrt(v*(1-v)/h):1;b[x]=[B,[e*v,e*z,e*z]]}}else{b[x]=[B,e*v]}}}else{if(this.attr_("customBars")){var F=0;var C=0;var o=0;var g=0;for(var x=0;x=0){var r=m[x-d];if(r[1][1]!=null&&!isNaN(r[1][1])){F-=r[1][0];C-=r[1][1];o-=r[1][2];g-=1}}b[x]=[m[x][0],[1*C/g,1*(C-F)/g,1*(o-C)/g]]}}else{var q=Math.min(d-1,m.length-2);if(!this.attr_("errorBars")){if(d==1){return m}for(var x=0;x=0||b.indexOf("/")>=0||isNaN(parseFloat(b))){a=true}else{if(b.length==8&&b>"19700101"&&b<"20371231"){a=true}}if(a){this.attrs_.xValueFormatter=Dygraph.dateString_;this.attrs_.xValueParser=Dygraph.dateParser;this.attrs_.xTicker=Dygraph.dateTicker}else{this.attrs_.xValueFormatter=function(c){return c};this.attrs_.xValueParser=function(c){return parseFloat(c)};this.attrs_.xTicker=Dygraph.numericTicks}};Dygraph.prototype.parseCSV_=function(h){var l=[];var p=h.split("\n");var b=this.attr_("delimiter");if(p[0].indexOf(b)==-1&&p[0].indexOf("\t")>=0){b="\t"}var a=0;if(this.labelsFromCSV_){a=1;this.attrs_.labels=p[0].split(b)}var c;var n=false;var d=this.attr_("labels").length;for(var g=a;g=0){this.loadedEvent_(this.file_)}else{var b=new XMLHttpRequest();var a=this;b.onreadystatechange=function(){if(b.readyState==4){if(b.status==200){a.loadedEvent_(b.responseText)}}};b.open("GET",this.file_,true);b.send(null)}}else{this.error("Unknown data format: "+(typeof this.file_))}}}}};Dygraph.prototype.updateOptions=function(a){if(a.rollPeriod){this.rollPeriod_=a.rollPeriod}if(a.dateWindow){this.dateWindow_=a.dateWindow}if(a.valueRange){this.valueRange_=a.valueRange}Dygraph.update(this.user_attrs_,a);this.labelsFromCSV_=(this.attr_("labels")==null);this.layout_.updateOptions({errorBars:this.attr_("errorBars")});if(a.file&&a.file!=this.file_){this.file_=a.file;this.start_()}else{this.drawGraph_(this.rawData_)}};Dygraph.prototype.resize=function(b,a){if((b===null)!=(a===null)){this.warn("Dygraph.resize() should be called with zero parameters or two non-NULL parameters. Pretending it was zero.");b=a=null}this.maindiv_.innerHTML="";this.attrs_.labelsDiv=null;if(b){this.maindiv_.style.width=b+"px";this.maindiv_.style.height=a+"px";this.width_=b;this.height_=a}else{this.width_=this.maindiv_.offsetWidth;this.height_=this.maindiv_.offsetHeight}this.createInterface_();this.drawGraph_(this.rawData_)};Dygraph.prototype.adjustRoll=function(a){this.rollPeriod_=a;this.drawGraph_(this.rawData_)};Dygraph.prototype.roundTime_=function(c,e){var b=c;if(e<=60){b.setSeconds(b.getSeconds()-b.getSeconds()%e);return b}b.setSeconds(0);e=e/60;if(e<=60){b.setMinutes(b.getMinutes()-b.getMinutes()%e);return b}b.setMinutes(0);e=e/60;if(e<=24){b.setHours(b.getHours()-b.getHours()%e);return b}b.setHours(0);e=e/24;if(e==7){b.setDate(b.getDate()-b.getDay());return b}if(e<30){b.setDate(b.getDate()-((b.getDate()-1)%e));return b}b.setDate(1);var a=e/30;if(a<=12){b.setMonth(b.getMonth()-b.getMonth()%a);return b}b.setMonth(0);e=e/365;if(e<1){e=1}b.setFullYear(b.getFullYear()-b.getFullYear()%e);return b};Dygraph.createCanvas=function(){var a=document.createElement("canvas");isIE=(/MSIE/.test(navigator.userAgent)&&!window.opera);if(isIE){a=G_vmlCanvasManager.initElement(a)}return a};Dygraph.GVizChart=function(a){this.container=a};Dygraph.GVizChart.prototype.draw=function(b,a){this.container.innerHTML="";this.date_graph=new Dygraph(this.container,b,a)};DateGraph=Dygraph;function RGBColor(g){this.ok=false;if(g.charAt(0)=="#"){g=g.substr(1,6)}g=g.replace(/ /g,"");g=g.toLowerCase();var a={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"};for(var c in a){if(g==c){g=a[c]}}var h=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(i){return[parseInt(i[1]),parseInt(i[2]),parseInt(i[3])]}},{re:/^(\w{2})(\w{2})(\w{2})$/,example:["#00ff00","336699"],process:function(i){return[parseInt(i[1],16),parseInt(i[2],16),parseInt(i[3],16)]}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(i){return[parseInt(i[1]+i[1],16),parseInt(i[2]+i[2],16),parseInt(i[3]+i[3],16)]}}];for(var b=0;b255)?255:this.r);this.g=(this.g<0||isNaN(this.g))?0:((this.g>255)?255:this.g);this.b=(this.b<0||isNaN(this.b))?0:((this.b>255)?255:this.b);this.toRGB=function(){return"rgb("+this.r+", "+this.g+", "+this.b+")"};this.toHex=function(){var k=this.r.toString(16);var j=this.g.toString(16);var i=this.b.toString(16);if(k.length==1){k="0"+k}if(j.length==1){j="0"+j}if(i.length==1){i="0"+i}return"#"+k+j+i}}Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(a,c,b){if(typeof(b)=="undefined"){b=10}for(;parseInt(a,10)1;b/=10){a=c.toString()+a}return a.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(a){return Date.ext.locales[a.locale].a[a.getDay()]},A:function(a){return Date.ext.locales[a.locale].A[a.getDay()]},b:function(a){return Date.ext.locales[a.locale].b[a.getMonth()]},B:function(a){return Date.ext.locales[a.locale].B[a.getMonth()]},c:"toLocaleString",C:function(a){return Date.ext.util.xPad(parseInt(a.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(a){return Date.ext.util.xPad(parseInt(Date.ext.util.G(a)/100,10),0)},G:function(c){var e=c.getFullYear();var b=parseInt(Date.ext.formats.V(c),10);var a=parseInt(Date.ext.formats.W(c),10);if(a>b){e++}else{if(a===0&&b>=52){e--}}return e},H:["getHours","0"],I:function(b){var a=b.getHours()%12;return Date.ext.util.xPad(a===0?12:a,0)},j:function(c){var a=c-new Date(""+c.getFullYear()+"/1/1 GMT");a+=c.getTimezoneOffset()*60000;var b=parseInt(a/60000/60/24,10)+1;return Date.ext.util.xPad(b,0,100)},m:function(a){return Date.ext.util.xPad(a.getMonth()+1,0)},M:["getMinutes","0"],p:function(a){return Date.ext.locales[a.locale].p[a.getHours()>=12?1:0]},P:function(a){return Date.ext.locales[a.locale].P[a.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(a){var b=a.getDay();return b===0?7:b},U:function(e){var a=parseInt(Date.ext.formats.j(e),10);var c=6-e.getDay();var b=parseInt((a+c)/7,10);return Date.ext.util.xPad(b,0)},V:function(e){var c=parseInt(Date.ext.formats.W(e),10);var a=(new Date(""+e.getFullYear()+"/1/1")).getDay();var b=c+(a>4||a<=1?0:1);if(b==53&&(new Date(""+e.getFullYear()+"/12/31")).getDay()<4){b=1}else{if(b===0){b=Date.ext.formats.V(new Date(""+(e.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(b,0)},w:"getDay",W:function(e){var a=parseInt(Date.ext.formats.j(e),10);var c=7-Date.ext.formats.u(e);var b=parseInt((a+c)/7,10);return Date.ext.util.xPad(b,0,10)},y:function(a){return Date.ext.util.xPad(a.getFullYear()%100,0)},Y:"getFullYear",z:function(c){var b=c.getTimezoneOffset();var a=Date.ext.util.xPad(parseInt(Math.abs(b/60),10),0);var e=Date.ext.util.xPad(b%60,0);return(b>0?"-":"+")+a+e},Z:function(a){return a.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(a){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(a){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 c=this;while(a.match(/%[cDhnrRtTxXzZ]/)){a=a.replace(/%([cDhnrRtTxXzZ])/g,function(e,d){var g=Date.ext.aggregates[d];return(g=="locale"?Date.ext.locales[c.locale][d]:g)})}var b=a.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(e,d){var g=Date.ext.formats[d];if(typeof(g)=="string"){return c[g]()}else{if(typeof(g)=="function"){return g.call(c,c)}else{if(typeof(g)=="object"&&typeof(g[0])=="string"){return Date.ext.util.xPad(c[g[0]](),g[1])}else{return d}}}});c=null;return b}; \ No newline at end of file diff --git a/generate-combined.sh b/generate-combined.sh index a191b90..5694425 100755 --- a/generate-combined.sh +++ b/generate-combined.sh @@ -6,14 +6,14 @@ cat \ dygraph-canvas.js \ dygraph.js \ rgbcolor/rgbcolor.js \ +strftime/strftime-min.js \ > /tmp/dygraph.js -java -jar custom_rhino.jar -c /tmp/dygraph.js \ +java -jar yuicompressor-2.4.2.jar /tmp/dygraph.js \ > /tmp/dygraph-packed.js # TODO(danvk): ensure the dygraphs copyright, etc. gets into the packed js. cat \ -strftime/strftime-min.js \ /tmp/dygraph-packed.js \ > dygraph-combined.js diff --git a/yuicompressor-2.4.2.jar b/yuicompressor-2.4.2.jar new file mode 100644 index 0000000..c29470b Binary files /dev/null and b/yuicompressor-2.4.2.jar differ