pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[se] For bug 40458

Browse Source
This commit is contained in:
GoshaZotov
2019-02-05 20:16:45 +03:00
parent d04c11c068
commit 720c27374e
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
common/Charts/ChartsDrawer.js
View File

@ -10207,7 +10207,7 @@ drawScatterChart.prototype = {
var yPoints = this.valAx.yPoints;
var betweenAxisCross = this.valAx.crossBetween === AscFormat.CROSS_BETWEEN_BETWEEN;
var seria, yVal, xVal, points, yNumCache, compiledMarkerSize, compiledMarkerSymbol, yPoint, idx, xPoint;
var seria, yVal, xVal, points, yNumCache, compiledMarkerSize, compiledMarkerSymbol, yPoint, idx, xPoint, prevYVal, prevXVal;
for (var i = 0; i < this.chart.series.length; i++) {
seria = this.chart.series[i];
yNumCache = this.cChartDrawer.getNumCache(seria.yVal);
@ -10226,6 +10226,7 @@ drawScatterChart.prototype = {
//вычисляем yVal
//пытаемся вычислить xVal в зависимости от idx точки по OY
yVal = this._getYVal(n, i);
xPoint = this.cChartDrawer.getIdxPoint(seria, idx, true);
if (xPoint) {
xVal = xPoint.val;
@ -10240,6 +10241,16 @@ drawScatterChart.prototype = {
xVal = n + 1;
}
/*var correctValues = this._correctValOutLimit(xVal, yVal, prevXVal, prevYVal, yPoints);
prevYVal = yVal;
prevXVal = xVal;
if(null === correctValues) {
continue;
} else {
xVal = correctValues.x;
yVal = correctValues.y;
}*/
yPoint = this.cChartDrawer.getIdxPoint(seria, idx);
compiledMarkerSize = yPoint && yPoint.compiledMarker ? yPoint.compiledMarker.size : null;
@ -10273,6 +10284,29 @@ drawScatterChart.prototype = {
this._calculateAllLines(points);
},
_correctValOutLimit: function(xVal, yVal, prevXVal, prevYVal, yPoints) {
var res = {x: xVal, y: yVal};
if(yPoints && yPoints.length) {
var minVal = yPoints[0].val < yPoints[yPoints.length - 1].val ? yPoints[0].val : yPoints[yPoints.length - 1].val;
var maxVal = yPoints[0].val < yPoints[yPoints.length - 1].val ? yPoints[yPoints.length - 1].val : yPoints[0].val;
//предыдущая точка ниже верхней границы, текущая выше - ищем пересечение с границей
if(prevYVal && yVal > maxVal && prevYVal < maxVal) {
var k = (yVal - prevYVal) / (xVal - prevXVal);
var b = prevYVal - k * prevXVal;
res.x = (maxVal - b) / k;
res.y = maxVal;
} else if(prevYVal && prevYVal > maxVal && yVal < maxVal) { //текущая точка выше верхней границы, следующая ниже - ищем пересечение с границей
} else if(yVal > maxVal && prevYVal && prevYVal > maxVal) { //если обе точки выще границы
res = null;
}
}
return res;
},
_recalculateScatter2: function () {
var xPoints = this.catAx.xPoints;