From 6e43994305ab42ad92c54570282b102583ac904b Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Mon, 13 Nov 2017 15:12:59 +0100 Subject: [PATCH] pass more data --- src/interface/Settings.js | 2 +- src/interface/index.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/interface/Settings.js b/src/interface/Settings.js index edf99f0..c2e0cb8 100644 --- a/src/interface/Settings.js +++ b/src/interface/Settings.js @@ -42,7 +42,7 @@ class Settings extends React.Component { state = _.set(_.cloneDeep(this.state), fieldName, value); break; } - if (onChange) onChange(state.settings); + if (onChange) onChange(state); if (state) this.setState(state); }; diff --git a/src/interface/index.js b/src/interface/index.js index ca49edb..2b6997c 100644 --- a/src/interface/index.js +++ b/src/interface/index.js @@ -69,6 +69,9 @@ class Interface extends React.Component { controlMode: 'translate', isSlicing: false, sliced: false, + printer: printers[defaultPrinter], + quality: quality[defaultQuality], + material: material[defaultMaterial], settings: _.merge( {}, defaultSettings, @@ -150,7 +153,7 @@ class Interface extends React.Component { }; onChangeSettings = (settings) => { - this.setState({ settings }); + this.setState(settings); }; updateDrawRange = (event, value) => { @@ -187,7 +190,7 @@ class Interface extends React.Component { render() { const { width, height, classes, onCompleteActions, defaultPrinter, defaultQuality, defaultMaterial } = this.props; - const { sliced, isSlicing, progress, gcode, controlMode, settings } = this.state; + const { sliced, isSlicing, progress, gcode, controlMode, settings, printer, quality, material } = this.state; return (
@@ -228,7 +231,7 @@ class Interface extends React.Component { {sliced &&
{onCompleteActions.map(({ title, callback }, i) => ( - callback(gcode.gcode, settings)} primary label={title} /> + callback({ gcode, settings, printer, quality, material })} primary label={title} /> ))}
} {isSlicing &&