Public
/
WebCAD
mirror of https://gitee.com/cf-fz/WebCAD.git
7
1
Fork 0
Code Issues Projects Releases Wiki Activity

修复拼写错误

Browse Source
optLineOffset
ChenX 5 years ago
parent 5956ddba7a
commit 10d748b67d
9 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
src/Add-on/BoardCutting/NonAssociativeCutting.ts
Unescape View File

@ -1,6 +1,6 @@
import { app } from "../../ApplicationServices/Application";
import { Board } from "../../DatabaseServices/Entity/Board";
import { ExtureSolid } from "../../DatabaseServices/Entity/Extrude";
import { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude";
import { Command } from "../../Editor/CommandMachine";
import { PromptStatus } from "../../Editor/PromptResult";
@ -52,7 +52,7 @@ export class NonAssociativeCutting implements Command
CuttingBoard(orgBoard: Board, knifBoards: Board[])
{
let addgs: ExtureSolid[] = [];
let addgs: ExtrudeSolid[] = [];
for (let br of knifBoards)
{
let gs = orgBoard.ConverToLocalGroove(br.Clone());

10
src/Add-on/DrawBoard/DrawSpecialShapeBoardTool.ts
Unescape View File

@ -5,7 +5,7 @@ import { curveLinkGroup } from "../../Common/CurveUtils";
import { Board } from "../../DatabaseServices/Entity/Board";
import { Contour } from "../../DatabaseServices/Contour";
import { Curve } from "../../DatabaseServices/Entity/Curve";
import { ExtureContour, ExtureContourCurve, ExtureSolid } from "../../DatabaseServices/Entity/Extrude";
import { ExtureContour, ExtureContourCurve, ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude";
import { Polyline } from "../../DatabaseServices/Entity/Polyline";
import { Region } from "../../DatabaseServices/Entity/Region";
import { PromptStatus } from "../../Editor/PromptResult";
@ -71,7 +71,7 @@ export async function SelectExtrudeContour(selectInside = false, useExtrude = fa
}>
{
let Msg = useExtrude ? "请选择(拉伸实体,面域或曲线):" : "请选择(面域或曲线):";
let filterTypes = useExtrude ? [Region, ExtureSolid, Curve] : [Region, Curve];
let filterTypes = useExtrude ? [Region, ExtrudeSolid, Curve] : [Region, Curve];
let ssRes = await app.Editor.GetSelection({
Msg,
@ -117,9 +117,9 @@ export async function SelectExtrudeContour(selectInside = false, useExtrude = fa
* 应用轮廓到拉伸实体,并且返回轮廓到WCS的应用矩阵.
* @returns 如果轮廓是曲线,那么将返回曲线转换到WCS的矩阵
*/
export function ExtrudeApplyContour(ext: ExtureSolid, contour: ExtureContour): Matrix4 | undefined
export function ExtrudeApplyContour(ext: ExtrudeSolid, contour: ExtureContour): Matrix4 | undefined
{
if (contour instanceof ExtureSolid)
if (contour instanceof ExtrudeSolid)
{
ext.ContourCurve = contour.ContourCurve.Clone();
}
@ -132,7 +132,7 @@ export function ExtrudeApplyContour(ext: ExtureSolid, contour: ExtureContour): M
for (let hole of sp.Holes)
{
let g = new ExtureSolid();
let g = new ExtrudeSolid();
g.OCS = ext.OCS;
g.ContourCurve = hole.Curve.Clone().ApplyMatrix(mtx);
g.Thickness = ext.Thickness;

4
src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts
Unescape View File

@ -1,7 +1,7 @@
import { app } from "../../ApplicationServices/Application";
import { FixedNotZero } from "../../Common/Utils";
import { BoardType, Board } from "../../DatabaseServices/Entity/Board";
import { ExtureSolid } from "../../DatabaseServices/Entity/Extrude";
import { ExtrudeSolid } from "../../DatabaseServices/Entity/Extrude";
import { Command } from "../../Editor/CommandMachine";
import { SpecialShapeBoardModal } from "../../UI/Components/Board/SpecialBoardModal";
import { ModalPosition } from "../../UI/Components/Modal/ModalsManage";
@ -11,7 +11,7 @@ import { Matrix4 } from "three";
export class DrawSpecialShapedBoard implements Command
{
ext = new ExtureSolid();
ext = new ExtrudeSolid();
async exec()
{
let { contour, useCurves } = await SelectExtrudeContour(true);

10
src/Add-on/Join.ts
Unescape View File

@ -6,7 +6,7 @@ import { Arc } from "../DatabaseServices/Entity/Arc";
import { Board, BoardType } from "../DatabaseServices/Entity/Board";
import { Circle } from "../DatabaseServices/Entity/Circle";
import { Curve } from '../DatabaseServices/Entity/Curve';
import { ExtureSolid } from "../DatabaseServices/Entity/Extrude";
import { ExtrudeSolid } from "../DatabaseServices/Entity/Extrude";
import { Line } from "../DatabaseServices/Entity/Line";
import { Polyline } from "../DatabaseServices/Entity/Polyline";
import { Command } from "../Editor/CommandMachine";
@ -19,20 +19,20 @@ export class Command_Join implements Command
{
async exec()
{
let exSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true, Filter: { filterTypes: [Curve, Board, ExtureSolid] } });
let exSsRes = await app.Editor.GetSelection({ Msg: "请选择对象<全部选择>:", UseSelect: true, Filter: { filterTypes: [Curve, Board, ExtrudeSolid] } });
if (exSsRes.Status === PromptStatus.Cancel)
return;
let curveCol: Curve[] = [];
let brs: Board[] = [];
let exts: ExtureSolid[] = [];
let exts: ExtrudeSolid[] = [];
for (let en of exSsRes.SelectSet.SelectEntityList)
{
if (en instanceof Curve)
curveCol.push(en);
else if (en instanceof Board)
brs.push(en);
else if (en instanceof ExtureSolid)
else if (en instanceof ExtrudeSolid)
exts.push(en);
}
@ -216,7 +216,7 @@ export class Command_Join implements Command
for (let [, bs] of brMap)
this.JoinSameTypeBrs(bs);
}
private JoinSameTypeBrs(brs: ExtureSolid[])
private JoinSameTypeBrs(brs: ExtrudeSolid[])
{
let sortFn = comparePoint("xyz");
//排序

4
src/DatabaseServices/CADFactory.ts
Unescape View File

@ -11,6 +11,10 @@ export class CADFactory
{
this.factory.objectNameMap.set(C.name, C);
}
static RegisterObjectAlias(C: any, name: string)
{
this.factory.objectNameMap.set(name, C);
}
static CreateObject(name: string): any
{
let C = this.factory.objectNameMap.get(name);

8
src/DatabaseServices/Entity/Board.ts
Unescape View File

@ -14,7 +14,7 @@ import { Contour } from '../Contour';
import { ObjectId } from '../ObjectId';
import { Shape } from '../Shape';
import { Circle } from './Circle';
import { ExtureContourCurve, ExtureSolid } from './Extrude';
import { ExtureContourCurve, ExtrudeSolid } from './Extrude';
import { deserializationBoardData, serializeBoardData } from '../../Add-on/BoardEditor/SerializeBoardData';
export enum BoardType
@ -51,7 +51,7 @@ export interface IModeling
* 板件实体
*/
@Factory
export class Board extends ExtureSolid
export class Board extends ExtrudeSolid
{
private m_Rotation = {
x: 0,
@ -247,7 +247,7 @@ export class Board extends ExtureSolid
for (let model of models)
{
let g = new ExtureSolid();
let g = new ExtrudeSolid();
g.OCS = this.OCS;
g.ContourCurve = model.shape.Outline.Curve;
g.Thickness = model.thickness;
@ -256,7 +256,7 @@ export class Board extends ExtureSolid
for (let hole of model.shape.Holes)
{
let subG = new ExtureSolid();
let subG = new ExtrudeSolid();
subG.OCS = this.OCS;
subG.ContourCurve = hole.Curve;
subG.Thickness = model.thickness;

39
src/DatabaseServices/Entity/Extrude.ts
Unescape View File

@ -17,7 +17,7 @@ import { equaln, equalv2, equalv3, isIntersect, isParallelTo, MoveMatrix, ZeroVe
import { ScaleUV } from "../../Geometry/UVUtils";
import { RenderType } from "../../GraphicsSystem/RenderType";
import { BlockTableRecord } from "../BlockTableRecord";
import { Factory } from "../CADFactory";
import { Factory, CADFactory } from "../CADFactory";
import { CADFiler } from "../CADFiler";
import { Contour } from "../Contour";
import { Shape } from "../Shape";
@ -28,7 +28,7 @@ import { Polyline } from "./Polyline";
import { Region } from "./Region";
export type ExtureContourCurve = Polyline | Circle;
export type ExtureContour = Polyline | Circle | ExtureSolid | Region;
export type ExtureContour = Polyline | Circle | ExtrudeSolid | Region;
enum DragPointType
{
@ -37,7 +37,7 @@ enum DragPointType
}
@Factory
export class ExtureSolid extends Entity
export class ExtrudeSolid extends Entity
{
/*
------------
@ -71,7 +71,7 @@ export class ExtureSolid extends Entity
/**
* 正面和反面的凹槽造型
*/
protected grooves: ExtureSolid[] = [];
protected grooves: ExtrudeSolid[] = [];
protected knifeRadius: number = 3;
protected groovesAddLength: number = 0;
@ -346,7 +346,7 @@ export class ExtureSolid extends Entity
// [ + ] 产生网洞.
for (let hole of unionShapes[0].Holes)
{
let g = new ExtureSolid();
let g = new ExtrudeSolid();
g.thickness = this.thickness;
g.ContourCurve = hole.Curve;
g.ApplyMatrix(this.OCS);
@ -393,7 +393,7 @@ export class ExtureSolid extends Entity
return Status.False;
}
AppendGroove(groove: ExtureSolid)
AppendGroove(groove: ExtrudeSolid)
{
this.WriteAllObjectRecord();
if (this.GrooveCheckPosition(groove) === Status.True)
@ -695,7 +695,7 @@ export class ExtureSolid extends Entity
* @param target 该对象可能被修改(内部不拷贝该实体)
* @param useClone 转换后的实体是目标实体拷贝后修改的
*/
ConverToLocalGroove(target: this, useClone = false): ExtureSolid[]
ConverToLocalGroove(target: this, useClone = false): ExtrudeSolid[]
{
if (isParallelTo(this.Normal, target.Normal))
{
@ -715,7 +715,7 @@ export class ExtureSolid extends Entity
let interBSP = this.CSG.intersect(target.CSG.transform1(this.OCSInv.multiply(target.OCS)));
let topology = new BSPGroupParse(interBSP);
let grooves: ExtureSolid[] = [];
let grooves: ExtrudeSolid[] = [];
for (let pts of topology.Parse())
{
for (let p of pts)
@ -723,7 +723,7 @@ export class ExtureSolid extends Entity
let box = new Box3().setFromPoints(pts);
let size = box.getSize(new Vector3());
let ext = useClone ? target.Clone() : new ExtureSolid();
let ext = useClone ? target.Clone() : new ExtrudeSolid();
if (useClone)
ext.grooves.length = 0;
ext.ConverToRectSolid(size.x, size.y, size.z);
@ -740,7 +740,7 @@ export class ExtureSolid extends Entity
* (步骤2)
* 更新凹槽位置和厚度(校验凹槽的Z轴位置是否存在交集)
*/
GrooveCheckPosition(target: ExtureSolid): Status
GrooveCheckPosition(target: ExtrudeSolid): Status
{
if (target.thickness <= 1e-3)
return Status.False;
@ -770,7 +770,7 @@ export class ExtureSolid extends Entity
*/
GrooveCheckMerge()
{
let thicknessMap = new Map<string, Array<ExtureSolid>>();
let thicknessMap = new Map<string, Array<ExtrudeSolid>>();
for (let groove of this.grooves)
{
@ -781,7 +781,7 @@ export class ExtureSolid extends Entity
thicknessMap.get(thicknessStr).push(groove);
}
let gs: ExtureSolid[] = [];
let gs: ExtrudeSolid[] = [];
for (let [, grooves] of thicknessMap)
{
while (grooves.length > 0)
@ -819,7 +819,7 @@ export class ExtureSolid extends Entity
* @param target 不拷贝修改
* @returns this[] 凹槽在本实体中正确的约束状态.(可能分裂成为多个)
*/
GrooveCheckContour(target: ExtureSolid): ExtureSolid[]
GrooveCheckContour(target: ExtrudeSolid): ExtrudeSolid[]
{
if (equaln(target.thickness, this.thickness))
return [target];
@ -841,7 +841,7 @@ export class ExtureSolid extends Entity
}
else
{
let grooves: ExtureSolid[] = [];
let grooves: ExtrudeSolid[] = [];
for (let contour of inters)
{
let ext = target.Clone();
@ -866,7 +866,7 @@ export class ExtureSolid extends Entity
);
let subtractShape = new ShapeManager();
let grooves: ExtureSolid[] = [];
let grooves: ExtrudeSolid[] = [];
arrayRemoveIf(this.grooves, groove =>
{
if (equaln(groove.thickness, this.thickness))
@ -904,7 +904,7 @@ export class ExtureSolid extends Entity
for (let hole of shape.Holes)
{
let groove = new ExtureSolid();
let groove = new ExtrudeSolid();
groove.ContourCurve = hole.Curve;
groove.thickness = this.thickness;
groove.OCS = this.OCS;
@ -922,7 +922,7 @@ export class ExtureSolid extends Entity
this.ContourCurve = shape.Outline.Curve;
for (let hole of shape.Holes)
{
let groove = new ExtureSolid();
let groove = new ExtrudeSolid();
groove.OCS = this.OCS;
groove.ContourCurve = hole.Curve;
groove.thickness = this.thickness;
@ -1175,7 +1175,7 @@ export class ExtureSolid extends Entity
for (let i = 0; i < grooveCount; i++)
{
if (this.grooves[i] === undefined)
this.grooves[i] = new ExtureSolid();
this.grooves[i] = new ExtrudeSolid();
this.grooves[i].ReadFileLite(file);
}
@ -1228,3 +1228,6 @@ function FastMeshGeometry(width: number, height: number, thickness: number)
geo.translate(width * 0.5, height * 0.5, thickness * 0.5);
return geo;
}
CADFactory.RegisterObjectAlias(ExtrudeSolid, "ExtureSolid");

6
src/Geometry/CreateWireframe.ts
Unescape View File

@ -4,13 +4,13 @@ import { FixIndex } from "../Common/Utils";
import { Board } from "../DatabaseServices/Entity/Board";
import { Contour } from "../DatabaseServices/Contour";
import { Curve } from "../DatabaseServices/Entity/Curve";
import { ExtureSolid } from "../DatabaseServices/Entity/Extrude";
import { ExtrudeSolid } from "../DatabaseServices/Entity/Extrude";
import { Shape } from "../DatabaseServices/Shape";
import { FaceDirection } from "../UI/Store/BoardInterface";
import { MoveMatrix } from "./GeUtils";
//FIXME: #IWBPB 性能缺陷和BUG. 等待废弃或者改进
export function CreateWireframe(en3D: Board | ExtureSolid)
export function CreateWireframe(en3D: Board | ExtrudeSolid)
{
let mat = ColorMaterial.GetLineMaterial(1);
let lines: Object3D[] = [];
@ -92,7 +92,7 @@ function appendLines(cu: Curve, thick: number, lines: Object3D[], mat: LineBasic
}
}
export function FastWireframe(br: ExtureSolid, color = 0)
export function FastWireframe(br: ExtrudeSolid, color = 0)
{
color = color || br.ColorIndex;
let material = ColorMaterial.GetLineMaterial(color);

6
src/UI/Components/Board/BoardConfigModal.tsx
Unescape View File

@ -9,7 +9,7 @@ import { CheckObjectType } from "../../../Common/CheckoutVaildValue";
import { DataAdapter } from "../../../Common/DataAdapter";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { Contour } from "../../../DatabaseServices/Contour";
import { ExtureSolid } from "../../../DatabaseServices/Entity/Extrude";
import { ExtrudeSolid } from "../../../DatabaseServices/Entity/Extrude";
import { Shape } from "../../../DatabaseServices/Shape";
import { commandMachine } from "../../../Editor/CommandMachine";
import { JigUtils } from "../../../Editor/JigUtils";
@ -138,14 +138,14 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
let shapes = Shape.pairHoleAndOutline(contours);
for (let shape of shapes)
{
let groove = new ExtureSolid();
let groove = new ExtrudeSolid();
groove.Thickness = cd.height;
groove.ContourCurve = shape.Outline.Curve;
groove.KnifeRadius = cd.knifeRad;
groove.GroovesAddLength = cd.addLen;
for (let hole of shape.Holes)
{
let holeSolid = new ExtureSolid();
let holeSolid = new ExtrudeSolid();
holeSolid.Thickness = cd.height;
holeSolid.ContourCurve = hole.Curve;
groove.AppendGroove(holeSolid);

Write Preview
Loading…
Cancel
Save