From 2bc5b3a5c6441a3908cf37a80ca318c3a6aa85d1 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sat, 31 Jan 2015 19:29:38 -0500
Subject: [PATCH] small changes
---
js/fea/dmaCell.js | 1 -
js/fea/dmaPart.js | 3 ++-
js/menus/ImportMenuView.js | 2 +-
js/models/threeModel.js | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/js/fea/dmaCell.js b/js/fea/dmaCell.js
index cd477996..d688cd0f 100644
--- a/js/fea/dmaCell.js
+++ b/js/fea/dmaCell.js
@@ -77,7 +77,6 @@
_.each(this.parts, function(part){
if (part) hasAnyParts = true;
});
- console.log("amanda");
if (!hasAnyParts) window.lattice.removeCell(this);
};
diff --git a/js/fea/dmaPart.js b/js/fea/dmaPart.js
index b6c0489b..f3bccf07 100644
--- a/js/fea/dmaPart.js
+++ b/js/fea/dmaPart.js
@@ -123,8 +123,9 @@
DMAPart.prototype.removeFromCell = function(){//send message back to parent cell to destroy this
if (this.parentCell) {
this.parentCell.removePart(this.type);
+// this.currentIntersectedPart = null;
window.three.render();
- }
+ } else console.warn("part has no parent cell");
};
DMAPart.prototype.destroy = function(){
diff --git a/js/menus/ImportMenuView.js b/js/menus/ImportMenuView.js
index ac99ad9c..70e3c29e 100644
--- a/js/menus/ImportMenuView.js
+++ b/js/menus/ImportMenuView.js
@@ -41,7 +41,7 @@ ImportMenuView = Backbone.View.extend({
},
_readDataURL: function(event, numFiles, filename, files){
- if (files.length>1) console.log("too many files selected");
+ if (files.length>1) console.warn("too many files selected");
var reader = new FileReader();
reader.readAsDataURL(files[0]);
var self = this;
diff --git a/js/models/threeModel.js b/js/models/threeModel.js
index f9ff57d5..9ab5d3b9 100644
--- a/js/models/threeModel.js
+++ b/js/models/threeModel.js
@@ -74,7 +74,7 @@ function ThreeModel(){
} else if (type == "part"){
parts.splice(parts.indexOf(objectToRemove), 1);
} else if (type == "basePlane"){
- console.log("not sure if i should be hitting this");
+ console.warn("something is wrong, deleting base plane");
basePlane.splice(basePlane.indexOf(objectToRemove), 1);
}
@@ -93,7 +93,6 @@ function ThreeModel(){
}
function render(){
- console.log("render");
renderer.render(scene, camera);
}
--
GitLab