From 102a1e01f948382ede8ee02cd1c5faf3ed3d4267 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 23 Mar 2015 20:55:08 -0400
Subject: [PATCH] cam processes by machine
---
js/menus/CamMenuView.js | 6 +++---
js/models/AppState.js | 8 ++++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js
index 10a818f8..ac31cfcc 100644
--- a/js/menus/CamMenuView.js
+++ b/js/menus/CamMenuView.js
@@ -130,10 +130,10 @@ CamMenuView = Backbone.View.extend({
template: _.template('\
CAM output: \
<div class="btn-group">\
- <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allCamProcesses[camProcess] %><span class="caret"></span></button>\
+ <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allCamProcesses[machineName][camProcess] %><span class="caret"></span></button>\
<ul role="menu" class="dropdown-menu">\
- <% _.each(_.keys(allCamProcesses), function(key){ %>\
- <li><a class="camProcess" data-type="<%= key %>" href="#"><%= allCamProcesses[key] %></a></li>\
+ <% _.each(_.keys(allCamProcesses[machineName]), function(key){ %>\
+ <li><a class="camProcess" data-type="<%= key %>" href="#"><%= allCamProcesses[machineName][key] %></a></li>\
<% }); %>\
</ul>\
</div><br/><br/>\
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 33bd0b2a..31680394 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -127,8 +127,12 @@ AppState = Backbone.Model.extend({
raster: "Raster"
},
allCamProcesses: {
- shopbot: "Shopbot (sbp)",
- gcode: "G-Code"
+ shopbot:{
+ shopbot: "Shopbot (sbp)",
+ gcode: "G-Code"
+ },
+ handOfGod:{gcode: "G-Code"},
+ oneBitBot:{gcode: "G-Code"}
},
allScripts: {
--
GitLab