Commit 9bc428f9 authored by GoshaZotov's avatar GoshaZotov

fix bug 32574

parent 32db698a
...@@ -1240,7 +1240,7 @@ CChartsDrawer.prototype = ...@@ -1240,7 +1240,7 @@ CChartsDrawer.prototype =
numSeries++; numSeries++;
} }
} }
else else //point(scatter) chart
{ {
var yVal; var yVal;
var xVal; var xVal;
...@@ -1253,7 +1253,9 @@ CChartsDrawer.prototype = ...@@ -1253,7 +1253,9 @@ CChartsDrawer.prototype =
if(!yNumCache) if(!yNumCache)
continue; continue;
for(var j = 0; j < yNumCache.pts.length; ++j) for(var j = 0; j < yNumCache.ptCount; ++j)
{
if(yNumCache.pts[j])
{ {
yVal = parseFloat(yNumCache.pts[j].val); yVal = parseFloat(yNumCache.pts[j].val);
...@@ -1287,6 +1289,33 @@ CChartsDrawer.prototype = ...@@ -1287,6 +1289,33 @@ CChartsDrawer.prototype =
if(yVal > maxY) if(yVal > maxY)
maxY = yVal; maxY = yVal;
} }
else
{
xNumCache = series[l].xVal && series[l].xVal.numRef ? series[l].xVal.numRef.numCache : series[l].xVal && series[l].xVal.numLit ? series[l].xVal.numLit : null;
if(xNumCache && xNumCache.pts[j])
{
if(!isNaN(parseFloat(xNumCache.pts[j].val)))
xVal = parseFloat(xNumCache.pts[j].val);
else
xVal = j + 1;
}
else
xVal = j + 1;
if(l == 0 && j == 0)
{
min = xVal;
max = xVal;
}
if(xVal < min)
min = xVal;
if(xVal > max)
max = xVal;
}
}
} }
this.calcProp.ymin = minY; this.calcProp.ymin = minY;
this.calcProp.ymax = maxY; this.calcProp.ymax = maxY;
......
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