From f1e5d8a47a036c0402936e9a26b48e581e3b3c41 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 29 Mar 2016 08:49:35 +0200
Subject: [PATCH] use deconstructs

---
 .../calculateLayersIntersections.js           |  3 +--
 src/sliceActions/generateInfills.js           | 21 ++++++++++++------
 src/sliceActions/generateInnerLines.js        | 10 ++++-----
 src/sliceActions/generateSupport.js           | 22 ++++++++++++-------
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/sliceActions/calculateLayersIntersections.js b/src/sliceActions/calculateLayersIntersections.js
index ccdcca2..f56a0b8 100644
--- a/src/sliceActions/calculateLayersIntersections.js
+++ b/src/sliceActions/calculateLayersIntersections.js
@@ -3,8 +3,7 @@ import THREE from 'three.js';
 export default function calculateLayersIntersections(lines, settings) {
   console.log('calculating layer intersections');
 
-  var layerHeight = settings.config["layerHeight"];
-  var height = settings.config["dimensionsZ"];
+  const { layerHeight, dimensionsZ: height } = settings.config;
 
   var numLayers = Math.floor(height / layerHeight);
 
diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js
index b284b7d..b3ae254 100644
--- a/src/sliceActions/generateInfills.js
+++ b/src/sliceActions/generateInfills.js
@@ -1,18 +1,25 @@
 import getFillTemplate from './getFillTemplate.js';
 import Paths from '../paths.js';
 
+const scale = 100;
+
 export default function generateInfills(slices, settings) {
   console.log("generating infills");
 
   // need to scale up everything because of clipper rounding errors
-  var scale = 100;
 
-  var layerHeight = settings.config["layerHeight"];
-  var fillGridSize = settings.config["fillGridSize"] * scale;
-  var bottomThickness = settings.config["bottomThickness"];
-  var topThickness = settings.config["topThickness"];
-  var nozzleDiameter = settings.config["nozzleDiameter"] * scale;
-  var infillOverlap = settings.config["infillOverlap"] * scale;
+  let {
+    layerHeight,
+    fillGridSize,
+    bottomThickness,
+    topThickness,
+    nozzleDiameter,
+    infillOverlap
+  } = settings.config;
+
+  fillGridSize *= scale;
+  nozzleDiameter *= scale;
+  infillOverlap *= scale;
 
   var bottomSkinCount = Math.ceil(bottomThickness/layerHeight);
   var topSkinCount = Math.ceil(topThickness/layerHeight);
diff --git a/src/sliceActions/generateInnerLines.js b/src/sliceActions/generateInnerLines.js
index fb9c850..006b5a6 100644
--- a/src/sliceActions/generateInnerLines.js
+++ b/src/sliceActions/generateInnerLines.js
@@ -1,12 +1,12 @@
+const scale = 100;
+
 export default function generateInnerLines(slices, settings) {
   console.log("generating outer lines and inner lines");
 
   // need to scale up everything because of clipper rounding errors
-  var scale = 100;
-
-  var layerHeight = settings.config["layerHeight"];
-  var nozzleDiameter = settings.config["nozzleDiameter"] * scale;
-  var shellThickness = settings.config["shellThickness"] * scale;
+  let {layerHeight, nozzleDiameter, shellThickness} = settings.config;
+  nozzleDiameter *= scale;
+  shellThickness *= scale;
   var nozzleRadius = nozzleDiameter / 2;
   var shells = Math.round(shellThickness / nozzleDiameter);
 
diff --git a/src/sliceActions/generateSupport.js b/src/sliceActions/generateSupport.js
index 05fe0a5..a974399 100644
--- a/src/sliceActions/generateSupport.js
+++ b/src/sliceActions/generateSupport.js
@@ -1,20 +1,26 @@
 import getFillTemplate from './getFillTemplate.js';
 import Paths from '../paths.js';
 
+const scale = 100;
+
 export default function generateSupport(slices, settings) {
   console.log("generating support");
 
   // need to scale up everything because of clipper rounding errors
-  var scale = 100;
+  let {
+    layerHeight,
+    supportGridSize,
+    supportAcceptanceMargin,
+    supportPlateSize: plateSize,
+    supportDistanceY,
+    nozzleDiameter
+  } = settings.config;
 
-  var layerHeight = settings.config["layerHeight"];
-  var supportGridSize = settings.config["supportGridSize"] * scale;
-  var supportAcceptanceMargin = settings.config["supportAcceptanceMargin"] * scale;
-  var supportMargin = settings.config["supportMargin"] * scale;
-  var plateSize = settings.config["supportPlateSize"] * scale;
-  var supportDistanceY = settings.config["supportDistanceY"];
+  supportGridSize *= scale;
+  supportMargin *= scale;
+  plateSize *= scale;
+  nozzleDiameter *= scale;
   var supportDistanceLayers = Math.max(Math.ceil(supportDistanceY / layerHeight), 1);
-  var nozzleDiameter = settings.config["nozzleDiameter"] * scale;
 
   var supportAreas = new Paths([], true);