mirror of
https://github.com/Doodle3D/Doodle3D-Slicer.git
synced 2024-11-21 13:17:56 +01:00
rename base to default
This commit is contained in:
parent
745c675f67
commit
54811b27e9
@ -9,7 +9,7 @@ import * as THREE from 'three';
|
||||
import { defaultSettings, sliceGeometry } from 'Doodle3D/Doodle3D-Slicer';
|
||||
|
||||
const settings = {
|
||||
...defaultSettings.base,
|
||||
...defaultSettings.default,
|
||||
...defaultSettings.material.pla,
|
||||
...defaultSettings.printer.ultimaker2go,
|
||||
...defaultSettings.quality.high
|
||||
@ -27,7 +27,7 @@ const gcode = await sliceGeometry(settings, geometry);
|
||||
import { defaultSettings } from 'Doodle3D/Doodle3D-Slicer';
|
||||
|
||||
const settings = {
|
||||
...defaultSettings.base,
|
||||
...defaultSettings.default,
|
||||
...defaultSettings.material.pla,
|
||||
...defaultSettings.printer.ultimaker2go,
|
||||
...defaultSettings.quality.high
|
||||
|
@ -1,12 +1,12 @@
|
||||
import { sliceGeometry, sliceMesh } from './slicer.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 materialSettings from './settings/material.yml';
|
||||
import qualitySettings from './settings/quality.yml';
|
||||
|
||||
const defaultSettings = {
|
||||
base: baseSettings,
|
||||
default: _defaultSettings,
|
||||
printer: printerSettings,
|
||||
material: materialSettings,
|
||||
quality: qualitySettings
|
||||
|
@ -13,7 +13,7 @@ import LinearProgress from 'material-ui/LinearProgress';
|
||||
import { grey50, grey300, grey800, red500 } from 'material-ui/styles/colors';
|
||||
import { Tabs, Tab } from 'material-ui/Tabs';
|
||||
import Settings from './Settings.js';
|
||||
import baseSettings from '../settings/default.yml';
|
||||
import defaultSettings from '../settings/default.yml';
|
||||
import printerSettings from '../settings/printer.yml';
|
||||
import materialSettings from '../settings/material.yml';
|
||||
import qualitySettings from '../settings/quality.yml';
|
||||
@ -94,7 +94,7 @@ class Interface extends React.Component {
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
defaultSettings: baseSettings,
|
||||
defaultSettings: defaultSettings,
|
||||
printers: printerSettings,
|
||||
quality: qualitySettings,
|
||||
defaultQuality: 'medium',
|
||||
|
Loading…
Reference in New Issue
Block a user