Merge pull request #52 from bitbybit-dev/develop

Develop

Author: matas-bitbybit-dev

lib/api/inputs/occ-inputs.ts

@@ -958,18 +958,105 @@ export namespace OCCT {
          */
         removeEnd = false;
     }
-    export class FaceSubdivisionToRectanglesDto<T> {
+    export class FaceSubdivideToRectangleWiresDto<T> {
         /**
           * Provide options without default values
           */
-        constructor(shape?: T, nrRectanglesU?: number, nrRectanglesV?: number, scalePatternU?: number[], scalePatternV?: number[], filletPattern?: number[], inclusionPattern?: boolean[]) {
+        constructor(shape?: T, nrRectanglesU?: number, nrRectanglesV?: number, scalePatternU?: number[], scalePatternV?: number[], filletPattern?: number[], inclusionPattern?: boolean[], offsetFromBorderU?: number, offsetFromBorderV?: number) {
             if (shape !== undefined) { this.shape = shape; }
             if (nrRectanglesU !== undefined) { this.nrRectanglesU = nrRectanglesU; }
             if (nrRectanglesV !== undefined) { this.nrRectanglesU = nrRectanglesV; }
             if (scalePatternU !== undefined) { this.scalePatternU = scalePatternU; }
             if (scalePatternV !== undefined) { this.scalePatternV = scalePatternV; }
             if (filletPattern !== undefined) { this.filletPattern = filletPattern; }
             if (inclusionPattern !== undefined) { this.inclusionPattern = inclusionPattern; }
+            if (offsetFromBorderU !== undefined) { this.offsetFromBorderU = offsetFromBorderU; }
+            if (offsetFromBorderV !== undefined) { this.offsetFromBorderV = offsetFromBorderV; }
+        }
+        /**
+         * Openascade Face
+         * @default undefined
+         */
+        shape: T;
+        /**
+         * Number of rectangles on U direction
+         * @default 10
+         * @minimum 1
+         * @maximum Infinity
+         * @step 1
+         */
+        nrRectanglesU = 10;
+        /**
+         * Number of rectangles on V direction
+         * @default 10
+         * @minimum 1
+         * @maximum Infinity
+         * @step 1
+         */
+        nrRectanglesV = 10;
+        /**
+         * Rectangle scale pattern on u direction - numbers between 0 and 1, if 1 or undefined is used, no scaling is applied
+         * @default undefined
+         * @optional true
+         */
+        scalePatternU: number[];
+        /**
+         * Rectangle scale pattern on v direction - numbers between 0 and 1, if 1 or undefined is used, no scaling is applied
+         * @default undefined
+         * @optional true
+         */
+        scalePatternV: number[];
+        /**
+         * Rectangle fillet scale pattern - numbers between 0 and 1, if 0 is used, no fillet is applied, 
+         * if 1 is used, the fillet will be exactly half of the length of the shorter side of the rectangle
+         * @default undefined
+         * @optional true
+         */
+        filletPattern: number[];
+        /**
+         * Rectangle inclusion pattern - true means that the rectangle will be included, 
+         * false means that the rectangle will be removed from the face
+         * @default undefined
+         * @optional true
+         */
+        inclusionPattern: boolean[];
+        /**
+         * If offset on U is bigger then 0 we will use a smaller space for rectangles to be placed. This means that even rectangle of U param 1 will be offset from the face border
+         * That is often required to create a pattern that is not too close to the face border
+         * It should not be bigger then half of the total width of the face as that will create problems
+         * @default 0
+         * @minimum 0
+         * @maximum 0.5
+         * @step 0.01
+         */
+        offsetFromBorderU = 0;
+        /**
+         * If offset on V is bigger then 0 we will use a smaller space for rectangles to be placed. This means that even rectangle of V param 1 will be offset from the face border
+         * That is often required to create a pattern that is not too close to the face border
+         * It should not be bigger then half of the total width of the face as that will create problems
+         * @default 0
+         * @minimum 0
+         * @maximum 0.5
+         * @step 0.01
+         */
+        offsetFromBorderV = 0;
+    }
+
+    export class FaceSubdivideToRectangleHolesDto<T> {
+        /**
+          * Provide options without default values
+          */
+        constructor(shape?: T, nrRectanglesU?: number, nrRectanglesV?: number, scalePatternU?: number[], scalePatternV?: number[], filletPattern?: number[], inclusionPattern?: boolean[], holesToFaces?: boolean, offsetFromBorderU?: number, offsetFromBorderV?: number) {
+            if (shape !== undefined) { this.shape = shape; }
+            if (nrRectanglesU !== undefined) { this.nrRectanglesU = nrRectanglesU; }
+            if (nrRectanglesV !== undefined) { this.nrRectanglesU = nrRectanglesV; }
+            if (scalePatternU !== undefined) { this.scalePatternU = scalePatternU; }
+            if (scalePatternV !== undefined) { this.scalePatternV = scalePatternV; }
+            if (filletPattern !== undefined) { this.filletPattern = filletPattern; }
+            if (inclusionPattern !== undefined) { this.inclusionPattern = inclusionPattern; }
+            if (holesToFaces !== undefined) { this.holesToFaces = holesToFaces; }
+            if (offsetFromBorderU !== undefined) { this.offsetFromBorderU = offsetFromBorderU; }
+            if (offsetFromBorderV !== undefined) { this.offsetFromBorderV = offsetFromBorderV; }
         }
         /**
          * Openascade Face
@@ -1023,6 +1110,26 @@ export namespace OCCT {
          * @default false
          */
         holesToFaces = false;
+        /**
+         * If offset on U is bigger then 0 we will use a smaller space for rectangles to be placed. This means that even rectangle of U param 1 will be offset from the face border
+         * That is often required to create a pattern that is not too close to the face border
+         * It should not be bigger then half of the total width of the face as that will create problems
+         * @default 0
+         * @minimum 0
+         * @maximum 0.5
+         * @step 0.01
+         */
+        offsetFromBorderU = 0;
+        /**
+         * If offset on V is bigger then 0 we will use a smaller space for rectangles to be placed. This means that even rectangle of V param 1 will be offset from the face border
+         * That is often required to create a pattern that is not too close to the face border
+         * It should not be bigger then half of the total width of the face as that will create problems
+         * @default 0
+         * @minimum 0
+         * @maximum 0.5
+         * @step 0.01
+         */
+        offsetFromBorderV = 0;
     }
     export class FaceSubdivisionControlledDto<T> {
         /**
@@ -4624,9 +4731,10 @@ export namespace OCCT {
         planar = false;
     }
     export class FaceFromWireOnFaceDto<T, U> {
-        constructor(wire?: T, face?: U) {
+        constructor(wire?: T, face?: U, inside?: boolean) {
             if (wire !== undefined) { this.wire = wire; }
             if (face !== undefined) { this.face = face; }
+            if (inside !== undefined) { this.inside = inside; }
         }
         /**
          * Wire shape to convert into a face
@@ -4638,11 +4746,17 @@ export namespace OCCT {
          * @default undefined
          */
         face: U;
+        /**
+         * Indication if wire is inside the surface or outside
+         * @default true
+         */
+        inside = true;
     }
     export class FacesFromWiresOnFaceDto<T, U> {
-        constructor(wires?: T[], face?: U) {
+        constructor(wires?: T[], face?: U, inside?: boolean) {
             if (wires !== undefined) { this.wires = wires; }
             if (face !== undefined) { this.face = face; }
+            if (inside !== undefined) { this.inside = inside; }
         }
         /**
          * Wire shape to convert into a face
@@ -4654,6 +4768,11 @@ export namespace OCCT {
          * @default undefined
          */
         face: U;
+        /**
+         * Indication if wire is inside the surface or outside
+         * @default true
+         */
+        inside = true;
     }
     export class FaceFromWiresDto<T> {
         constructor(shapes?: T[], planar?: boolean) {
@@ -4687,6 +4806,28 @@ export namespace OCCT {
          */
         planar = false;
     }
+    export class FaceFromWiresOnFaceDto<T, U> {
+        constructor(wires?: T[], face?: U, inside?: boolean) {
+            if (wires !== undefined) { this.wires = wires; }
+            if (face !== undefined) { this.face = face; }
+            if (inside !== undefined) { this.inside = inside; }
+        }
+        /**
+         * Wire shapes to convert into a faces
+         * @default undefined
+         */
+        wires: T[];
+        /**
+         * Guide face to use as a base
+         * @default undefined
+         */
+        face: U;
+        /**
+         * Indication if wire is inside the surface or outside
+         * @default true
+         */
+        inside = true;
+    }
     export class SewDto<T> {
         constructor(shapes: T[], tolerance?: number) {
             if (shapes !== undefined) { this.shapes = shapes; }

lib/api/vector-helper.service.ts

@@ -94,6 +94,13 @@ export class VectorHelperService {
         return [x, y, z];
     }
 
+    angleBetweenVectors(vector1: [number, number, number], vector2: [number, number, number]): number {
+        const dotProduct = vector1[0] * vector2[0] + vector1[1] * vector2[1] + vector1[2] * vector2[2];
+        const magnitude1 = this.magnitude(vector1);
+        const magnitude2 = this.magnitude(vector2);
+        return Math.acos(dotProduct / (magnitude1 * magnitude2));
+    }
+
     distanceBetweenPoints(point1: [number, number, number], point2: [number, number, number]): number {
         const x = point2[0] - point1[0];
         const y = point2[1] - point1[1];

lib/occ-helper.ts

@@ -66,7 +66,7 @@ export class OccHelper {
             this.enumService, this.entitiesService, this.converterService, this.geomService, this.edgesService, this.booleansService);
 
         this.facesService = new FacesService(occ, this.occRefReturns, this.entitiesService, this.enumService,
-            this.shapeGettersService, this.converterService, this.booleansService, this.wiresService, this.filletsService);
+            this.shapeGettersService, this.converterService, this.booleansService, this.wiresService, this.transformsService, this.vecHelper, this.filletsService);
 
         this.shellsService = new ShellsService(occ, this.shapeGettersService, this.converterService, this.facesService);
 

lib/services/base/entities.service.ts

@@ -144,17 +144,22 @@ export class EntitiesService {
         return shell;
     }
 
-    bRepBuilderAPIMakeFaceFromWires(wires: TopoDS_Wire[], planar: boolean): TopoDS_Face {
+    bRepBuilderAPIMakeFaceFromWires(wires: TopoDS_Wire[], planar: boolean, guideFace?: TopoDS_Face, inside?: boolean): TopoDS_Face {
         let face;
         const faces = [];
         wires.forEach(currentWire => {
             if (faces.length > 0) {
-                const faceBuilder = new this.occ.BRepBuilderAPI_MakeFace_22(
-                    faces[faces.length - 1], currentWire);
+                const faceBuilder = new this.occ.BRepBuilderAPI_MakeFace_22(faces[faces.length - 1], currentWire);
                 faces.push(faceBuilder.Face());
                 faceBuilder.delete();
             } else {
-                const faceBuilder = new this.occ.BRepBuilderAPI_MakeFace_15(currentWire, planar);
+                let faceBuilder;
+                if (!guideFace) {
+                    faceBuilder = new this.occ.BRepBuilderAPI_MakeFace_15(currentWire, planar);
+                } else {
+                    const surface = this.occ.BRep_Tool.Surface_2(guideFace);
+                    faceBuilder = new this.occ.BRepBuilderAPI_MakeFace_21(surface, currentWire, inside);
+                }
                 faces.push(faceBuilder.Face());
                 faceBuilder.delete();
             }
@@ -174,22 +179,22 @@ export class EntitiesService {
         return face;
     }
 
-    bRepBuilderAPIMakeFacesFromWiresOnFace(face: TopoDS_Face, wires: TopoDS_Wire[]): TopoDS_Face[] {
+    bRepBuilderAPIMakeFacesFromWiresOnFace(face: TopoDS_Face, wires: TopoDS_Wire[], inside: boolean): TopoDS_Face[] {
         const surface = this.occ.BRep_Tool.Surface_2(face);
-        const res = wires.map(wire => this.bRepBuilderAPIMakeFaceFromWireOnSurface(surface, wire));
+        const res = wires.map(wire => this.bRepBuilderAPIMakeFaceFromWireOnSurface(surface, wire, inside));
         surface.delete();
         return res;
     }
 
-    bRepBuilderAPIMakeFaceFromWireOnFace(face: TopoDS_Face, wire: TopoDS_Wire): TopoDS_Face {
+    bRepBuilderAPIMakeFaceFromWireOnFace(face: TopoDS_Face, wire: TopoDS_Wire, inside: boolean): TopoDS_Face {
         const surface = this.occ.BRep_Tool.Surface_2(face);
-        const res = this.bRepBuilderAPIMakeFaceFromWireOnSurface(surface, wire);
+        const res = this.bRepBuilderAPIMakeFaceFromWireOnSurface(surface, wire, inside);
         surface.delete();
         return res;
     }
 
-    bRepBuilderAPIMakeFaceFromWireOnSurface(surface: Handle_Geom_Surface, wire: TopoDS_Wire): TopoDS_Face {
-        const faceMaker = new this.occ.BRepBuilderAPI_MakeFace_21(surface, wire, true);
+    bRepBuilderAPIMakeFaceFromWireOnSurface(surface: Handle_Geom_Surface, wire: TopoDS_Wire, inside: boolean): TopoDS_Face {
+        const faceMaker = new this.occ.BRepBuilderAPI_MakeFace_21(surface, wire, inside);
         const f = faceMaker.Face();
         faceMaker.delete();
         return f;