From 5c4090e14a02da0e42f7b1481be1a767c66b553b Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 24 Mar 2015 23:38:07 -0400
Subject: [PATCH] delete mode
---
css/main.css | 8 ++++++++
js/cam/Assembler.js | 2 --
js/menus/Ribbon.js | 10 +++++++++-
js/models/AppState.js | 4 ++++
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/css/main.css b/css/main.css
index 62873606..f9358eb4 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 91029b67..a3597c59 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 9ab8d7a6..eb0b7250 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 443f8576..6e965beb 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;
}
--
GitLab