Skip to content
Snippets Groups Projects
Commit dc84ad2d authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

units

parent dc374af5
Branches
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ CamMenuView = Backbone.View.extend({ ...@@ -9,6 +9,7 @@ CamMenuView = Backbone.View.extend({
events: { events: {
"click .camProcess": "_selectCamProcess", "click .camProcess": "_selectCamProcess",
"click .units": "_changeUnits",
"click #saveCam": "_processAndSave" "click #saveCam": "_processAndSave"
}, },
...@@ -20,6 +21,7 @@ CamMenuView = Backbone.View.extend({ ...@@ -20,6 +21,7 @@ CamMenuView = Backbone.View.extend({
_.bindAll(this, "render"); _.bindAll(this, "render");
this.listenTo(this.assembler, "change", this.render); this.listenTo(this.assembler, "change", this.render);
this.listenTo(this.model, "change:units", this.render);
}, },
_selectCamProcess: function(e){ _selectCamProcess: function(e){
...@@ -27,6 +29,11 @@ CamMenuView = Backbone.View.extend({ ...@@ -27,6 +29,11 @@ CamMenuView = Backbone.View.extend({
this.assembler.set("camProcess", $(e.target).data("type")); this.assembler.set("camProcess", $(e.target).data("type"));
}, },
_changeUnits: function(e){
e.preventDefault();
this.model.set("units", $(e.target).data("type"));
},
_processAndSave: function(e){ _processAndSave: function(e){
e.preventDefault(); e.preventDefault();
this.assembler.processAndSave(); this.assembler.processAndSave();
...@@ -47,6 +54,15 @@ CamMenuView = Backbone.View.extend({ ...@@ -47,6 +54,15 @@ CamMenuView = Backbone.View.extend({
<% }); %>\ <% }); %>\
</ul>\ </ul>\
</div><br/><br/>\ </div><br/><br/>\
Units: &nbsp;&nbsp;\
<div class="btn-group">\
<button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allUnitTypes[units] %><span class="caret"></span></button>\
<ul role="menu" class="dropdown-menu">\
<% _.each(_.keys(allUnitTypes), function(key){ %>\
<li><a class="units" data-type="<%= key %>" href="#"><%= allUnitTypes[key] %></a></li>\
<% }); %>\
</ul>\
</div><br/><br/>\
<a href="#" id="saveCam" class=" btn btn-block btn-lg btn-default">Process and Save</a><br/>\ <a href="#" id="saveCam" class=" btn btn-block btn-lg btn-default">Process and Save</a><br/>\
') ')
......
...@@ -10,6 +10,7 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -10,6 +10,7 @@ LatticeMenuView = Backbone.View.extend({
events: { events: {
"click #latticeMenuClearCells": "_clearCells", "click #latticeMenuClearCells": "_clearCells",
"change #latticeScale": "_changeScale", "change #latticeScale": "_changeScale",
"click .units": "_changeUnits",
"click .cellType": "_changeCellType", "click .cellType": "_changeCellType",
"click .connectionType": "_changeConnectionType", "click .connectionType": "_changeConnectionType",
"slide #scaleSlider": "_sliderDidSlide", "slide #scaleSlider": "_sliderDidSlide",
...@@ -27,6 +28,7 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -27,6 +28,7 @@ LatticeMenuView = Backbone.View.extend({
_.bindAll(this, "render"); _.bindAll(this, "render");
this.listenTo(this.lattice, "change", this.render); this.listenTo(this.lattice, "change", this.render);
this.listenTo(this.model, "change:units", this.render);
}, },
_clearCells: function(e){ _clearCells: function(e){
...@@ -41,6 +43,11 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -41,6 +43,11 @@ LatticeMenuView = Backbone.View.extend({
this.lattice.set("scale", val); this.lattice.set("scale", val);
}, },
_changeUnits: function(e){
e.preventDefault();
this.model.set("units", $(e.target).data("type"));
},
_sliderDidSlide: function(e){ _sliderDidSlide: function(e){
var scale = $(e.target)[0].value; var scale = $(e.target)[0].value;
this.lattice.previewScaleChange(scale);//does not trigger lattice change event - no rerendering of ui this.lattice.previewScaleChange(scale);//does not trigger lattice change event - no rerendering of ui
...@@ -143,6 +150,15 @@ LatticeMenuView = Backbone.View.extend({ ...@@ -143,6 +150,15 @@ LatticeMenuView = Backbone.View.extend({
<br/>\ <br/>\
Scale:&nbsp;&nbsp;<input id="scaleSlider" data-slider-id="ex1Slider" type="text" data-slider-min="1" data-slider-max="100" data-slider-step="0.1" data-slider-value="<%= scale %>"/>\ Scale:&nbsp;&nbsp;<input id="scaleSlider" data-slider-id="ex1Slider" type="text" data-slider-min="1" data-slider-max="100" data-slider-step="0.1" data-slider-value="<%= scale %>"/>\
<br/><input id="latticeScale" value="<%= scale %>" placeholder="enter scale" class="form-control" type="text"><br/>\ <br/><input id="latticeScale" value="<%= scale %>" placeholder="enter scale" class="form-control" type="text"><br/>\
Units: &nbsp;&nbsp;\
<div class="btn-group">\
<button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allUnitTypes[units] %><span class="caret"></span></button>\
<ul role="menu" class="dropdown-menu">\
<% _.each(_.keys(allUnitTypes), function(key){ %>\
<li><a class="units" data-type="<%= key %>" href="#"><%= allUnitTypes[key] %></a></li>\
<% }); %>\
</ul>\
</div><br/><br/>\
Num Cells:&nbsp;&nbsp;<%= numCells %><br/>\ Num Cells:&nbsp;&nbsp;<%= numCells %><br/>\
<br/>\ <br/>\
<a href="#" id="latticeMenuClearCells" class=" btn btn-block btn-lg btn-default">Clear All Cells</a><br/>\ <a href="#" id="latticeMenuClearCells" class=" btn btn-block btn-lg btn-default">Clear All Cells</a><br/>\
......
...@@ -59,6 +59,12 @@ AppState = Backbone.Model.extend({ ...@@ -59,6 +59,12 @@ AppState = Backbone.Model.extend({
menuIsVisible: true, menuIsVisible: true,
allUnitTypes: {
mm: "mm",
inches: "Inches"
},
units: "mm",
//key bindings //key bindings
shift: false, shift: false,
deleteMode: false, deleteMode: false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment