✨ feat: add Split and Section

xiangechen · May 28, 2024 · afea788 · afea788
1 parent 47768af
commit afea788
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 3 deletions.
diff --git a/packages/chili-core/src/command/commandKeys.ts b/packages/chili-core/src/command/commandKeys.ts
@@ -24,6 +24,7 @@ export type CommandKeys =
     | "create.group"
     | "create.polygon"
     | "create.offset"
+    | "create.section"
     | "convert.toWire"
     | "convert.toFace"
     | "convert.prism"
@@ -35,5 +36,6 @@ export type CommandKeys =
     | "modify.rotate"
     | "modify.mirror"
     | "modify.delete"
+    | "modify.split"
     | "workingPlane.alignToPlane"
     | "workingPlane.set";
diff --git a/packages/chili-core/src/i18n/en.ts b/packages/chili-core/src/i18n/en.ts
@@ -89,6 +89,8 @@ export default {
         "command.import": "Import",
         "command.export.iges": "Export IGS",
         "command.export.step": "Export STP",
+        "command.section": "Section",
+        "command.split": "Split",
         "snap.end": "End",
         "snap.mid": "Middle",
         "snap.center": "Center",

diff --git a/packages/chili-core/src/i18n/keys.ts b/packages/chili-core/src/i18n/keys.ts
@@ -108,6 +108,8 @@ export type I18nKeys =
     | "command.import"
     | "command.export.iges"
     | "command.export.step"
+    | "command.split"
+    | "command.section"
     | "operate.pickFistPoint"
     | "operate.pickNextPoint"
     | "operate.pickCircleCenter"

diff --git a/packages/chili-core/src/i18n/zh-cn.ts b/packages/chili-core/src/i18n/zh-cn.ts
@@ -89,6 +89,8 @@ export default {
         "command.import": "导入",
         "command.export.iges": "导出IGS",
         "command.export.step": "导出STP",
+        "command.split": "分割",
+        "command.section": "相交线",
         "snap.end": "端点",
         "snap.mid": "中点",
         "snap.center": "圆心",

diff --git a/packages/chili-ui/src/profile/ribbon.ts b/packages/chili-ui/src/profile/ribbon.ts
@@ -28,7 +28,14 @@ export const DefaultRibbon: RibbonTabProfile[] = [
             },
             {
                 groupName: "ribbon.group.modify",
-                items: ["modify.move", "modify.rotate", "modify.mirror", "modify.delete", "create.offset"],
+                items: [
+                    "modify.move",
+                    "modify.rotate",
+                    "modify.mirror",
+                    "modify.delete",
+                    "create.offset",
+                    "modify.split",
+                ],
             },
             {
                 groupName: "ribbon.group.converter",
@@ -42,7 +49,7 @@ export const DefaultRibbon: RibbonTabProfile[] = [
             },
             {
                 groupName: "ribbon.group.boolean",
-                items: ["boolean.common", "boolean.cut", "boolean.fuse"],
+                items: ["boolean.common", "boolean.cut", "boolean.fuse", "create.section"],
             },
             {
                 groupName: "ribbon.group.workingPlane",

diff --git a/packages/chili/src/commands/create/index.ts b/packages/chili/src/commands/create/index.ts
@@ -12,4 +12,5 @@ export * from "./polygon";
 export * from "./prism";
 export * from "./rect";
 export * from "./revolve";
+export * from "./section";
 export * from "./sweep";
diff --git a/packages/chili/src/commands/create/section.ts b/packages/chili/src/commands/create/section.ts
@@ -0,0 +1,27 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license.
+
+import { EditableGeometryEntity, GeometryEntity, ShapeType, command } from "chili-core";
+import { IStep } from "../../step";
+import { SelectShapeStep } from "../../step/selectStep";
+import { CreateCommand } from "../createCommand";
+
+@command({
+    name: "create.section",
+    display: "command.section",
+    icon: "icon-section",
+})
+export class Section extends CreateCommand {
+    protected override geometryEntity(): GeometryEntity {
+        let shape = this.stepDatas[0].shapes[0].shape;
+        let path = this.stepDatas[1].shapes[0].shape;
+        let section = shape.section(path);
+        return new EditableGeometryEntity(this.document, section);
+    }
+
+    protected override getSteps(): IStep[] {
+        return [
+            new SelectShapeStep(ShapeType.Shape, "prompt.select.shape", false),
+            new SelectShapeStep(ShapeType.Shape, "prompt.select.shape", false),
+        ];
+    }
+}
diff --git a/packages/chili/src/commands/modify/index.ts b/packages/chili/src/commands/modify/index.ts
@@ -4,3 +4,4 @@ export * from "./array";
 export * from "./mirror";
 export * from "./move";
 export * from "./rotate";
+export * from "./split";
diff --git a/packages/chili/src/commands/modify/split.ts b/packages/chili/src/commands/modify/split.ts
@@ -0,0 +1,27 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. AGPL-3.0 license.
+
+import { EditableGeometryEntity, GeometryEntity, IEdge, ShapeType, command } from "chili-core";
+import { IStep } from "../../step";
+import { SelectShapeStep } from "../../step/selectStep";
+import { CreateCommand } from "../createCommand";
+
+@command({
+    name: "modify.split",
+    display: "command.split",
+    icon: "icon-split",
+})
+export class Split extends CreateCommand {
+    protected override geometryEntity(): GeometryEntity {
+        let shape1 = this.stepDatas[0].shapes[0].shape;
+        let edges = this.stepDatas[1].shapes.map((x) => x.shape) as IEdge[];
+        let shapes = shape1.split(edges);
+        return new EditableGeometryEntity(this.document, shapes);
+    }
+
+    protected override getSteps(): IStep[] {
+        return [
+            new SelectShapeStep(ShapeType.Shape, "prompt.select.shape", false),
+            new SelectShapeStep(ShapeType.Edge, "prompt.select.shape", true),
+        ];
+    }
+}
diff --git a/public/iconfont.js b/public/iconfont.js