From 8c822ff7ae536059111a305659ce81ee7883d679 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 12 Aug 2015 17:55:40 -0400
Subject: [PATCH] cam plist
---
js/cam/cam.js | 10 ++--
js/main.js | 3 +-
js/menus/AnimationMenuView.js | 4 +-
js/menus/AssemblerMenuView.js | 5 +-
js/menus/AssemblerSetupMenuView.js | 4 +-
js/menus/CamMenuView.js | 5 +-
js/plists/CamPList.js | 89 ++++++++++++++++++++++++++++++
js/plists/PList.js | 79 --------------------------
8 files changed, 106 insertions(+), 93 deletions(-)
create mode 100644 js/plists/CamPList.js
diff --git a/js/cam/cam.js b/js/cam/cam.js
index 39f1715a..f0a556a2 100644
--- a/js/cam/cam.js
+++ b/js/cam/cam.js
@@ -2,8 +2,8 @@
* Created by aghassaei on 3/10/15.
*/
-define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel', 'plist', 'materials'],
- function(_, THREE, Backbone, appState, lattice, three, plist, materials){
+define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel', 'camPlist', 'materials'],
+ function(_, THREE, Backbone, appState, lattice, three, camPlist, materials){
var Cam = Backbone.Model.extend({
@@ -110,8 +110,8 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel
_setMachineDefaults: function(machineName){
var self = this;
- if (plist.allMachines[machineName].defaults){
- _.each(plist.allMachines[machineName].defaults, function(value, key){
+ if (camPlist.allMachines[machineName].defaults){
+ _.each(camPlist.allMachines[machineName].defaults, function(value, key){
self.set(key, value, {silent:true});
});
}
@@ -138,7 +138,7 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel
_setToDefaults: function(){
//call this each time we switch to assemble tab
- var availableMachines = plist.machineTypesForLattice[lattice.get("cellType")][lattice.get("connectionType")];
+ var availableMachines = camPlist.machineTypesForLattice[lattice.get("cellType")][lattice.get("connectionType")];
if (availableMachines.indexOf(this.get("machineName")) < 0){
this.set("machineName", availableMachines[0], {silent:true});
}
diff --git a/js/main.js b/js/main.js
index 5b27c471..9fa9c9c0 100644
--- a/js/main.js
+++ b/js/main.js
@@ -23,7 +23,7 @@ require.config({
threeView: 'three/ThreeView',
fillGeometry: 'three/FillGeometry',
- //plists
+ //plist
plist: 'plists/PList',
//models
@@ -170,6 +170,7 @@ require.config({
//cam
cam: 'cam/CAM',
+ camPlist: 'plists/CamPList',
//assemblers
assembler: 'cam/assemblers/Assembler',
diff --git a/js/menus/AnimationMenuView.js b/js/menus/AnimationMenuView.js
index 47475ce4..ff3f9589 100644
--- a/js/menus/AnimationMenuView.js
+++ b/js/menus/AnimationMenuView.js
@@ -2,8 +2,8 @@
* Created by aghassaei on 2/1/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!animationMenuTemplate'],
- function($, _, MenuParentView, plist, cam, template){
+define(['jquery', 'underscore', 'menuParent', 'cam', 'text!animationMenuTemplate'],
+ function($, _, MenuParentView, cam, template){
return MenuParentView.extend({
diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js
index 1e705947..85340094 100644
--- a/js/menus/AssemblerMenuView.js
+++ b/js/menus/AssemblerMenuView.js
@@ -2,7 +2,8 @@
* Created by aghassaei on 2/25/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice', 'materials', 'text!assemblerMenuTemplate'], function($, _, MenuParentView, plist, cam, lattice, materials, template){
+define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'materials', 'text!assemblerMenuTemplate'],
+ function($, _, MenuParentView, camPlist, cam, lattice, materials, template){
return MenuParentView.extend({
@@ -35,7 +36,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice', 'materi
},
_makeTemplateJSON: function(){
- return _.extend(this.model.toJSON(), cam.toJSON(), lattice.toJSON(), plist, {materials:materials.list});
+ return _.extend(this.model.toJSON(), cam.toJSON(), lattice.toJSON(), camPlist, {materials:materials.list});
},
template: _.template(template)
diff --git a/js/menus/AssemblerSetupMenuView.js b/js/menus/AssemblerSetupMenuView.js
index d5074c23..7aeacfed 100644
--- a/js/menus/AssemblerSetupMenuView.js
+++ b/js/menus/AssemblerSetupMenuView.js
@@ -3,8 +3,8 @@
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'text!assemblerSetupMenuTemplate'],
- function($, _, MenuParentView, plist, cam, template){
+define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'text!assemblerSetupMenuTemplate'],
+ function($, _, MenuParentView, camPlist, cam, template){
return MenuParentView.extend({
diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js
index a8e77198..c57dc0c6 100644
--- a/js/menus/CamMenuView.js
+++ b/js/menus/CamMenuView.js
@@ -2,7 +2,8 @@
* Created by aghassaei on 1/26/15.
*/
-define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice', 'text!camMenuTemplate'], function($, _, MenuParentView, plist, cam, lattice, template){
+define(['jquery', 'underscore', 'menuParent', 'camPlist', 'cam', 'lattice', 'text!camMenuTemplate'],
+ function($, _, MenuParentView, camPlist, cam, lattice, template){
return MenuParentView.extend({
@@ -35,7 +36,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice', 'text!c
},
_makeTemplateJSON: function(){
- var data = _.extend(this.model.toJSON(), cam.toJSON(), lattice.toJSON(), plist);
+ var data = _.extend(this.model.toJSON(), cam.toJSON(), lattice.toJSON(), camPlist);
if (cam.get("stockPositionRelative")){
var relStockPos = {};
relStockPos.x = data.stockPosition.x - data.originPosition.x;
diff --git a/js/plists/CamPList.js b/js/plists/CamPList.js
new file mode 100644
index 00000000..2e8b9b27
--- /dev/null
+++ b/js/plists/CamPList.js
@@ -0,0 +1,89 @@
+/**
+ * Created by aghassaei on 8/12/15.
+ */
+
+
+define(['three'], function(THREE){
+
+ return {
+
+ allMachines:{
+ handOfGod: {
+ name: "Hand of God",
+ shouldPickUpStock: false,
+ relative: false,
+ camProcesses: ["gcode"],
+ numMaterials: -1//-1 == infinite
+ },
+ shopbot: {
+ name: "Shopbot",
+ shouldPickUpStock: true,
+ relative: false,
+ camProcesses: ["shopbot", "gcode"],
+ numMaterials: -1
+ },
+ oneBitBot: {
+ name: "One Bit Bot",
+ shouldPickUpStock: true,
+ relative: true,
+ camProcesses: ["gcode", "tinyG"]
+ },
+ stapler: {
+ name: "Dual Head Stapler",
+ shouldPickUpStock: false,
+ relative: false,
+ camProcesses: ["gcode"],
+ numMaterials: 2,
+ defaults: {
+ camStrategy: "raster",
+ placementOrder: "XYZ",//used for raster strategy entry
+ camProcess: "gcode",
+ rapidHeight:3,
+ rapidHeightRelative: true,
+ safeHeight: 0.05,
+ originPosition: new THREE.Vector3(0,0,0),
+ rapidSpeeds:{xy: 3, z: 2},
+ feedRate:{xy: 0.1, z: 0.1}
+ }
+ }
+ },
+
+ machineTypesForLattice:{
+ octa:{
+ face: ["handOfGod"],
+ edgeRot: ["shopbot", "oneBitBot", "handOfGod"],
+ vertex: ["handOfGod"]
+ },
+ tetra: {
+ vertex: ["handOfGod"]
+ },
+ cube:{
+ face: ["handOfGod"],
+ gik: ["stapler", "handOfGod"]
+ },
+ truncatedCube:{
+ face:["handOfGod"]
+ },
+ kelvin:{
+ face:["handOfGod"]
+ }
+ },
+
+ allAssemblyStrategies: {
+ raster: "Raster"
+ },
+
+ allCamProcesses: {
+ shopbot: "Shopbot (sbp)",
+ gcode: "G-Code",
+ tinyG: "TinyG"
+ },
+
+ allUnitTypes: {
+ inches: "Inches",
+ mm: "mm",
+ um: "Micron"
+ }
+
+ }
+});
\ No newline at end of file
diff --git a/js/plists/PList.js b/js/plists/PList.js
index ebc047bb..35a719cf 100644
--- a/js/plists/PList.js
+++ b/js/plists/PList.js
@@ -197,87 +197,8 @@ define(['three'], function(THREE){
}
},
-
- allMachines:{
- handOfGod: {
- name: "Hand of God",
- shouldPickUpStock: false,
- relative: false,
- camProcesses: ["gcode"],
- numMaterials: -1//-1 == infinite
- },
- shopbot: {
- name: "Shopbot",
- shouldPickUpStock: true,
- relative: false,
- camProcesses: ["shopbot", "gcode"],
- numMaterials: -1
- },
- oneBitBot: {
- name: "One Bit Bot",
- shouldPickUpStock: true,
- relative: true,
- camProcesses: ["gcode", "tinyG"]
- },
- stapler: {
- name: "Dual Head Stapler",
- shouldPickUpStock: false,
- relative: false,
- camProcesses: ["gcode"],
- numMaterials: 2,
- defaults: {
- camStrategy: "raster",
- placementOrder: "XYZ",//used for raster strategy entry
- camProcess: "gcode",
- rapidHeight:3,
- rapidHeightRelative: true,
- safeHeight: 0.05,
- originPosition: new THREE.Vector3(0,0,0),
- rapidSpeeds:{xy: 3, z: 2},
- feedRate:{xy: 0.1, z: 0.1}
- }
- }
- },
-
- machineTypesForLattice:{
- octa:{
- face: ["handOfGod"],
- edgeRot: ["shopbot", "oneBitBot", "handOfGod"],
- vertex: ["handOfGod"]
- },
- tetra: {
- vertex: ["handOfGod"]
- },
- cube:{
- face: ["handOfGod"],
- gik: ["stapler", "handOfGod"]
- },
- truncatedCube:{
- face:["handOfGod"]
- },
- kelvin:{
- face:["handOfGod"]
- }
- },
-
- allAssemblyStrategies: {
- raster: "Raster"
- },
-
- allCamProcesses: {
- shopbot: "Shopbot (sbp)",
- gcode: "G-Code",
- tinyG: "TinyG"
- },
-
allScripts: {
loadFile: "Load From File..."
- },
-
- allUnitTypes: {
- inches: "Inches",
- mm: "mm",
- um: "Micron"
}
}
--
GitLab