From d885f003e6d9143391ad56b568fee11885ca0326 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 21 Aug 2015 15:13:35 -0400
Subject: [PATCH] changes
---
js/cam/assemblers/AssemblerPost.js | 2 +-
js/plists/CamPList.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/js/cam/assemblers/AssemblerPost.js b/js/cam/assemblers/AssemblerPost.js
index 667cb95b..ea95ebb5 100644
--- a/js/cam/assemblers/AssemblerPost.js
+++ b/js/cam/assemblers/AssemblerPost.js
@@ -61,7 +61,7 @@ define(['underscore', 'appState', 'lattice', 'cam'], function(_, appState, latti
this.customChangeZLayer = function(currentIndex, lastIndex, exporter, settings, context, self){
var data = "";
if (lastIndex === null || (currentIndex.z-lastIndex.z)%2 != 0){
- data += exporter.addLine("G0", ["A" + (currentIndex.z%2*0.3125).toFixed(4)], "new layer");
+ data += exporter.addLine("G0", ["A" + ((currentIndex.z%2+1)*0.3125).toFixed(4)], "new layer");
data += "\n";
}
return data;
diff --git a/js/plists/CamPList.js b/js/plists/CamPList.js
index a8f9271a..e8e41c18 100644
--- a/js/plists/CamPList.js
+++ b/js/plists/CamPList.js
@@ -102,7 +102,7 @@ define(['three'], function(THREE){
stock:{
stock1: {
description:{
- materialName: "brass",
+ materialName: "fiberGlass",
length: 4
},
name: "Stock 1",
@@ -111,7 +111,7 @@ define(['three'], function(THREE){
},
stock2: {
description:{
- materialName: "fiberGlass",
+ materialName: "brass",
length: 4
},
name: "Stock 2",
--
GitLab