diff --git a/css/main.css b/css/main.css index 62873606d8b7d967a4616fb53fcb8b8db28c867d..f9358eb4cc5ceb37caa6b1678667009d725dd8bb 100644 --- a/css/main.css +++ b/css/main.css @@ -285,6 +285,14 @@ input.numberInput{ #navRibbon .btn-ribbon{ background-color: #444; padding: 5px 10px; + height: 49px; +} + +.fui-cross{ + font-size: 28px!important; + display: block; + margin-top: 4px!important; + color: #B50303; } .ribbon-selected { diff --git a/js/cam/Assembler.js b/js/cam/Assembler.js index 91029b6762709a4eaf1b340b2f858e5218d1e613..a3597c5945888a78637090f1d5051476b9b6059e 100644 --- a/js/cam/Assembler.js +++ b/js/cam/Assembler.js @@ -34,7 +34,6 @@ Assembler = Backbone.Model.extend({ simLineNumber: 0,//used for stock simulation, reading through gcode simSpeed: 4,//#X times real speed - simStockNum:0//which piece of stock to pick up }, initialize: function(options){ @@ -179,7 +178,6 @@ Assembler = Backbone.Model.extend({ this.set("simLineNumber", 0, {silent:true}); dmaGlobals.appState.set("stockSimulationPlaying", false); dmaGlobals.three.stopAnimationLoop(); - this.set("simStockNum", 0); dmaGlobals.lattice.showCells(); }, diff --git a/js/menus/Ribbon.js b/js/menus/Ribbon.js index 9ab8d7a602a559178ed04d30ad47ebcd530df0d4..eb0b725022a33977c2072495a0c94f6aaca930b1 100644 --- a/js/menus/Ribbon.js +++ b/js/menus/Ribbon.js @@ -8,7 +8,8 @@ Ribbon = Backbone.View.extend({ el: "#navRibbon", events: { - "click .cellModeBtn": "_updateCellMode" + "click .cellModeBtn": "_updateCellMode", + "click .deleteMode": "_updateDeleteMode" }, initialize: function(){ @@ -16,6 +17,7 @@ Ribbon = Backbone.View.extend({ _.bindAll(this, "render"); this.listenTo(this.model, "change:cellMode", this.render); + this.listenTo(this.model, "change:deleteMode", this.render); this.render(); }, @@ -24,6 +26,11 @@ Ribbon = Backbone.View.extend({ dmaGlobals.appState.set("cellMode", $(e.target).data("type")); }, + _updateDeleteMode: function(e){ + e.preventDefault(); + dmaGlobals.appState.set("deleteMode", !dmaGlobals.appState.get("deleteMode")); + }, + render: function(){ this.$el.html(this.template(this.model.toJSON())); }, @@ -33,6 +40,7 @@ Ribbon = Backbone.View.extend({ <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="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>\ ') diff --git a/js/models/AppState.js b/js/models/AppState.js index 443f8576866509f630158f02a7364b8e1ef1770b..6e965bebd43e50a5eaad02fbf142054de18e1375 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -261,6 +261,10 @@ AppState = Backbone.Model.extend({ $("#jsonInput").click(); } break; + case 32://space bar (play/pause simulation) + e.preventDefault(); + if (state && this.get("currentTab") == "animate") this.set("stockSimulationPlaying", !this.get("stockSimulationPlaying")); + break; default: break; }