Add Torus (#15)

Author: martinRenou

src/schema/jcad.json

@@ -19,6 +19,7 @@
         "Part::Cylinder",
         "Part::Sphere",
         "Part::Cone",
+        "Part::Torus",
         "Part::Cut"
       ]
     },

src/schema/torus.json

@@ -0,0 +1,32 @@
+{
+  "type": "object",
+  "description": "Part::Torus",
+  "title": "ITorus",
+  "required": ["Radius1", "Radius2", "Angle1", "Angle2", "Angle3", "Placement"],
+  "additionalProperties": false,
+  "properties": {
+    "Radius1": {
+      "type": "number",
+      "description": "The radius of the torus"
+    },
+    "Radius2": {
+      "type": "number",
+      "description": "The radius of the torus"
+    },
+    "Angle1": {
+      "type": "number",
+      "description": "The angle of the torus"
+    },
+    "Angle2": {
+      "type": "number",
+      "description": "The angle of the torus"
+    },
+    "Angle3": {
+      "type": "number",
+      "description": "The angle of the torus"
+    },
+    "Placement": {
+      "$ref": "./placement.json"
+    }
+  }
+}

src/toolbar/parttoolbar.tsx

@@ -59,6 +59,19 @@ export class PartToolbarReact extends React.Component<IProps> {
         Angle: 360,
         Placement: { Position: [0, 0, 0], Axis: [0, 0, 1], Angle: 0 }
       }
+    },
+    TORUS: {
+      title: 'Torus parameters',
+      shape: 'Part::Torus',
+      schema: this.props.toolbarModel.formSchema['Part::Torus'],
+      default: {
+        Radius1: 10,
+        Radius2: 2,
+        Angle1: -180,
+        Angle2: 180,
+        Angle3: 360,
+        Placement: { Position: [0, 0, 0], Axis: [0, 0, 1], Angle: 0 }
+      }
     }
   };
 

src/worker/occapi.ts

@@ -7,6 +7,7 @@ import { IBox } from '../_interface/box';
 import { ICylinder } from '../_interface/cylinder';
 import { ISphere } from '../_interface/sphere';
 import { ICone } from '../_interface/cone';
+import { ITorus } from '../_interface/torus';
 import { ICut } from '../_interface/cut';
 
 const SHAPE_CACHE = new Map<string, TopoDS_Shape>();
@@ -103,6 +104,20 @@ function _Cone(arg: ICone, _: IJCadContent): TopoDS_Shape | undefined {
   return setShapePlacement(shape, Placement);
 }
 
+function _Torus(arg: ITorus, _: IJCadContent): TopoDS_Shape | undefined {
+  const { Radius1, Radius2, Angle1, Angle2, Angle3, Placement } = arg;
+  const oc = getOcc();
+  const torus = new oc.BRepPrimAPI_MakeTorus_4(
+    Radius1,
+    Radius2,
+    toRad(Angle1),
+    toRad(Angle2),
+    toRad(Angle3)
+  );
+  const shape = torus.Shape();
+  return setShapePlacement(shape, Placement);
+}
+
 function _Cut(arg: ICut, content: IJCadContent): TopoDS_Shape | undefined {
   const { Placement, Base, Tool } = arg;
   const oc = getOcc();
@@ -140,6 +155,7 @@ const Box = operatorCache<IBox>('Box', _Box);
 const Cylinder = operatorCache<ICylinder>('Cylinder', _Cylinder);
 const Sphere = operatorCache<ISphere>('Sphere', _Sphere);
 const Cone = operatorCache<ICone>('Cone', _Cone);
+const Torus = operatorCache<ITorus>('Torus', _Torus);
 // const Cut = operatorCache<ICut>('Cut', _Cut);
 
 export const ShapesFactory: {
@@ -149,5 +165,6 @@ export const ShapesFactory: {
   'Part::Cylinder': Cylinder,
   'Part::Sphere': Sphere,
   'Part::Cone': Cone,
+  'Part::Torus': Torus,
   'Part::Cut': _Cut
 };

src/worker/types.ts

@@ -4,6 +4,7 @@ import { IBox } from '../_interface/box';
 import { ICylinder } from '../_interface/cylinder';
 import { ISphere } from '../_interface/sphere';
 import { ICone } from '../_interface/cone';
+import { ITorus } from '../_interface/torus';
 import { ICut } from '../_interface/cut';
 
 type IOperatorFunc<T> = (
@@ -16,5 +17,6 @@ export type IAllOperatorFunc =
   | IOperatorFunc<ICylinder>
   | IOperatorFunc<ISphere>
   | IOperatorFunc<ICone>
+  | IOperatorFunc<ITorus>
   | IOperatorFunc<ICut>;
-export type IOperatorArg = IBox & ICylinder & ISphere & ICone & ICut;
+export type IOperatorArg = IBox & ICylinder & ISphere & ICone & ITorus & ICut;