From 3f43477ef6beb94248a74233330f2987b041acd3 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Thu, 21 Apr 2016 22:50:02 +0200
Subject: [PATCH] fix join

---
 config.js                              |  4 ++--
 package.json                           |  2 +-
 src/sliceActions/generateInfills.js    |  2 --
 src/sliceActions/generateInnerLines.js |  7 ++++---
 src/slicer.js                          | 16 ++++++----------
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/config.js b/config.js
index f4bfbec..5e9a068 100644
--- a/config.js
+++ b/config.js
@@ -16,14 +16,14 @@ System.config({
   },
 
   map: {
-    "Doodle3D/clipper-js": "github:Doodle3D/clipper-js@0.0.2",
+    "Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master",
     "babel": "npm:babel-core@5.8.38",
     "babel-runtime": "npm:babel-runtime@5.8.38",
     "casperlamboo/EventDispatcher": "github:casperlamboo/EventDispatcher@master",
     "core-js": "npm:core-js@0.9.18",
     "json": "github:systemjs/plugin-json@0.1.0",
     "three.js": "github:mrdoob/three.js@r72",
-    "github:Doodle3D/clipper-js@0.0.2": {
+    "github:Doodle3D/clipper-js@master": {
       "clipper-lib": "npm:clipper-lib@1.0.0"
     },
     "github:jspm/nodelibs-assert@0.1.0": {
diff --git a/package.json b/package.json
index 94f6285..15a35e3 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
       "lib": "src"
     },
     "dependencies": {
-      "Doodle3D/clipper-js": "github:Doodle3D/clipper-js@^0.0.2",
+      "Doodle3D/clipper-js": "github:Doodle3D/clipper-js@master",
       "casperlamboo/EventDispatcher": "github:casperlamboo/EventDispatcher@master",
       "three.js": "github:mrdoob/three.js@r72"
     },
diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js
index e6a61d4..39939b9 100644
--- a/src/sliceActions/generateInfills.js
+++ b/src/sliceActions/generateInfills.js
@@ -6,8 +6,6 @@ const scale = 100;
 export default function generateInfills(slices, settings) {
   console.log("generating infills");
 
-  // need to scale up everything because of clipper rounding errors
-
   let {
     layerHeight,
     fillGridSize,
diff --git a/src/sliceActions/generateInnerLines.js b/src/sliceActions/generateInnerLines.js
index 1033ecb..ec69641 100644
--- a/src/sliceActions/generateInnerLines.js
+++ b/src/sliceActions/generateInnerLines.js
@@ -27,7 +27,8 @@ export default function generateInnerLines(slices, settings) {
       // var outerLine = part.shape.clone().scaleUp(scale).offset(-nozzleRadius);
       var outerLine = part.shape.scaleUp(scale).offset(-nozzleRadius, offsetOptions);
 
-      if (outerLine.length > 0) {
+
+      if (outerLine.paths.length > 0) {
         part.outerLine.join(outerLine);
 
         for (var shell = 1; shell < shells; shell += 1) {
@@ -35,8 +36,8 @@ export default function generateInnerLines(slices, settings) {
 
           var innerLine = outerLine.offset(-offset, offsetOptions);
 
-          if (innerLine.length > 0) {
-            part.innerLines.paths.push(innerLine);
+          if (innerLine.paths.length > 0) {
+            part.innerLines.push(innerLine);
           }
           else {
             break;
diff --git a/src/slicer.js b/src/slicer.js
index 536d4d0..0892733 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -104,23 +104,22 @@ export default class extends EventDispatcher {
 		this.progress.generatedGCode = true;
 	  this._updateProgress(settings);
 
-		this.dispatchEvent({
-			type: 'finish',
-			gcode
-		});
+		this.dispatchEvent({ type: 'finish', gcode });
+
+		console.log(slices);
 
 		return gcode;
 	}
 
 	_updateProgress (settings) {
-		var supportEnabled = settings.config["supportEnabled"];
+		var supportEnabled = settings.config['supportEnabled'];
 
 		var progress = {};
 
 		var procent = 0;
 		var length = 0;
 		for (var i in this.progress) {
-			if (!(!supportEnabled && i === "generatedSupport")) {
+			if (!(!supportEnabled && i === 'generatedSupport')) {
 				progress[i] = this.progress[i];
 				if (progress[i]) {
 					procent += 1;
@@ -131,9 +130,6 @@ export default class extends EventDispatcher {
 
 		progress.procent = procent / length;
 
-		this.dispatchEvent({
-			type: 'progress',
-			progress
-		});
+		this.dispatchEvent({ type: 'progress', progress 	});
 	}
 }