@itwin/editor-frontend 3.0.0-dev.154 → 3.0.0-dev.155

package/lib/esm/SolidModelingTools.js

@@ -8,9 +8,11 @@
 import { BooleanMode, BRepEntityType, ChamferMode, CutDepthMode, CutDirectionMode, EmbossDirectionMode, ProfileClosure, SubEntityType } from "@itwin/editor-common";
 import { ColorDef, ElementGeometry } from "@itwin/core-common";
 import { Angle, Geometry, LineString3d, Matrix3d, Point3d, Vector3d } from "@itwin/core-geometry";
-import { AccuDraw, AccuDrawHintBuilder, EventHandled, GraphicType, TentativeOrAccuSnap } from "@itwin/core-frontend";
+import { AccuDraw, AccuDrawHintBuilder, AngleDescription, EventHandled, GraphicType, IModelApp, LengthDescription, TentativeOrAccuSnap } from "@itwin/core-frontend";
 import { computeChordToleranceFromPoint } from "./CreateElementTool";
 import { ElementGeometryCacheTool, isSameSubEntity, LocateSubEntityTool, SubEntityData } from "./ElementGeometryTool";
+import { DialogProperty, PropertyDescriptionHelper } from "@itwin/appui-abstract";
+import { EditTools } from "./EditTool";
 /** @alpha Base class for tools that perform boolean operations on a set of elements. */
 export class BooleanOperationTool extends ElementGeometryCacheTool {
     get allowSelectionSet() { return BooleanMode.Subtract !== this.mode; }
@@ -118,12 +120,20 @@ SewSheetElementsTool.toolId = "SewSheets";
 SewSheetElementsTool.iconSpec = "icon-move"; // TODO: Need better icon...
 /** @alpha Perform thicken operation on surface geometry. */
 export class ThickenSheetElementsTool extends ElementGeometryCacheTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for front and back distances...
-        this.frontDistance = 0.5;
-        this.backDistance = 0.0;
-    }
+    get frontDistanceProperty() {
+        if (!this._frontDistanceProperty)
+            this._frontDistanceProperty = new DialogProperty(new LengthDescription("thickenFront", EditTools.translate("ThickenSheets.Label.FrontDistance")), 0.1, undefined);
+        return this._frontDistanceProperty;
+    }
+    get frontDistance() { return this.frontDistanceProperty.value; }
+    set frontDistance(value) { this.frontDistanceProperty.value = value; }
+    get backDistanceProperty() {
+        if (!this._backDistanceProperty)
+            this._backDistanceProperty = new DialogProperty(new LengthDescription("thickenBack", EditTools.translate("ThickenSheets.Label.BackDistance")), 0.0, undefined);
+        return this._backDistanceProperty;
+    }
+    get backDistance() { return this.backDistanceProperty.value; }
+    set backDistance(value) { this.backDistanceProperty.value = value; }
     get geometryCacheFilter() {
         return { parts: true, curves: false, surfaces: true, solids: false, other: false };
     }
@@ -146,6 +156,32 @@ export class ThickenSheetElementsTool extends ElementGeometryCacheTool {
         if (result === null || result === void 0 ? void 0 : result.elementId)
             await this.saveChanges();
     }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.frontDistanceProperty.name) {
+            this.frontDistance = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.frontDistanceProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.backDistanceProperty.name) {
+            this.backDistance = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.backDistanceProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.frontDistanceProperty.name, this.backDistanceProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.frontDistanceProperty.name)
+                this.frontDistanceProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.backDistanceProperty.name)
+                this.backDistanceProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        toolSettings.push(this.frontDistanceProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 }));
+        toolSettings.push(this.backDistanceProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new ThickenSheetElementsTool();
         if (!await tool.run())
@@ -156,13 +192,34 @@ ThickenSheetElementsTool.toolId = "ThickenSheets";
 ThickenSheetElementsTool.iconSpec = "icon-move"; // TODO: Need better icon...
 /** @alpha Perform cut operation on solid using region or path profile. */
 export class CutSolidElementsTool extends ElementGeometryCacheTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for both directions, blind cut depth, and outside...
-        this.bothDirections = false;
-        this.distance = 0.0;
-        this.outside = undefined;
-    }
+    get bothDirectionsProperty() {
+        if (!this._bothDirectionsProperty)
+            this._bothDirectionsProperty = new DialogProperty(PropertyDescriptionHelper.buildToggleDescription("cutBothDirections", EditTools.translate("CutSolids.Label.BothDirections")), false);
+        return this._bothDirectionsProperty;
+    }
+    get bothDirections() { return this.bothDirectionsProperty.value; }
+    set bothDirections(value) { this.bothDirectionsProperty.value = value; }
+    get outsideProperty() {
+        if (!this._outsideProperty)
+            this._outsideProperty = new DialogProperty(PropertyDescriptionHelper.buildToggleDescription("cutOutside", EditTools.translate("CutSolids.Label.Outside")), false);
+        return this._outsideProperty;
+    }
+    get outside() { return this.outsideProperty.value; }
+    set outside(value) { this.outsideProperty.value = value; }
+    get useDepthProperty() {
+        if (!this._useDepthProperty)
+            this._useDepthProperty = new DialogProperty(PropertyDescriptionHelper.buildLockPropertyDescription("useCutDepth"), false);
+        return this._useDepthProperty;
+    }
+    get useDepth() { return this.useDepthProperty.value; }
+    set useDepth(value) { this.useDepthProperty.value = value; }
+    get depthProperty() {
+        if (!this._depthProperty)
+            this._depthProperty = new DialogProperty(new LengthDescription("cutDepth", EditTools.translate("CutSolids.Label.Depth")), 0.1, undefined, !this.useDepth);
+        return this._depthProperty;
+    }
+    get depth() { return this.depthProperty.value; }
+    set depth(value) { this.depthProperty.value = value; }
     get requiredElementCount() { return 2; }
     get isProfilePhase() { return !this.agenda.isEmpty; }
     get geometryCacheFilter() {
@@ -191,12 +248,12 @@ export class CutSolidElementsTool extends ElementGeometryCacheTool {
         if (this.agenda.length < this.requiredElementCount)
             return undefined;
         const direction = (this.bothDirections ? CutDirectionMode.Both : CutDirectionMode.Auto);
-        const depth = (0.0 === this.distance ? CutDepthMode.All : CutDepthMode.Blind);
+        const depth = (this.useDepth ? CutDepthMode.Blind : CutDepthMode.All);
         try {
             this._startedCmd = await this.startCommand();
             const target = this.agenda.elements[0];
             const profile = this.agenda.elements[1];
-            const params = { profile, direction, depth, distance: this.distance, outside: this.outside, closeOpen: ProfileClosure.Auto, targetPoint: this.targetPoint, toolPoint: this.toolPoint };
+            const params = { profile, direction, depth, distance: this.depth, outside: this.outside ? true : undefined, closeOpen: ProfileClosure.Auto, targetPoint: this.targetPoint, toolPoint: this.toolPoint };
             const opts = { writeChanges: true };
             return await ElementGeometryCacheTool.callCommand("cutSolid", target, params, opts);
         }
@@ -216,6 +273,60 @@ export class CutSolidElementsTool extends ElementGeometryCacheTool {
             this.targetPoint = hit.hitPoint;
         return super.buildLocateAgenda(hit);
     }
+    syncDepthState() {
+        this.depthProperty.displayValue = this.depthProperty.description.format(this.depth);
+        this.depthProperty.isDisabled = !this.useDepth;
+        this.syncToolSettingsProperties([this.depthProperty.syncItem]);
+    }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.bothDirectionsProperty.name) {
+            this.bothDirections = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.bothDirectionsProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.outsideProperty.name) {
+            this.outside = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.outsideProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.useDepthProperty.name) {
+            this.useDepth = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.useDepthProperty.item);
+            this.syncDepthState();
+            return true;
+        }
+        else if (updatedValue.propertyName === this.depthProperty.name) {
+            if (!updatedValue.value.value) {
+                this.syncDepthState(); // force UI to redisplay last valid value
+                return false;
+            }
+            this.depth = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.depthProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.bothDirectionsProperty.name, this.outsideProperty.name, this.useDepthProperty.name, this.depthProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.bothDirectionsProperty.name)
+                this.bothDirectionsProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.outsideProperty.name)
+                this.outsideProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.useDepthProperty.name)
+                this.useDepthProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.depthProperty.name)
+                this.depthProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        toolSettings.push(this.bothDirectionsProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 }));
+        toolSettings.push(this.outsideProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+        // ensure controls are enabled/disabled based on current lock property state
+        this.depthProperty.isDisabled = !this.useDepth;
+        const useDepthLock = this.useDepthProperty.toDialogItem({ rowPriority: 3, columnIndex: 0 });
+        toolSettings.push(this.depthProperty.toDialogItem({ rowPriority: 3, columnIndex: 1 }, useDepthLock));
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new CutSolidElementsTool();
         if (!await tool.run())
@@ -353,13 +464,27 @@ export class FaceLocationData {
 }
 /** @alpha Identify faces of solids and surfaces to offset. */
 export class OffsetFacesTool extends LocateSubEntityTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for offset distance...
-        this.useOffset = false;
-        this.offset = 0.1;
-        this.addSmoothFaces = false;
-    }
+    get addSmoothProperty() {
+        if (!this._addSmoothProperty)
+            this._addSmoothProperty = new DialogProperty(PropertyDescriptionHelper.buildToggleDescription("offsetSmooth", EditTools.translate("OffsetFaces.Label.AddSmooth")), false);
+        return this._addSmoothProperty;
+    }
+    get addSmooth() { return this.addSmoothProperty.value; }
+    set addSmooth(value) { this.addSmoothProperty.value = value; }
+    get useDistanceProperty() {
+        if (!this._useDistanceProperty)
+            this._useDistanceProperty = new DialogProperty(PropertyDescriptionHelper.buildLockPropertyDescription("useOffsetDistance"), false);
+        return this._useDistanceProperty;
+    }
+    get useDistance() { return this.useDistanceProperty.value; }
+    set useDistance(value) { this.useDistanceProperty.value = value; }
+    get distanceProperty() {
+        if (!this._distanceProperty)
+            this._distanceProperty = new DialogProperty(new LengthDescription("offsetDistance", EditTools.translate("OffsetFaces.Label.Distance")), 0.1, undefined, !this.useDistance);
+        return this._distanceProperty;
+    }
+    get distance() { return this.distanceProperty.value; }
+    set distance(value) { this.distanceProperty.value = value; }
     get wantDynamics() { return true; }
     get wantAccuSnap() { return this.isDynamicsStarted; }
     get geometryCacheFilter() {
@@ -403,7 +528,7 @@ export class OffsetFacesTool extends LocateSubEntityTool {
         if (undefined === projPt)
             return undefined;
         const offsetDir = Vector3d.createStartEnd(faceData.point, projPt);
-        if (this.useOffset && undefined === offsetDir.scaleToLength(this.offset, offsetDir))
+        if (this.useDistance && undefined === offsetDir.scaleToLength(this.distance, offsetDir))
             return undefined;
         let offset = offsetDir.magnitude();
         if (offset < Geometry.smallMetricDistance)
@@ -414,7 +539,7 @@ export class OffsetFacesTool extends LocateSubEntityTool {
             this._startedCmd = await this.startCommand();
             const id = this.agenda.elements[0];
             const faces = this.getAcceptedSubEntities();
-            if (this.addSmoothFaces) {
+            if (this.addSmooth) {
                 const allSmoothFaces = [];
                 for (const face of faces) {
                     const smoothFaces = await this.getSmoothFaces(id, face);
@@ -455,6 +580,52 @@ export class OffsetFacesTool extends LocateSubEntityTool {
         hints.setXAxis2(faceData.normal);
         hints.sendHints(false);
     }
+    syncDistanceState() {
+        this.distanceProperty.displayValue = this.distanceProperty.description.format(this.distance);
+        this.distanceProperty.isDisabled = !this.useDistance;
+        this.syncToolSettingsProperties([this.distanceProperty.syncItem]);
+    }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.addSmoothProperty.name) {
+            this.addSmooth = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.addSmoothProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.useDistanceProperty.name) {
+            this.useDistance = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.useDistanceProperty.item);
+            this.syncDistanceState();
+            return true;
+        }
+        else if (updatedValue.propertyName === this.distanceProperty.name) {
+            if (!updatedValue.value.value) {
+                this.syncDistanceState(); // force UI to redisplay last valid value
+                return false;
+            }
+            this.distance = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.distanceProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.addSmoothProperty.name, this.useDistanceProperty.name, this.distanceProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.addSmoothProperty.name)
+                this.addSmoothProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.useDistanceProperty.name)
+                this.useDistanceProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.distanceProperty.name)
+                this.distanceProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        // ensure controls are enabled/disabled based on current lock property state
+        this.distanceProperty.isDisabled = !this.useDistance;
+        const useDistanceLock = this.useDistanceProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 });
+        toolSettings.push(this.distanceProperty.toDialogItem({ rowPriority: 1, columnIndex: 1 }, useDistanceLock));
+        toolSettings.push(this.addSmoothProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new OffsetFacesTool();
         if (!await tool.run())
@@ -465,12 +636,20 @@ OffsetFacesTool.toolId = "OffsetFaces";
 OffsetFacesTool.iconSpec = "icon-move"; // TODO: Need better icon...
 /** @alpha Identify faces to offset to hollow solids. */
 export class HollowFacesTool extends LocateSubEntityTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for shell thickness and face thickness...
-        this.shellThickness = 0.1;
-        this.faceThickness = 0.0;
-    }
+    get shellThicknessProperty() {
+        if (!this._shellThicknessProperty)
+            this._shellThicknessProperty = new DialogProperty(new LengthDescription("hollowShellThickness", EditTools.translate("HollowFaces.Label.ShellThickness")), 0.1, undefined);
+        return this._shellThicknessProperty;
+    }
+    get shellThickness() { return this.shellThicknessProperty.value; }
+    set shellThickness(value) { this.shellThicknessProperty.value = value; }
+    get faceThicknessProperty() {
+        if (!this._faceThicknessProperty)
+            this._faceThicknessProperty = new DialogProperty(new LengthDescription("hollowFaceThickness", EditTools.translate("HollowFaces.Label.FaceThickness")), 0.0, undefined);
+        return this._faceThicknessProperty;
+    }
+    get faceThickness() { return this.faceThicknessProperty.value; }
+    set faceThickness(value) { this.faceThicknessProperty.value = value; }
     get geometryCacheFilter() {
         return { parts: true, curves: false, surfaces: false, solids: true, other: false };
     }
@@ -492,6 +671,32 @@ export class HollowFacesTool extends LocateSubEntityTool {
             return undefined;
         }
     }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.shellThicknessProperty.name) {
+            this.shellThickness = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.shellThicknessProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.faceThicknessProperty.name) {
+            this.faceThickness = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.faceThicknessProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.shellThicknessProperty.name, this.faceThicknessProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.shellThicknessProperty.name)
+                this.shellThicknessProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.faceThicknessProperty.name)
+                this.faceThicknessProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        toolSettings.push(this.shellThicknessProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 }));
+        toolSettings.push(this.faceThicknessProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new HollowFacesTool();
         if (!await tool.run())
@@ -580,12 +785,31 @@ export var ImprintSolidMethod;
 export class ImprintSolidElementsTool extends LocateSubEntityTool {
     constructor() {
         super(...arguments);
-        // TODO: Tool settings for method, propagate for edges, offset distance...
-        this.method = ImprintSolidMethod.Points;
         this.points = [];
-        this.extend = true;
-        this.distance = 0.1;
     }
+    static methodMessage(str) { return EditTools.translate(`ImprintSolids.Method.${str}`); }
+    get methodProperty() {
+        if (!this._methodProperty)
+            this._methodProperty = new DialogProperty(PropertyDescriptionHelper.buildEnumPicklistEditorDescription("imprintMethod", EditTools.translate("ImprintSolids.Label.Method"), ImprintSolidElementsTool.getMethodChoices()), ImprintSolidMethod.Element);
+        return this._methodProperty;
+    }
+    get method() { return this.methodProperty.value; }
+    set method(method) { this.methodProperty.value = method; }
+    get distanceProperty() {
+        if (!this._distanceProperty)
+            this._distanceProperty = new DialogProperty(new LengthDescription("imprintDistance", EditTools.translate("ImprintSolids.Label.Distance")), 0.1, undefined);
+        return this._distanceProperty;
+    }
+    get distance() { return this.distanceProperty.value; }
+    set distance(value) { this.distanceProperty.value = value; }
+    get extendProperty() {
+        if (!this._extendProperty)
+            this._extendProperty = new DialogProperty(PropertyDescriptionHelper.buildToggleDescription("imprintExtend", EditTools.translate("ImprintSolids.Label.Extend")), false);
+        return this._extendProperty;
+    }
+    get extend() { return this.extendProperty.value; }
+    set extend(value) { this.extendProperty.value = value; }
+    get requiredSubEntityCount() { return ImprintSolidMethod.Element === this.method ? 0 : 1; }
     get requiredElementCount() { return ImprintSolidMethod.Element === this.method ? 2 : 1; }
     get allowSubEntityControlSelect() { return ImprintSolidMethod.Edges === this.method; }
     get inhibitSubEntityDisplay() { return ImprintSolidMethod.Points === this.method ? false : super.inhibitSubEntityDisplay; }
@@ -708,6 +932,50 @@ export class ImprintSolidElementsTool extends LocateSubEntityTool {
         hints.setNormal(faceData.normal);
         hints.sendHints(false);
     }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.methodProperty.name) {
+            this.method = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.methodProperty.item);
+            await this.onReinitialize();
+            return true;
+        }
+        else if (updatedValue.propertyName === this.extendProperty.name) {
+            this.extend = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.extendProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.distanceProperty.name) {
+            this.distance = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.distanceProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.methodProperty.name, this.extendProperty.name, this.distanceProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.methodProperty.name)
+                this.methodProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.extendProperty.name)
+                this.extendProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.distanceProperty.name)
+                this.distanceProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        toolSettings.push(this.methodProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 }));
+        switch (this.method) {
+            case ImprintSolidMethod.Element:
+                toolSettings.push(this.extendProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+                break;
+            case ImprintSolidMethod.Edges:
+                toolSettings.push(this.distanceProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+                break;
+            case ImprintSolidMethod.Points:
+                toolSettings.push(this.extendProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+                break;
+        }
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new ImprintSolidElementsTool();
         if (!await tool.run())
@@ -716,13 +984,22 @@ export class ImprintSolidElementsTool extends LocateSubEntityTool {
 }
 ImprintSolidElementsTool.toolId = "ImprintSolids";
 ImprintSolidElementsTool.iconSpec = "icon-move"; // TODO: Need better icon...
+ImprintSolidElementsTool.getMethodChoices = () => {
+    return [
+        { label: ImprintSolidElementsTool.methodMessage("Element"), value: ImprintSolidMethod.Element },
+        { label: ImprintSolidElementsTool.methodMessage("Edges"), value: ImprintSolidMethod.Edges },
+        { label: ImprintSolidElementsTool.methodMessage("Points"), value: ImprintSolidMethod.Points },
+    ];
+};
 /** @alpha Base class for tools to identify edges of solids and surfaces and apply blends. */
 export class BlendEdgesTool extends LocateSubEntityTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for tangent edge propagation...
-        this.propagateSmooth = true;
+    get addSmoothProperty() {
+        if (!this._addSmoothProperty)
+            this._addSmoothProperty = new DialogProperty(PropertyDescriptionHelper.buildToggleDescription("blendSmooth", EditTools.translate("RoundEdges.Label.AddSmooth")), false);
+        return this._addSmoothProperty;
     }
+    get addSmooth() { return this.addSmoothProperty.value; }
+    set addSmooth(value) { this.addSmoothProperty.value = value; }
     wantSubEntityType(type) { return SubEntityType.Edge === type; }
     getSubEntityFilter() {
         return { laminarEdges: true, smoothEdges: true };
@@ -773,16 +1050,26 @@ export class BlendEdgesTool extends LocateSubEntityTool {
         const primaryEdge = (undefined !== edgeData.toolData ? edgeData.toolData : edgeData.props);
         this._acceptedSubEntities = this._acceptedSubEntities.filter((entry) => !isTangentEdge(entry));
     }
+    async syncTangentEdges() {
+        const id = this.getCurrentElement();
+        if (undefined === id)
+            return;
+        if (this.addSmooth)
+            await this.addTangentEdges(id);
+        else
+            await this.removeTangentEdges(id);
+        IModelApp.viewManager.invalidateDecorationsAllViews();
+    }
     async addSubEntity(id, props) {
         await super.addSubEntity(id, props);
-        if (!this.propagateSmooth)
+        if (!this.addSmooth)
             return;
         const chordTolerance = (this.targetView ? computeChordToleranceFromPoint(this.targetView, Point3d.fromJSON(props.point)) : undefined);
         return this.addTangentEdges(id, props.subEntity, chordTolerance);
     }
     async removeSubEntity(id, props) {
         var _a;
-        if (!this.propagateSmooth)
+        if (!this.addSmooth)
             return super.removeSubEntity(id, props);
         const edge = (undefined !== props) ? props.subEntity : (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.props;
         if (undefined === edge)
@@ -798,17 +1085,19 @@ export class BlendEdgesTool extends LocateSubEntityTool {
 }
 /** @alpha Identify edges of solids and surfaces to apply a rolling ball blend to. */
 export class RoundEdgesTool extends BlendEdgesTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for blend radius...
-        this.radius = 0.5;
+    get radiusProperty() {
+        if (!this._radiusProperty)
+            this._radiusProperty = new DialogProperty(new LengthDescription("roundRadius", EditTools.translate("RoundEdges.Label.Radius")), 0.1, undefined);
+        return this._radiusProperty;
     }
+    get radius() { return this.radiusProperty.value; }
+    set radius(value) { this.radiusProperty.value = value; }
     async applyAgendaOperation(ev, isAccept) {
         if (undefined === ev.viewport || this.agenda.isEmpty || !this.haveAcceptedSubEntities)
             return undefined;
         try {
             this._startedCmd = await this.startCommand();
-            const params = { edges: this.getAcceptedSubEntities(), radii: this.radius, propagateSmooth: this.propagateSmooth };
+            const params = { edges: this.getAcceptedSubEntities(), radii: this.radius, propagateSmooth: this.addSmooth };
             const opts = {
                 wantGraphic: isAccept ? undefined : true,
                 chordTolerance: computeChordToleranceFromPoint(ev.viewport, ev.point),
@@ -821,6 +1110,33 @@ export class RoundEdgesTool extends BlendEdgesTool {
             return undefined;
         }
     }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.radiusProperty.name) {
+            this.radius = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.radiusProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.addSmoothProperty.name) {
+            this.addSmooth = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.addSmoothProperty.item);
+            await this.syncTangentEdges();
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.radiusProperty.name, this.addSmoothProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.radiusProperty.name)
+                this.radiusProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.addSmoothProperty.name)
+                this.addSmoothProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        toolSettings.push(this.radiusProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 }));
+        toolSettings.push(this.addSmoothProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new RoundEdgesTool();
         if (!await tool.run())
@@ -831,18 +1147,69 @@ RoundEdgesTool.toolId = "RoundEdges";
 RoundEdgesTool.iconSpec = "icon-move"; // TODO: Need better icon...
 /** @alpha Identify edges of solids and surfaces to apply a rolling ball blend to. */
 export class ChamferEdgesTool extends BlendEdgesTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for chamfer length, distances, distance + angle...
-        this.mode = ChamferMode.Length;
-        this.length = 0.5;
-    }
+    static methodMessage(str) { return EditTools.translate(`ChamferEdges.Method.${str}`); }
+    get methodProperty() {
+        if (!this._methodProperty)
+            this._methodProperty = new DialogProperty(PropertyDescriptionHelper.buildEnumPicklistEditorDescription("chamferMethod", EditTools.translate("ChamferEdges.Label.Method"), ChamferEdgesTool.getMethodChoices()), ChamferMode.Length);
+        return this._methodProperty;
+    }
+    get method() { return this.methodProperty.value; }
+    set method(method) { this.methodProperty.value = method; }
+    get lengthProperty() {
+        if (!this._lengthProperty)
+            this._lengthProperty = new DialogProperty(new LengthDescription("chamferLength", EditTools.translate("ChamferEdges.Label.Length")), 0.1, undefined);
+        return this._lengthProperty;
+    }
+    get length() { return this.lengthProperty.value; }
+    set length(value) { this.lengthProperty.value = value; }
+    get distanceLeftProperty() {
+        if (!this._distanceLeftProperty)
+            this._distanceLeftProperty = new DialogProperty(new LengthDescription("chamferLeftDist", EditTools.translate("ChamferEdges.Label.LeftDistance")), 0.1, undefined);
+        return this._distanceLeftProperty;
+    }
+    get distanceLeft() { return this.distanceLeftProperty.value; }
+    set distanceLeft(value) { this.distanceLeftProperty.value = value; }
+    get distanceRightProperty() {
+        if (!this._distanceRightProperty)
+            this._distanceRightProperty = new DialogProperty(new LengthDescription("chamferRightDist", EditTools.translate("ChamferEdges.Label.RightDistance")), 0.1, undefined);
+        return this._distanceRightProperty;
+    }
+    get distanceRight() { return this.distanceRightProperty.value; }
+    set distanceRight(value) { this.distanceRightProperty.value = value; }
+    get angleProperty() {
+        if (!this._angleProperty)
+            this._angleProperty = new DialogProperty(new AngleDescription("chamferAngle", EditTools.translate("ChamferEdges.Label.Angle")), Angle.piOver4Radians, undefined, false);
+        return this._angleProperty;
+    }
+    get angle() { return this.angleProperty.value; }
+    set angle(value) { this.angleProperty.value = value; }
     async applyAgendaOperation(ev, isAccept) {
         if (undefined === ev.viewport || this.agenda.isEmpty || !this.haveAcceptedSubEntities)
             return undefined;
         try {
             this._startedCmd = await this.startCommand();
-            const params = { edges: this.getAcceptedSubEntities(), mode: this.mode, values1: this.length, propagateSmooth: this.propagateSmooth };
+            let values1;
+            let values2;
+            switch (this.method) {
+                case ChamferMode.Length:
+                    values1 = this.length;
+                    break;
+                case ChamferMode.Distances:
+                    values1 = this.distanceLeft;
+                    values2 = this.distanceRight;
+                    break;
+                case ChamferMode.DistanceAngle:
+                    values1 = this.distanceLeft;
+                    values2 = this.angle;
+                    break;
+                case ChamferMode.AngleDistance:
+                    values1 = this.angle;
+                    values2 = this.distanceRight;
+                    break;
+                default:
+                    return undefined;
+            }
+            const params = { edges: this.getAcceptedSubEntities(), mode: this.method, values1, values2, propagateSmooth: this.addSmooth };
             const opts = {
                 wantGraphic: isAccept ? undefined : true,
                 chordTolerance: computeChordToleranceFromPoint(ev.viewport, ev.point),
@@ -855,6 +1222,78 @@ export class ChamferEdgesTool extends BlendEdgesTool {
             return undefined;
         }
     }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.methodProperty.name) {
+            this.method = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.methodProperty.item);
+            await this.onReinitialize();
+            return true;
+        }
+        else if (updatedValue.propertyName === this.addSmoothProperty.name) {
+            this.addSmooth = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.addSmoothProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.lengthProperty.name) {
+            this.length = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.lengthProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.distanceLeftProperty.name) {
+            this.distanceLeft = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.distanceLeftProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.distanceRightProperty.name) {
+            this.distanceRight = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.distanceRightProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.angleProperty.name) {
+            this.angle = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.angleProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.methodProperty.name, this.addSmoothProperty.name, this.lengthProperty.name, this.distanceLeftProperty.name, this.distanceRightProperty.name, this.angleProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.methodProperty.name)
+                this.methodProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.addSmoothProperty.name)
+                this.addSmoothProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.lengthProperty.name)
+                this.lengthProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.distanceLeftProperty.name)
+                this.distanceLeftProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.distanceRightProperty.name)
+                this.distanceRightProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.angleProperty.name)
+                this.angleProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        toolSettings.push(this.methodProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 }));
+        toolSettings.push(this.addSmoothProperty.toDialogItem({ rowPriority: ChamferMode.Length === this.method ? 3 : 4, columnIndex: 0 }));
+        switch (this.method) {
+            case ChamferMode.Length:
+                toolSettings.push(this.lengthProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+                break;
+            case ChamferMode.Distances:
+                toolSettings.push(this.distanceLeftProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+                toolSettings.push(this.distanceRightProperty.toDialogItem({ rowPriority: 3, columnIndex: 0 }));
+                break;
+            case ChamferMode.DistanceAngle:
+                toolSettings.push(this.distanceLeftProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+                toolSettings.push(this.angleProperty.toDialogItem({ rowPriority: 3, columnIndex: 0 }));
+                break;
+            case ChamferMode.AngleDistance:
+                toolSettings.push(this.distanceRightProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+                toolSettings.push(this.angleProperty.toDialogItem({ rowPriority: 3, columnIndex: 0 }));
+                break;
+        }
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new ChamferEdgesTool();
         if (!await tool.run())
@@ -863,6 +1302,14 @@ export class ChamferEdgesTool extends BlendEdgesTool {
 }
 ChamferEdgesTool.toolId = "ChamferEdges";
 ChamferEdgesTool.iconSpec = "icon-move"; // TODO: Need better icon...
+ChamferEdgesTool.getMethodChoices = () => {
+    return [
+        { label: ChamferEdgesTool.methodMessage("Length"), value: ChamferMode.Length },
+        { label: ChamferEdgesTool.methodMessage("Distances"), value: ChamferMode.Distances },
+        { label: ChamferEdgesTool.methodMessage("DistanceAngle"), value: ChamferMode.DistanceAngle },
+        { label: ChamferEdgesTool.methodMessage("AngleDistance"), value: ChamferMode.AngleDistance },
+    ];
+};
 /** @alpha */
 export class ProfileLocationData {
     constructor(point, orientation) {
@@ -928,16 +1375,30 @@ export class LocateFaceOrProfileTool extends LocateSubEntityTool {
 }
 /** @alpha Identify faces of solids and surfaces to translate. */
 export class SweepFacesTool extends LocateFaceOrProfileTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for sweep distance...
-        this.useDistance = false;
-        this.distance = 0.1;
-        this.addSmoothFaces = false;
-    }
     get wantDynamics() { return true; }
     get wantAccuSnap() { return true; }
     get wantSubEntitySnap() { return true; }
+    get addSmoothProperty() {
+        if (!this._addSmoothProperty)
+            this._addSmoothProperty = new DialogProperty(PropertyDescriptionHelper.buildToggleDescription("sweepSmooth", EditTools.translate("SweepFaces.Label.AddSmooth")), false);
+        return this._addSmoothProperty;
+    }
+    get addSmooth() { return this.addSmoothProperty.value; }
+    set addSmooth(value) { this.addSmoothProperty.value = value; }
+    get useDistanceProperty() {
+        if (!this._useDistanceProperty)
+            this._useDistanceProperty = new DialogProperty(PropertyDescriptionHelper.buildLockPropertyDescription("useOffsetDistance"), false);
+        return this._useDistanceProperty;
+    }
+    get useDistance() { return this.useDistanceProperty.value; }
+    set useDistance(value) { this.useDistanceProperty.value = value; }
+    get distanceProperty() {
+        if (!this._distanceProperty)
+            this._distanceProperty = new DialogProperty(new LengthDescription("sweepDistance", EditTools.translate("SweepFaces.Label.Distance")), 0.1, undefined, !this.useDistance);
+        return this._distanceProperty;
+    }
+    get distance() { return this.distanceProperty.value; }
+    set distance(value) { this.distanceProperty.value = value; }
     async getSmoothFaces(id, face) {
         try {
             // NOTE: For sweep/translation, it makes sense to limit smooth to immediately adjacent...
@@ -973,7 +1434,7 @@ export class SweepFacesTool extends LocateFaceOrProfileTool {
             if (SubEntityType.Edge === subEntities[0].type || BRepEntityType.Solid !== this.getBRepEntityTypeForSubEntity(id, subEntities[0])) {
                 return await ElementGeometryCacheTool.callCommand("sweepFaces", id, params, opts);
             }
-            if (this.addSmoothFaces) {
+            if (this.addSmooth) {
                 const allSmoothFaces = [];
                 for (const face of subEntities) {
                     const smoothFaces = await this.getSmoothFaces(id, face);
@@ -1008,6 +1469,52 @@ export class SweepFacesTool extends LocateFaceOrProfileTool {
         hints.setXAxis2(profileData.orientation instanceof Matrix3d ? profileData.orientation.getColumn(2) : profileData.orientation);
         hints.sendHints(false);
     }
+    syncDistanceState() {
+        this.distanceProperty.displayValue = this.distanceProperty.description.format(this.distance);
+        this.distanceProperty.isDisabled = !this.useDistance;
+        this.syncToolSettingsProperties([this.distanceProperty.syncItem]);
+    }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.addSmoothProperty.name) {
+            this.addSmooth = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.addSmoothProperty.item);
+            return true;
+        }
+        else if (updatedValue.propertyName === this.useDistanceProperty.name) {
+            this.useDistance = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.useDistanceProperty.item);
+            this.syncDistanceState();
+            return true;
+        }
+        else if (updatedValue.propertyName === this.distanceProperty.name) {
+            if (!updatedValue.value.value) {
+                this.syncDistanceState(); // force UI to redisplay last valid value
+                return false;
+            }
+            this.distance = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.distanceProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.addSmoothProperty.name, this.useDistanceProperty.name, this.distanceProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.addSmoothProperty.name)
+                this.addSmoothProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.useDistanceProperty.name)
+                this.useDistanceProperty.dialogItemValue = value.value;
+            else if (value.propertyName === this.distanceProperty.name)
+                this.distanceProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        // ensure controls are enabled/disabled based on current lock property state
+        this.distanceProperty.isDisabled = !this.useDistance;
+        const useDistanceLock = this.useDistanceProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 });
+        toolSettings.push(this.distanceProperty.toDialogItem({ rowPriority: 1, columnIndex: 1 }, useDistanceLock));
+        toolSettings.push(this.addSmoothProperty.toDialogItem({ rowPriority: 2, columnIndex: 0 }));
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new SweepFacesTool();
         if (!await tool.run())
@@ -1020,10 +1527,15 @@ SweepFacesTool.iconSpec = "icon-move"; // TODO: Need better icon...
 export class SpinFacesTool extends LocateFaceOrProfileTool {
     constructor() {
         super(...arguments);
-        // TODO: Tool settings for sweep angle...
-        this.sweep = Angle.piOver2Radians;
         this.points = [];
     }
+    get angleProperty() {
+        if (!this._angleProperty)
+            this._angleProperty = new DialogProperty(new AngleDescription("spinAngle", EditTools.translate("SpinFaces.Label.Angle")), Angle.piOver2Radians, undefined, false);
+        return this._angleProperty;
+    }
+    get angle() { return this.angleProperty.value; }
+    set angle(value) { this.angleProperty.value = value; }
     get wantDynamics() { return true; }
     get wantAccuSnap() { return true; }
     get wantSubEntitySnap() { return true; }
@@ -1034,7 +1546,7 @@ export class SpinFacesTool extends LocateFaceOrProfileTool {
         if (direction.magnitude() < Geometry.smallMetricDistance)
             return undefined;
         const origin = this.points[0];
-        const angle = Angle.createRadians(this.sweep);
+        const angle = Angle.createRadians(this.angle);
         try {
             this._startedCmd = await this.startCommand();
             const id = this.agenda.elements[0];
@@ -1097,6 +1609,24 @@ export class SpinFacesTool extends LocateFaceOrProfileTool {
             hints.setNormal(profileData.orientation);
         hints.sendHints(false);
     }
+    async applyToolSettingPropertyChange(updatedValue) {
+        if (updatedValue.propertyName === this.angleProperty.name) {
+            this.angle = updatedValue.value.value;
+            IModelApp.toolAdmin.toolSettingsState.saveToolSettingProperty(this.toolId, this.angleProperty.item);
+            return true;
+        }
+        return false;
+    }
+    supplyToolSettingsProperties() {
+        var _a;
+        (_a = IModelApp.toolAdmin.toolSettingsState.getInitialToolSettingValues(this.toolId, [this.angleProperty.name])) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
+            if (value.propertyName === this.angleProperty.name)
+                this.angleProperty.dialogItemValue = value.value;
+        });
+        const toolSettings = new Array();
+        toolSettings.push(this.angleProperty.toDialogItem({ rowPriority: 1, columnIndex: 0 }));
+        return toolSettings;
+    }
     async onRestartTool() {
         const tool = new SpinFacesTool();
         if (!await tool.run())