vmario
/
Doodle3D-Slicer
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename base to default

This commit is contained in:
casperlamboo 2017-12-24 14:46:00 +01:00
parent 745c675f67
commit 54811b27e9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -9,7 +9,7 @@ import * as THREE from 'three';
import { defaultSettings, sliceGeometry } from 'Doodle3D/Doodle3D-Slicer'; import { defaultSettings, sliceGeometry } from 'Doodle3D/Doodle3D-Slicer';
const settings = { const settings = {
...defaultSettings.base, ...defaultSettings.default,
...defaultSettings.material.pla, ...defaultSettings.material.pla,
...defaultSettings.printer.ultimaker2go, ...defaultSettings.printer.ultimaker2go,
...defaultSettings.quality.high ...defaultSettings.quality.high
@ -27,7 +27,7 @@ const gcode = await sliceGeometry(settings, geometry);
import { defaultSettings } from 'Doodle3D/Doodle3D-Slicer'; import { defaultSettings } from 'Doodle3D/Doodle3D-Slicer';
const settings = { const settings = {
...defaultSettings.base, ...defaultSettings.default,
...defaultSettings.material.pla, ...defaultSettings.material.pla,
...defaultSettings.printer.ultimaker2go, ...defaultSettings.printer.ultimaker2go,
...defaultSettings.quality.high ...defaultSettings.quality.high

4
src/index.js
View File

@ -1,12 +1,12 @@
import { sliceGeometry, sliceMesh } from './slicer.js'; import { sliceGeometry, sliceMesh } from './slicer.js';
import Interface from './interface/index.js'; import Interface from './interface/index.js';
import baseSettings from './settings/default.yml'; import _defaultSettings from './settings/default.yml';
import printerSettings from './settings/printer.yml'; 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 defaultSettings = { const defaultSettings = {
base: baseSettings, default: _defaultSettings,
printer: printerSettings, printer: printerSettings,
material: materialSettings, material: materialSettings,
quality: qualitySettings quality: qualitySettings

4
src/interface/index.js
View File

@ -13,7 +13,7 @@ import LinearProgress from 'material-ui/LinearProgress';
import { grey50, grey300, grey800, red500 } from 'material-ui/styles/colors'; import { grey50, grey300, grey800, red500 } from 'material-ui/styles/colors';
import { Tabs, Tab } from 'material-ui/Tabs'; import { Tabs, Tab } from 'material-ui/Tabs';
import Settings from './Settings.js'; import Settings from './Settings.js';
import baseSettings from '../settings/default.yml'; import defaultSettings from '../settings/default.yml';
import printerSettings from '../settings/printer.yml'; 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';
@ -94,7 +94,7 @@ class Interface extends React.Component {
}; };
static defaultProps = { static defaultProps = {
defaultSettings: baseSettings, defaultSettings: defaultSettings,
printers: printerSettings, printers: printerSettings,
quality: qualitySettings, quality: qualitySettings,
defaultQuality: 'medium', defaultQuality: 'medium',