Skip to content
Snippets Groups Projects
Commit ecbf62a1 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

small changes

parent 1cbd358c
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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;
};
......
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment