vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-12-23 03:23:48 +01:00
Code Issues Projects Releases Wiki Activity

rename percentage to density

Browse Source
This commit is contained in:
casperlamboo 2018-01-18 16:32:54 +01:00
parent 485f741077
commit f28722aec5
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface/Settings.js
View File

@ -156,7 +156,7 @@ class Settings extends React.Component {
case 'settings.innerShell.flowRate': case 'settings.innerShell.flowRate':
case 'settings.outerShell.speed': case 'settings.outerShell.speed':
case 'settings.outerShell.flowRate': case 'settings.outerShell.flowRate':
case 'settings.innerInfill.precentage': case 'settings.innerInfill.density':
case 'settings.innerInfill.speed': case 'settings.innerInfill.speed':
case 'settings.innerInfill.flowRate': case 'settings.innerInfill.flowRate':
case 'settings.outerInfill.speed': case 'settings.outerInfill.speed':
@ -367,7 +367,7 @@ class Settings extends React.Component {
<NumberField name="settings.outerShell.speed" min={10} max={200} fullWidth floatingLabelText="Speed" /> <NumberField name="settings.outerShell.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
<NumberField name="settings.outerShell.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" /> <NumberField name="settings.outerShell.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
<p>Inner infill</p> <p>Inner infill</p>
<NumberField name="settings.innerInfill.precentage" min={0} max={100} fullWidth floatingLabelText="Percentage" /> <NumberField name="settings.innerInfill.density" min={0} max={100} fullWidth floatingLabelText="Density" />
<NumberField name="settings.innerInfill.speed" min={10} max={200} fullWidth floatingLabelText="Speed" /> <NumberField name="settings.innerInfill.speed" min={10} max={200} fullWidth floatingLabelText="Speed" />
<NumberField name="settings.innerInfill.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" /> <NumberField name="settings.innerInfill.flowRate" min={0.1} max={4} fullWidth floatingLabelText="Flow rate" />
<p>Outer infill</p> <p>Outer infill</p>

2
src/settings/default.yml
View File

@ -38,7 +38,7 @@ outerShell:
innerInfill: innerInfill:
flowRate: 1.0 flowRate: 1.0
speed: 80.0 speed: 80.0
precentage: 20.0 density: 20.0
outerInfill: outerInfill:
flowRate: 1.0 flowRate: 1.0
speed: 50.0 speed: 50.0

6
src/settings/quality.yml
View File

@ -15,7 +15,7 @@ low:
speed: 70.0 speed: 70.0
innerInfill: innerInfill:
speed: 80.0 speed: 80.0
precentage: 10.0 density: 10.0
medium: medium:
title: "Medium" title: "Medium"
layerHeight: .15 layerHeight: .15
@ -33,7 +33,7 @@ medium:
speed: 40.0 speed: 40.0
innerInfill: innerInfill:
speed: 80.0 speed: 80.0
precentage: 10.0 density: 10.0
high: high:
title: "High" title: "High"
thickness: thickness:
@ -51,4 +51,4 @@ high:
speed: 30.0 speed: 30.0
innerInfill: innerInfill:
speed: 70.0 speed: 70.0
precentage: 20.0 density: 20.0

8
src/sliceActions/generateInfills.js
View File

@ -5,7 +5,7 @@ import Shape from 'clipper-js';
export default function generateInfills(slices, settings) { export default function generateInfills(slices, settings) {
let { let {
layerHeight, layerHeight,
innerInfill: { precentage: infillPercentage }, innerInfill: { density: infillDensity },
thickness: { thickness: {
top: topThickness, top: topThickness,
bottom: bottomThickness bottom: bottomThickness
@ -13,11 +13,11 @@ export default function generateInfills(slices, settings) {
nozzleDiameter nozzleDiameter
} = settings; } = settings;
infillPercentage /= 100; infillDensity /= 100;
nozzleDiameter /= PRECISION; nozzleDiameter /= PRECISION;
const bidirectionalInfill = infillPercentage < 0.8; const bidirectionalInfill = infillDensity < 0.8;
const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillPercentage; const infillGridSize = nozzleDiameter * (bidirectionalInfill ? 2 : 1) / infillDensity;
const bottomSkinCount = Math.ceil(bottomThickness / layerHeight); const bottomSkinCount = Math.ceil(bottomThickness / layerHeight);
const topSkinCount = Math.ceil(topThickness / layerHeight); const topSkinCount = Math.ceil(topThickness / layerHeight);