From f36f9142451de32d738eaef75398ea398aff8cac Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 14 Aug 2015 11:28:02 -0400
Subject: [PATCH] stock events
---
js/cam/Cam.js | 2 +-
js/cam/assemblers/Assembler.js | 6 ++++++
js/cam/assemblers/StockComponent.js | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/js/cam/Cam.js b/js/cam/Cam.js
index 23d7c507..340b9d4f 100644
--- a/js/cam/Cam.js
+++ b/js/cam/Cam.js
@@ -78,7 +78,7 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel
// this._setNeedsPostProcessing);
// this.listenTo(appState, "change:stockSimulationPlaying", this._stockSimulation);
-// this.listenTo(lattice, "change:partType", this._updatePartType);
+ this.listenTo(lattice, "change:partType", this._updatePartType);
this.listenTo(appState, "change:cellMode", this._updateCellMode);
this.listenTo(this, "change:machineName", this.selectMachine);
diff --git a/js/cam/assemblers/Assembler.js b/js/cam/assemblers/Assembler.js
index 47e7453e..48289100 100644
--- a/js/cam/assemblers/Assembler.js
+++ b/js/cam/assemblers/Assembler.js
@@ -197,6 +197,12 @@ define(['underscore', 'appState', 'lattice', 'stlLoader', 'threeModel', 'cam', '
stock.setMode();
});
};
+
+ Assembler.prototype.updatePartType = function(){//message from cam
+ _.each(this.stock, function(stock){
+ stock.updatePartType();
+ });
+ };
Assembler.prototype.pickUpStock = function(){
_.each(this.stock, function(stock){
diff --git a/js/cam/assemblers/StockComponent.js b/js/cam/assemblers/StockComponent.js
index 8fb6fa23..ff315a36 100644
--- a/js/cam/assemblers/StockComponent.js
+++ b/js/cam/assemblers/StockComponent.js
@@ -52,6 +52,10 @@ define(['underscore', 'cam', 'three', 'component', 'lattice'], function(_, cam,
this.cell.setMode();
};
+ StockComponent.prototype.updatePartType = function(){//message from cam
+ this.cell.destroyParts();
+ this.setMode();
+ };
//helper
--
GitLab