From f4ef2126fd1962aa4cadc5a828a3532ecd367d67 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 27 Jan 2015 01:12:52 -0500
Subject: [PATCH] small changes

---
 js/menus/ImportMenuView.js | 4 +++-
 js/menus/MenuWrapper.js    | 2 +-
 js/menus/PartMenuView.js   | 5 +++--
 js/models/lattice.js       | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/js/menus/ImportMenuView.js b/js/menus/ImportMenuView.js
index d5c6d389..c2d46acb 100644
--- a/js/menus/ImportMenuView.js
+++ b/js/menus/ImportMenuView.js
@@ -20,11 +20,13 @@ ImportMenuView = Backbone.View.extend({
     },
 
     template: _.template('\
+        Filename:<br/>\
         Rotate:<br/>\
         Scale:<br/><br/>\
         <span class="btn btn-default btn-file fullWidth">\
             Upload STL<input id="uploadMesh" type="file">\
-       </span><br/><br/>\
+       </span><br/>\
+       <div class="text-center">OR</div>\
         <div class="btn-group fullWidth">\
             <button data-toggle="dropdown" class="btn btn-default dropdown-toggle fullWidth" type="button">Select Model <span class="caret"></span></button>\
             <ul role="menu" class="dropdown-menu">\
diff --git a/js/menus/MenuWrapper.js b/js/menus/MenuWrapper.js
index 0c84bba1..f46f089f 100644
--- a/js/menus/MenuWrapper.js
+++ b/js/menus/MenuWrapper.js
@@ -11,7 +11,7 @@ function MenuWrapper(args){
     var latticeMenu = new LatticeMenuView({model:args.lattice});
     var importMenu = new ImportMenuView();
     var sketchMenu = new SketchMenuView();
-    var partMenu = new PartMenuView();
+    var partMenu = new PartMenuView({model:args.lattice});
     var scriptMenu = new ScriptMenuView();
 
     init();
diff --git a/js/menus/PartMenuView.js b/js/menus/PartMenuView.js
index 540b8b3f..602b9bca 100644
--- a/js/menus/PartMenuView.js
+++ b/js/menus/PartMenuView.js
@@ -12,14 +12,15 @@ PartMenuView = Backbone.View.extend({
     initialize: function(){
 
         _.bindAll(this, "render");
+        this.listenTo(this.model, "change:partType", this.render);
     },
 
     render: function(){
-        this.$el.html(this.template());
+        this.$el.html(this.template(this.model.attributes));
     },
 
     template: _.template('\
-        Part Type: <br/>\
+        Part Type: &nbsp;&nbsp;<%= partType %><br/>\
         ')
 
 });
\ No newline at end of file
diff --git a/js/models/lattice.js b/js/models/lattice.js
index 98318114..4518fb1d 100644
--- a/js/models/lattice.js
+++ b/js/models/lattice.js
@@ -11,7 +11,8 @@ Lattice = Backbone.Model.extend({
         connectionType: "face",
         nodes: [],
         cells: [],
-        numCells: 0
+        numCells: 0,
+        partType: "triangle"
     },
 
     //pass in fillGeometry
-- 
GitLab