operations under workbenches

modules/3d-party/customExtrude/schema.ts

@@ -1 +0,0 @@
-console.log("Hello World")

modules/3d-party/primitive_cylinder/partOperationsPlugin.js

@@ -1,57 +0,0 @@
-import extrudeOperation from '../craft/cutExtrude/extrudeOperation';
-import cutOperation from '../craft/cutExtrude/cutOperation';
-import planeOperation from '../craft/primitives/simplePlane/simplePlaneOperation';
-import filletOperation from '../craft/fillet/filletOperation';
-import revolveOperation from '../craft/revolve/revolveOperation';
-import createDatumOperation from '../craft/datum/create/createDatumOperation';
-import moveDatumOperation from '../craft/datum/move/moveDatumOperation';
-import rotateDatumOperation from '../craft/datum/rotate/rotateDatumOperation';
-import datumOperation from '../craft/primitives/plane/planeOperation';
-import boxOperation from '../craft/primitives/box/boxOperation';
-import sphereOperation from '../craft/primitives/sphere/sphereOperation';
-import cylinderOperation from '../craft/primitives/cylinder/cylinderOperation';
-import torusOperation from '../craft/primitives/torus/torusOperation';
-import coneOperation from '../craft/primitives/cone/coneOperation';
-import spatialCurveOperation from '../craft/spatialCurve/spatialCurveOperation';
-import loftOperation from '../craft/loft/loftOperation';
-import {intersectionOperation, subtractOperation, unionOperation} from '../craft/boolean/booleanOperation';
-import { loadMDFCommand } from '../mdf/mdf';
-import { MDF_EXTRUDE_EXAMPLE } from '../mdf/mdfExtrudeExample';
-import { OCC_BOTTLE_OPERATION } from '3d-party/occ-bottle/bottleOperation';
-import { primitive_cylinder } from '3d-party/primitive_cylinder/index';
-import { primitive_box } from '3d-party/primitive_box/index';
-import { primitive_cone } from '3d-party/primitive_cone/index';
-//import { primitive_box } from '3d-party/primitive_sphere/index';
-//import { primitive_box } from '3d-party/primitive_torus/index';
-
-
-export function activate({services}) {
-  services.operation.registerOperations([
-    planeOperation,
-    boxOperation, 
-    // extrudeOperation,
-    loadMDFCommand(MDF_EXTRUDE_EXAMPLE),
-    cutOperation,
-    revolveOperation,
-    filletOperation,
-    createDatumOperation,
-    moveDatumOperation,
-    rotateDatumOperation,
-    datumOperation,
-    sphereOperation,
-    cylinderOperation,
-    torusOperation,
-    coneOperation,
-    spatialCurveOperation,
-    loftOperation,
-    intersectionOperation,
-    subtractOperation,
-    unionOperation,    
-    loadMDFCommand(OCC_BOTTLE_OPERATION),
-    loadMDFCommand(primitive_cylinder),
-    loadMDFCommand(primitive_box),
-    loadMDFCommand(primitive_cone),
-    loadMDFCommand(primitive_sphere),
-    //loadMDFCommand(primitive_torus),
-  ])
-}

modules/svg/SvgIcon.tsx

@@ -1,6 +1,9 @@
 import React, {useMemo} from 'react';
 
-export function SvgIcon({content, size, ...props}) {
+export function SvgIcon({content, size, ...props}: {
+  content: string,
+  size?: number|string
+} & React.HTMLAttributes<HTMLDivElement>) {
 
   const className = size&&'icon-'+size;
 

modules/workbenches/modeler/features/extrude/extrude.operation.ts

@@ -0,0 +1,64 @@
+import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
+
+export default {
+    id: 'EXTRUDE',
+    label: 'Extrude',
+    icon: 'img/cad/extrude',
+    info: 'extrudes 2D sketch',
+    paramsInfo: ({ value }) => `(${r(value)})`,
+    mutualExclusiveFields: ['datumAxisVector', 'edgeVector', 'sketchSegmentVector'],
+    run: (params, ctx) => {
+        return ctx.craftEngine.cutExtrude(false, params);
+    },
+    schema: {
+        value: {
+            type: 'number',
+            defaultValue: 50,
+            label: 'height'
+        },
+        wierdField: {
+            type: 'number',
+            defaultValue: 50,
+            label: 'weird field'
+        },
+        prism: {
+            type: 'number',
+            min: 0,
+            defaultValue: 1
+        },
+        angle: {
+            type: 'number',
+            defaultValue: 0
+        },
+        rotation: {
+            type: 'number',
+            defaultValue: 0
+        },
+        face: {
+            type: 'face',
+            initializeBySelection: 0
+        },
+        datumAxisVector: {
+            type: 'datumAxis',
+            optional: true,
+            label: 'datum axis'
+        },
+        edgeVector: {
+            type: 'edge',
+            optional: true,
+            label: 'edge',
+            accept: edge => edge.brepEdge.curve.degree === 1
+        },
+        sketchSegmentVector: {
+            type: 'sketchObject',
+            optional: true,
+            label: 'sketch segment',
+            accept: obj => obj.isSegment
+        },
+        flip: {
+            type: 'boolean',
+            defaultValue: false,
+        }
+
+    }
+}

modules/workbenches/modeler/features/occ-bottle/icon.svg

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 512 512">
+  <g>
+    <g>
+      <path d="m409.1,150.1h-306.2c-11.3,0-20.4,9.1-20.4,20.4v310.1c0,11.3 9.1,20.4 20.4,20.4h306.3c11.3,0 20.4-9.1 20.4-20.4v-310.1c-0.1-11.3-9.2-20.4-20.5-20.4zm-20.4,310.1h-265.4v-269.3h265.4v269.3z"/>
+      <path d="m170,135.9h175c11.3,0 20.4-9.1 20.4-20.4v-84.1c0-11.3-9.1-20.4-20.4-20.4h-175c-11.3,0-20.4,9.1-20.4,20.4v84.1c-0.1,11.3 9.1,20.4 20.4,20.4zm20.4-84.1h134.2v43.3h-134.2v-43.3z"/>
+    </g>
+  </g>
+</svg>

modules/workbenches/modeler/features/occ-bottle/index.ts

@@ -1,15 +1,18 @@
 import { ApplicationContext } from 'context';
-import { MBrepShell } from '../../../web/app/cad/model/mshell';
+import { MBrepShell } from 'cad/model/mshell';
-import { roundValueForPresentation as r } from '../../../web/app/cad/craft/operationHelper';
+import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
 import { createOCCBottle } from './bottle.occ';
-import { occ2brep } from '../../../web/app/cad/occ/occ2models';
+import { occ2brep } from 'cad/occ/occ2models';
+import icon from './icon.svg'; 
 
-export const OCC_BOTTLE_OPERATION = {
+export default {
     id: 'OCC_BOTTLE',
     label: 'OCC Bottle',
-    icon: 'img/cad/extrude',
+    icon,
     info: 'create occ bottle',
     mutualExclusiveFields: [],
+
+
     paramsInfo: ({ width, height, thickness }) => `(${r(width)} ${r(height)} ${r(thickness)})`,
     run: ({ width, height, thickness }, ctx: ApplicationContext) => {
         const occObj = createOCCBottle(width, height, thickness, ctx.occService.occContext);

modules/workbenches/modeler/features/primitive_box/index.ts

@@ -1,9 +1,9 @@
 import { ApplicationContext } from 'context';
-import { MBrepShell } from '../../../web/app/cad/model/mshell';
+import { MBrepShell } from 'cad/model/mshell';
-import { roundValueForPresentation as r } from '../../../web/app/cad/craft/operationHelper';
+import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
-import { occ2brep } from '../../../web/app/cad/occ/occ2models';
+import { occ2brep } from 'cad/occ/occ2models';
 
-export const primitive_box = {
+export default {
     id: 'primitive_box',
     label: 'primitive_box',
     icon: 'img/cad/extrude',

modules/workbenches/modeler/features/primitive_cone/index.ts

@@ -1,9 +1,9 @@
 import { ApplicationContext } from 'context';
-import { MBrepShell } from '../../../web/app/cad/model/mshell';
+import { MBrepShell } from 'cad/model/mshell';
-import { roundValueForPresentation as r } from '../../../web/app/cad/craft/operationHelper';
+import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
-import { occ2brep } from '../../../web/app/cad/occ/occ2models';
+import { occ2brep } from 'cad/occ/occ2models';
 
-export const primitive_cone = {
+export default {
     id: 'primitive_cone',
     label: 'primitive_cone',
     icon: 'img/cad/extrude',

modules/workbenches/modeler/features/primitive_cylinder/index.ts

@@ -1,9 +1,9 @@
 import { ApplicationContext } from 'context';
-import { MBrepShell } from '../../../web/app/cad/model/mshell';
+import { MBrepShell } from 'cad/model/mshell';
-import { roundValueForPresentation as r } from '../../../web/app/cad/craft/operationHelper';
+import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
-import { occ2brep } from '../../../web/app/cad/occ/occ2models';
+import { occ2brep } from 'cad/occ/occ2models';
 
-export const primitive_cylinder = {
+export default {
     id: 'primitive_cylinder',
     label: 'primitive_cylinder',
     icon: 'img/cad/extrude',

modules/workbenches/modeler/features/primitive_sphere/index.ts

@@ -1,9 +1,9 @@
 import { ApplicationContext } from 'context';
-import { MBrepShell } from '../../../web/app/cad/model/mshell';
+import { MBrepShell } from 'cad/model/mshell';
-import { roundValueForPresentation as r } from '../../../web/app/cad/craft/operationHelper';
+import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
-import { occ2brep } from '../../../web/app/cad/occ/occ2models';
+import { occ2brep } from 'cad/occ/occ2models';
 
-export const primitive_sphere = {
+export default {
     id: 'primitive_sphere',
     label: 'primitive_sphere',
     icon: 'img/cad/extrude',

modules/workbenches/modeler/features/primitive_torus/index.ts

@@ -1,9 +1,9 @@
 import { ApplicationContext } from 'context';
-import { MBrepShell } from '../../../web/app/cad/model/mshell';
+import { MBrepShell } from 'cad/model/mshell';
-import { roundValueForPresentation as r } from '../../../web/app/cad/craft/operationHelper';
+import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
-import { occ2brep } from '../../../web/app/cad/occ/occ2models';
+import { occ2brep } from 'cad/occ/occ2models';
 
-export const primitive_torus = {
+export default {
     id: 'primitive_torus',
     label: 'primitive_torus',
     icon: 'img/cad/extrude',

modules/workbenches/modeler/features/registry.ts

@@ -0,0 +1,4 @@
+
+
+export default [
+];

modules/workbenches/modeler/index.ts

@@ -0,0 +1,21 @@
+import EXTRUDE from './features/extrude/extrude.operation'; 
+import OCC_BOTTLE from './features/occ-bottle'; 
+import primitive_box from './features/primitive_box'; 
+import primitive_cone from './features/primitive_cone'; 
+import primitive_cylinder from './features/primitive_cylinder'; 
+import primitive_sphere from './features/primitive_sphere'; 
+import primitive_torus from './features/primitive_torus'; 
+
+export default {
+
+    workbenchId: 'modeler',
+    features: [
+        EXTRUDE,
+        OCC_BOTTLE,
+        primitive_box,
+        primitive_cone,
+        primitive_cylinder,
+        primitive_sphere,
+        primitive_torus    
+    ]
+}

modules/workbenches/registry.ts

@@ -0,0 +1,5 @@
+import ModelerWorkbench from './modeler';
+
+export default [
+    ModelerWorkbench
+]

web/app/cad/craft/operationPlugin.ts

@@ -125,7 +125,7 @@ export interface OperationDescriptor<R> {
   id: string;
   label: string;
   info: string;
-  icon: IconType | string;
+  icon: IconType | string | ((props: any) => JSX.Element);
   actionParams?: any;
   run: (request: R, opContext: CoreContext) => OperationResult | Promise<OperationResult>;
   paramsInfo: (params: R) => string,

web/app/cad/mdf/mdf.ts

@@ -3,6 +3,7 @@ import { IconType } from "react-icons";
 import { OperationResult } from "../craft/craftPlugin";
 import { OperationDescriptor } from "../craft/operationPlugin";
 import { generateForm } from "./generateForm";
+import { resolveMDFIcon } from "./mdfIconResolver";
 
 
 interface MDFCommand<R> {
@@ -33,7 +34,7 @@ export function loadMDFCommand<R>(mdfCommand: MDFCommand<R>): OperationDescripto
   return {
     id: mdfCommand.id,
     label: mdfCommand.label,
-    icon: mdfCommand.icon,
+    icon: resolveMDFIcon(mdfCommand.icon),
     info: mdfCommand.info,
     paramsInfo: mdfCommand.paramsInfo,
     onParamsUpdate: (params, name, value) => {

web/app/cad/mdf/mdfIconResolver.tsx

@@ -0,0 +1,6 @@
+import React from 'react';
+import { SvgIcon } from "svg/SvgIcon";
+
+export function resolveMDFIcon(iconDef: any) {
+    return () => <SvgIcon content={iconDef} />
+}

web/app/cad/part/partOperationsPlugin.js

@@ -16,21 +16,13 @@ import spatialCurveOperation from '../craft/spatialCurve/spatialCurveOperation';
 import loftOperation from '../craft/loft/loftOperation';
 import {intersectionOperation, subtractOperation, unionOperation} from '../craft/boolean/booleanOperation';
 import { loadMDFCommand } from '../mdf/mdf';
-import { MDF_EXTRUDE_EXAMPLE } from '../mdf/mdfExtrudeExample';
+import WorkbenchRegistry from 'workbenches/registry';
-import { OCC_BOTTLE_OPERATION } from '3d-party/occ-bottle/bottleOperation';
-import { primitive_cylinder } from '3d-party/primitive_cylinder/index';
-import { primitive_box } from '3d-party/primitive_box/index';
-import { primitive_cone } from '3d-party/primitive_cone/index';
-import { primitive_sphere } from '3d-party/primitive_sphere/index';
-import { primitive_torus } from '3d-party/primitive_torus/index';
-
 
 export function activate({services}) {
   services.operation.registerOperations([
     planeOperation,
     boxOperation, 
     // extrudeOperation,
-    loadMDFCommand(MDF_EXTRUDE_EXAMPLE),
     cutOperation,
     revolveOperation,
     filletOperation,
@@ -47,11 +39,8 @@ export function activate({services}) {
     intersectionOperation,
     subtractOperation,
     unionOperation,    
-    loadMDFCommand(OCC_BOTTLE_OPERATION),
+  ]);
-    loadMDFCommand(primitive_cylinder),
+  WorkbenchRegistry.forEach(w => {
-    loadMDFCommand(primitive_box),
+    services.operation.registerOperations(w.features.map(loadMDFCommand));
-    loadMDFCommand(primitive_cone),
+  });
-    loadMDFCommand(primitive_sphere),
-    loadMDFCommand(primitive_torus),
-  ])
 }