From ef2daf3188ac777791806dfc5ecdce2489716401 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Thu, 15 Nov 2018 01:00:05 -0800 Subject: [PATCH] create primitive objects in origin if datum is not specified --- web/app/cad/craft/primitives/box/boxOpSchema.js | 1 + web/app/cad/craft/primitives/cone/coneOpSchema.js | 1 + web/app/cad/craft/primitives/cylinder/cylinderOpSchema.js | 1 + web/app/cad/craft/primitives/datumConsumingOperation.js | 4 +++- web/app/cad/craft/primitives/sphere/sphereOpSchema.js | 1 + web/app/cad/craft/primitives/torus/torusOpSchema.js | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/app/cad/craft/primitives/box/boxOpSchema.js b/web/app/cad/craft/primitives/box/boxOpSchema.js index 80dd5edd..3ce5dc1c 100644 --- a/web/app/cad/craft/primitives/box/boxOpSchema.js +++ b/web/app/cad/craft/primitives/box/boxOpSchema.js @@ -1,6 +1,7 @@ export default { datum: { type: 'datum', + optional: true, defaultValue: {type: 'selection'} }, width: { diff --git a/web/app/cad/craft/primitives/cone/coneOpSchema.js b/web/app/cad/craft/primitives/cone/coneOpSchema.js index b9524b3a..1ee5f25a 100644 --- a/web/app/cad/craft/primitives/cone/coneOpSchema.js +++ b/web/app/cad/craft/primitives/cone/coneOpSchema.js @@ -1,6 +1,7 @@ export default { datum: { type: 'datum', + optional: true, defaultValue: {type: 'selection'} }, radius: { diff --git a/web/app/cad/craft/primitives/cylinder/cylinderOpSchema.js b/web/app/cad/craft/primitives/cylinder/cylinderOpSchema.js index 4fb6920e..66ec8e03 100644 --- a/web/app/cad/craft/primitives/cylinder/cylinderOpSchema.js +++ b/web/app/cad/craft/primitives/cylinder/cylinderOpSchema.js @@ -1,6 +1,7 @@ export default { datum: { type: 'datum', + optional: true, defaultValue: {type: 'selection'} }, radius: { diff --git a/web/app/cad/craft/primitives/datumConsumingOperation.js b/web/app/cad/craft/primitives/datumConsumingOperation.js index 6074ad99..a9e67e6d 100644 --- a/web/app/cad/craft/primitives/datumConsumingOperation.js +++ b/web/app/cad/craft/primitives/datumConsumingOperation.js @@ -1,6 +1,8 @@ +import CSys from '../../../math/csys'; + export default function datumConsumingOperation(params, services, run) { let mDatum = params.datum && services.cadRegistry.findDatum(params.datum); - let res = run(mDatum.csys); + let res = run(mDatum ? mDatum.csys : CSys.ORIGIN); if (mDatum) { res.consumed.push(mDatum); } diff --git a/web/app/cad/craft/primitives/sphere/sphereOpSchema.js b/web/app/cad/craft/primitives/sphere/sphereOpSchema.js index a953171a..d133e674 100644 --- a/web/app/cad/craft/primitives/sphere/sphereOpSchema.js +++ b/web/app/cad/craft/primitives/sphere/sphereOpSchema.js @@ -1,6 +1,7 @@ export default { datum: { type: 'datum', + optional: true, defaultValue: {type: 'selection'} }, radius: { diff --git a/web/app/cad/craft/primitives/torus/torusOpSchema.js b/web/app/cad/craft/primitives/torus/torusOpSchema.js index 3a02b665..8d3c370f 100644 --- a/web/app/cad/craft/primitives/torus/torusOpSchema.js +++ b/web/app/cad/craft/primitives/torus/torusOpSchema.js @@ -1,6 +1,7 @@ export default { datum: { type: 'datum', + optional: true, defaultValue: {type: 'selection'} }, radius: {