vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-11-22 13:37:58 +01:00
Code Issues Projects Releases Wiki Activity

make settings passable

Browse Source
This commit is contained in:
casperlamboo 2017-11-13 10:40:58 +01:00
parent 53d2023047
commit cd737da6d9
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/interface/index.js
View File

@ -15,18 +15,6 @@ import printerSettings from '../settings/printer.yml';
import materialSettings from '../settings/material.yml'; import materialSettings from '../settings/material.yml';
import qualitySettings from '../settings/quality.yml'; import qualitySettings from '../settings/quality.yml';
const DEFAULT_PRINTER = 'ultimaker2';
const DEFAULT_MATERIAL = 'pla';
const DEFAULT_QUALITY = 'medium';
const INITIAL_SETTINGS = _.merge(
{},
baseSettings,
printerSettings[DEFAULT_PRINTER],
qualitySettings[DEFAULT_MATERIAL],
materialSettings[DEFAULT_MATERIAL]
);
const styles = { const styles = {
container: { container: {
position: 'relative', position: 'relative',
@ -67,11 +55,18 @@ const styles = {
class Interface extends React.Component { class Interface extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
const { defaultPrinter, defaultQuality, defaultMaterial, printers, quality, material, defaultSettings } = props;
this.state = { this.state = {
controlMode: 'translate', controlMode: 'translate',
isSlicing: false, isSlicing: false,
sliced: false, sliced: false,
settings: INITIAL_SETTINGS settings: _.merge(
{},
defaultSettings,
printers[defaultPrinter],
quality[defaultQuality],
material[defaultMaterial]
)
}; };
} }
@ -168,7 +163,7 @@ class Interface extends React.Component {
} }
render() { render() {
const { width, height, classes, onCompleteActions } = this.props; 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 } = this.state;
return ( return (
@ -194,12 +189,12 @@ class Interface extends React.Component {
{!sliced && <Paper className={classes.sliceBar}> {!sliced && <Paper className={classes.sliceBar}>
<Settings <Settings
printers={printerSettings} printers={printerSettings}
defaultPrinter={DEFAULT_PRINTER} defaultPrinter={defaultPrinter}
quality={qualitySettings} quality={qualitySettings}
defaultQuality={DEFAULT_QUALITY} defaultQuality={defaultQuality}
material={materialSettings} material={materialSettings}
defaultMaterial={DEFAULT_MATERIAL} defaultMaterial={defaultMaterial}
initalSettings={INITIAL_SETTINGS} initalSettings={settings}
onChange={this.onChangeSettings} onChange={this.onChangeSettings}
/> />
<RaisedButton className={classes.button} fullWidth disabled={isSlicing} onTouchTap={this.slice} primary label="slice" /> <RaisedButton className={classes.button} fullWidth disabled={isSlicing} onTouchTap={this.slice} primary label="slice" />
@ -234,6 +229,22 @@ Interface.propTypes = {
height: PropTypes.number.isRequired, height: PropTypes.number.isRequired,
classes: PropTypes.objectOf(PropTypes.string), classes: PropTypes.objectOf(PropTypes.string),
onCompleteActions: PropTypes.arrayOf(PropTypes.shape({ title: PropTypes.string, callback: PropTypes.func })).isRequired, onCompleteActions: PropTypes.arrayOf(PropTypes.shape({ title: PropTypes.string, callback: PropTypes.func })).isRequired,
defaultSettings: PropTypes.object.isRequired,
printers: PropTypes.object.isRequired,
defaultPrinter: PropTypes.string.isRequired,
quality: PropTypes.object.isRequired,
defaultQuality: PropTypes.string.isRequired,
material: PropTypes.object.isRequired,
defaultMaterial: PropTypes.string.isRequired
};
Interface.defaultProps = {
defaultSettings: baseSettings,
printers: printerSettings,
defaultPrinter: 'ultimaker2',
quality: qualitySettings,
defaultQuality: 'medium',
material: materialSettings,
defaultMaterial: 'pla'
}; };
export default injectSheet(styles)(Interface); export default injectSheet(styles)(Interface);