memory management issues fixed

Author: matas-bitbybit-dev

src/lib/workers/occ/occ-helper.ts

@@ -63,7 +63,7 @@ export class OccHelper {
         inputs.shapes.forEach(shape => {
             builder.Add(resCompound, shape);
         });
-        // builder.delete();
+        builder.delete();
         return resCompound;
     }
 
@@ -160,12 +160,16 @@ export class OccHelper {
 
     gcMakeEllipse(center: Base.Point3, direction: Base.Vector3, minorRadius: number, majorRadius: number): Geom_Ellipse {
         const ax = this.gpAx2(center, direction);
-        const ellipse = new this.occ.GC_MakeEllipse_2(ax, minorRadius, majorRadius);
-        const ellipseVal = ellipse.Value();
-        const ell = ellipseVal.get();
-        ellipse.delete();
-        ax.delete();
-        return ell;
+        const ellipse = new this.occ.GC_MakeEllipse_2(ax, majorRadius, minorRadius);
+        if (ellipse.IsDone()) {
+            const ellipseVal = ellipse.Value();
+            const ell = ellipseVal.get();
+            ellipse.delete();
+            ax.delete();
+            return ell;
+        } else {
+            throw new Error("Ellipse could not be created.");
+        }
     }
 
     bRepBuilderAPIMakeEdge(curve: Geom_Curve): TopoDS_Edge {
@@ -1180,15 +1184,16 @@ export class OccHelper {
             rotation.delete();
         }
         let actualShape = this.getActualTypeOfShape(rotated);
-        rotated.delete();
+        if (inputs.angle !== 0) {
+            rotated.delete();
+        }
         return actualShape;
     }
 
     surfaceFromFace(inputs: Inputs.OCCT.ShapeDto<TopoDS_Face>) {
         const face = inputs.shape;
         const surface = this.occ.BRep_Tool.Surface_2(face);
         const srf = surface.get();
-        surface.delete();
         return srf;
     }
 

src/lib/workers/occ/services/booleans.ts

@@ -66,8 +66,10 @@ export class OCCTBooleans {
         return difference;
     }
 
-    intersection(inputs: Inputs.OCCT.IntersectionDto<TopoDS_Shape>): TopoDS_Shape[] {
-        return this.och.intersection(inputs);
+    intersection(inputs: Inputs.OCCT.IntersectionDto<TopoDS_Shape>): TopoDS_Shape {
+        let int = this.och.intersection(inputs);
+        const res = this.och.makeCompound({ shapes: int });
+        return res;
     }
 
 }

src/lib/workers/occ/services/shapes/face.ts

@@ -128,7 +128,6 @@ export class OCCTFace {
                 gpPnt.delete();
             }
         }
-        surface.delete();
         handle.delete();
         return { result: points };
     }
@@ -207,7 +206,6 @@ export class OCCTFace {
             points.push(pt);
             gpPnt.delete();
         }
-        surface.delete();
         handle.delete();
         return { result: points };
     }
@@ -331,7 +329,6 @@ export class OCCTFace {
         surface.D0(u, v, gpPnt);
         const pt = [gpPnt.X(), gpPnt.Y(), gpPnt.Z()];
         gpPnt.delete();
-        surface.delete();
         handle.delete();
         return { result: pt };
     }

src/lib/workers/occ/services/shapes/wire.ts

@@ -135,7 +135,6 @@ export class OCCTWire {
         edgeMaker.delete();
         edge.delete();
         geomCurve.delete();
-        geomBezierCurveHandle.delete();
         ptList.delete();
         return result;
     }
@@ -205,17 +204,14 @@ export class OCCTWire {
         let face: TopoDS_Face = inputs.shapes[1] as TopoDS_Face;
         const srf = this.och.surfaceFromFace({ shape: face });
         let result = this.placeWire(wire, srf);
-        srf.delete();
         return result;
     }
 
     placeWiresOnFace(inputs: Inputs.OCCT.ShapeShapesDto<TopoDS_Face, TopoDS_Wire>) {
         let wires = inputs.shapes;
         let face = inputs.shape;
         const srf = this.och.surfaceFromFace({ shape: face });
-
         let result = wires.map(wire => this.placeWire(wire, srf));
-        srf.delete();
         return result;
     }
 
@@ -237,7 +233,6 @@ export class OCCTWire {
                 }
                 plane.delete();
                 c2dHandle.delete();
-                c2.delete();
             }
             crv.delete();
         });