Commit 428ee7fc authored by Amanda Ghassaei's avatar Amanda Ghassaei

units in plist instead of camplist

parent 62c7a1fc
......@@ -2,8 +2,8 @@
* Created by aghassaei on 1/26/15.
*/
define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'text!camMenuTemplate'],
function($, _, MenuParentView, camPlist, cam, lattice, template){
define(['jquery', 'underscore', 'menuParent', 'camPlist', 'plist', 'cam', 'lattice', 'text!camMenuTemplate'],
function($, _, MenuParentView, camPlist, plist, cam, lattice, template){
return MenuParentView.extend({
......@@ -36,7 +36,7 @@ define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'tex
},
_makeTemplateJSON: function(){
var data = _.extend(this.model.toJSON(), cam.toJSON(), camPlist, cam.get("assembler").toJSON(), lattice.toJSON());
var data = _.extend(this.model.toJSON(), cam.toJSON(), camPlist, plist, cam.get("assembler").toJSON(), lattice.toJSON());
if (cam.get("stockPositionRelative")){
var relStockPos = {};
relStockPos.x = data.stockPosition.x - data.originPosition.x;
......
......@@ -202,12 +202,6 @@ define(['three'], function(THREE){
shopbot: "Shopbot (sbp)",
gcode: "G-Code",
tinyG: "TinyG (G-Code)"
},
allUnitTypes: {
inches: "Inches",
mm: "mm",
um: "Micron"
}
}
......
......@@ -370,6 +370,12 @@ define(['three'], function(THREE){
allScripts: {
loadFile: "Load From File..."
},
allUnitTypes: {
inches: "Inches",
mm: "mm",
um: "Micron"
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment