Add command icons

package.json

@@ -16,7 +16,7 @@
     },
     "lint-staged": {
         "*": [
-            "prettier --write ."
+            "prettier --write"
         ]
     },
     "workspaces": [

packages/chili-shared/src/commands.ts

@@ -4,6 +4,10 @@ export class Commands {
     LastCommand = "LastCommand";
     NewGroup = "NewGroup";
     Line = "Line";
+    PLine = "PLine";
+    Circle = "Circle";
+    Rect = "Rect";
+    Box = "Box";
     Delete = "Delete";
     Undo = "Undo";
     Redo = "Redo";

packages/chili/src/commands/create/box.ts

@@ -0,0 +1,33 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
+
+import { command, ICommand, Id, IDocument, LineBody, Model, Dimension, Snapper } from "chili-core";
+import { IEdgeFactory } from "chili-geo";
+import { inject, injectable, Token, XYZ } from "chili-shared";
+
+@injectable()
+@command({
+    name: "Box",
+    display: "command.line",
+    icon: "icon-box",
+})
+export class Box implements ICommand {
+    constructor(@inject(Token.EdgeFactory) private factory: IEdgeFactory) {}
+
+    async excute(document: IDocument): Promise<boolean> {
+        let snap = new Snapper(document);
+        let start = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickStart");
+        if (start === undefined) return false;
+        let end = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickEnd", start, (p) =>
+            this.handleTempLine(start!, p)
+        );
+        if (end === undefined) return false;
+        document.addModel(new Model(document, `Line ${document.modelCount + 1}`, Id.new(), new LineBody(start, end)));
+        document.viewer.redraw();
+        return true;
+    }
+
+    private handleTempLine = (start: XYZ, end: XYZ) => {
+        if (start.isEqualTo(end)) return undefined;
+        return this.factory.byStartAndEnd(start, end).ok();
+    };
+}

packages/chili/src/commands/create/circle.ts

@@ -0,0 +1,33 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
+
+import { command, ICommand, Id, IDocument, LineBody, Model, Dimension, Snapper } from "chili-core";
+import { IEdgeFactory } from "chili-geo";
+import { inject, injectable, Token, XYZ } from "chili-shared";
+
+@injectable()
+@command({
+    name: "Circle",
+    display: "command.line",
+    icon: "icon-circle",
+})
+export class Circle implements ICommand {
+    constructor(@inject(Token.EdgeFactory) private factory: IEdgeFactory) {}
+
+    async excute(document: IDocument): Promise<boolean> {
+        let snap = new Snapper(document);
+        let start = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickStart");
+        if (start === undefined) return false;
+        let end = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickEnd", start, (p) =>
+            this.handleTempLine(start!, p)
+        );
+        if (end === undefined) return false;
+        document.addModel(new Model(document, `Line ${document.modelCount + 1}`, Id.new(), new LineBody(start, end)));
+        document.viewer.redraw();
+        return true;
+    }
+
+    private handleTempLine = (start: XYZ, end: XYZ) => {
+        if (start.isEqualTo(end)) return undefined;
+        return this.factory.byStartAndEnd(start, end).ok();
+    };
+}

packages/chili/src/commands/create/index.ts

@@ -1,4 +1,8 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
 
+export * from "./box";
+export * from "./circle";
 export * from "./group";
 export * from "./line";
+export * from "./pline";
+export * from "./rect";

packages/chili/src/commands/create/pline.ts

@@ -0,0 +1,33 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
+
+import { command, ICommand, Id, IDocument, LineBody, Model, Dimension, Snapper } from "chili-core";
+import { IEdgeFactory } from "chili-geo";
+import { inject, injectable, Token, XYZ } from "chili-shared";
+
+@injectable()
+@command({
+    name: "PLine",
+    display: "command.line",
+    icon: "icon-pline",
+})
+export class PLine implements ICommand {
+    constructor(@inject(Token.EdgeFactory) private factory: IEdgeFactory) {}
+
+    async excute(document: IDocument): Promise<boolean> {
+        let snap = new Snapper(document);
+        let start = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickStart");
+        if (start === undefined) return false;
+        let end = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickEnd", start, (p) =>
+            this.handleTempLine(start!, p)
+        );
+        if (end === undefined) return false;
+        document.addModel(new Model(document, `Line ${document.modelCount + 1}`, Id.new(), new LineBody(start, end)));
+        document.viewer.redraw();
+        return true;
+    }
+
+    private handleTempLine = (start: XYZ, end: XYZ) => {
+        if (start.isEqualTo(end)) return undefined;
+        return this.factory.byStartAndEnd(start, end).ok();
+    };
+}

packages/chili/src/commands/create/rect.ts

@@ -0,0 +1,33 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
+
+import { command, ICommand, Id, IDocument, LineBody, Model, Dimension, Snapper } from "chili-core";
+import { IEdgeFactory } from "chili-geo";
+import { inject, injectable, Token, XYZ } from "chili-shared";
+
+@injectable()
+@command({
+    name: "Rect",
+    display: "command.line",
+    icon: "icon-rect",
+})
+export class Rect implements ICommand {
+    constructor(@inject(Token.EdgeFactory) private factory: IEdgeFactory) {}
+
+    async excute(document: IDocument): Promise<boolean> {
+        let snap = new Snapper(document);
+        let start = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickStart");
+        if (start === undefined) return false;
+        let end = await snap.snapPointAsync(Dimension.D1D2D3, "command.line.pickEnd", start, (p) =>
+            this.handleTempLine(start!, p)
+        );
+        if (end === undefined) return false;
+        document.addModel(new Model(document, `Line ${document.modelCount + 1}`, Id.new(), new LineBody(start, end)));
+        document.viewer.redraw();
+        return true;
+    }
+
+    private handleTempLine = (start: XYZ, end: XYZ) => {
+        if (start.isEqualTo(end)) return undefined;
+        return this.factory.byStartAndEnd(start, end).ok();
+    };
+}

packages/chili/src/ribbon.json

@@ -4,7 +4,7 @@
         "groups": [
             {
                 "groupName": "ui.ribbon.group.drawing",
-                "items": ["Line", "Circle", ["Line", "Circle"]]
+                "items": ["Line", "PLine", "Circle", "Box", ["Rect", "Circle"]]
             }
         ]
     }