清理代码

pull/509/MERGE
ChenX 5 years ago
parent 69029c030a
commit 469957ab43

@ -4,7 +4,7 @@ exports[`双圆多段线倒角 1`] = `1208.3752684304045`;
exports[`双圆多段线倒角 2`] = `1208.3752684304045`;
exports[`双圆多段线倒角 3`] = `1208.3752684304054`;
exports[`双圆多段线倒角 3`] = `1208.3752684304043`;
exports[`双圆多段线倒角 4`] = `1208.3752684304045`;
@ -12,7 +12,7 @@ exports[`双圆多段线倒角 5`] = `1200.7933322000165`;
exports[`双圆多段线倒角 6`] = `1200.7933322000163`;
exports[`双圆多段线倒角 7`] = `1200.793332200017`;
exports[`双圆多段线倒角 7`] = `1200.7933322000163`;
exports[`双圆多段线倒角 8`] = `1200.793332200017`;

@ -103,7 +103,10 @@ export abstract class Curve extends Entity
{
if (Array.isArray(param))
{
param = param.filter(p => this.ParamOnCurve(p));
param = param.filter(p =>
{
return p > 0 && p < this.EndParam;
});
if (param.length === 0)
return [];
param.push(0, this.EndParam);

@ -311,14 +311,17 @@ export class Line extends Curve
return Status.False;
if (param1 > param2)
{
[param1, param2] = [param2, param1];
[sp, ep] = [ep, sp];
}
if (allowGap || Math.max(0, param1) < Math.min(1, param2) + tolerance)
{
if (param1 < 0)
this.Extend(param1);
this.StartPoint = sp;
if (param2 > 1)
this.Extend(param2);
this.EndPoint = ep;
return Status.True;
}
}

@ -10,9 +10,9 @@ export interface EBox
* x
* @param {EBox[]} arr
*/
export function SortEntityByBox(arr: EBox[], sort: boolean = true)
export function SortEntityByBox<T extends EBox>(arr: T[], sort: boolean = true)
{
let boxMap: Map<EBox, Box3> = new Map();
let boxMap: Map<T, Box3> = new Map();
arr.forEach(e => boxMap.set(e, e.BoundingBox));
if (sort)

Loading…
Cancel
Save