@@ -540,5 +560,8 @@ function printDialog(props, state, title, form, submitText, data, closeDialog, r
);
}
+printDialog.propTypes = {
+ classes: PropTypes.objectOf(PropTypes.string)
+};
export default injectSheet(styles)(Settings);
diff --git a/src/interface/WifiBoxControl.js b/src/interface/WifiBoxControl.js
deleted file mode 100644
index 5720e35..0000000
--- a/src/interface/WifiBoxControl.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import PropTypes from 'proptypes';
-import muiThemeable from 'material-ui/styles/muiThemeable';
-import injectSheet from 'react-jss';
-import FlatButton from 'material-ui/FlatButton';
-import { Doodle3DBox } from 'doodle3d-api';
-
-const styles = {
-
-};
-
-class WifiBoxControl extends React.Component {
- static propTypes = {
- ip: PropTypes.string.isRequired
- };
-
- state = {
- box: null,
- status: null
- };
-
- componentDidMount = async () => {
- const { ip } = this.props;
-
- const box = new Doodle3DBox(ip);
- window.d3dbox = box;
- box.addEventListener('update', ({ state }) => this.setState({ status: state }));
- box.setAutoUpdate(true, 5000);
-
- this.setState({ box });
-
- const alive = await box.checkAlive();
- };
-
- stop = async () => {
- const { box } = this.state;
- const result = await box.printer.stop();
- console.log('result: ', result);
- };
-
- componentWillUnmount() {
- const { box } = this.state;
- if (box) box.setAutoUpdate(false);
-
- this.setState({ mounted: false });
- }
-
- render() {
- const { status } = this.state;
-
- return (
-
-
-
- );
- }
-}
-
-export default muiThemeable()(injectSheet(styles)(WifiBoxControl));
diff --git a/src/interface/index.js b/src/interface/index.js
index c89de2f..294ea3a 100644
--- a/src/interface/index.js
+++ b/src/interface/index.js
@@ -1,12 +1,9 @@
import * as THREE from 'three';
-import _ from 'lodash';
import React from 'react';
import PropTypes from 'proptypes';
import { centerGeometry, placeOnGround, createScene, slice, TabTemplate } from './utils.js';
import injectSheet from 'react-jss';
import RaisedButton from 'material-ui/RaisedButton';
-import FlatButton from 'material-ui/FlatButton';
-import Slider from 'material-ui/Slider';
import LinearProgress from 'material-ui/LinearProgress';
import { grey50, grey300, grey800, red500 } from 'material-ui/styles/colors';
import Popover from 'material-ui/Popover/Popover';
@@ -14,14 +11,11 @@ import Menu from 'material-ui/Menu';
import MenuItem from 'material-ui/MenuItem';
import { Tabs, Tab } from 'material-ui/Tabs';
import Settings from './Settings.js';
-// import MalyanControl from './MalyanControl.js';
-// import WifiBoxControl from './WifiBoxControl.js';
import ReactResizeDetector from 'react-resize-detector';
import JSONToSketchData from 'doodle3d-core/shape/JSONToSketchData';
import createSceneData from 'doodle3d-core/d3/createSceneData.js';
import { generateExportMesh } from 'doodle3d-core/utils/exportUtils.js';
import muiThemeable from 'material-ui/styles/muiThemeable';
-import Dialog from 'material-ui/Dialog';
import logo from '../../img/logo.png';
const MAX_FULLSCREEN_WIDTH = 720;
@@ -58,7 +52,7 @@ const styles = {
borderLeft: `1px solid ${grey300}`
},
sliceActions: {
- flexShrink: 0,
+ flexShrink: 0
},
sliceInfo: {
margin: '10px 0',
@@ -166,8 +160,8 @@ class Interface extends React.Component {
fetch(`${origin}${port}${pathname}`, { headers })
.then(resonse => resonse.json())
- .then(json => JSONToSketchData(json))
- .then(file => createSceneData(file))
+ .then(JSONToSketchData)
+ .then(createSceneData)
.then(sketch => generateExportMesh(sketch, { offsetSingleWalls: false, matrix: new THREE.Matrix4() }))
.then(mesh => this.updateMesh(mesh));
};
@@ -232,7 +226,7 @@ class Interface extends React.Component {
};
slice = async (action) => {
- const { isSlicing, settings, mesh, scene: { material, mesh: { matrix } } } = this.state;
+ const { isSlicing, settings, mesh, scene: { mesh: { matrix } } } = this.state;
const { name } = this.props;
if (isSlicing) return;
@@ -342,7 +336,7 @@ class Interface extends React.Component {
render() {
const { classes, onCancel, selectedPrinter, actions } = this.props;
- const { isSlicing, progress, showFullScreen, error, objectDimensions, settings } = this.state;
+ const { isSlicing, progress, showFullScreen, error, objectDimensions } = this.state;
const style = { ...(showFullScreen ? {} : { maxWidth: 'inherit', width: '100%', height: '100%' }) };
@@ -365,10 +359,6 @@ class Interface extends React.Component {
className={`${classes.button}`}
onTouchTap={onCancel}
/>}
- {/* (settings && settings.ip) && ((settings.printer === 'doodle3d_printer') ?
-
:
-
- ) */}
{actions.length === 1 ? (