diff --git a/src/Add-on/DrawRegion.ts b/src/Add-on/DrawRegion.ts index c1edbf39c..bffa3d957 100644 --- a/src/Add-on/DrawRegion.ts +++ b/src/Add-on/DrawRegion.ts @@ -35,11 +35,11 @@ export class DrawRegion implements Command { if (en.IsClose) { - let reg = new Region(en.Export()); + let reg = new Region(en.Explode()); app.m_Database.ModelSpace.Append(reg); } else - lines.push(...en.Export()); + lines.push(...en.Explode()); } else if (en instanceof Curve) { diff --git a/src/Add-on/Export.ts b/src/Add-on/Explode.ts similarity index 89% rename from src/Add-on/Export.ts rename to src/Add-on/Explode.ts index 2e2cf02fb..e7d14674b 100644 --- a/src/Add-on/Export.ts +++ b/src/Add-on/Explode.ts @@ -4,7 +4,7 @@ import { PromptStatus } from "../Editor/PromptResult"; import { app } from "../ApplicationServices/Application"; -export class Command_Export implements Command +export class Command_Explode implements Command { async exec(ss: SelectSet) { @@ -19,7 +19,7 @@ export class Command_Export implements Command for (let en of ss.SelectEntityList) { - let ens = en.Export(); + let ens = en.Explode(); en.Erase(); for (let e of ens) diff --git a/src/DatabaseServices/Dimension/AlignedDimension.ts b/src/DatabaseServices/Dimension/AlignedDimension.ts index 5bba3d217..ee86b0851 100644 --- a/src/DatabaseServices/Dimension/AlignedDimension.ts +++ b/src/DatabaseServices/Dimension/AlignedDimension.ts @@ -69,7 +69,7 @@ export class AlignedDimension extends Dimension this.m_Oblique = v; this.Update(); } - Export() + Explode() { //TODO:箭头实体 let [ept1, ept2, extEndPt1, extEndPt2, scaleSPt, scaleEPt] = this.GetDimPts(); diff --git a/src/DatabaseServices/Dimension/LineAngularDimension.ts b/src/DatabaseServices/Dimension/LineAngularDimension.ts index 4667d0cf8..f716b1954 100644 --- a/src/DatabaseServices/Dimension/LineAngularDimension.ts +++ b/src/DatabaseServices/Dimension/LineAngularDimension.ts @@ -94,7 +94,7 @@ export class LineAngularDimension extends Dimension { super.TextString = v; } - Export() + Explode() { let { lineStartPt, lineEndPt } = this.getDimLineData(); let { arcStartPt, arcEndPt, extSpt, extEpt, scaleSPt, scaleEPt, bul } = this.getDimArcData(); diff --git a/src/DatabaseServices/Dimension/dimTest.ts b/src/DatabaseServices/Dimension/dimTest.ts index 74d3b1b97..f68cbf0a3 100644 --- a/src/DatabaseServices/Dimension/dimTest.ts +++ b/src/DatabaseServices/Dimension/dimTest.ts @@ -18,7 +18,7 @@ export class Command_DimTest implements Command let dim = new AlignedDimension(new Vector3(), new Vector3(5), new Vector3(1, 3), "123"); dim.GetSnapPoints() app.m_Database.ModelSpace.Append(dim); - let cus = dim.Export(); + let cus = dim.Explode(); cus.forEach(cu => { app.m_Database.ModelSpace.Append(cu); diff --git a/src/DatabaseServices/Entity.ts b/src/DatabaseServices/Entity.ts index 33bbf2bea..4b597a550 100644 --- a/src/DatabaseServices/Entity.ts +++ b/src/DatabaseServices/Entity.ts @@ -49,7 +49,7 @@ export class Entity extends CADObject * @returns {Entity[]} * @memberof Entity */ - Export(): Entity[] { return [] } + Explode(): Entity[] { return [] } /** * 返回对象的包围框. diff --git a/src/DatabaseServices/Polyline.ts b/src/DatabaseServices/Polyline.ts index 02f5f6a49..c35333e68 100644 --- a/src/DatabaseServices/Polyline.ts +++ b/src/DatabaseServices/Polyline.ts @@ -224,12 +224,12 @@ export class Polyline extends Curve * 返回参数所在的点. 如果曲线不闭合,会试图返回延伸点参数 * * @param {Vector3} pt - * @returns {number} + * @returns {number} * @memberof Polyline */ GetParamAtPoint(pt: Vector3): number { - let cus = this.Export(); + let cus = this.Explode(); if (cus.length === 0) return NaN; for (let i = 0; i < cus.length; i++) { @@ -263,12 +263,11 @@ export class Polyline extends Curve return pt.distanceToSquared(this.StartPoint) < pt.distanceToSquared(this.EndPoint) ? startParam : endParam; } - return NaN; } GetParamAtDist(dist: number): number { - let cus = this.Export(); + let cus = this.Explode(); for (let i = 0; i < cus.length; i++) { let cu = cus[i]; @@ -724,7 +723,7 @@ export class Polyline extends Curve * * @memberof Polyline */ - Export(): Curve[] + Explode(): Curve[] { let exportCus: Curve[] = []; for (let i = 0; i < this.EndParam; i++) diff --git a/src/Editor/CommandRegister.ts b/src/Editor/CommandRegister.ts index 5fc3ae938..f6b463ce5 100644 --- a/src/Editor/CommandRegister.ts +++ b/src/Editor/CommandRegister.ts @@ -23,7 +23,7 @@ import { DrawText } from '../Add-on/DrawText'; import { DrawCircle0 } from '../Add-on/DrawZeroCircle'; import { Entsel } from '../Add-on/Entsel'; import { Command_Erase } from '../Add-on/Erase'; -import { Command_Export } from '../Add-on/Export'; +import { Command_Explode } from '../Add-on/Explode'; import { Command_Extend } from '../Add-on/Extends'; import { CommandFillet } from '../Add-on/Fillet'; import { Command_GenerateCode } from '../Add-on/GenerateCode'; @@ -147,7 +147,7 @@ export function registerCommand() /*******test ↓↓↓*********/ commandMachine.RegisterCommand("tt", new Command_PLTest()); commandMachine.RegisterCommand("tt2", new Command_INsTest()); - commandMachine.RegisterCommand("x", new Command_Export()); + commandMachine.RegisterCommand("x", new Command_Explode()); commandMachine.RegisterCommand("close", new Command_ClosePt()); //用于测试包围盒 commandMachine.RegisterCommand("box", new Command_TestBox()); diff --git a/src/GraphicsSystem/IntersectWith.ts b/src/GraphicsSystem/IntersectWith.ts index 3247a8dbc..c43350f54 100644 --- a/src/GraphicsSystem/IntersectWith.ts +++ b/src/GraphicsSystem/IntersectWith.ts @@ -238,11 +238,11 @@ export function IntersectLineAndLine(l1: Line, l2: Line, extType: IntersectOptio export function IntersectPolylineAndCurve(pl: Polyline, cu: Curve, extType: IntersectOption): Vector3[] { - let cus: Curve[] = pl.Export(); + let cus: Curve[] = pl.Explode(); let cus2: Curve[]; if (cu instanceof Polyline) - cus2 = cu.Export() + cus2 = cu.Explode() else cus2 = [cu];