diff --git a/js/menus/ImportMenuView.js b/js/menus/ImportMenuView.js
index 70f1e01a5727c0c836150fd899a7bb1c76101eff..0e9ccb224c2a809244bdbdf644ed4a073b1ce250 100644
--- a/js/menus/ImportMenuView.js
+++ b/js/menus/ImportMenuView.js
@@ -19,6 +19,8 @@ ImportMenuView = Backbone.View.extend({
_.bindAll(this, "render", "_onMeshLoad");
this.listenTo(this.model, "change", this.render);
+// this.listenTo(this.model, "change:filename change:boundingBoxHelper", this.render);//boundingBoxHelper covers orientation
+
},
@@ -68,6 +70,38 @@ ImportMenuView = Backbone.View.extend({
this.$el.html(this.template(this.model.attributes));
},
+// makeDimensionString: function(){
+// var bounds = this.model.get("boundingBoxHelper").box;
+// return (bounds.max.x - bounds.min.x).toFixed(1) + " x " +
+// (bounds.max.y - bounds.min.y).toFixed(1) + " x " + (bounds.max.z - bounds.min.z).toFixed(1);
+// },
+//
+// getScale: function(){
+// var scale = this.model.get("scale");
+// var dimensions = {};
+// dimensions.xScale = scale[0];
+// dimensions.yScale = scale[1];
+// dimensions.zScale = scale[2];
+// dimensions.dimensions = this.makeDimensionString();
+// return dimensions;
+// },
+//
+// scale: function(e){
+//
+// this.model.scale([this.getDimScale($(".xScale").val()), this.getDimScale($(".yScale").val()), this.getDimScale($(".zScale").val())]);
+// },
+//
+// getDimScale: function(val){
+// if (val == "") return null;
+// return parseFloat(val);
+// },
+//
+// rotate: function(e){
+// e.preventDefault();
+// var axis = $(e.target).data("axis");
+// this.model.rotate(axis);
+// },
+
template: _.template('\
Filename: <%= filename %><br/>\
Rotate:<br/>\
diff --git a/js/menus/importView.js b/js/menus/importView.js
deleted file mode 100644
index 81b0e29d9c272dd16da8258486ac526cbb3b2055..0000000000000000000000000000000000000000
--- a/js/menus/importView.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Created by aghassaei on 1/16/15.
- */
-
-
-ImportView = Backbone.View.extend({
-
- el: "#importGeometry",
-
- events: {
- "change #uploadMesh": "uploadMesh",
- "click .selectMesh": "selectMesh",
- "fileselect .btn-file :file": "readDataURL",
- "click .stlRotate": "rotate",
- "change .dimension": "scale"
- },
-
- initialize: function(){
-
- _.bindAll(this, "render", "onMeshLoad");
- this.listenTo(this.model, "change:filename change:boundingBoxHelper", this.render);//boundingBoxHelper covers orientation
-
- this.render();
- },
-
- selectMesh: function(e){//select mesh from dropdown list
- e.preventDefault();
- var filename = $(e.target).data("file");
- this.loadMeshFromURL('data/' + filename);
- this.model.set("filename", filename);
- },
-
- uploadMesh: function(e){//select a mesh to upload
- var input = $(e.target),
- numFiles = input.get(0).files ? input.get(0).files.length : 1,
- label = input.val().replace(/\\/g, '/').replace(/.*\//, '');
- input.trigger('fileselect', [numFiles, label, input.get(0).files]);
- input.val("");
- },
-
- readDataURL: function(event, numFiles, filename, files){
- if (files.length>1) console.log("too many files selected");
- var reader = new FileReader();
- reader.readAsDataURL(files[0]);
- var self = this;
- reader.onload = (function() {
- return function(e) {
- self.loadMeshFromURL(e.target.result);
- self.model.set("filename", filename);
- }
- })();
- },
-
- loadMeshFromURL: function(url){
- var loader = new THREE.STLLoader();
- loader.addEventListener('load', this.onMeshLoad);
- loader.load(url);
- },
-
- onMeshLoad: function(e){
- this.model.set("geometry", e.content);
- },
-
- makeDimensionString: function(){
- var bounds = this.model.get("boundingBoxHelper").box;
- return (bounds.max.x - bounds.min.x).toFixed(1) + " x " +
- (bounds.max.y - bounds.min.y).toFixed(1) + " x " + (bounds.max.z - bounds.min.z).toFixed(1);
- },
-
- getScale: function(){
- var scale = this.model.get("scale");
- var dimensions = {};
- dimensions.xScale = scale[0];
- dimensions.yScale = scale[1];
- dimensions.zScale = scale[2];
- dimensions.dimensions = this.makeDimensionString();
- return dimensions;
- },
-
- scale: function(e){
-
- this.model.scale([this.getDimScale($(".xScale").val()), this.getDimScale($(".yScale").val()), this.getDimScale($(".zScale").val())]);
- },
-
- getDimScale: function(val){
- if (val == "") return null;
- return parseFloat(val);
- },
-
- rotate: function(e){
- e.preventDefault();
- var axis = $(e.target).data("axis");
- this.model.rotate(axis);
- },
-
- render: function(){
- this.$el.html(this.template(_.extend(this.model.attributes, this.getScale())));
- },
-
- template: _.template(
- '<div class="row demo-row">\
- <div class="col-xs-3">\
- <div>\
- <span class="btn btn-default btn-file fullWidth">\
- Upload STL<input id="uploadMesh" type="file">\
- </span>\
- </div>\
- <div class="text-center">\
- OR\
- </div>\
- <div>\
- <div class="btn-group fullWidth">\
- <button data-toggle="dropdown" class="btn btn-primary dropdown-toggle fullWidth" type="button">Select Model <span class="caret"></span></button>\
- <ul role="menu" class="dropdown-menu">\
- <li><a class="selectMesh" data-file="Airbus_A300-600.stl" href="#">Plane</a></li>\
- </ul>\
- </div><!-- /btn-group -->\
- </div>\
- </div> <!-- /.col-xs-3 -->\
- <div class="col-xs-9">\
- <div>Geometry: <%= filename %><br/>\
- <div>Dimensions: <%= dimensions %></div>\
- <div class="col-xs-2">\
- <input type="text" value placeholder="<%= xScale %>" class="xScale dimension form-control"></input>\
- </div> \
- <div class="col-xs-2">\
- <input type="text" value placeholder="<%= yScale %>" class="yScale dimension form-control"></input>\
- </div>\
- <div class="col-xs-2">\
- <input type="text" value placeholder="<%= zScale %>" class="zScale dimension form-control"></input>\
- </div><br/><br/>\
- Units: </div></br>\
- </div>\
- </div>')
-});
-
-
-// <div class="col-xs-4">\
-// <a href="#" data-axis="z" class="stlRotate btn btn-block btn-lg btn-default">Rotate X</a>\
-// </div>\
-// <div class="col-xs-4">\
-// <a href="#" data-axis="y" class="stlRotate btn btn-block btn-lg btn-default">Rotate Y</a>\
-// </div>\
-// <div class="col-xs-4">\
-// <a href="#" data-axis="x" class="stlRotate btn btn-block btn-lg btn-default">Rotate Z</a>\
-// </div>\
\ No newline at end of file