Commit b3209441 authored by Sergey Luzyanin's avatar Sergey Luzyanin

Пустые точки

parent 992f28b9
......@@ -3522,11 +3522,14 @@ drawLineChart.prototype =
//draw point
for(var k = 0; k < this.paths.points[i].length; k++)
{
if(numCache.pts[k])
{
var numPoint = numCache.getPtByIndex(k);
if(numPoint)
{
markerBrush = numCache.pts[k].compiledMarker ? numCache.pts[k].compiledMarker.brush : null;
markerPen = numCache.pts[k].compiledMarker ? numCache.pts[k].compiledMarker.pen : null;
markerBrush = numPoint.compiledMarker ? numPoint.compiledMarker.brush : null;
markerPen = numPoint.compiledMarker ? numPoint.compiledMarker.pen : null;
}
//frame of point
......
......@@ -441,10 +441,8 @@ CSparklineView.prototype.initFromSparkline = function(oSparkline, oSparklineGrou
break;
}
}
chart_space.displayHidden = oSparklineGroup.displayHidden;
}
chart_space.displayHidden = oSparklineGroup.displayHidden;
settings.putTitle(c_oAscChartTitleShowSettings.none);
settings.putHorAxisLabel(c_oAscChartTitleShowSettings.none);
settings.putVertAxisLabel(c_oAscChartTitleShowSettings.none);
......
......@@ -2364,7 +2364,7 @@ CChartSpace.prototype =
{
var range = range1.bbox;
var nLastNoEmptyIndex = null, dLastNoEmptyVal = null, aSpanPoints = [];
var nLastNoEmptyIndex = null, dLastNoEmptyVal = null, aSpanPoints = [], nSpliceIndex = null;
if(range.r1 === range.r2 || bVertical === true)
{
row_hidden = source_worksheet.getRowHidden(range.r1);
......@@ -2390,14 +2390,16 @@ CChartSpace.prototype =
if(isRealNumber(nLastNoEmptyIndex))
{
var oStartPoint = num_cache.getPtByIndex(nLastNoEmptyIndex);
for(t = 0; t < aSpanPoints.length; ++i)
for(t = 0; t < aSpanPoints.length; ++t)
{
aSpanPoints[t].val = oStartPoint.val + ((pt.val - oStartPoint.val)/(aSpanPoints.length + 1))*(t+1);
num_cache.pts.splice(nSpliceIndex + t, 0, aSpanPoints[t]);
}
}
aSpanPoints.length = 0;
}
nLastNoEmptyIndex = pt_index;
nSpliceIndex = num_cache.pts.length;
dLastNoEmptyVal = pt.val;
}
else
......@@ -2416,7 +2418,6 @@ CChartSpace.prototype =
pt = new CNumericPoint();
pt.setIdx(pt_index);
pt.setVal(0);
num_cache.addPt(pt);
aSpanPoints.push(pt);
}
}
......
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