From 0825dc0065bcefb6de0b68710565bed2456dc495 Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Sun, 28 Oct 2018 00:14:28 -0700 Subject: [PATCH] rename outdated to consumed --- web/app/cad/craft/booleanOperation.js | 2 +- web/app/cad/craft/craftPlugin.js | 4 ++-- web/app/cad/craft/datum/create/createDatumOperation.js | 2 +- web/app/cad/craft/datum/move/moveDatumOperation.js | 2 +- web/app/cad/craft/datum/rotate/rotateDatumOperation.js | 2 +- web/app/cad/craft/primitives/datumConsumingOperation.js | 2 +- web/app/cad/craft/primitives/plane/planeOperation.js | 2 +- .../cad/craft/primitives/simplePlane/simplePlaneOperation.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/app/cad/craft/booleanOperation.js b/web/app/cad/craft/booleanOperation.js index 5f26a78e..c8b54302 100644 --- a/web/app/cad/craft/booleanOperation.js +++ b/web/app/cad/craft/booleanOperation.js @@ -27,7 +27,7 @@ export function BooleanOperation(face, solid, operand, operationType) { updateStitching(result); const newSolid = new MBrepShell(result); return { - outdated: [solid], + consumed: [solid], created: [newSolid] } } diff --git a/web/app/cad/craft/craftPlugin.js b/web/app/cad/craft/craftPlugin.js index ccffcc85..9ce677ce 100644 --- a/web/app/cad/craft/craftPlugin.js +++ b/web/app/cad/craft/craftPlugin.js @@ -85,8 +85,8 @@ export function activate({streams, services}) { let {history, pointer} = curr; for (let i = beginIndex; i <= pointer; i++) { let request = history[i]; - let {outdated, created} = runOrGetPreRunResults(request); - outdated.forEach(m => models.delete(m)); + let {consumed, created} = runOrGetPreRunResults(request); + consumed.forEach(m => models.delete(m)); created.forEach(m => models.add(m)); streams.craft.models.next(Array.from(models).sort(m => m.id)); } diff --git a/web/app/cad/craft/datum/create/createDatumOperation.js b/web/app/cad/craft/datum/create/createDatumOperation.js index 5fa5cf50..7854aae5 100644 --- a/web/app/cad/craft/datum/create/createDatumOperation.js +++ b/web/app/cad/craft/datum/create/createDatumOperation.js @@ -25,7 +25,7 @@ function create(params, {cadRegistry}) { updateCSys(csys, params, cadRegistry.findFace); return { - outdated: [], + consumed: [], created: [new MDatum(csys)] } } diff --git a/web/app/cad/craft/datum/move/moveDatumOperation.js b/web/app/cad/craft/datum/move/moveDatumOperation.js index a0500bc3..a5af369b 100644 --- a/web/app/cad/craft/datum/move/moveDatumOperation.js +++ b/web/app/cad/craft/datum/move/moveDatumOperation.js @@ -15,7 +15,7 @@ function move(params, {cadRegistry}) { csys.origin.z += params.z; return { - outdated: [mDatum], + consumed: [mDatum], created: [new MDatum(csys)] } } diff --git a/web/app/cad/craft/datum/rotate/rotateDatumOperation.js b/web/app/cad/craft/datum/rotate/rotateDatumOperation.js index fdb0b164..f35bfba7 100644 --- a/web/app/cad/craft/datum/rotate/rotateDatumOperation.js +++ b/web/app/cad/craft/datum/rotate/rotateDatumOperation.js @@ -16,7 +16,7 @@ function rotate(params, {cadRegistry}) { applyRotation(mDatum.csys, csys, params.angle, axis); return { - outdated: [mDatum], + consumed: [mDatum], created: [new MDatum(csys)] } } diff --git a/web/app/cad/craft/primitives/datumConsumingOperation.js b/web/app/cad/craft/primitives/datumConsumingOperation.js index 7b1ba2db..6074ad99 100644 --- a/web/app/cad/craft/primitives/datumConsumingOperation.js +++ b/web/app/cad/craft/primitives/datumConsumingOperation.js @@ -2,7 +2,7 @@ export default function datumConsumingOperation(params, services, run) { let mDatum = params.datum && services.cadRegistry.findDatum(params.datum); let res = run(mDatum.csys); if (mDatum) { - res.outdated.push(mDatum); + res.consumed.push(mDatum); } return res; } \ No newline at end of file diff --git a/web/app/cad/craft/primitives/plane/planeOperation.js b/web/app/cad/craft/primitives/plane/planeOperation.js index fd76c043..c45514dc 100644 --- a/web/app/cad/craft/primitives/plane/planeOperation.js +++ b/web/app/cad/craft/primitives/plane/planeOperation.js @@ -13,7 +13,7 @@ function createPlane(params, services) { let mDatum = services.cadRegistry.findDatum(params.datum); return { - outdated: [mDatum], + consumed: [mDatum], created: [new MOpenFaceShell(new CSysPlaneSurfacePrototype(mDatum.csys), mDatum.csys)] } } diff --git a/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js b/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js index 52ada59d..ecc0beaa 100644 --- a/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js +++ b/web/app/cad/craft/primitives/simplePlane/simplePlaneOperation.js @@ -25,7 +25,7 @@ function paramsToPlane({orientation, parallelTo, depth}, cadRegistry) { function createPlane(params, {cadRegistry}) { return { - outdated: [], + consumed: [], created: [new MOpenFaceShell(new PlaneSurfacePrototype(paramsToPlane(params, cadRegistry)))] } }