projects
/
dygraphs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b8e33d
)
update dygraph-combined.js
author
Dan Vanderkam
<danvdk@gmail.com>
Thu, 27 Aug 2009 06:09:01 +0000
(06:09 +0000)
committer
Dan Vanderkam
<danvdk@gmail.com>
Thu, 27 Aug 2009 06:09:01 +0000
(06:09 +0000)
dygraph-combined.js
patch
|
blob
|
blame
|
history
diff --git
a/dygraph-combined.js
b/dygraph-combined.js
index
6ef5aea
..
dfd995a
100644
(file)
--- a/
dygraph-combined.js
+++ b/
dygraph-combined.js
@@
-5064,22
+5064,47
@@
var ctx=this.canvas_.getContext("2d");
ctx.clearRect(0,0,this.width_,this.height_);
this.labelsDiv_.innerHTML="";
};
ctx.clearRect(0,0,this.width_,this.height_);
this.labelsDiv_.innerHTML="";
};
+DateGraph.prototype.hmsString_=function(date){
+var _118=function(x){
+if(x<10){
+return "0"+x;
+}else{
+return ""+x;
+}
+};
+var d=new Date(date);
+if(d.getSeconds()){
+return _118(d.getHours())+":"+_118(d.getMinutes())+":"+_118(d.getSeconds());
+}else{
+if(d.getMinutes()){
+return _118(d.getHours())+":"+_118(d.getMinutes());
+}else{
+return _118(d.getHours());
+}
+}
+};
DateGraph.prototype.dateString_=function(date){
DateGraph.prototype.dateString_=function(date){
+var _120=function(x){
+if(x<10){
+return "0"+x;
+}else{
+return ""+x;
+}
+};
var d=new Date(date);
var year=""+d.getFullYear();
var d=new Date(date);
var year=""+d.getFullYear();
-var _120=""+(d.getMonth()+1);
-if(_120.length<2){
-_120="0"+_120;
-}
-var day=""+d.getDate();
-if(day.length<2){
-day="0"+day;
+var _122=_120(d.getMonth()+1);
+var day=_120(d.getDate());
+var ret="";
+var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds();
+if(frac){
+ret=" "+this.hmsString_(date);
}
}
-return year+"/"+_12
0+"/"+day
;
+return year+"/"+_12
2+"/"+day+ret
;
};
};
-DateGraph.prototype.round_=function(num,_12
2
){
-var _12
3=Math.pow(10,_122
);
-return Math.round(num*_12
3)/_123
;
+DateGraph.prototype.round_=function(num,_12
6
){
+var _12
7=Math.pow(10,_126
);
+return Math.round(num*_12
7)/_127
;
};
DateGraph.prototype.loadedEvent_=function(data){
this.rawData_=this.parseCSV_(data);
};
DateGraph.prototype.loadedEvent_=function(data){
this.rawData_=this.parseCSV_(data);
@@
-5088,160
+5113,172
@@
this.drawGraph_(this.rawData_);
DateGraph.prototype.months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
DateGraph.prototype.quarters=["Jan","Apr","Jul","Oct"];
DateGraph.prototype.addXTicks_=function(){
DateGraph.prototype.months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
DateGraph.prototype.quarters=["Jan","Apr","Jul","Oct"];
DateGraph.prototype.addXTicks_=function(){
-var _12
5
,endDate;
+var _12
9
,endDate;
if(this.dateWindow_){
if(this.dateWindow_){
-_12
5
=this.dateWindow_[0];
+_12
9
=this.dateWindow_[0];
endDate=this.dateWindow_[1];
}else{
endDate=this.dateWindow_[1];
}else{
-_12
5
=this.rawData_[0][0];
+_12
9
=this.rawData_[0][0];
endDate=this.rawData_[this.rawData_.length-1][0];
}
endDate=this.rawData_[this.rawData_.length-1][0];
}
-var _1
26=this.xTicker_(_125
,endDate);
-this.layout_.updateOptions({xTicks:_1
26
});
+var _1
30=this.xTicker_(_129
,endDate);
+this.layout_.updateOptions({xTicks:_1
30
});
};
};
-DateGraph.prototype.dateTicker=function(_1
27,_128
){
-var _1
29
=24*60*60*1000;
-_1
27=_127/_129
;
-_1
28=_128/_129
;
-var _13
0=_128-_127
;
-var _13
1
=[];
-var _13
2
=false;
-var _13
3
=1;
-if(_13
0
>30*366){
-_13
2
=true;
-_13
1
=["Jan"];
-_13
3
=10;
+DateGraph.prototype.dateTicker=function(_1
31,_132
){
+var _1
33
=24*60*60*1000;
+_1
31=_131/_133
;
+_1
32=_132/_133
;
+var _13
4=_132-_131
;
+var _13
5
=[];
+var _13
6
=false;
+var _13
7
=1;
+if(_13
4
>30*366){
+_13
6
=true;
+_13
5
=["Jan"];
+_13
7
=10;
}else{
}else{
-if(_13
0
>4*366){
-_13
1
=["Jan"];
-_13
2
=true;
+if(_13
4
>4*366){
+_13
5
=["Jan"];
+_13
6
=true;
}else{
}else{
-if(_13
0
>366){
-_13
1
=this.quarters;
-_13
2
=true;
+if(_13
4
>366){
+_13
5
=this.quarters;
+_13
6
=true;
}else{
}else{
-if(_13
0
>40){
-_13
1
=this.months;
-_13
2
=true;
+if(_13
4
>40){
+_13
5
=this.months;
+_13
6
=true;
}else{
}else{
-if(_13
0
>10){
-for(var week=_1
27-14;week<_128
+14;week+=7){
-_13
1.push(week*_129
);
+if(_13
4
>10){
+for(var week=_1
31-14;week<_132
+14;week+=7){
+_13
5.push(week*_133
);
}
}else{
}
}else{
-for(var day=_127-14;day<_128+14;day+=1){
-_131.push(day*_129);
+if(_134>1){
+for(var day=_131-14;day<_132+14;day+=1){
+_135.push(day*_133);
}
}
+}else{
+for(var hour=Math.floor(_131-1)*24;hour<(_132+1)*24;hour+=1){
+_135.push(hour*60*60*1000);
}
}
}
}
}
}
}
}
}
}
-var _135=[];
-if(_132){
-var _136=1900+(new Date(_127*_129)).getYear();
-var _137=1900+(new Date(_128*_129)).getYear();
-for(var i=_136;i<=_137;i++){
-if(i%_133!=0){
+}
+}
+var _140=[];
+if(_136){
+var _141=1900+(new Date(_131*_133)).getYear();
+var _142=1900+(new Date(_132*_133)).getYear();
+for(var i=_141;i<=_142;i++){
+if(i%_137!=0){
continue;
}
continue;
}
-for(var j=0;j<_13
1
.length;j++){
-var date=Date.parse(_13
1
[j]+" 1, "+i);
-_1
35.push({label:_131
[j]+"'"+(""+i).substr(2,2),v:date});
+for(var j=0;j<_13
5
.length;j++){
+var date=Date.parse(_13
5
[j]+" 1, "+i);
+_1
40.push({label:_135
[j]+"'"+(""+i).substr(2,2),v:date});
}
}
}else{
}
}
}else{
-for(var i=0;i<_131.length;i++){
-var date=new Date(_131[i]);
-var year=date.getFullYear().toString();
-var _138=this.months[date.getMonth()]+date.getDate();
-_138+="'"+year.substr(year.length-2,2);
-_135.push({label:_138,v:date});
+for(var i=0;i<_135.length;i++){
+var d=new Date(_135[i]);
+var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds();
+var _143;
+if(frac==0){
+var year=d.getFullYear().toString();
+var _143=this.months[d.getMonth()]+d.getDate();
+_143+="'"+year.substr(year.length-2,2);
+}else{
+_143=this.hmsString_(d);
}
}
+_140.push({label:_143,v:d});
}
}
-return _135;
+}
+return _140;
};
DateGraph.prototype.numericTicks=function(minV,maxV){
};
DateGraph.prototype.numericTicks=function(minV,maxV){
-var _14
1
;
+var _14
6
;
if(maxV<=0){
if(maxV<=0){
-_14
1
=1;
+_14
6
=1;
}else{
}else{
-_14
1
=Math.pow(10,Math.floor(Math.log(maxV)/Math.log(10)));
+_14
6
=Math.pow(10,Math.floor(Math.log(maxV)/Math.log(10)));
}
}
-var _14
2=(maxV-minV)/_141
;
-while(2*_14
2
<20){
-_14
2
*=2;
+var _14
7=(maxV-minV)/_146
;
+while(2*_14
7
<20){
+_14
7
*=2;
}
}
-if((maxV-minV)/_14
2
<this.minTickSize_){
-_14
2
=this.round_((maxV-minV)/this.minTickSize_,1);
+if((maxV-minV)/_14
7
<this.minTickSize_){
+_14
7
=this.round_((maxV-minV)/this.minTickSize_,1);
}
}
-var _14
3
=[];
-for(var i=0;i<=_14
2
;i++){
-var _14
4=minV+i*(maxV-minV)/_142
;
-var _1
45=this.round_(_144
,2);
+var _14
8
=[];
+for(var i=0;i<=_14
7
;i++){
+var _14
9=minV+i*(maxV-minV)/_147
;
+var _1
50=this.round_(_149
,2);
if(this.labelsKMB_){
var k=1000;
if(this.labelsKMB_){
var k=1000;
-if(_14
4
>=k*k*k){
-_1
45=this.round_(_144
/(k*k*k),1)+"B";
+if(_14
9
>=k*k*k){
+_1
50=this.round_(_149
/(k*k*k),1)+"B";
}else{
}else{
-if(_14
4
>=k*k){
-_1
45=this.round_(_144
/(k*k),1)+"M";
+if(_14
9
>=k*k){
+_1
50=this.round_(_149
/(k*k),1)+"M";
}else{
}else{
-if(_14
4
>=k){
-_1
45=this.round_(_144
/k,1)+"K";
+if(_14
9
>=k){
+_1
50=this.round_(_149
/k,1)+"K";
}
}
}
}
}
}
}
}
-_14
3.push({label:_145,v:_144
});
+_14
8.push({label:_150,v:_149
});
}
}
-return _14
3
;
+return _14
8
;
};
DateGraph.prototype.addYTicks_=function(minY,maxY){
};
DateGraph.prototype.addYTicks_=function(minY,maxY){
-var _1
49
=this.numericTicks(minY,maxY);
-this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_1
49
});
+var _1
54
=this.numericTicks(minY,maxY);
+this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_1
54
});
};
DateGraph.prototype.drawGraph_=function(data){
var maxY=null;
this.layout_.removeAllDatasets();
for(var i=1;i<data[0].length;i++){
};
DateGraph.prototype.drawGraph_=function(data){
var maxY=null;
this.layout_.removeAllDatasets();
for(var i=1;i<data[0].length;i++){
-var _15
0
=[];
+var _15
5
=[];
for(var j=0;j<data.length;j++){
var date=data[j][0];
for(var j=0;j<data.length;j++){
var date=data[j][0];
-_15
0
[j]=[date,data[j][i]];
+_15
5
[j]=[date,data[j][i]];
}
}
-_15
0=this.rollingAverage(_150
,this.rollPeriod_);
+_15
5=this.rollingAverage(_155
,this.rollPeriod_);
var bars=this.errorBars_||this.customBars_;
if(this.dateWindow_){
var low=this.dateWindow_[0];
var high=this.dateWindow_[1];
var bars=this.errorBars_||this.customBars_;
if(this.dateWindow_){
var low=this.dateWindow_[0];
var high=this.dateWindow_[1];
-var _15
4
=[];
-for(var k=0;k<_15
0
.length;k++){
-if(_15
0[k][0]>=low&&_150
[k][0]<=high){
-_15
4.push(_150
[k]);
-var y=bars?_15
0[k][1][0]:_150
[k][1];
+var _15
9
=[];
+for(var k=0;k<_15
5
.length;k++){
+if(_15
5[k][0]>=low&&_155
[k][0]<=high){
+_15
9.push(_155
[k]);
+var y=bars?_15
5[k][1][0]:_155
[k][1];
if(maxY==null||y>maxY){
maxY=y;
}
}
}
if(maxY==null||y>maxY){
maxY=y;
}
}
}
-_15
0=_154
;
+_15
5=_159
;
}else{
}else{
-for(var j=0;j<_15
0
.length;j++){
-var y=bars?_15
0[j][1][0]:_150
[j][1];
+for(var j=0;j<_15
5
.length;j++){
+var y=bars?_15
5[j][1][0]:_155
[j][1];
if(maxY==null||y>maxY){
if(maxY==null||y>maxY){
-maxY=bars?y+_15
0
[j][1][1]:y;
+maxY=bars?y+_15
5
[j][1][1]:y;
}
}
}
if(bars){
var vals=[];
}
}
}
if(bars){
var vals=[];
-for(var j=0;j<_15
0
.length;j++){
-vals[j]=[_15
0[j][0],_150[j][1][0],_150[j][1][1],_150
[j][1][2]];
+for(var j=0;j<_15
5
.length;j++){
+vals[j]=[_15
5[j][0],_155[j][1][0],_155[j][1][1],_155
[j][1][2]];
}
this.layout_.addDataset(this.labels_[i-1],vals);
}else{
}
this.layout_.addDataset(this.labels_[i-1],vals);
}else{
-this.layout_.addDataset(this.labels_[i-1],_15
0
);
+this.layout_.addDataset(this.labels_[i-1],_15
5
);
}
}
if(this.valueRange_!=null){
}
}
if(this.valueRange_!=null){
@@
-5251,8
+5288,8
@@
maxY*=1.1;
if(maxY<=0){
maxY=1;
}else{
if(maxY<=0){
maxY=1;
}else{
-var _1
56
=Math.pow(10,Math.floor(Math.log(maxY)/Math.log(10)));
-maxY=_1
56*Math.ceil(maxY/_156
);
+var _1
61
=Math.pow(10,Math.floor(Math.log(maxY)/Math.log(10)));
+maxY=_1
61*Math.ceil(maxY/_161
);
}
this.addYTicks_(0,maxY);
}
}
this.addYTicks_(0,maxY);
}
@@
-5262,160
+5299,177
@@
this.plotter_.clear();
this.plotter_.render();
this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height);
};
this.plotter_.render();
this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height);
};
-DateGraph.prototype.rollingAverage=function(_1
57,_158
){
-if(_1
57
.length<2){
-return _1
57
;
+DateGraph.prototype.rollingAverage=function(_1
62,_163
){
+if(_1
62
.length<2){
+return _1
62
;
}
}
-var _1
58=Math.min(_158,_157
.length-1);
-var _1
59
=[];
-var _16
0
=this.sigma_;
+var _1
63=Math.min(_163,_162
.length-1);
+var _1
64
=[];
+var _16
5
=this.sigma_;
if(this.fractions_){
var num=0;
var den=0;
var mult=100;
if(this.fractions_){
var num=0;
var den=0;
var mult=100;
-for(var i=0;i<_1
57
.length;i++){
-num+=_1
57
[i][1][0];
-den+=_1
57
[i][1][1];
-if(i-_1
58
>=0){
-num-=_1
57[i-_158
][1][0];
-den-=_1
57[i-_158
][1][1];
-}
-var date=_1
57
[i][0];
-var _16
3
=den?num/den:0;
+for(var i=0;i<_1
62
.length;i++){
+num+=_1
62
[i][1][0];
+den+=_1
62
[i][1][1];
+if(i-_1
63
>=0){
+num-=_1
62[i-_163
][1][0];
+den-=_1
62[i-_163
][1][1];
+}
+var date=_1
62
[i][0];
+var _16
8
=den?num/den:0;
if(this.errorBars_){
if(this.wilsonInterval_){
if(den){
if(this.errorBars_){
if(this.wilsonInterval_){
if(den){
-var p=_16
3<0?0:_163
,n=den;
-var pm=_16
0*Math.sqrt(p*(1-p)/n+_160*_160
/(4*n*n));
-var _1
66=1+_160*_160
/den;
-var low=(p+_16
0*_160/(2*den)-pm)/_166
;
-var high=(p+_16
0*_160/(2*den)+pm)/_166
;
-_1
59
[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]];
+var p=_16
8<0?0:_168
,n=den;
+var pm=_16
5*Math.sqrt(p*(1-p)/n+_165*_165
/(4*n*n));
+var _1
71=1+_165*_165
/den;
+var low=(p+_16
5*_165/(2*den)-pm)/_171
;
+var high=(p+_16
5*_165/(2*den)+pm)/_171
;
+_1
64
[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]];
}else{
}else{
-_1
59
[i]=[date,[0,0,0]];
+_1
64
[i]=[date,[0,0,0]];
}
}else{
}
}else{
-var _1
67=den?_160*Math.sqrt(_163*(1-_163
)/den):1;
-_1
59[i]=[date,[mult*_163,mult*_167,mult*_167
]];
+var _1
72=den?_165*Math.sqrt(_168*(1-_168
)/den):1;
+_1
64[i]=[date,[mult*_168,mult*_172,mult*_172
]];
}
}else{
}
}else{
-_1
59[i]=[date,mult*_163
];
+_1
64[i]=[date,mult*_168
];
}
}
}else{
if(this.customBars_){
}
}
}else{
if(this.customBars_){
-for(var i=0;i<_157.length;i++){
-var data=_157[i][1];
+var low=0;
+var mid=0;
+var high=0;
+var _174=0;
+for(var i=0;i<_162.length;i++){
+var data=_162[i][1];
var y=data[1];
var y=data[1];
-_159[i]=[_157[i][0],[y,y-data[0],data[2]-y]];
-}
-}else{
-var _168=Math.min(_158-1,_157.length-2);
+_164[i]=[_162[i][0],[y,y-data[0],data[2]-y]];
+low+=data[0];
+mid+=y;
+high+=data[2];
+_174+=1;
+if(i-_163>=0){
+var prev=_162[i-_163];
+low-=prev[1][0];
+mid-=prev[1][1];
+high-=prev[1][2];
+_174-=1;
+}
+_164[i]=[_162[i][0],[1*mid/_174,1*(mid-low)/_174,1*(high-mid)/_174]];
+}
+}else{
+var _176=Math.min(_163-1,_162.length-2);
if(!this.errorBars_){
if(!this.errorBars_){
-for(var i=0;i<_1
68
;i++){
+for(var i=0;i<_1
76
;i++){
var sum=0;
for(var j=0;j<i+1;j++){
var sum=0;
for(var j=0;j<i+1;j++){
-sum+=_1
57
[j][1];
+sum+=_1
62
[j][1];
}
}
-_1
59[i]=[_157
[i][0],sum/(i+1)];
+_1
64[i]=[_162
[i][0],sum/(i+1)];
}
}
-for(var i=Math.min(_1
58-1,_157.length-2);i<_157
.length;i++){
+for(var i=Math.min(_1
63-1,_162.length-2);i<_162
.length;i++){
var sum=0;
var sum=0;
-for(var j=i-_1
58
+1;j<i+1;j++){
-sum+=_1
57
[j][1];
+for(var j=i-_1
63
+1;j<i+1;j++){
+sum+=_1
62
[j][1];
}
}
-_1
59[i]=[_157[i][0],sum/_158
];
+_1
64[i]=[_162[i][0],sum/_163
];
}
}else{
}
}else{
-for(var i=0;i<_1
68
;i++){
+for(var i=0;i<_1
76
;i++){
var sum=0;
var sum=0;
-var _17
0
=0;
+var _17
8
=0;
for(var j=0;j<i+1;j++){
for(var j=0;j<i+1;j++){
-sum+=_1
57
[j][1][0];
-_17
0+=Math.pow(_157
[j][1][1],2);
+sum+=_1
62
[j][1][0];
+_17
8+=Math.pow(_162
[j][1][1],2);
}
}
-var _1
67=Math.sqrt(_170
)/(i+1);
-_1
59[i]=[_157[i][0],[sum/(i+1),_160*_167,_160*_167
]];
+var _1
72=Math.sqrt(_178
)/(i+1);
+_1
64[i]=[_162[i][0],[sum/(i+1),_165*_172,_165*_172
]];
}
}
-for(var i=Math.min(_1
58-1,_157.length-2);i<_157
.length;i++){
+for(var i=Math.min(_1
63-1,_162.length-2);i<_162
.length;i++){
var sum=0;
var sum=0;
-var _17
0
=0;
-for(var j=i-_1
58
+1;j<i+1;j++){
-sum+=_1
57
[j][1][0];
-_17
0+=Math.pow(_157
[j][1][1],2);
+var _17
8
=0;
+for(var j=i-_1
63
+1;j<i+1;j++){
+sum+=_1
62
[j][1][0];
+_17
8+=Math.pow(_162
[j][1][1],2);
}
}
-var _1
67=Math.sqrt(_170)/_158
;
-_1
59[i]=[_157[i][0],[sum/_158,_160*_167,_160*_167
]];
+var _1
72=Math.sqrt(_178)/_163
;
+_1
64[i]=[_162[i][0],[sum/_163,_165*_172,_165*_172
]];
}
}
}
}
}
}
}
}
-return _1
59
;
+return _1
64
;
};
};
-DateGraph.prototype.dateParser=function(_17
1
){
-var _1
72
;
-if(_17
1
.search("-")!=-1){
-_1
72=_171
.replace("-","/","g");
-while(_1
72
.search("-")!=-1){
-_1
72=_172
.replace("-","/");
+DateGraph.prototype.dateParser=function(_17
9
){
+var _1
80
;
+if(_17
9.length==10&&_179
.search("-")!=-1){
+_1
80=_179
.replace("-","/","g");
+while(_1
80
.search("-")!=-1){
+_1
80=_180
.replace("-","/");
}
}
+return Date.parse(_180);
}else{
}else{
-if(_171.search("/")!=-1){
-return Date.parse(_171);
+if(_179.length==8){
+_180=_179.substr(0,4)+"/"+_179.substr(4,2)+"/"+_179.substr(6,2);
+return Date.parse(_180);
}else{
}else{
-
_172=_171.substr(0,4)+"/"+_171.substr(4,2)+"/"+_171.substr(6,2
);
+
return Date.parse(_179
);
}
}
}
}
-return Date.parse(_172);
};
DateGraph.prototype.parseCSV_=function(data){
var ret=[];
};
DateGraph.prototype.parseCSV_=function(data){
var ret=[];
-var _1
74
=data.split("\n");
-var _1
75
=this.labelsFromCSV_?1:0;
+var _1
81
=data.split("\n");
+var _1
82
=this.labelsFromCSV_?1:0;
if(this.labelsFromCSV_){
if(this.labelsFromCSV_){
-var _1
76=_174
[0].split(",");
-_1
76
.shift();
-this.labels_=_1
76
;
+var _1
83=_181
[0].split(",");
+_1
83
.shift();
+this.labels_=_1
83
;
this.setColors_(this.attrs_);
this.renderOptions_.colorScheme=this.colors_;
MochiKit.Base.update(this.plotter_.options,this.renderOptions_);
MochiKit.Base.update(this.layoutOptions_,this.attrs_);
}
this.setColors_(this.attrs_);
this.renderOptions_.colorScheme=this.colors_;
MochiKit.Base.update(this.plotter_.options,this.renderOptions_);
MochiKit.Base.update(this.layoutOptions_,this.attrs_);
}
-for(var i=_1
75;i<_174
.length;i++){
-var line=_1
74
[i];
+for(var i=_1
82;i<_181
.length;i++){
+var line=_1
81
[i];
if(line.length==0){
continue;
}
if(line.length==0){
continue;
}
-var _1
78
=line.split(",");
-if(_1
78
.length<2){
+var _1
85
=line.split(",");
+if(_1
85
.length<2){
continue;
}
continue;
}
-var _1
79
=[];
-_1
79[0]=this.xValueParser_(_178
[0]);
+var _1
86
=[];
+_1
86[0]=this.xValueParser_(_185
[0]);
if(this.fractions_){
if(this.fractions_){
-for(var j=1;j<_1
78
.length;j++){
-var vals=_1
78
[j].split("/");
-_1
79
[j]=[parseFloat(vals[0]),parseFloat(vals[1])];
+for(var j=1;j<_1
85
.length;j++){
+var vals=_1
85
[j].split("/");
+_1
86
[j]=[parseFloat(vals[0]),parseFloat(vals[1])];
}
}else{
if(this.errorBars_){
}
}else{
if(this.errorBars_){
-for(var j=1;j<_1
78
.length;j+=2){
-_1
79[(j+1)/2]=[parseFloat(_178[j]),parseFloat(_178
[j+1])];
+for(var j=1;j<_1
85
.length;j+=2){
+_1
86[(j+1)/2]=[parseFloat(_185[j]),parseFloat(_185
[j+1])];
}
}else{
if(this.customBars_){
}
}else{
if(this.customBars_){
-for(var j=1;j<_1
78
.length;j++){
-var vals=_1
78
[j].split(";");
-_1
79
[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])];
+for(var j=1;j<_1
85
.length;j++){
+var vals=_1
85
[j].split(";");
+_1
86
[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])];
}
}else{
}
}else{
-for(var j=1;j<_1
78
.length;j++){
-_1
79[j]=parseFloat(_178
[j]);
+for(var j=1;j<_1
85
.length;j++){
+_1
86[j]=parseFloat(_185
[j]);
}
}
}
}
}
}
}
}
-ret.push(_1
79
);
+ret.push(_1
86
);
}
return ret;
};
}
return ret;
};
@@
-5424,11
+5478,11
@@
if(typeof this.file_=="function"){
this.loadedEvent_(this.file_());
}else{
var req=new XMLHttpRequest();
this.loadedEvent_(this.file_());
}else{
var req=new XMLHttpRequest();
-var _18
1
=this;
+var _18
8
=this;
req.onreadystatechange=function(){
if(req.readyState==4){
if(req.status==200){
req.onreadystatechange=function(){
if(req.readyState==4){
if(req.status==200){
-_18
1
.loadedEvent_(req.responseText);
+_18
8
.loadedEvent_(req.responseText);
}
}
};
}
}
};
@@
-5436,42
+5490,42
@@
req.open("GET",this.file_,true);
req.send(null);
}
};
req.send(null);
}
};
-DateGraph.prototype.updateOptions=function(_18
2
){
-if(_18
2
.errorBars){
-this.errorBars_=_18
2
.errorBars;
+DateGraph.prototype.updateOptions=function(_18
9
){
+if(_18
9
.errorBars){
+this.errorBars_=_18
9
.errorBars;
}
}
-if(_18
2
.customBars){
-this.customBars_=_18
2
.customBars;
+if(_18
9
.customBars){
+this.customBars_=_18
9
.customBars;
}
}
-if(_18
2
.strokeWidth){
-this.strokeWidth_=_18
2
.strokeWidth;
+if(_18
9
.strokeWidth){
+this.strokeWidth_=_18
9
.strokeWidth;
}
}
-if(_18
2
.rollPeriod){
-this.rollPeriod_=_18
2
.rollPeriod;
+if(_18
9
.rollPeriod){
+this.rollPeriod_=_18
9
.rollPeriod;
}
}
-if(_18
2
.dateWindow){
-this.dateWindow_=_18
2
.dateWindow;
+if(_18
9
.dateWindow){
+this.dateWindow_=_18
9
.dateWindow;
}
}
-if(_18
2
.valueRange){
-this.valueRange_=_18
2
.valueRange;
+if(_18
9
.valueRange){
+this.valueRange_=_18
9
.valueRange;
}
}
-if(_18
2
.minTickSize){
-this.minTickSize_=_18
2
.minTickSize;
+if(_18
9
.minTickSize){
+this.minTickSize_=_18
9
.minTickSize;
}
}
-if(typeof (_18
2
.labels)!="undefined"){
-this.labels_=_18
2
.labels;
-this.labelsFromCSV_=(_18
2
.labels==null);
+if(typeof (_18
9
.labels)!="undefined"){
+this.labels_=_18
9
.labels;
+this.labelsFromCSV_=(_18
9
.labels==null);
}
this.layout_.updateOptions({"errorBars":this.errorBars_});
}
this.layout_.updateOptions({"errorBars":this.errorBars_});
-if(_18
2["file"]&&_182
["file"]!=this.file_){
-this.file_=_18
2
["file"];
+if(_18
9["file"]&&_189
["file"]!=this.file_){
+this.file_=_18
9
["file"];
this.start_();
}else{
this.drawGraph_(this.rawData_);
}
};
this.start_();
}else{
this.drawGraph_(this.rawData_);
}
};
-DateGraph.prototype.adjustRoll=function(_1
83
){
-this.rollPeriod_=_1
83
;
+DateGraph.prototype.adjustRoll=function(_1
90
){
+this.rollPeriod_=_1
90
;
this.drawGraph_(this.rawData_);
};
this.drawGraph_(this.rawData_);
};