From ecbf62a1649abdb17d601511ad0c2e94793b9f33 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 14 Aug 2015 23:07:27 -0400
Subject: [PATCH] small changes
---
js/cam/assemblers/StockComponent.js | 1 -
js/cam/processes/GCodeExporter.js | 1 +
js/plists/CamPList.js | 11 ++++++-----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/js/cam/assemblers/StockComponent.js b/js/cam/assemblers/StockComponent.js
index ff315a36..3819a730 100644
--- a/js/cam/assemblers/StockComponent.js
+++ b/js/cam/assemblers/StockComponent.js
@@ -15,7 +15,6 @@ define(['underscore', 'cam', 'three', 'component', 'lattice'], function(_, cam,
self.cell = cell;
self._setPosition(cell, json.position, json.rotation);
self.object3D.add(cell.getObject3D());
- cell.show();
});
}
StockComponent.prototype = Object.create(Component.prototype);
diff --git a/js/cam/processes/GCodeExporter.js b/js/cam/processes/GCodeExporter.js
index 75dc048e..8e87a816 100644
--- a/js/cam/processes/GCodeExporter.js
+++ b/js/cam/processes/GCodeExporter.js
@@ -87,6 +87,7 @@ define(['underscore', 'cam', 'lattice'], function(_, cam, lattice){
GCodeExporter.prototype.makeFooter = function(settings){
var data = "";
+ data += this.goHome(settings);
// data += this.addLine("M30", [], "program stop");
return data;
};
diff --git a/js/plists/CamPList.js b/js/plists/CamPList.js
index 68ec428e..28107c8d 100644
--- a/js/plists/CamPList.js
+++ b/js/plists/CamPList.js
@@ -40,7 +40,7 @@ define(['three'], function(THREE){
components: {
xAxis: {
name: "X Axis",
- isLinear: true,
+ rotary: false,
axisOfMotion: null,
//minBound
//maxBound
@@ -55,7 +55,7 @@ define(['three'], function(THREE){
},
frame: {
name: "Y Axis",
- isLinear: true,
+ rotary: false,
axisOfMotion: null,
//minBound
//maxBound
@@ -70,7 +70,7 @@ define(['three'], function(THREE){
},
zAxis: {
name: "Z Axis",
- isLinear: true,
+ rotary: false,
axisOfMotion: null,
//minBound
//maxBound
@@ -85,7 +85,7 @@ define(['three'], function(THREE){
},
yAxis: {
name: "Frame",
- isLinear: true,
+ rotary: false,
axisOfMotion: null,
//minBound
//maxBound
@@ -100,8 +100,9 @@ define(['three'], function(THREE){
},
substrate: {
name: "Substrate",
- isLinear: false,
+ rotary: true,
axisOfMotion: null,
+ centerOfRotation: {x:10,y:10,z:0},
//minBound
//maxBound
parent: null,
--
GitLab