From f474c2a348651a43addaf796d31aab16e5851b74 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Mon, 30 Nov 2009 16:08:24 -0500 Subject: [PATCH] Remove MochiKit.Color dependence, add in simpler rgbcolor library. combined down to 65k --- dygraph-canvas.js | 48 +- dygraph-combined.js | 1605 +++++++++++++++++++------------------------------- dygraph.js | 41 +- generate-combined.sh | 9 +- rgbcolor/rgbcolor.js | 250 ++++++++ tests/grid_dot.html | 9 - 6 files changed, 924 insertions(+), 1038 deletions(-) create mode 100644 rgbcolor/rgbcolor.js diff --git a/dygraph-canvas.js b/dygraph-canvas.js index 2b649a2..452be0a 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -165,19 +165,19 @@ DygraphCanvasRenderer = function(dygraph, element, layout, options) { // default options this.options = { - "strokeWidth": 0.5, - "drawXAxis": true, - "drawYAxis": true, - "axisLineColor": Color.blackColor(), - "axisLineWidth": 0.5, - "axisTickSize": 3, - "axisLabelColor": Color.blackColor(), - "axisLabelFont": "Arial", - "axisLabelFontSize": 9, - "axisLabelWidth": 50, - "drawYGrid": true, - "drawXGrid": true, - "gridLineColor": 'rgb(0.5,0.5,0.5)' + "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)" }; MochiKit.Base.update(this.options, options); @@ -311,7 +311,6 @@ DygraphCanvasRenderer.prototype.render = function() { } // Do the ordinary rendering, as before - // TODO(danvk) Call super.render() this._renderLineChart(); this._renderAxis(); }; @@ -327,7 +326,7 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { "position": "absolute", "fontSize": this.options.axisLabelFontSize + "px", "zIndex": 10, - "color": this.options.axisLabelColor.toRGBString(), + "color": this.options.axisLabelColor, "width": this.options.axisLabelWidth + "px", "overflow": "hidden" }; @@ -342,7 +341,7 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { // axis lines context.save(); - context.strokeStyle = this.options.axisLineColor.toRGBString(); + context.strokeStyle = this.options.axisLineColor; context.lineWidth = this.options.axisLineWidth; if (this.options.drawYAxis) { @@ -465,12 +464,9 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { for (var i = 0; i < setCount; i++) { var setName = setNames[i]; var color = colorScheme[i%colorCount]; - var strokeX = this.options.strokeColorTransform; // setup graphics context context.save(); - context.strokeStyle = color.toRGBString(); - context.lineWidth = this.options.strokeWidth; var point = this.layout.points[0]; var pointSize = this.dygraph_.attr_("pointSize"); var prevX = null, prevY = null; @@ -493,6 +489,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { prevY = point.canvasy; } else { ctx.beginPath(); + ctx.strokeStyle = color; + ctx.lineWidth = this.options.strokeWidth; ctx.moveTo(prevX, prevY); prevX = point.canvasx; prevY = point.canvasy; @@ -502,7 +500,7 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { if (drawPoints || isIsolated) { ctx.beginPath(); - ctx.fillStyle = color.toRGBString(); + ctx.fillStyle = color; ctx.arc(point.canvasx, point.canvasy, pointSize, 0, 360, false); ctx.fill(); } @@ -516,19 +514,19 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { for (var i = 0; i < setCount; i++) { var setName = setNames[i]; var color = colorScheme[i % colorCount]; - var strokeX = this.options.strokeColorTransform; // setup graphics context context.save(); - context.strokeStyle = color.toRGBString(); + context.strokeStyle = color; context.lineWidth = this.options.strokeWidth; var prevX = -1; var prevYs = [-1, -1]; var count = 0; var yscale = this.layout.yscale; - // should be same color as the lines - var err_color = color.colorWithAlpha(0.15); - ctx.fillStyle = err_color.toRGBString(); + // should be same color as the lines but only 15% opaque. + var rgb = new RGBColor(color); + var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',0.15)'; + ctx.fillStyle = err_color; ctx.beginPath(); for (var j = 0; j < this.layout.points.length; j++) { var point = this.layout.points[j]; diff --git a/dygraph-combined.js b/dygraph-combined.js index 946e587..870b7df 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -1001,498 +1001,6 @@ compose=MochiKit.Base.compose; serializeJSON=MochiKit.Base.serializeJSON; } MochiKit.Base._exportSymbols(this,MochiKit.Base); -if(typeof (dojo)!="undefined"){ -dojo.provide("MochiKit.Color"); -dojo.require("MochiKit.Base"); -} -if(typeof (JSAN)!="undefined"){ -JSAN.use("MochiKit.Base",[]); -} -try{ -if(typeof (MochiKit.Base)=="undefined"){ -throw ""; -} -} -catch(e){ -throw "MochiKit.Color depends on MochiKit.Base"; -} -if(typeof (MochiKit.Color)=="undefined"){ -MochiKit.Color={}; -} -MochiKit.Color.NAME="MochiKit.Color"; -MochiKit.Color.VERSION="1.4"; -MochiKit.Color.__repr__=function(){ -return "["+this.NAME+" "+this.VERSION+"]"; -}; -MochiKit.Color.toString=function(){ -return this.__repr__(); -}; -MochiKit.Color.Color=function(red,_14e,blue,_150){ -if(typeof (_150)=="undefined"||_150===null){ -_150=1; -} -this.rgb={r:red,g:_14e,b:blue,a:_150}; -}; -MochiKit.Color.Color.prototype={__class__:MochiKit.Color.Color,colorWithAlpha:function(_151){ -var rgb=this.rgb; -var m=MochiKit.Color; -return m.Color.fromRGB(rgb.r,rgb.g,rgb.b,_151); -},colorWithHue:function(hue){ -var hsl=this.asHSL(); -hsl.h=hue; -var m=MochiKit.Color; -return m.Color.fromHSL(hsl); -},colorWithSaturation:function(_157){ -var hsl=this.asHSL(); -hsl.s=_157; -var m=MochiKit.Color; -return m.Color.fromHSL(hsl); -},colorWithLightness:function(_15a){ -var hsl=this.asHSL(); -hsl.l=_15a; -var m=MochiKit.Color; -return m.Color.fromHSL(hsl); -},darkerColorWithLevel:function(_15d){ -var hsl=this.asHSL(); -hsl.l=Math.max(hsl.l-_15d,0); -var m=MochiKit.Color; -return m.Color.fromHSL(hsl); -},lighterColorWithLevel:function(_160){ -var hsl=this.asHSL(); -hsl.l=Math.min(hsl.l+_160,1); -var m=MochiKit.Color; -return m.Color.fromHSL(hsl); -},blendedColor:function(_163,_164){ -if(typeof (_164)=="undefined"||_164===null){ -_164=0.5; -} -var sf=1-_164; -var s=this.rgb; -var d=_163.rgb; -var df=_164; -return MochiKit.Color.Color.fromRGB((s.r*sf)+(d.r*df),(s.g*sf)+(d.g*df),(s.b*sf)+(d.b*df),(s.a*sf)+(d.a*df)); -},compareRGB:function(_169){ -var a=this.asRGB(); -var b=_169.asRGB(); -return MochiKit.Base.compare([a.r,a.g,a.b,a.a],[b.r,b.g,b.b,b.a]); -},isLight:function(){ -return this.asHSL().b>0.5; -},isDark:function(){ -return (!this.isLight()); -},toHSLString:function(){ -var c=this.asHSL(); -var ccc=MochiKit.Color.clampColorComponent; -var rval=this._hslString; -if(!rval){ -var mid=(ccc(c.h,360).toFixed(0)+","+ccc(c.s,100).toPrecision(4)+"%"+","+ccc(c.l,100).toPrecision(4)+"%"); -var a=c.a; -if(a>=1){ -a=1; -rval="hsl("+mid+")"; -}else{ -if(a<=0){ -a=0; -} -rval="hsla("+mid+","+a+")"; -} -this._hslString=rval; -} -return rval; -},toRGBString:function(){ -var c=this.rgb; -var ccc=MochiKit.Color.clampColorComponent; -var rval=this._rgbString; -if(!rval){ -var mid=(ccc(c.r,255).toFixed(0)+","+ccc(c.g,255).toFixed(0)+","+ccc(c.b,255).toFixed(0)); -if(c.a!=1){ -rval="rgba("+mid+","+c.a+")"; -}else{ -rval="rgb("+mid+")"; -} -this._rgbString=rval; -} -return rval; -},asRGB:function(){ -return MochiKit.Base.clone(this.rgb); -},toHexString:function(){ -var m=MochiKit.Color; -var c=this.rgb; -var ccc=MochiKit.Color.clampColorComponent; -var rval=this._hexString; -if(!rval){ -rval=("#"+m.toColorPart(ccc(c.r,255))+m.toColorPart(ccc(c.g,255))+m.toColorPart(ccc(c.b,255))); -this._hexString=rval; -} -return rval; -},asHSV:function(){ -var hsv=this.hsv; -var c=this.rgb; -if(typeof (hsv)=="undefined"||hsv===null){ -hsv=MochiKit.Color.rgbToHSV(this.rgb); -this.hsv=hsv; -} -return MochiKit.Base.clone(hsv); -},asHSL:function(){ -var hsl=this.hsl; -var c=this.rgb; -if(typeof (hsl)=="undefined"||hsl===null){ -hsl=MochiKit.Color.rgbToHSL(this.rgb); -this.hsl=hsl; -} -return MochiKit.Base.clone(hsl); -},toString:function(){ -return this.toRGBString(); -},repr:function(){ -var c=this.rgb; -var col=[c.r,c.g,c.b,c.a]; -return this.__class__.NAME+"("+col.join(", ")+")"; -}}; -MochiKit.Base.update(MochiKit.Color.Color,{fromRGB:function(red,_180,blue,_182){ -var _183=MochiKit.Color.Color; -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_180=rgb.g; -blue=rgb.b; -if(typeof (rgb.a)=="undefined"){ -_182=undefined; -}else{ -_182=rgb.a; -} -} -return new _183(red,_180,blue,_182); -},fromHSL:function(hue,_186,_187,_188){ -var m=MochiKit.Color; -return m.Color.fromRGB(m.hslToRGB.apply(m,arguments)); -},fromHSV:function(hue,_18b,_18c,_18d){ -var m=MochiKit.Color; -return m.Color.fromRGB(m.hsvToRGB.apply(m,arguments)); -},fromName:function(name){ -var _190=MochiKit.Color.Color; -if(name.charAt(0)=="\""){ -name=name.substr(1,name.length-2); -} -var _191=_190._namedColors[name.toLowerCase()]; -if(typeof (_191)=="string"){ -return _190.fromHexString(_191); -}else{ -if(name=="transparent"){ -return _190.transparentColor(); -} -} -return null; -},fromString:function(_192){ -var self=MochiKit.Color.Color; -var _194=_192.substr(0,3); -if(_194=="rgb"){ -return self.fromRGBString(_192); -}else{ -if(_194=="hsl"){ -return self.fromHSLString(_192); -}else{ -if(_192.charAt(0)=="#"){ -return self.fromHexString(_192); -} -} -} -return self.fromName(_192); -},fromHexString:function(_195){ -if(_195.charAt(0)=="#"){ -_195=_195.substring(1); -} -var _196=[]; -var i,hex; -if(_195.length==3){ -for(i=0;i<3;i++){ -hex=_195.substr(i,1); -_196.push(parseInt(hex+hex,16)/255); -} -}else{ -for(i=0;i<6;i+=2){ -hex=_195.substr(i,2); -_196.push(parseInt(hex,16)/255); -} -} -var _199=MochiKit.Color.Color; -return _199.fromRGB.apply(_199,_196); -},_fromColorString:function(pre,_19b,_19c,_19d){ -if(_19d.indexOf(pre)===0){ -_19d=_19d.substring(_19d.indexOf("(",3)+1,_19d.length-1); -} -var _19e=_19d.split(/\s*,\s*/); -var _19f=[]; -for(var i=0;i<_19e.length;i++){ -var c=_19e[i]; -var val; -var _1a3=c.substring(c.length-3); -if(c.charAt(c.length-1)=="%"){ -val=0.01*parseFloat(c.substring(0,c.length-1)); -}else{ -if(_1a3=="deg"){ -val=parseFloat(c)/360; -}else{ -if(_1a3=="rad"){ -val=parseFloat(c)/(Math.PI*2); -}else{ -val=_19c[i]*parseFloat(c); -} -} -} -_19f.push(val); -} -return this[_19b].apply(this,_19f); -},fromBackground:function(elem){ -var cls=MochiKit.Color.Color; -return cls.fromComputedStyle(elem,"backgroundColor","background-color")||cls.whiteColor(); -},fromText:function(elem){ -var cls=MochiKit.Color.Color; -return cls.fromComputedStyle(elem,"color","color")||cls.blackColor(); -},namedColors:function(){ -return MochiKit.Base.clone(MochiKit.Color.Color._namedColors); -}}); -MochiKit.Base.update(MochiKit.Color,{clampColorComponent:function(v,_1a9){ -v*=_1a9; -if(v<0){ -return 0; -}else{ -if(v>_1a9){ -return _1a9; -}else{ -return v; -} -} -},_hslValue:function(n1,n2,hue){ -if(hue>6){ -hue-=6; -}else{ -if(hue<0){ -hue+=6; -} -} -var val; -if(hue<1){ -val=n1+(n2-n1)*hue; -}else{ -if(hue<3){ -val=n2; -}else{ -if(hue<4){ -val=n1+(n2-n1)*(4-hue); -}else{ -val=n1; -} -} -} -return val; -},hsvToRGB:function(hue,_1af,_1b0,_1b1){ -if(arguments.length==1){ -var hsv=hue; -hue=hsv.h; -_1af=hsv.s; -_1b0=hsv.v; -_1b1=hsv.a; -} -var red; -var _1b4; -var blue; -if(_1af===0){ -red=_1b0; -_1b4=_1b0; -blue=_1b0; -}else{ -var i=Math.floor(hue*6); -var f=(hue*6)-i; -var p=_1b0*(1-_1af); -var q=_1b0*(1-(_1af*f)); -var t=_1b0*(1-(_1af*(1-f))); -switch(i){ -case 1: -red=q; -_1b4=_1b0; -blue=p; -break; -case 2: -red=p; -_1b4=_1b0; -blue=t; -break; -case 3: -red=p; -_1b4=q; -blue=_1b0; -break; -case 4: -red=t; -_1b4=p; -blue=_1b0; -break; -case 5: -red=_1b0; -_1b4=p; -blue=q; -break; -case 6: -case 0: -red=_1b0; -_1b4=t; -blue=p; -break; -} -} -return {r:red,g:_1b4,b:blue,a:_1b1}; -},hslToRGB:function(hue,_1bc,_1bd,_1be){ -if(arguments.length==1){ -var hsl=hue; -hue=hsl.h; -_1bc=hsl.s; -_1bd=hsl.l; -_1be=hsl.a; -} -var red; -var _1c1; -var blue; -if(_1bc===0){ -red=_1bd; -_1c1=_1bd; -blue=_1bd; -}else{ -var m2; -if(_1bd<=0.5){ -m2=_1bd*(1+_1bc); -}else{ -m2=_1bd+_1bc-(_1bd*_1bc); -} -var m1=(2*_1bd)-m2; -var f=MochiKit.Color._hslValue; -var h6=hue*6; -red=f(m1,m2,h6+2); -_1c1=f(m1,m2,h6); -blue=f(m1,m2,h6-2); -} -return {r:red,g:_1c1,b:blue,a:_1be}; -},rgbToHSV:function(red,_1c8,blue,_1ca){ -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_1c8=rgb.g; -blue=rgb.b; -_1ca=rgb.a; -} -var max=Math.max(Math.max(red,_1c8),blue); -var min=Math.min(Math.min(red,_1c8),blue); -var hue; -var _1cf; -var _1d0=max; -if(min==max){ -hue=0; -_1cf=0; -}else{ -var _1d1=(max-min); -_1cf=_1d1/max; -if(red==max){ -hue=(_1c8-blue)/_1d1; -}else{ -if(_1c8==max){ -hue=2+((blue-red)/_1d1); -}else{ -hue=4+((red-_1c8)/_1d1); -} -} -hue/=6; -if(hue<0){ -hue+=1; -} -if(hue>1){ -hue-=1; -} -} -return {h:hue,s:_1cf,v:_1d0,a:_1ca}; -},rgbToHSL:function(red,_1d3,blue,_1d5){ -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_1d3=rgb.g; -blue=rgb.b; -_1d5=rgb.a; -} -var max=Math.max(red,Math.max(_1d3,blue)); -var min=Math.min(red,Math.min(_1d3,blue)); -var hue; -var _1da; -var _1db=(max+min)/2; -var _1dc=max-min; -if(_1dc===0){ -hue=0; -_1da=0; -}else{ -if(_1db<=0.5){ -_1da=_1dc/(max+min); -}else{ -_1da=_1dc/(2-max-min); -} -if(red==max){ -hue=(_1d3-blue)/_1dc; -}else{ -if(_1d3==max){ -hue=2+((blue-red)/_1dc); -}else{ -hue=4+((red-_1d3)/_1dc); -} -} -hue/=6; -if(hue<0){ -hue+=1; -} -if(hue>1){ -hue-=1; -} -} -return {h:hue,s:_1da,l:_1db,a:_1d5}; -},toColorPart:function(num){ -num=Math.round(num); -var _1de=num.toString(16); -if(num<16){ -return "0"+_1de; -} -return _1de; -},__new__:function(){ -var m=MochiKit.Base; -this.Color.fromRGBString=m.bind(this.Color._fromColorString,this.Color,"rgb","fromRGB",[1/255,1/255,1/255,1]); -this.Color.fromHSLString=m.bind(this.Color._fromColorString,this.Color,"hsl","fromHSL",[1/360,0.01,0.01,1]); -var _1e0=1/3; -var _1e1={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_1e0,_1e0,_1e0],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_1e0,2*_1e0,2*_1e0],magenta:[1,0,1],orange:[1,0.5,0],purple:[0.5,0,0.5],red:[1,0,0],transparent:[0,0,0,0],white:[1,1,1],yellow:[1,1,0]}; -var _1e2=function(name,r,g,b,a){ -var rval=this.fromRGB(r,g,b,a); -this[name]=function(){ -return rval; -}; -return rval; -}; -for(var k in _1e1){ -var name=k+"Color"; -var _1eb=m.concat([_1e2,this.Color,name],_1e1[k]); -this.Color[name]=m.bind.apply(null,_1eb); -} -var _1ec=function(){ -for(var i=0;i1;r/=10){x=pad.toString()+x}return x.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(d){return Date.ext.locales[d.locale].a[d.getDay()]},A:function(d){return Date.ext.locales[d.locale].A[d.getDay()]},b:function(d){return Date.ext.locales[d.locale].b[d.getMonth()]},B:function(d){return Date.ext.locales[d.locale].B[d.getMonth()]},c:"toLocaleString",C:function(d){return Date.ext.util.xPad(parseInt(d.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(d){return Date.ext.util.xPad(parseInt(Date.ext.util.G(d)/100,10),0)},G:function(d){var y=d.getFullYear();var V=parseInt(Date.ext.formats.V(d),10);var W=parseInt(Date.ext.formats.W(d),10);if(W>V){y++}else{if(W===0&&V>=52){y--}}return y},H:["getHours","0"],I:function(d){var I=d.getHours()%12;return Date.ext.util.xPad(I===0?12:I,0)},j:function(d){var ms=d-new Date(""+d.getFullYear()+"/1/1 GMT");ms+=d.getTimezoneOffset()*60000;var doy=parseInt(ms/60000/60/24,10)+1;return Date.ext.util.xPad(doy,0,100)},m:function(d){return Date.ext.util.xPad(d.getMonth()+1,0)},M:["getMinutes","0"],p:function(d){return Date.ext.locales[d.locale].p[d.getHours()>=12?1:0]},P:function(d){return Date.ext.locales[d.locale].P[d.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(d){var dow=d.getDay();return dow===0?7:dow},U:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=6-d.getDay();var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0)},V:function(d){var woy=parseInt(Date.ext.formats.W(d),10);var dow1_1=(new Date(""+d.getFullYear()+"/1/1")).getDay();var idow=woy+(dow1_1>4||dow1_1<=1?0:1);if(idow==53&&(new Date(""+d.getFullYear()+"/12/31")).getDay()<4){idow=1}else{if(idow===0){idow=Date.ext.formats.V(new Date(""+(d.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(idow,0)},w:"getDay",W:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=7-Date.ext.formats.u(d);var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0,10)},y:function(d){return Date.ext.util.xPad(d.getFullYear()%100,0)},Y:"getFullYear",z:function(d){var o=d.getTimezoneOffset();var H=Date.ext.util.xPad(parseInt(Math.abs(o/60),10),0);var M=Date.ext.util.xPad(o%60,0);return(o>0?"-":"+")+H+M},Z:function(d){return d.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(d){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(fmt){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var d=this;while(fmt.match(/%[cDhnrRtTxXzZ]/)){fmt=fmt.replace(/%([cDhnrRtTxXzZ])/g,function(m0,m1){var f=Date.ext.aggregates[m1];return(f=="locale"?Date.ext.locales[d.locale][m1]:f)})}var str=fmt.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(m0,m1){var f=Date.ext.formats[m1];if(typeof (f)=="string"){return d[f]()}else{if(typeof (f)=="function"){return f.call(d,d)}else{if(typeof (f)=="object"&&typeof (f[0])=="string"){return Date.ext.util.xPad(d[f[0]](),f[1])}else{return m1}}}});d=null;return str}; @@ -1601,7 +1109,7 @@ MochiKit.Base.update(this.options,_24?_24:{}); }; DygraphCanvasRenderer=function(_25,_26,_27,_28){ this.dygraph_=_25; -this.options={"strokeWidth":0.5,"drawXAxis":true,"drawYAxis":true,"axisLineColor":Color.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":Color.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"drawYGrid":true,"drawXGrid":true,"gridLineColor":MochiKit.Color.Color.grayColor()}; +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)"}; MochiKit.Base.update(this.options,_28); this.layout=_27; this.element=_26; @@ -1680,7 +1188,7 @@ var ctx=this.element.getContext("2d"); if(this.options.drawYGrid){ var _37=this.layout.yticks; ctx.save(); -ctx.strokeStyle=this.options.gridLineColor.toRGBString(); +ctx.strokeStyle=this.options.gridLineColor; ctx.lineWidth=this.options.axisLineWidth; for(var i=0;i<_37.length;i++){ var x=this.area.x; @@ -1695,7 +1203,7 @@ ctx.stroke(); if(this.options.drawXGrid){ var _37=this.layout.xticks; ctx.save(); -ctx.strokeStyle=this.options.gridLineColor.toRGBString(); +ctx.strokeStyle=this.options.gridLineColor; ctx.lineWidth=this.options.axisLineWidth; for(var i=0;i<_37.length;i++){ var x=this.area.x+_37[i][0]*this.area.w; @@ -1715,7 +1223,7 @@ if(!this.options.drawXAxis&&!this.options.drawYAxis){ return; } var _40=this.element.getContext("2d"); -var _41={"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}; +var _41={"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor,"width":this.options.axisLabelWidth+"px","overflow":"hidden"}; var _42=function(txt){ var div=document.createElement("div"); for(var _45 in _41){ @@ -1725,7 +1233,7 @@ div.appendChild(document.createTextNode(txt)); return div; }; _40.save(); -_40.strokeStyle=this.options.axisLineColor.toRGBString(); +_40.strokeStyle=this.options.axisLineColor; _40.lineWidth=this.options.axisLineWidth; if(this.options.drawYAxis){ if(this.layout.yticks){ @@ -1831,37 +1339,36 @@ var _63=function(ctx){ for(var i=0;i<_58;i++){ var _64=_56[i]; var _65=_55[i%_54]; -var _66=this.options.strokeColorTransform; _53.save(); -_53.strokeStyle=_65.toRGBString(); -_53.lineWidth=this.options.strokeWidth; var _61=this.layout.points[0]; -var _67=this.dygraph_.attr_("pointSize"); -var _68=null,prevY=null; -var _69=this.dygraph_.attr_("drawPoints"); -var _70=this.layout.points; -for(var j=0;j<_70.length;j++){ -var _61=_70[j]; +var _66=this.dygraph_.attr_("pointSize"); +var _67=null,prevY=null; +var _68=this.dygraph_.attr_("drawPoints"); +var _69=this.layout.points; +for(var j=0;j<_69.length;j++){ +var _61=_69[j]; if(_61.name==_64){ if(!_62(_61.canvasy)){ -_68=prevY=null; +_67=prevY=null; }else{ -var _71=(!_68&&(j==_70.length-1||!_62(_70[j+1].canvasy))); -if(!_68){ -_68=_61.canvasx; +var _70=(!_67&&(j==_69.length-1||!_62(_69[j+1].canvasy))); +if(!_67){ +_67=_61.canvasx; prevY=_61.canvasy; }else{ ctx.beginPath(); -ctx.moveTo(_68,prevY); -_68=_61.canvasx; +ctx.strokeStyle=_65; +ctx.lineWidth=this.options.strokeWidth; +ctx.moveTo(_67,prevY); +_67=_61.canvasx; prevY=_61.canvasy; -ctx.lineTo(_68,prevY); +ctx.lineTo(_67,prevY); ctx.stroke(); } -if(_69||_71){ +if(_68||_70){ ctx.beginPath(); -ctx.fillStyle=_65.toRGBString(); -ctx.arc(_61.canvasx,_61.canvasy,_67,0,360,false); +ctx.fillStyle=_65; +ctx.arc(_61.canvasx,_61.canvasy,_66,0,360,false); ctx.fill(); } } @@ -1869,60 +1376,60 @@ ctx.fill(); } } }; -var _72=function(ctx){ +var _71=function(ctx){ for(var i=0;i<_58;i++){ -var _73=_56[i]; -var _74=_55[i%_54]; -var _75=this.options.strokeColorTransform; +var _72=_56[i]; +var _73=_55[i%_54]; _53.save(); -_53.strokeStyle=_74.toRGBString(); +_53.strokeStyle=_73; _53.lineWidth=this.options.strokeWidth; -var _76=-1; -var _77=[-1,-1]; -var _78=0; -var _79=this.layout.yscale; -var _80=_74.colorWithAlpha(0.15); -ctx.fillStyle=_80.toRGBString(); +var _74=-1; +var _75=[-1,-1]; +var _76=0; +var _77=this.layout.yscale; +var rgb=new RGBColor(_73); +var _79="rgba("+rgb.r+","+rgb.g+","+rgb.b+",0.15)"; +ctx.fillStyle=_79; ctx.beginPath(); for(var j=0;j=0){ -ctx.moveTo(_76,_77[0]); -ctx.lineTo(_81.canvasx,_82[0]); -ctx.lineTo(_81.canvasx,_82[1]); -ctx.lineTo(_76,_77[1]); +var _81=[_80.y-_80.errorPlus*_77,_80.y+_80.errorMinus*_77]; +_81[0]=this.area.h*_81[0]+this.area.y; +_81[1]=this.area.h*_81[1]+this.area.y; +if(_74>=0){ +ctx.moveTo(_74,_75[0]); +ctx.lineTo(_80.canvasx,_81[0]); +ctx.lineTo(_80.canvasx,_81[1]); +ctx.lineTo(_74,_75[1]); ctx.closePath(); } -_77[0]=_82[0]; -_77[1]=_82[1]; -_76=_81.canvasx; +_75[0]=_81[0]; +_75[1]=_81[1]; +_74=_80.canvasx; } } ctx.fill(); } }; if(_57){ -_59(_72,this)(_53); +_59(_71,this)(_53); } _59(_63,this)(_53); _53.restore(); }; -Dygraph=function(div,_83,_84){ +Dygraph=function(div,_82,_83){ if(arguments.length>0){ if(arguments.length==4){ this.warn("Using deprecated four-argument dygraph constructor"); -this.__old_init__(div,_83,arguments[2],arguments[3]); +this.__old_init__(div,_82,arguments[2],arguments[3]); }else{ -this.__init__(div,_83,_84); +this.__init__(div,_82,_83); } } }; @@ -1943,28 +1450,28 @@ Dygraph.DEBUG=1; Dygraph.INFO=2; Dygraph.WARNING=3; Dygraph.ERROR=3; -Dygraph.prototype.__old_init__=function(div,_85,_86,_87){ -if(_86!=null){ -var _88=["Date"]; -for(var i=0;i<_86.length;i++){ -_88.push(_86[i]); +Dygraph.prototype.__old_init__=function(div,_84,_85,_86){ +if(_85!=null){ +var _87=["Date"]; +for(var i=0;i<_85.length;i++){ +_87.push(_85[i]); } -MochiKit.Base.update(_87,{"labels":_88}); +MochiKit.Base.update(_86,{"labels":_87}); } -this.__init__(div,_85,_87); +this.__init__(div,_84,_86); }; -Dygraph.prototype.__init__=function(div,_89,_90){ -if(_90==null){ -_90={}; +Dygraph.prototype.__init__=function(div,_88,_89){ +if(_89==null){ +_89={}; } this.maindiv_=div; -this.file_=_89; -this.rollPeriod_=_90.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; +this.file_=_88; +this.rollPeriod_=_89.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; this.previousVerticalX_=-1; -this.fractions_=_90.fractions||false; -this.dateWindow_=_90.dateWindow||null; -this.valueRange_=_90.valueRange||null; -this.wilsonInterval_=_90.wilsonInterval||true; +this.fractions_=_89.fractions||false; +this.dateWindow_=_89.dateWindow||null; +this.valueRange_=_89.valueRange||null; +this.wilsonInterval_=_89.wilsonInterval||true; div.innerHTML=""; if(div.style.width==""){ div.style.width=Dygraph.DEFAULT_WIDTH+"px"; @@ -1975,7 +1482,7 @@ div.style.height=Dygraph.DEFAULT_HEIGHT+"px"; this.width_=parseInt(div.style.width,10); this.height_=parseInt(div.style.height,10); this.user_attrs_={}; -MochiKit.Base.update(this.user_attrs_,_90); +MochiKit.Base.update(this.user_attrs_,_89); this.attrs_={}; MochiKit.Base.update(this.attrs_,Dygraph.DEFAULT_ATTRS); this.labelsFromCSV_=(this.attr_("labels")==null); @@ -1993,105 +1500,158 @@ this.createRollInterface_(); this.createDragInterface_(); this.start_(); }; -Dygraph.prototype.attr_=function(_91){ -if(typeof (this.user_attrs_[_91])!="undefined"){ -return this.user_attrs_[_91]; +Dygraph.prototype.attr_=function(_90){ +if(typeof (this.user_attrs_[_90])!="undefined"){ +return this.user_attrs_[_90]; }else{ -if(typeof (this.attrs_[_91])!="undefined"){ -return this.attrs_[_91]; +if(typeof (this.attrs_[_90])!="undefined"){ +return this.attrs_[_90]; }else{ return null; } } }; -Dygraph.prototype.log=function(_92,_93){ +Dygraph.prototype.log=function(_91,_92){ if(typeof (console)!="undefined"){ -switch(_92){ +switch(_91){ case Dygraph.DEBUG: -console.debug("dygraphs: "+_93); +console.debug("dygraphs: "+_92); break; case Dygraph.INFO: -console.info("dygraphs: "+_93); +console.info("dygraphs: "+_92); break; case Dygraph.WARNING: -console.warn("dygraphs: "+_93); +console.warn("dygraphs: "+_92); break; case Dygraph.ERROR: -console.error("dygraphs: "+_93); +console.error("dygraphs: "+_92); break; } } }; -Dygraph.prototype.info=function(_94){ -this.log(Dygraph.INFO,_94); +Dygraph.prototype.info=function(_93){ +this.log(Dygraph.INFO,_93); }; -Dygraph.prototype.warn=function(_95){ -this.log(Dygraph.WARNING,_95); +Dygraph.prototype.warn=function(_94){ +this.log(Dygraph.WARNING,_94); }; -Dygraph.prototype.error=function(_96){ -this.log(Dygraph.ERROR,_96); +Dygraph.prototype.error=function(_95){ +this.log(Dygraph.ERROR,_95); }; Dygraph.prototype.rollPeriod=function(){ return this.rollPeriod_; }; Dygraph.addEvent=function(el,evt,fn){ -var _99=function(e){ +var _98=function(e){ if(!e){ var e=window.event; } fn(e); }; if(window.addEventListener){ -el.addEventListener(evt,_99,false); +el.addEventListener(evt,_98,false); }else{ -el.attachEvent("on"+evt,_99); +el.attachEvent("on"+evt,_98); } }; Dygraph.prototype.createInterface_=function(){ -var _101=this.maindiv_; +var _100=this.maindiv_; this.graphDiv=document.createElement("div"); this.graphDiv.style.width=this.width_+"px"; this.graphDiv.style.height=this.height_+"px"; -_101.appendChild(this.graphDiv); +_100.appendChild(this.graphDiv); this.canvas_=document.createElement("canvas"); this.canvas_.style.position="absolute"; this.canvas_.width=this.width_; this.canvas_.height=this.height_; this.graphDiv.appendChild(this.canvas_); this.hidden_=this.createPlotKitCanvas_(this.canvas_); -var _102=this; +var _101=this; Dygraph.addEvent(this.hidden_,"mousemove",function(e){ -_102.mouseMove_(e); +_101.mouseMove_(e); }); Dygraph.addEvent(this.hidden_,"mouseout",function(e){ -_102.mouseOut_(e); +_101.mouseOut_(e); }); }; -Dygraph.prototype.createPlotKitCanvas_=function(_103){ +Dygraph.prototype.createPlotKitCanvas_=function(_102){ var h=document.createElement("canvas"); h.style.position="absolute"; -h.style.top=_103.style.top; -h.style.left=_103.style.left; +h.style.top=_102.style.top; +h.style.left=_102.style.left; h.width=this.width_; h.height=this.height_; this.graphDiv.appendChild(h); return h; }; +Dygraph.hsvToRGB=function(hue,_105,_106){ +var red; +var _108; +var blue; +if(_105===0){ +red=_106; +_108=_106; +blue=_106; +}else{ +var i=Math.floor(hue*6); +var f=(hue*6)-i; +var p=_106*(1-_105); +var q=_106*(1-(_105*f)); +var t=_106*(1-(_105*(1-f))); +switch(i){ +case 1: +red=q; +_108=_106; +blue=p; +break; +case 2: +red=p; +_108=_106; +blue=t; +break; +case 3: +red=p; +_108=q; +blue=_106; +break; +case 4: +red=t; +_108=p; +blue=_106; +break; +case 5: +red=_106; +_108=p; +blue=q; +break; +case 6: +case 0: +red=_106; +_108=t; +blue=p; +break; +} +} +red=Math.floor(255*red+0.5); +_108=Math.floor(255*_108+0.5); +blue=Math.floor(255*blue+0.5); +return "rgb("+red+","+_108+","+blue+")"; +}; Dygraph.prototype.setColors_=function(){ var num=this.attr_("labels").length-1; this.colors_=[]; -var _106=this.attr_("colors"); -if(!_106){ +var _115=this.attr_("colors"); +if(!_115){ var sat=this.attr_("colorSaturation")||1; var val=this.attr_("colorValue")||0.5; for(var i=1;i<=num;i++){ var hue=(1*i/(1+num)); -this.colors_.push(MochiKit.Color.Color.fromHSV(hue,sat,val)); +this.colors_.push(Dygraph.hsvToRGB(hue,sat,val)); } }else{ for(var i=0;i=10){ -self.doZoom_(Math.min(_126,_128),Math.max(_126,_128)); +Dygraph.addEvent(this.hidden_,"mouseup",function(_147){ +if(_133){ +_133=false; +_136=getX(_147); +_137=getY(_147); +var _148=Math.abs(_136-_134); +var _149=Math.abs(_137-_135); +if(_148<2&&_149<2&&self.attr_("clickCallback")!=null&&self.lastx_!=undefined){ +self.attr_("clickCallback")(_147,new Date(self.lastx_)); +} +if(_148>=10){ +self.doZoom_(Math.min(_134,_136),Math.max(_134,_136)); }else{ self.canvas_.getContext("2d").clearRect(0,0,self.canvas_.width,self.canvas_.height); } -_126=null; -_127=null; +_134=null; +_135=null; } }); -Dygraph.addEvent(this.hidden_,"dblclick",function(_142){ +Dygraph.addEvent(this.hidden_,"dblclick",function(_150){ self.dateWindow_=null; self.drawGraph_(self.rawData_); -var _143=self.rawData_[0][0]; -var _144=self.rawData_[self.rawData_.length-1][0]; +var _151=self.rawData_[0][0]; +var _152=self.rawData_[self.rawData_.length-1][0]; if(self.attr_("zoomCallback")){ -self.attr_("zoomCallback")(_143,_144); +self.attr_("zoomCallback")(_151,_152); } }); }; -Dygraph.prototype.drawZoomRect_=function(_145,endX,_147){ +Dygraph.prototype.drawZoomRect_=function(_153,endX,_155){ var ctx=this.canvas_.getContext("2d"); -if(_147){ -ctx.clearRect(Math.min(_145,_147),0,Math.abs(_145-_147),this.height_); +if(_155){ +ctx.clearRect(Math.min(_153,_155),0,Math.abs(_153-_155),this.height_); } -if(endX&&_145){ +if(endX&&_153){ ctx.fillStyle="rgba(128,128,128,0.33)"; -ctx.fillRect(Math.min(_145,endX),0,Math.abs(endX-_145),this.height_); +ctx.fillRect(Math.min(_153,endX),0,Math.abs(endX-_153),this.height_); } }; -Dygraph.prototype.doZoom_=function(lowX,_149){ -var _150=this.layout_.points; -var _151=null; -var _152=null; -for(var i=0;i<_150.length;i++){ -var cx=_150[i].canvasx; -var x=_150[i].xval; -if(cx_151)){ -_151=x; +Dygraph.prototype.doZoom_=function(lowX,_157){ +var _158=this.layout_.points; +var _159=null; +var _160=null; +for(var i=0;i<_158.length;i++){ +var cx=_158[i].canvasx; +var x=_158[i].xval; +if(cx_159)){ +_159=x; } -if(cx>_149&&(_152==null||x<_152)){ -_152=x; +if(cx>_157&&(_160==null||x<_160)){ +_160=x; } } -if(_151==null){ -_151=_150[0].xval; +if(_159==null){ +_159=_158[0].xval; } -if(_152==null){ -_152=_150[_150.length-1].xval; +if(_160==null){ +_160=_158[_158.length-1].xval; } -this.dateWindow_=[_151,_152]; +this.dateWindow_=[_159,_160]; this.drawGraph_(this.rawData_); if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_151,_152); +this.attr_("zoomCallback")(_159,_160); } }; -Dygraph.prototype.mouseMove_=function(_154){ -var _155=Dygraph.pageX(_154)-Dygraph.findPosX(this.hidden_); -var _156=this.layout_.points; -var _157=-1; -var _158=-1; -var _159=1e+100; +Dygraph.prototype.mouseMove_=function(_162){ +var _163=Dygraph.pageX(_162)-Dygraph.findPosX(this.hidden_); +var _164=this.layout_.points; +var _165=-1; +var _166=-1; +var _167=1e+100; var idx=-1; -for(var i=0;i<_156.length;i++){ -var dist=Math.abs(_156[i].canvasx-_155); -if(dist>_159){ +for(var i=0;i<_164.length;i++){ +var dist=Math.abs(_164[i].canvasx-_163); +if(dist>_167){ break; } -_159=dist; +_167=dist; idx=i; } if(idx>=0){ -_157=_156[idx].xval; +_165=_164[idx].xval; } -if(_155>_156[_156.length-1].canvasx){ -_157=_156[_156.length-1].xval; +if(_163>_164[_164.length-1].canvasx){ +_165=_164[_164.length-1].xval; } -var _162=[]; -for(var i=0;i<_156.length;i++){ -if(_156[i].xval==_157){ -_162.push(_156[i]); +var _170=[]; +for(var i=0;i<_164.length;i++){ +if(_164[i].xval==_165){ +_170.push(_164[i]); } } -var _163=this.attr_("highlightCircleSize"); +var _171=this.attr_("highlightCircleSize"); var ctx=this.canvas_.getContext("2d"); if(this.previousVerticalX_>=0){ var px=this.previousVerticalX_; -ctx.clearRect(px-_163-1,0,2*_163+2,this.height_); +ctx.clearRect(px-_171-1,0,2*_171+2,this.height_); } var isOK=function(x){ return x&&!isNaN(x); }; -if(_162.length>0){ -var _155=_162[0].canvasx; -var _165=this.attr_("xValueFormatter")(_157,this)+":"; +if(_170.length>0){ +var _163=_170[0].canvasx; +var _173=this.attr_("xValueFormatter")(_165,this)+":"; var clen=this.colors_.length; -for(var i=0;i<_162.length;i++){ -if(!isOK(_162[i].canvasy)){ +for(var i=0;i<_170.length;i++){ +if(!isOK(_170[i].canvasy)){ continue; } if(this.attr_("labelsSeparateLines")){ -_165+="
"; +_173+="
"; } -var _167=_162[i]; -_165+=" "+_167.name+":"+this.round_(_167.yval,2); +var _175=_170[i]; +var c=new RGBColor(this.colors_[i%clen]); +_173+=" "+_175.name+":"+this.round_(_175.yval,2); } -this.attr_("labelsDiv").innerHTML=_165; -this.lastx_=_157; +this.attr_("labelsDiv").innerHTML=_173; +this.lastx_=_165; ctx.save(); -for(var i=0;i<_162.length;i++){ -if(!isOK(_162[i%clen].canvasy)){ +for(var i=0;i<_170.length;i++){ +if(!isOK(_170[i%clen].canvasy)){ continue; } ctx.beginPath(); -ctx.fillStyle=this.colors_[i%clen].toRGBString(); -ctx.arc(_155,_162[i%clen].canvasy,_163,0,360,false); +ctx.fillStyle=this.colors_[i%clen]; +ctx.arc(_163,_170[i%clen].canvasy,_171,0,360,false); ctx.fill(); } ctx.restore(); -this.previousVerticalX_=_155; +this.previousVerticalX_=_163; } }; -Dygraph.prototype.mouseOut_=function(_168){ +Dygraph.prototype.mouseOut_=function(_177){ var ctx=this.canvas_.getContext("2d"); ctx.clearRect(0,0,this.width_,this.height_); this.attr_("labelsDiv").innerHTML=""; @@ -2364,34 +1925,34 @@ return ""+x; } }; Dygraph.prototype.hmsString_=function(date){ -var _170=Dygraph.zeropad; +var _179=Dygraph.zeropad; var d=new Date(date); if(d.getSeconds()){ -return _170(d.getHours())+":"+_170(d.getMinutes())+":"+_170(d.getSeconds()); +return _179(d.getHours())+":"+_179(d.getMinutes())+":"+_179(d.getSeconds()); }else{ if(d.getMinutes()){ -return _170(d.getHours())+":"+_170(d.getMinutes()); +return _179(d.getHours())+":"+_179(d.getMinutes()); }else{ -return _170(d.getHours()); +return _179(d.getHours()); } } }; Dygraph.dateString_=function(date,self){ -var _172=Dygraph.zeropad; +var _181=Dygraph.zeropad; var d=new Date(date); var year=""+d.getFullYear(); -var _174=_172(d.getMonth()+1); -var day=_172(d.getDate()); +var _183=_181(d.getMonth()+1); +var day=_181(d.getDate()); var ret=""; var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds(); if(frac){ ret=" "+self.hmsString_(date); } -return year+"/"+_174+"/"+day+ret; +return year+"/"+_183+"/"+day+ret; }; -Dygraph.prototype.round_=function(num,_178){ -var _179=Math.pow(10,_178); -return Math.round(num*_179)/_179; +Dygraph.prototype.round_=function(num,_187){ +var _188=Math.pow(10,_187); +return Math.round(num*_188)/_188; }; Dygraph.prototype.loadedEvent_=function(data){ this.rawData_=this.parseCSV_(data); @@ -2400,16 +1961,16 @@ this.drawGraph_(this.rawData_); Dygraph.prototype.months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]; Dygraph.prototype.quarters=["Jan","Apr","Jul","Oct"]; Dygraph.prototype.addXTicks_=function(){ -var _181,endDate; +var _190,endDate; if(this.dateWindow_){ -_181=this.dateWindow_[0]; +_190=this.dateWindow_[0]; endDate=this.dateWindow_[1]; }else{ -_181=this.rawData_[0][0]; +_190=this.rawData_[0][0]; endDate=this.rawData_[this.rawData_.length-1][0]; } -var _182=this.attr_("xTicker")(_181,endDate,this); -this.layout_.updateOptions({xTicks:_182}); +var _191=this.attr_("xTicker")(_190,endDate,this); +this.layout_.updateOptions({xTicks:_191}); }; Dygraph.SECONDLY=0; Dygraph.TEN_SECONDLY=1; @@ -2438,161 +1999,161 @@ Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600; Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600*6; Dygraph.SHORT_SPACINGS[Dygraph.DAILY]=1000*86400; Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY]=1000*604800; -Dygraph.prototype.NumXTicks=function(_183,_184,_185){ -if(_185=Dygraph.DAILY){ -_194.push({v:t,label:new Date(t+3600*1000).strftime(_196)}); +if(frac==0||_202>=Dygraph.DAILY){ +_203.push({v:t,label:new Date(t+3600*1000).strftime(_205)}); }else{ -_194.push({v:t,label:this.hmsString_(t)}); +_203.push({v:t,label:this.hmsString_(t)}); } } }else{ -var _198; -var _199=1; -if(_193==Dygraph.MONTHLY){ -_198=[0,1,2,3,4,5,6,7,8,9,10,11,12]; +var _206; +var _207=1; +if(_202==Dygraph.MONTHLY){ +_206=[0,1,2,3,4,5,6,7,8,9,10,11,12]; }else{ -if(_193==Dygraph.QUARTERLY){ -_198=[0,3,6,9]; +if(_202==Dygraph.QUARTERLY){ +_206=[0,3,6,9]; }else{ -if(_193==Dygraph.BIANNUAL){ -_198=[0,6]; +if(_202==Dygraph.BIANNUAL){ +_206=[0,6]; }else{ -if(_193==Dygraph.ANNUAL){ -_198=[0]; +if(_202==Dygraph.ANNUAL){ +_206=[0]; }else{ -if(_193==Dygraph.DECADAL){ -_198=[0]; -_199=10; +if(_202==Dygraph.DECADAL){ +_206=[0]; +_207=10; } } } } } -var _200=new Date(_191).getFullYear(); -var _201=new Date(_192).getFullYear(); -var _202=Dygraph.zeropad; -for(var i=_200;i<=_201;i++){ -if(i%_199!=0){ +var _208=new Date(_200).getFullYear(); +var _209=new Date(_201).getFullYear(); +var _210=Dygraph.zeropad; +for(var i=_208;i<=_209;i++){ +if(i%_207!=0){ continue; } -for(var j=0;j<_198.length;j++){ -var _203=i+"/"+_202(1+_198[j])+"/01"; -var t=Date.parse(_203); -if(t<_191||t>_192){ +for(var j=0;j<_206.length;j++){ +var _211=i+"/"+_210(1+_206[j])+"/01"; +var t=Date.parse(_211); +if(t<_200||t>_201){ continue; } -_194.push({v:t,label:new Date(t).strftime("%b %y")}); +_203.push({v:t,label:new Date(t).strftime("%b %y")}); } } } -return _194; +return _203; }; -Dygraph.dateTicker=function(_204,_205,self){ -var _206=-1; +Dygraph.dateTicker=function(_212,_213,self){ +var _214=-1; for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_206=i; +var _215=self.NumXTicks(_212,_213,i); +if(self.width_/_215>=self.attr_("pixelsPerXLabel")){ +_214=i; break; } } -if(_206>=0){ -return self.GetXAxis(_204,_205,_206); +if(_214>=0){ +return self.GetXAxis(_212,_213,_214); }else{ } }; Dygraph.numericTicks=function(minV,maxV,self){ -var _210=[1,2,5]; -var _211,low_val,high_val,nTicks; -var _212=self.attr_("pixelsPerYLabel"); +var _218=[1,2,5]; +var _219,low_val,high_val,nTicks; +var _220=self.attr_("pixelsPerYLabel"); for(var i=-10;i<50;i++){ -var _213=Math.pow(10,i); -for(var j=0;j<_210.length;j++){ -_211=_213*_210[j]; -low_val=Math.floor(minV/_211)*_211; -high_val=Math.ceil(maxV/_211)*_211; -nTicks=(high_val-low_val)/_211; -var _214=self.height_/nTicks; -if(_214>_212){ +var _221=Math.pow(10,i); +for(var j=0;j<_218.length;j++){ +_219=_221*_218[j]; +low_val=Math.floor(minV/_219)*_219; +high_val=Math.ceil(maxV/_219)*_219; +nTicks=(high_val-low_val)/_219; +var _222=self.height_/nTicks; +if(_222>_220){ break; } } -if(_214>_212){ +if(_222>_220){ break; } } -var _215=[]; +var _223=[]; for(var i=0;i=k*k*k){ -_217=self.round_(_216/(k*k*k),1)+"B"; +if(_224>=k*k*k){ +_225=self.round_(_224/(k*k*k),1)+"B"; }else{ -if(_216>=k*k){ -_217=self.round_(_216/(k*k),1)+"M"; +if(_224>=k*k){ +_225=self.round_(_224/(k*k),1)+"M"; }else{ -if(_216>=k){ -_217=self.round_(_216/k,1)+"K"; +if(_224>=k){ +_225=self.round_(_224/k,1)+"K"; } } } } -_215.push({label:_217,v:_216}); +_223.push({label:_225,v:_224}); } -return _215; +return _223; }; Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _221=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_221}); +var _229=Dygraph.numericTicks(minY,maxY,this); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_229}); }; -Dygraph.prototype.extremeValues_=function(_222){ +Dygraph.prototype.extremeValues_=function(_230){ var minY=null,maxY=null; var bars=this.attr_("errorBars")||this.attr_("customBars"); if(bars){ -for(var j=0;j<_222.length;j++){ -var y=_222[j][1][0]; +for(var j=0;j<_230.length;j++){ +var y=_230[j][1][0]; if(!y){ continue; } -var low=y-_222[j][1][1]; -var high=y+_222[j][1][2]; +var low=y-_230[j][1][1]; +var high=y+_230[j][1][2]; if(low>y){ low=y; } @@ -2607,8 +2168,8 @@ minY=low; } } }else{ -for(var j=0;j<_222.length;j++){ -var y=_222[j][1]; +for(var j=0;j<_230.length;j++){ +var y=_230[j][1]; if(!y){ continue; } @@ -2628,64 +2189,64 @@ this.layout_.removeAllDatasets(); this.setColors_(); this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize"); for(var i=1;i=low&&_226[k][0]<=high){ -_227.push(_226[k]); +var _235=[]; +for(var k=0;k<_234.length;k++){ +if(_234[k][0]>=low&&_234[k][0]<=high){ +_235.push(_234[k]); } } -_226=_227; +_234=_235; } -var _228=this.extremeValues_(_226); -var _229=_228[0]; -var _230=_228[1]; -if(!minY||_229maxY){ -maxY=_230; +if(!maxY||_238>maxY){ +maxY=_238; } if(bars){ var vals=[]; -for(var j=0;j<_226.length;j++){ -vals[j]=[_226[j][0],_226[j][1][0],_226[j][1][1],_226[j][1][2]]; +for(var j=0;j<_234.length;j++){ +vals[j]=[_234[j][0],_234[j][1][0],_234[j][1][1],_234[j][1][2]]; } this.layout_.addDataset(this.attr_("labels")[i],vals); }else{ -this.layout_.addDataset(this.attr_("labels")[i],_226); +this.layout_.addDataset(this.attr_("labels")[i],_234); } } if(this.valueRange_!=null){ this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); }else{ var span=maxY-minY; -var _233=maxY+0.1*span; -var _234=minY-0.1*span; -if(_234<0&&minY>=0){ -_234=0; +var _241=maxY+0.1*span; +var _242=minY-0.1*span; +if(_242<0&&minY>=0){ +_242=0; } -if(_233>0&&maxY<=0){ -_233=0; +if(_241>0&&maxY<=0){ +_241=0; } if(this.attr_("includeZero")){ if(maxY<0){ -_233=0; +_241=0; } if(minY>0){ -_234=0; +_242=0; } } -this.addYTicks_(_234,_233); +this.addYTicks_(_242,_241); } this.addXTicks_(); this.layout_.evaluateWithError(); @@ -2693,44 +2254,44 @@ this.plotter_.clear(); this.plotter_.render(); this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); }; -Dygraph.prototype.rollingAverage=function(_235,_236){ -if(_235.length<2){ -return _235; +Dygraph.prototype.rollingAverage=function(_243,_244){ +if(_243.length<2){ +return _243; } -var _236=Math.min(_236,_235.length-1); -var _237=[]; -var _238=this.attr_("sigma"); +var _244=Math.min(_244,_243.length-1); +var _245=[]; +var _246=this.attr_("sigma"); if(this.fractions_){ var num=0; var den=0; var mult=100; -for(var i=0;i<_235.length;i++){ -num+=_235[i][1][0]; -den+=_235[i][1][1]; -if(i-_236>=0){ -num-=_235[i-_236][1][0]; -den-=_235[i-_236][1][1]; -} -var date=_235[i][0]; -var _241=den?num/den:0; +for(var i=0;i<_243.length;i++){ +num+=_243[i][1][0]; +den+=_243[i][1][1]; +if(i-_244>=0){ +num-=_243[i-_244][1][0]; +den-=_243[i-_244][1][1]; +} +var date=_243[i][0]; +var _249=den?num/den:0; if(this.attr_("errorBars")){ if(this.wilsonInterval_){ if(den){ -var p=_241<0?0:_241,n=den; -var pm=_238*Math.sqrt(p*(1-p)/n+_238*_238/(4*n*n)); -var _244=1+_238*_238/den; -var low=(p+_238*_238/(2*den)-pm)/_244; -var high=(p+_238*_238/(2*den)+pm)/_244; -_237[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; +var p=_249<0?0:_249,n=den; +var pm=_246*Math.sqrt(p*(1-p)/n+_246*_246/(4*n*n)); +var _251=1+_246*_246/den; +var low=(p+_246*_246/(2*den)-pm)/_251; +var high=(p+_246*_246/(2*den)+pm)/_251; +_245[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; }else{ -_237[i]=[date,[0,0,0]]; +_245[i]=[date,[0,0,0]]; } }else{ -var _245=den?_238*Math.sqrt(_241*(1-_241)/den):1; -_237[i]=[date,[mult*_241,mult*_245,mult*_245]]; +var _252=den?_246*Math.sqrt(_249*(1-_249)/den):1; +_245[i]=[date,[mult*_249,mult*_252,mult*_252]]; } }else{ -_237[i]=[date,mult*_241]; +_245[i]=[date,mult*_249]; } } }else{ @@ -2738,105 +2299,105 @@ if(this.attr_("customBars")){ var low=0; var mid=0; var high=0; -var _247=0; -for(var i=0;i<_235.length;i++){ -var data=_235[i][1]; +var _254=0; +for(var i=0;i<_243.length;i++){ +var data=_243[i][1]; var y=data[1]; -_237[i]=[_235[i][0],[y,y-data[0],data[2]-y]]; +_245[i]=[_243[i][0],[y,y-data[0],data[2]-y]]; low+=data[0]; mid+=y; high+=data[2]; -_247+=1; -if(i-_236>=0){ -var prev=_235[i-_236]; +_254+=1; +if(i-_244>=0){ +var prev=_243[i-_244]; low-=prev[1][0]; mid-=prev[1][1]; high-=prev[1][2]; -_247-=1; +_254-=1; } -_237[i]=[_235[i][0],[1*mid/_247,1*(mid-low)/_247,1*(high-mid)/_247]]; +_245[i]=[_243[i][0],[1*mid/_254,1*(mid-low)/_254,1*(high-mid)/_254]]; } }else{ -var _249=Math.min(_236-1,_235.length-2); +var _256=Math.min(_244-1,_243.length-2); if(!this.attr_("errorBars")){ -if(_236==1){ -return _235; +if(_244==1){ +return _243; } -for(var i=0;i<_235.length;i++){ +for(var i=0;i<_243.length;i++){ var sum=0; -var _251=0; -for(var j=Math.max(0,i-_236+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_256=true; +_263=true; }else{ if(str.length==8&&str>"19700101"&&str<"20371231"){ -_256=true; +_263=true; } } -if(_256){ +if(_263){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xValueParser=Dygraph.dateParser; this.attrs_.xTicker=Dygraph.dateTicker; @@ -2852,57 +2413,57 @@ this.attrs_.xTicker=Dygraph.numericTicks; }; Dygraph.prototype.parseCSV_=function(data){ var ret=[]; -var _257=data.split("\n"); -var _258=0; +var _264=data.split("\n"); +var _265=0; if(this.labelsFromCSV_){ -_258=1; -this.attrs_.labels=_257[0].split(","); -} -var _259; -var _260=false; -var _261=this.attr_("labels").length; -for(var i=_258;i<_257.length;i++){ -var line=_257[i]; +_265=1; +this.attrs_.labels=_264[0].split(","); +} +var _266; +var _267=false; +var _268=this.attr_("labels").length; +for(var i=_265;i<_264.length;i++){ +var line=_264[i]; if(line.length==0){ continue; } -var _263=line.split(","); -if(_263.length<2){ +var _270=line.split(","); +if(_270.length<2){ continue; } -var _264=[]; -if(!_260){ -this.detectTypeFromString_(_263[0]); -_259=this.attr_("xValueParser"); -_260=true; +var _271=[]; +if(!_267){ +this.detectTypeFromString_(_270[0]); +_266=this.attr_("xValueParser"); +_267=true; } -_264[0]=_259(_263[0],this); +_271[0]=_266(_270[0],this); if(this.fractions_){ -for(var j=1;j<_263.length;j++){ -var vals=_263[j].split("/"); -_264[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; +for(var j=1;j<_270.length;j++){ +var vals=_270[j].split("/"); +_271[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; } }else{ if(this.attr_("errorBars")){ -for(var j=1;j<_263.length;j+=2){ -_264[(j+1)/2]=[parseFloat(_263[j]),parseFloat(_263[j+1])]; +for(var j=1;j<_270.length;j+=2){ +_271[(j+1)/2]=[parseFloat(_270[j]),parseFloat(_270[j+1])]; } }else{ if(this.attr_("customBars")){ -for(var j=1;j<_263.length;j++){ -var vals=_263[j].split(";"); -_264[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; +for(var j=1;j<_270.length;j++){ +var vals=_270[j].split(";"); +_271[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; } }else{ -for(var j=1;j<_263.length;j++){ -_264[j]=parseFloat(_263[j]); +for(var j=1;j<_270.length;j++){ +_271[j]=parseFloat(_270[j]); } } } } -ret.push(_264); -if(_264.length!=_261){ -this.error("Number of columns in line "+i+" ("+_264.length+") does not agree with number of labels ("+_261+") "+line); +ret.push(_271); +if(_271.length!=_268){ +this.error("Number of columns in line "+i+" ("+_271.length+") does not agree with number of labels ("+_268+") "+line); } } return ret; @@ -2926,19 +2487,19 @@ this.attrs_.labels.push("Y"+i); if(MochiKit.Base.isDateLike(data[0][0])){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xTicker=Dygraph.dateTicker; -var _265=MochiKit.Base.clone(data); +var _272=MochiKit.Base.clone(data); for(var i=0;i=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _272=this; +var _279=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_272.loadedEvent_(req.responseText); +_279.loadedEvent_(req.responseText); } } }; @@ -3027,36 +2588,90 @@ this.error("Unknown data format: "+(typeof this.file_)); } } }; -Dygraph.prototype.updateOptions=function(_273){ -if(_273.rollPeriod){ -this.rollPeriod_=_273.rollPeriod; +Dygraph.prototype.updateOptions=function(_280){ +if(_280.rollPeriod){ +this.rollPeriod_=_280.rollPeriod; } -if(_273.dateWindow){ -this.dateWindow_=_273.dateWindow; +if(_280.dateWindow){ +this.dateWindow_=_280.dateWindow; } -if(_273.valueRange){ -this.valueRange_=_273.valueRange; +if(_280.valueRange){ +this.valueRange_=_280.valueRange; } -MochiKit.Base.update(this.user_attrs_,_273); +MochiKit.Base.update(this.user_attrs_,_280); this.labelsFromCSV_=(this.attr_("labels")==null); this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_273["file"]&&_273["file"]!=this.file_){ -this.file_=_273["file"]; +if(_280["file"]&&_280["file"]!=this.file_){ +this.file_=_280["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_274){ -this.rollPeriod_=_274; +Dygraph.prototype.adjustRoll=function(_281){ +this.rollPeriod_=_281; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_275){ -this.container=_275; +Dygraph.GVizChart=function(_282){ +this.container=_282; }; -Dygraph.GVizChart.prototype.draw=function(data,_276){ +Dygraph.GVizChart.prototype.draw=function(data,_283){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_276); +this.date_graph=new Dygraph(this.container,data,_283); }; DateGraph=Dygraph; +function RGBColor(_284){ +this.ok=false; +if(_284.charAt(0)=="#"){ +_284=_284.substr(1,6); +} +_284=_284.replace(/ /g,""); +_284=_284.toLowerCase(); +var _285={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"}; +for(var key in _285){ +if(_284==key){ +_284=_285[key]; +} +} +var _287=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(bits){ +return [parseInt(bits[1]),parseInt(bits[2]),parseInt(bits[3])]; +}},{re:/^(\w{2})(\w{2})(\w{2})$/,example:["#00ff00","336699"],process:function(bits){ +return [parseInt(bits[1],16),parseInt(bits[2],16),parseInt(bits[3],16)]; +}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(bits){ +return [parseInt(bits[1]+bits[1],16),parseInt(bits[2]+bits[2],16),parseInt(bits[3]+bits[3],16)]; +}}]; +for(var i=0;i<_287.length;i++){ +var re=_287[i].re; +var _290=_287[i].process; +var bits=re.exec(_284); +if(bits){ +channels=_290(bits); +this.r=channels[0]; +this.g=channels[1]; +this.b=channels[2]; +this.ok=true; +} +} +this.r=(this.r<0||isNaN(this.r))?0:((this.r>255)?255:this.r); +this.g=(this.g<0||isNaN(this.g))?0:((this.g>255)?255:this.g); +this.b=(this.b<0||isNaN(this.b))?0:((this.b>255)?255:this.b); +this.toRGB=function(){ +return "rgb("+this.r+", "+this.g+", "+this.b+")"; +}; +this.toHex=function(){ +var r=this.r.toString(16); +var g=this.g.toString(16); +var b=this.b.toString(16); +if(r.length==1){ +r="0"+r; +} +if(g.length==1){ +g="0"+g; +} +if(b.length==1){ +b="0"+b; +} +return "#"+r+g+b; +}; +} diff --git a/dygraph.js b/dygraph.js index f282990..26b069b 100644 --- a/dygraph.js +++ b/dygraph.js @@ -327,6 +327,38 @@ Dygraph.prototype.createPlotKitCanvas_ = function(canvas) { return h; }; +// Taken from MochiKit.Color +Dygraph.hsvToRGB = function (hue, saturation, value) { + var red; + var green; + var blue; + if (saturation === 0) { + red = value; + green = value; + blue = value; + } else { + var i = Math.floor(hue * 6); + var f = (hue * 6) - i; + var p = value * (1 - saturation); + var q = value * (1 - (saturation * f)); + var t = value * (1 - (saturation * (1 - f))); + switch (i) { + case 1: red = q; green = value; blue = p; break; + case 2: red = p; green = value; blue = t; break; + case 3: red = p; green = q; blue = value; break; + case 4: red = t; green = p; blue = value; break; + case 5: red = value; green = p; blue = q; break; + case 6: // fall through + case 0: red = value; green = t; blue = p; break; + } + } + red = Math.floor(255 * red + 0.5); + green = Math.floor(255 * green + 0.5); + blue = Math.floor(255 * blue + 0.5); + return 'rgb(' + red + ',' + green + ',' + blue + ')'; +}; + + /** * Generate a set of distinct colors for the data series. This is done with a * color wheel. Saturation/Value are customizable, and the hue is @@ -345,12 +377,12 @@ Dygraph.prototype.setColors_ = function() { var val = this.attr_('colorValue') || 0.5; for (var i = 1; i <= num; i++) { var hue = (1.0*i/(1+num)); - this.colors_.push( MochiKit.Color.Color.fromHSV(hue, sat, val) ); + this.colors_.push( Dygraph.hsvToRGB(hue, sat, val) ); } } else { for (var i = 0; i < num; i++) { var colorStr = colors[i % colors.length]; - this.colors_.push( MochiKit.Color.Color.fromString(colorStr) ); + this.colors_.push(colorStr); } } @@ -693,7 +725,8 @@ Dygraph.prototype.mouseMove_ = function(event) { replace += "
"; } var point = selPoints[i]; - replace += " " + var c = new RGBColor(this.colors_[i%clen]); + replace += " " + point.name + ":" + this.round_(point.yval, 2); } @@ -707,7 +740,7 @@ Dygraph.prototype.mouseMove_ = function(event) { for (var i = 0; i < selPoints.length; i++) { if (!isOK(selPoints[i%clen].canvasy)) continue; ctx.beginPath(); - ctx.fillStyle = this.colors_[i%clen].toRGBString(); + ctx.fillStyle = this.colors_[i%clen]; ctx.arc(canvasx, selPoints[i%clen].canvasy, circleSize, 0, 360, false); ctx.fill(); } diff --git a/generate-combined.sh b/generate-combined.sh index d27cc98..1fa7094 100755 --- a/generate-combined.sh +++ b/generate-combined.sh @@ -1,19 +1,18 @@ #!/bin/bash # Generates a single JS file that's easier to include. -# This packed JS includes a partial copy of MochiKit and PlotKit. -# It winds up being 146k uncompressed and 37k gzipped. -# Do the same for MochiKit. This save another 77k. +# Pack up just the bits of MochiKit that we need. cd mochikit_v14 ./scripts/pack.py \ -Base Color \ +Base \ > /tmp/mochikit-packed.js cd .. -# Pack the dygraphs JS. This saves another 22k. +# Pack the dygraphs JS and rgbcolor cat \ dygraph-canvas.js \ dygraph.js \ +rgbcolor/rgbcolor.js \ > /tmp/dygraph.js java -jar custom_rhino.jar -c /tmp/dygraph.js \ diff --git a/rgbcolor/rgbcolor.js b/rgbcolor/rgbcolor.js new file mode 100644 index 0000000..4316814 --- /dev/null +++ b/rgbcolor/rgbcolor.js @@ -0,0 +1,250 @@ +/** + * A class to parse color values + * + * NOTE: modified by danvk. I removed the "getHelpXML" function to reduce the + * file size. + * + * @author Stoyan Stefanov + * @link http://www.phpied.com/rgb-color-parser-in-javascript/ + * @license Use it if you like it + */ +function RGBColor(color_string) +{ + this.ok = false; + + // strip any leading # + if (color_string.charAt(0) == '#') { // remove # if any + color_string = color_string.substr(1,6); + } + + color_string = color_string.replace(/ /g,''); + color_string = color_string.toLowerCase(); + + // before getting into regexps, try simple matches + // and overwrite the input + var simple_colors = { + 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 simple_colors) { + if (color_string == key) { + color_string = simple_colors[key]; + } + } + // emd of simple type-in colors + + // array of color definition objects + var color_defs = [ + { + 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) + ]; + } + } + ]; + + // search through the definitions to find a match + for (var i = 0; i < color_defs.length; i++) { + var re = color_defs[i].re; + var processor = color_defs[i].process; + var bits = re.exec(color_string); + if (bits) { + channels = processor(bits); + this.r = channels[0]; + this.g = channels[1]; + this.b = channels[2]; + this.ok = true; + } + + } + + // validate/cleanup values + 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); + + // some getters + 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; + } + + +} + diff --git a/tests/grid_dot.html b/tests/grid_dot.html index 9d7bfaa..2f01242 100644 --- a/tests/grid_dot.html +++ b/tests/grid_dot.html @@ -4,16 +4,7 @@ - - - - - - - - -- 2.7.4