From f28722aec52129b0ec407c824c108dd4e505ff2e Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Thu, 18 Jan 2018 16:32:54 +0100 Subject: [PATCH] rename percentage to density --- src/interface/Settings.js | 4 ++-- src/settings/default.yml | 2 +- src/settings/quality.yml | 6 +++--- src/sliceActions/generateInfills.js | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/interface/Settings.js b/src/interface/Settings.js index b578672..ec94401 100644 --- a/src/interface/Settings.js +++ b/src/interface/Settings.js @@ -156,7 +156,7 @@ class Settings extends React.Component { case 'settings.innerShell.flowRate': case 'settings.outerShell.speed': case 'settings.outerShell.flowRate': - case 'settings.innerInfill.precentage': + case 'settings.innerInfill.density': case 'settings.innerInfill.speed': case 'settings.innerInfill.flowRate': case 'settings.outerInfill.speed': @@ -367,7 +367,7 @@ class Settings extends React.Component {

Inner infill

- +

Outer infill

diff --git a/src/settings/default.yml b/src/settings/default.yml index 84806ad..b3c42ec 100644 --- a/src/settings/default.yml +++ b/src/settings/default.yml @@ -38,7 +38,7 @@ outerShell: innerInfill: flowRate: 1.0 speed: 80.0 - precentage: 20.0 + density: 20.0 outerInfill: flowRate: 1.0 speed: 50.0 diff --git a/src/settings/quality.yml b/src/settings/quality.yml index 1c840bf..96134d9 100644 --- a/src/settings/quality.yml +++ b/src/settings/quality.yml @@ -15,7 +15,7 @@ low: speed: 70.0 innerInfill: speed: 80.0 - precentage: 10.0 + density: 10.0 medium: title: "Medium" layerHeight: .15 @@ -33,7 +33,7 @@ medium: speed: 40.0 innerInfill: speed: 80.0 - precentage: 10.0 + density: 10.0 high: title: "High" thickness: @@ -51,4 +51,4 @@ high: speed: 30.0 innerInfill: speed: 70.0 - precentage: 20.0 + density: 20.0 diff --git a/src/sliceActions/generateInfills.js b/src/sliceActions/generateInfills.js index e741493..6d854aa 100644 --- a/src/sliceActions/generateInfills.js +++ b/src/sliceActions/generateInfills.js @@ -5,7 +5,7 @@ import Shape from 'clipper-js'; export default function generateInfills(slices, settings) { let { layerHeight, - innerInfill: { precentage: infillPercentage }, + innerInfill: { density: infillDensity }, thickness: { top: topThickness, bottom: bottomThickness @@ -13,11 +13,11 @@ export default function generateInfills(slices, settings) { nozzleDiameter } = settings; - infillPercentage /= 100; + infillDensity /= 100; nozzleDiameter /= PRECISION; - const bidirectionalInfill = infillPercentage < 0.8; - const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillPercentage; + const bidirectionalInfill = infillDensity < 0.8; + const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillDensity; const bottomSkinCount = Math.ceil(bottomThickness / layerHeight); const topSkinCount = Math.ceil(topThickness / layerHeight);