From 2f8cb3938754f10aa7e1e165bf0cad36a3db6341 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 21 Aug 2015 17:47:24 -0400
Subject: [PATCH] ending pt
---
css/main.css | 2 +-
js/cam/assemblers/AssemblerPost.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/css/main.css b/css/main.css
index d715bf8b..b878da64 100644
--- a/css/main.css
+++ b/css/main.css
@@ -20,7 +20,7 @@ pre {
.navbar {
margin-bottom:0;
- z-index: 2;
+ z-index: 5;
border-radius: 0;
opacity:0.8;
}
diff --git a/js/cam/assemblers/AssemblerPost.js b/js/cam/assemblers/AssemblerPost.js
index ea95ebb5..2c007a6f 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+1)*0.3125).toFixed(4)], "new layer");
+ data += exporter.addLine("G0", ["A" + ((currentIndex.z+1)%2*0.3125).toFixed(4)], "new layer");
data += "\n";
}
return data;
--
GitLab