Commit 812a2540 authored by Igor.Zotov's avatar Igor.Zotov

поправил - при построении линейной диаграммы с накоплением не отрисовывалась одна из линий.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48023 954022d7-b5bf-4e40-9824-e11837661b57
parent b742d46a
...@@ -277,32 +277,12 @@ ...@@ -277,32 +277,12 @@
//var isSkip = false; //var isSkip = false;
if(this._otherProps._filled == true && (this._otherProps._autoGrouping == 'stacked' || this._otherProps._autoGrouping == 'stackedPer')) if(this._otherProps._filled == true && (this._otherProps._autoGrouping == 'stacked' || this._otherProps._autoGrouping == 'stackedPer'))
{ {
//isSkip = $.grep(this.data[this.data.length - 1 - i],)
var k = 0; var k = 0;
/*while(k != this.data[this.data.length - 1 - i].length - 1)
{
if(this.data[this.data.length - 1 - i][k] != '')
{
isSkip = true;
break;
}
k++;
}*/
if(!isSkip[i]) if(!isSkip[i])
this.DrawLine(this.data[this.data.length - 1 - i], 'inherit', this._otherProps._colors[this._otherProps._colors.length - 1- j], this.GetLineWidth(j), tickmarks, i); this.DrawLine(this.data[this.data.length - 1 - i], 'inherit', this._otherProps._colors[this._otherProps._colors.length - 1- j], this.GetLineWidth(j), tickmarks, i);
} }
else else
{ {
/*var k = 0;
while(k != this.data[i].length - 1)
{
if(this.data[i][k] != '')
{
isSkip = true;
break;
}
k++;
}*/
if(!isSkip[i]) if(!isSkip[i])
this.DrawLine(this.data[i], this._otherProps._colors[j], fill, this.GetLineWidth(j), tickmarks, i); this.DrawLine(this.data[i], this._otherProps._colors[j], fill, this.GetLineWidth(j), tickmarks, i);
} }
...@@ -1394,7 +1374,7 @@ ...@@ -1394,7 +1374,7 @@
penUp = true; penUp = true;
} }
if (i == 0 || penUp || !yPos || !prevY || prevY < this._chartGutter._top) { if (i == 0 || penUp || !yPos || !prevY /*|| prevY < this._chartGutter._top*/) {
if (this._otherProps._filled && !this._otherProps._filled_range) { if (this._otherProps._filled && !this._otherProps._filled_range) {
...@@ -1832,8 +1812,8 @@ ...@@ -1832,8 +1812,8 @@
if (( if ((
(i == 0 && coords[i]) (i == 0 && coords[i])
|| (yPos < this._chartGutter._top) /*|| (yPos < this._chartGutter._top)
|| (prevY < this._chartGutter._top) || (prevY < this._chartGutter._top)*/
|| (yPos > (height - this._chartGutter._bottom)) || (yPos > (height - this._chartGutter._bottom))
|| (i > 0 && prevX > (width - this._chartGutter._right)) || (i > 0 && prevX > (width - this._chartGutter._right))
|| (i > 0 && prevY > (height - this._chartGutter._bottom)) || (i > 0 && prevY > (height - this._chartGutter._bottom))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment