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

implement methods for Path2

Browse Source
This commit is contained in:
Sergey Luzyanin
2025-05-20 11:39:27 +03:00
parent 176d5d13fd
commit c074620b0a
3 changed files with 132 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
common/Charts/ChartsDrawer.js
View File

@ -16965,60 +16965,61 @@ CErrBarsDraw.prototype = {
}
};
/** @constructor */
function CGeometry2()
{
this.pathLst = [];
this.isLine = false;
this.gdLst = [];
}
/** @constructor */
function CGeometry2()
{
this.pathLst = [];
this.isLine = false;
this.gdLst = [];
}
CGeometry2.prototype.constructor = CGeometry2;
CGeometry2.prototype.canFill = function()
{
if(this.preset === "line")
return false;
for(var i = 0; i < this.pathLst.length; ++i)
{
if(this.pathLst[i].fill !== "none")
return true;
}
return false;
};
CGeometry2.prototype.AddPath = function(path)
{
this.pathLst.push(path);
};
CGeometry2.prototype.AddRect = function(l, t, r, b)
{
this.rectS = {};
this.rectS.l = l;
this.rectS.t = t;
this.rectS.r = r;
this.rectS.b = b;
};
CGeometry2.prototype.draw = function(shape_drawer)
{
for (var i=0, n=this.pathLst.length; i<n;++i)
this.pathLst[i].drawSmart(shape_drawer);
};
CGeometry2.prototype.check_bounds = function(checker)
{
CGeometry2.prototype =
{
constructor: CGeometry2,
canFill: function()
{
if(this.preset === "line")
return false;
for(var i = 0; i < this.pathLst.length; ++i)
{
if(this.pathLst[i].fill !== "none")
return true;
}
return false;
},
for(var i=0, n=this.pathLst.length; i<n;++i)
AddPath: function(path)
{
this.pathLst.push(path);
},
AddRect: function(l, t, r, b)
{
this.rectS = {};
this.rectS.l = l;
this.rectS.t = t;
this.rectS.r = r;
this.rectS.b = b;
},
draw: function(shape_drawer)
{
for (var i=0, n=this.pathLst.length; i<n;++i)
this.pathLst[i].drawSmart(shape_drawer);
},
check_bounds: function(checker)
{
for(var i=0, n=this.pathLst.length; i<n;++i)
this.pathLst[i].check_bounds(checker);
}
};
this.pathLst[i].check_bounds(checker);
};
CGeometry2.prototype.getContinuousSubpaths = function () {
const subpaths = [];
this.pathLst.forEach(function (path) {
if (path.stroke) {
path.getContinuousSubpaths().forEach(function (subpath) {
subpaths.push(subpath);
});
}
});
return subpaths;
};
/** @constructor */
function CColorObj(pen, brush, geometry) {
this.pen = pen;

79
common/Drawings/Format/Path.js
View File

@ -3291,6 +3291,85 @@ function (window, undefined) {
let path = this.getArrPathCommand();
return path[this.startPos + 1] === moveTo;
};
Path2.prototype.getArrPathCommandObjects = function () {
let i = 0;
let len = this.getMemoryLength();
let path = this.getArrPathCommand();
let arrPathCommand = [];
while (i < len) {
let cmd = path[this.startPos + i + 1];
switch (cmd) {
case moveTo: {
arrPathCommand.push({id:moveTo, X: path[this.startPos + i + 2], Y: path[this.startPos + i + 3]});
i += 3;
break;
}
case lineTo: {
arrPathCommand.push({id:lineTo, X: path[this.startPos + i + 2], Y: path[this.startPos + i + 3]});
i += 3;
break;
}
case bezier3: {
arrPathCommand.push({
id:bezier3,
X0: path[this.startPos + i + 2],
Y0: path[this.startPos + i + 3],
X1: path[this.startPos + i + 4],
Y1: path[this.startPos + i + 5]
});
i += 5;
break;
}
case bezier4: {
arrPathCommand.push({
id:bezier4,
X0: path[this.startPos + i + 2],
Y0: path[this.startPos + i + 3],
X1: path[this.startPos + i + 4],
Y1: path[this.startPos + i + 5],
X2: path[this.startPos + i + 6],
Y2: path[this.startPos + i + 7]
});
i += 7;
break;
}
case arcTo: {
arrPathCommand.push({
id:arcTo,
stX: path[this.startPos + i + 2],
stY: path[this.startPos + i + 3],
wR: path[this.startPos + i + 4],
hR: path[this.startPos + i + 5],
stAng: path[this.startPos + i + 6],
swAng: path[this.startPos + i + 7]
});
i += 7;
break;
}
case close: {
i += 1;
break;
}
}
}
};
Path2.prototype.executeWithPathCommands = function(fMethod, params) {
this.ArrPathCommand = this.getArrPathCommand();
let result = fMethod.apply(this, params);
this.ArrPathCommand = undefined;
return result;
};
Path2.prototype.getContinuousSubpaths = function () {
return this.executeWithPathCommands(Path.prototype.getContinuousSubpaths, []);
};
Path2.prototype.getHeadArrowAngle = function (arrowLength) {
return this.executeWithPathCommands(Path.prototype.getHeadArrowAngle, [arrowLength]);
};
Path2.prototype.getTailArrowAngle = function (arrowLength) {
return this.executeWithPathCommands(Path.prototype.getTailArrowAngle, [arrowLength]);
};
function partition_bezier3(x0, y0, x1, y1, x2, y2, epsilon) {
let dx01 = x1 - x0;

2
word/Drawing/ShapeDrawer.js
View File

@ -2151,7 +2151,7 @@ CShapeDrawer.prototype =
isArrowPresent: function()
{
if(this.IsCurrentPathCanArrows && this.Ln && this.Ln.isArrowPresent())
if(this.IsCurrentPathCanArrows && this.Ln && this.Ln.isArrowPresent() && !this.IsArrowsDrawing)
return true;
return false;
},