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

delete mode

parent d93345a8
No related branches found
No related tags found
No related merge requests found
...@@ -285,6 +285,14 @@ input.numberInput{ ...@@ -285,6 +285,14 @@ input.numberInput{
#navRibbon .btn-ribbon{ #navRibbon .btn-ribbon{
background-color: #444; background-color: #444;
padding: 5px 10px; padding: 5px 10px;
height: 49px;
}
.fui-cross{
font-size: 28px!important;
display: block;
margin-top: 4px!important;
color: #B50303;
} }
.ribbon-selected { .ribbon-selected {
......
...@@ -34,7 +34,6 @@ Assembler = Backbone.Model.extend({ ...@@ -34,7 +34,6 @@ Assembler = Backbone.Model.extend({
simLineNumber: 0,//used for stock simulation, reading through gcode simLineNumber: 0,//used for stock simulation, reading through gcode
simSpeed: 4,//#X times real speed simSpeed: 4,//#X times real speed
simStockNum:0//which piece of stock to pick up
}, },
initialize: function(options){ initialize: function(options){
...@@ -179,7 +178,6 @@ Assembler = Backbone.Model.extend({ ...@@ -179,7 +178,6 @@ Assembler = Backbone.Model.extend({
this.set("simLineNumber", 0, {silent:true}); this.set("simLineNumber", 0, {silent:true});
dmaGlobals.appState.set("stockSimulationPlaying", false); dmaGlobals.appState.set("stockSimulationPlaying", false);
dmaGlobals.three.stopAnimationLoop(); dmaGlobals.three.stopAnimationLoop();
this.set("simStockNum", 0);
dmaGlobals.lattice.showCells(); dmaGlobals.lattice.showCells();
}, },
......
...@@ -8,7 +8,8 @@ Ribbon = Backbone.View.extend({ ...@@ -8,7 +8,8 @@ Ribbon = Backbone.View.extend({
el: "#navRibbon", el: "#navRibbon",
events: { events: {
"click .cellModeBtn": "_updateCellMode" "click .cellModeBtn": "_updateCellMode",
"click .deleteMode": "_updateDeleteMode"
}, },
initialize: function(){ initialize: function(){
...@@ -16,6 +17,7 @@ Ribbon = Backbone.View.extend({ ...@@ -16,6 +17,7 @@ Ribbon = Backbone.View.extend({
_.bindAll(this, "render"); _.bindAll(this, "render");
this.listenTo(this.model, "change:cellMode", this.render); this.listenTo(this.model, "change:cellMode", this.render);
this.listenTo(this.model, "change:deleteMode", this.render);
this.render(); this.render();
}, },
...@@ -24,6 +26,11 @@ Ribbon = Backbone.View.extend({ ...@@ -24,6 +26,11 @@ Ribbon = Backbone.View.extend({
dmaGlobals.appState.set("cellMode", $(e.target).data("type")); dmaGlobals.appState.set("cellMode", $(e.target).data("type"));
}, },
_updateDeleteMode: function(e){
e.preventDefault();
dmaGlobals.appState.set("deleteMode", !dmaGlobals.appState.get("deleteMode"));
},
render: function(){ render: function(){
this.$el.html(this.template(this.model.toJSON())); this.$el.html(this.template(this.model.toJSON()));
}, },
...@@ -33,6 +40,7 @@ Ribbon = Backbone.View.extend({ ...@@ -33,6 +40,7 @@ Ribbon = Backbone.View.extend({
<div class="btn-group">\ <div class="btn-group">\
<a data-type="cell" class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "cell"){ %> ribbon-selected"<% } %> href="#"><img data-type="cell" src="assets/cell-sm.png"></a>\ <a data-type="cell" class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "cell"){ %> ribbon-selected"<% } %> href="#"><img data-type="cell" src="assets/cell-sm.png"></a>\
<a data-type="part" class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "part"){ %> ribbon-selected"<% } %> href="#"><img data-type="part" src="assets/part-sm.png"></a>\ <a data-type="part" class="btn btn-primary btn-ribbon cellModeBtn<% if (cellMode == "part"){ %> ribbon-selected"<% } %> href="#"><img data-type="part" src="assets/part-sm.png"></a>\
<a class="btn btn-primary btn-ribbon deleteMode<% if (deleteMode){ %> ribbon-selected"<% } %>"><span class="fui-cross"></span></a>\
</div>\ </div>\
</div>\ </div>\
') ')
......
...@@ -261,6 +261,10 @@ AppState = Backbone.Model.extend({ ...@@ -261,6 +261,10 @@ AppState = Backbone.Model.extend({
$("#jsonInput").click(); $("#jsonInput").click();
} }
break; break;
case 32://space bar (play/pause simulation)
e.preventDefault();
if (state && this.get("currentTab") == "animate") this.set("stockSimulationPlaying", !this.get("stockSimulationPlaying"));
break;
default: default:
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment