From 4377c95b57a4041a739bf99d8ee7678d7a617b0d Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 16 Jan 2015 20:28:22 -0500
Subject: [PATCH] eod
---
js/models/fillGeometry.js | 13 +++++++------
js/views/importView.js | 4 +++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/js/models/fillGeometry.js b/js/models/fillGeometry.js
index 44a19815..87ba21e9 100644
--- a/js/models/fillGeometry.js
+++ b/js/models/fillGeometry.js
@@ -68,15 +68,16 @@ FillGeometry = Backbone.Model.extend({
rotate: function(axis){
var orientation = this.get("orientation");
var mesh = this.get("mesh");
+ var piOver2 = Math.Pi/2;
if (axis == "x"){
- mesh.rotateX(Math.PI/2);
- orientation[0] += Math.PI/2;
+ mesh.rotateX(piOver2);
+ orientation[0] += piOver2;
} else if (axis == "y"){
- mesh.rotateX(Math.PI/2);
- orientation[1] += Math.PI/2;
+ mesh.rotateX(piOver2);
+ orientation[1] += piOver2;
} else {
- mesh.rotateX(Math.PI/2);
- orientation[2] += Math.PI/2;
+ mesh.rotateX(piOver2);
+ orientation[2] += piOver2;
}
this.trigger("change:orientation");
}
diff --git a/js/views/importView.js b/js/views/importView.js
index 80258f50..e0b2e212 100644
--- a/js/views/importView.js
+++ b/js/views/importView.js
@@ -11,7 +11,7 @@ ImportView = Backbone.View.extend({
"change #uploadMesh": "uploadMesh",
"click .selectMesh": "selectMesh",
"fileselect .btn-file :file": "readDataURL",
- "click .stlRotate": "rotate",
+ "click .stlRotate": "rotate"
},
initialize: function(){
@@ -80,6 +80,8 @@ ImportView = Backbone.View.extend({
this.$el.html(this.template(_.extend(this.model.attributes, {dimensions:this.makeDimensionString()})));
},
+
+
template: _.template(
'<div class="row demo-row">\
<div class="col-xs-3">\
--
GitLab