✨ feat: add measure tools

Author: xiangechen

cpp/src/shape.cpp

@@ -12,6 +12,7 @@
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepExtrema_ExtCC.hxx>
 #include <BRepFeat_SplitShape.hxx>
+#include <BRepGProp.hxx>
 #include <BRepGProp_Face.hxx>
 #include <BRepOffsetAPI_MakeOffset.hxx>
 #include <BRepTools.hxx>
@@ -23,6 +24,7 @@
 #include <Geom_OffsetCurve.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAbs_JoinType.hxx>
+#include <GProp_GProps.hxx>
 #include <ShapeAnalysis.hxx>
 #include <ShapeFix_Shape.hxx>
 #include <TopExp.hxx>
@@ -214,8 +216,9 @@ class Edge {
     }
 
     static double curveLength(const TopoDS_Edge& edge) {
-        BRepAdaptor_Curve curve(edge);
-        return GCPnts_AbscissaPoint::Length(curve);
+        GProp_GProps props;
+        BRepGProp::LinearProperties(edge, props);
+        return props.Mass();
     }
 
     static Handle_Geom_TrimmedCurve curve(const TopoDS_Edge& edge) {
@@ -292,7 +295,15 @@ class Wire {
 
 class Face {
 public:
-    static TopoDS_Shape offset(const TopoDS_Face& face , double distance, const GeomAbs_JoinType& joinType) {
+    static double area(const TopoDS_Face &face)
+    {
+        GProp_GProps props;
+        BRepGProp::SurfaceProperties(face, props);
+        return props.Mass();
+    }
+
+    static TopoDS_Shape offset(const TopoDS_Face &face, double distance, const GeomAbs_JoinType &joinType)
+    {
         BRepOffsetAPI_MakeOffset offsetter(face, joinType);
         offsetter.Perform(distance);
         if (offsetter.IsDone()) {
@@ -334,6 +345,15 @@ class Face {
 
 };
 
+class Solid {
+public:
+    static double volume(const TopoDS_Solid& solid) {
+        GProp_GProps props;
+        BRepGProp::VolumeProperties(solid, props);
+        return props.Mass();
+    }
+};
+
 EMSCRIPTEN_BINDINGS(Shape) {
 
     class_<Shape>("Shape")
@@ -360,8 +380,7 @@ EMSCRIPTEN_BINDINGS(Shape) {
         .class_function("curveLength", &Edge::curveLength)
         .class_function("trim", &Edge::trim)
         .class_function("intersect", &Edge::intersect)
-        .class_function("offset", &Edge::offset)
-    ;
+        .class_function("offset", &Edge::offset);
 
     class_<Wire>("Wire")
         .class_function("offset", &Wire::offset)
@@ -370,12 +389,17 @@ EMSCRIPTEN_BINDINGS(Shape) {
     ;
 
     class_<Face>("Face")
+        .class_function("area", &Face::area)
         .class_function("offset", &Face::offset)
         .class_function("outerWire", &Face::outerWire)
         .class_function("surface", &Face::surface)
         .class_function("normal", &Face::normal)
         .class_function("curveOnSurface", &Face::curveOnSurface)
     ;
 
+    class_<Solid>("Solid")
+       .class_function("volume", &Solid::volume)
+    ;
+
 }
 

packages/chili-builder/src/ribbon.ts

@@ -54,7 +54,11 @@ export const DefaultRibbon: RibbonTab[] = [
             },
             {
                 groupName: "ribbon.group.tools",
-                items: ["create.section", "create.offset", "create.copySubShape", "create.group"],
+                items: ["create.group", ["create.section", "create.offset", "create.copyShape"]],
+            },
+            {
+                groupName: "ribbon.group.measure",
+                items: [["measure.length", "measure.angle", "measure.select"]],
             },
             {
                 groupName: "ribbon.group.importExport",

packages/chili-core/src/i18n/en.ts

@@ -61,7 +61,7 @@ export default {
         "command.create.box": "Box",
         "command.create.circle": "Circle",
         "command.create.cone": "Cone",
-        "command.create.copySubShape": "SubShape",
+        "command.create.copyShape": "CopyShape",
         "command.create.cylinder": "Cylinder",
         "command.create.ellipse": "Ellipse",
         "command.create.ellipsoid": "Ellipsoid",
@@ -83,6 +83,9 @@ export default {
         "command.edit.undo": "Undo",
         "command.file.export": "Export",
         "command.file.import": "Import",
+        "command.measure.angle": "Angle",
+        "command.measure.length": "Length",
+        "command.measure.select": "Select",
         "command.modify.array": "Array",
         "command.modify.break": "Break",
         "command.modify.brushAdd": "BrushAdd",
@@ -107,6 +110,7 @@ export default {
         "command.workingPlane.set": "Set",
         "command.workingPlane.toggleDynamic": "Toggle",
         "common.angle": "Angle",
+        "common.area": "Area",
         "common.back": "Back",
         "common.cancel": "Cancel",
         "common.clone": "Clone",
@@ -121,6 +125,7 @@ export default {
         "common.opacity": "Opacity",
         "common.thickness": "Thickness",
         "common.type": "Type",
+        "common.volume": "Volume",
         "dialog.title.selectWorkingPlane": "Select Working Plane",
         "entity.editable": "Editable Entity",
         "entity.parameter": "Parameter Entity",
@@ -183,6 +188,7 @@ export default {
         "prompt.select.models": "Please select models",
         "prompt.select.noModelSelected": "No model selected",
         "prompt.select.shape": "Please select shape",
+        "prompt.select.solids": "Please select solids",
         "prompt.select.vertexs": "Please select vertexs",
         "prompt.select.wires": "Please select wires",
         "toast.snap.notFoundValidPoint": "No valid point",
@@ -197,6 +203,7 @@ export default {
         "ribbon.group.converter": "Converter",
         "ribbon.group.draw": "Drawing",
         "ribbon.group.importExport": "Import/Export",
+        "ribbon.group.measure": "Measure",
         "ribbon.group.modify": "Modify",
         "ribbon.group.other": "Other",
         "ribbon.group.selection": "Selection",

packages/chili-core/src/i18n/keys.ts

@@ -56,7 +56,7 @@ const I18N_KEYS = [
     "command.create.box",
     "command.create.circle",
     "command.create.cone",
-    "command.create.copySubShape",
+    "command.create.copyShape",
     "command.create.cylinder",
     "command.create.ellipse",
     "command.create.ellipsoid",
@@ -78,6 +78,9 @@ const I18N_KEYS = [
     "command.edit.undo",
     "command.file.export",
     "command.file.import",
+    "command.measure.angle",
+    "command.measure.length",
+    "command.measure.select",
     "command.modify.array",
     "command.modify.break",
     "command.modify.brushAdd",
@@ -102,6 +105,7 @@ const I18N_KEYS = [
     "command.workingPlane.set",
     "command.workingPlane.toggleDynamic",
     "common.angle",
+    "common.area",
     "common.back",
     "common.cancel",
     "common.clone",
@@ -116,6 +120,7 @@ const I18N_KEYS = [
     "common.opacity",
     "common.thickness",
     "common.type",
+    "common.volume",
     "dialog.title.selectWorkingPlane",
     "entity.editable",
     "entity.parameter",
@@ -177,6 +182,7 @@ const I18N_KEYS = [
     "prompt.select.models",
     "prompt.select.noModelSelected",
     "prompt.select.shape",
+    "prompt.select.solids",
     "prompt.select.vertexs",
     "prompt.select.wires",
     "properties.group.transform",
@@ -190,6 +196,7 @@ const I18N_KEYS = [
     "ribbon.group.converter",
     "ribbon.group.draw",
     "ribbon.group.importExport",
+    "ribbon.group.measure",
     "ribbon.group.modify",
     "ribbon.group.other",
     "ribbon.group.selection",

packages/chili-core/src/i18n/zh-cn.ts

@@ -61,7 +61,7 @@ export default {
         "command.create.box": "立方体",
         "command.create.circle": "圆形",
         "command.create.cone": "圆锥",
-        "command.create.copySubShape": "复制子形状",
+        "command.create.copyShape": "复制形状",
         "command.create.cylinder": "圆柱",
         "command.create.ellipse": "椭圆",
         "command.create.ellipsoid": "椭球体",
@@ -83,6 +83,9 @@ export default {
         "command.edit.undo": "撤销",
         "command.file.export": "导出",
         "command.file.import": "导入",
+        "command.measure.angle": "角度",
+        "command.measure.length": "长度",
+        "command.measure.select": "选择",
         "command.modify.array": "阵列",
         "command.modify.break": "打断",
         "command.modify.brushAdd": "添加画笔",
@@ -107,6 +110,7 @@ export default {
         "command.workingPlane.set": "设置",
         "command.workingPlane.toggleDynamic": "动态",
         "common.angle": "角度",
+        "common.area": "面积",
         "common.back": "返回",
         "common.cancel": "取消",
         "common.clone": "复制对象",
@@ -121,6 +125,7 @@ export default {
         "common.opacity": "不透明度",
         "common.thickness": "厚度",
         "common.type": "类型",
+        "common.volume": "体积",
         "dialog.title.selectWorkingPlane": "选择工作平面",
         "entity.editable": "可编辑实体",
         "entity.parameter": "参数化实体",
@@ -182,6 +187,7 @@ export default {
         "prompt.select.models": "请选择模型",
         "prompt.select.noModelSelected": "未选择任何模型",
         "prompt.select.shape": "选择形状",
+        "prompt.select.solids": "请选择实体",
         "prompt.select.vertexs": "请选择点",
         "prompt.select.wires": "请选择线",
         "toast.snap.notFoundValidPoint": "未找到有效的点",
@@ -196,6 +202,7 @@ export default {
         "ribbon.group.converter": "转换",
         "ribbon.group.draw": "绘制",
         "ribbon.group.importExport": "导入/导出",
+        "ribbon.group.measure": "测量",
         "ribbon.group.modify": "修改",
         "ribbon.group.other": "其他",
         "ribbon.group.selection": "选择",

packages/chili-core/src/shape/shape.ts

@@ -80,6 +80,7 @@ export interface IWire extends IShape {
 }
 
 export interface IFace extends IShape {
+    area(): number;
     normal(u: number, v: number): [point: XYZ, normal: XYZ];
     outerWire(): IWire;
     surface(): ISurface;
@@ -93,7 +94,9 @@ export interface IFace extends IShape {
 
 export interface IShell extends IShape {}
 
-export interface ISolid extends IShape {}
+export interface ISolid extends IShape {
+    volume(): number;
+}
 
 export interface ICompound extends IShape {}
 

packages/chili-core/src/visual/view.ts

@@ -27,6 +27,7 @@ export interface IView extends IPropertyChanged, IDisposable {
     get isClosed(): boolean;
     get width(): number;
     get height(): number;
+    get dom(): HTMLElement | undefined;
     mode: ViewMode;
     name: string;
     workplane: Plane;

packages/chili-three/src/threeView.ts

@@ -75,6 +75,10 @@ export class ThreeView extends Observable implements IView {
         this.setProperty("name", value);
     }
 
+    get dom() {
+        return this._dom;
+    }
+
     private _isClosed: boolean = false;
     get isClosed(): boolean {
         return this._isClosed;
@@ -532,6 +536,10 @@ export class ThreeView extends Observable implements IView {
         let { shape, subShape, index, groups, transform } = this.findShapeAndIndex(parent, intersection);
         if (!subShape || !shape) return { shape: undefined, indexes: [] };
 
+        if (ShapeType.hasSolid(shapeType) && subShape.shapeType === ShapeType.Face) {
+            let solid = this.getAncestorAndIndex(ShapeType.Solid, subShape, shape, groups);
+            if (solid.shape) return solid;
+        }
         if (ShapeType.hasShell(shapeType) && subShape.shapeType === ShapeType.Face) {
             let shell = this.getAncestorAndIndex(ShapeType.Shell, subShape, shape, groups);
             if (shell.shape) return shell;

packages/chili-wasm/lib/chili-wasm.d.ts

@@ -509,6 +509,8 @@ export interface Wire extends ClassHandle {}
 
 export interface Face extends ClassHandle {}
 
+export interface Solid extends ClassHandle {}
+
 export type Domain = {
     start: number;
     end: number;
@@ -800,12 +802,16 @@ interface EmbindModule {
         edgeLoop(_0: TopoDS_Wire): Array<TopoDS_Edge>;
     };
     Face: {
+        area(_0: TopoDS_Face): number;
         offset(_0: TopoDS_Face, _1: number, _2: GeomAbs_JoinType): TopoDS_Shape;
         outerWire(_0: TopoDS_Face): TopoDS_Wire;
         surface(_0: TopoDS_Face): Handle_Geom_Surface;
         normal(_0: TopoDS_Face, _1: number, _2: number, _3: gp_Pnt, _4: gp_Vec): void;
         curveOnSurface(_0: TopoDS_Face, _1: TopoDS_Edge): Domain;
     };
+    Solid: {
+        volume(_0: TopoDS_Solid): number;
+    };
     Transient: {
         isKind(_0: Standard_Transient | null, _1: EmbindString): boolean;
         isInstance(_0: Standard_Transient | null, _1: EmbindString): boolean;