{
- if (container) {
- container.addEventListener('dragover', event => event.preventDefault());
- container.addEventListener('drop', this.onDrop);
- }
- }}
- >
+
{d3Panel}
@@ -432,15 +351,7 @@ class Interface extends React.Component {
);
} else {
return (
-
{
- if (container) {
- container.addEventListener('dragover', event => event.preventDefault());
- container.addEventListener('drop', this.onDrop);
- }
- }}
- >
+
{
- const request = new Request(url, data);
- const xhr = new XMLHttpRequest();
-
- xhr.onload = () => {
- resolve(new Response(xhr.response));
- // const headers = new Headers(xhr.getAllResponseHeaders() || '');
- // const { status, statusText, response, responseText, responseURL: url = headers.get('X-Request-URL') } = xhr;
- // resolve(new Response(response || responseText, { headers, status, statusText, url }));
- };
- xhr.onerror = () => reject(new TypeError('Network request failed'));
- xhr.ontimeout = () => reject(new TypeError('Network request failed'));
-
- xhr.open(request.method, url, true);
-
- if (request.credentials === 'include') {
- xhr.withCredentials = true;
- } else if (request.credentials === 'omit') {
- xhr.withCredentials = false;
- }
- if (xhr.upload && onProgress) xhr.upload.onprogress = onProgress;
- if (xhr.responseType) xhr.responseType = 'blob';
-
- // request.headers.forEach((value, name) => xhr.setRequestHeader(name, value));
-
- xhr.send(data.body);
- });
-}
-
-export function getMalyanStatus(ip) {
- return fetch(`http://${ip}/inquiry`, { method: 'GET' })
- .then(response => response.text())
- .then(statusText => {
- const [nozzleTemperature, nozzleTargetTemperature, bedTemperature, bedTargetTemperature, progress] = statusText.match(/\d+/g);
- const status = { nozzleTemperature, nozzleTargetTemperature, bedTemperature, bedTargetTemperature, progress };
-
- switch (statusText.charAt(statusText.length - 1)) {
- case 'I':
- status.state = 'idle';
- break;
- case 'P':
- status.state = 'printing';
- break;
- default:
- status.state = 'unknown';
- break;
- }
- return status;
- });
-}
-
export function sleep(time) {
return new Promise(resolve => setTimeout(resolve, time));
}
-const GCODE_SERVER_URL = 'https://gcodeserver.doodle3d.com';
-
-export async function slice(action, name, mesh, settings, updateProgress) {
- let steps;
+export async function slice(mesh, settings, updateProgress) {
+ let steps = 1;
let currentStep = 0;
- let wifiBox;
- switch (action.target) {
- case 'DOWNLOAD':
- steps = 1;
- break;
- case 'WIFI_PRINT':
- if (settings.printer === 'doodle3d_printer') {
- // const { state } = await getMalyanStatus(settings.ip);
- // if (state !== 'idle') throw { message: 'printer is busy', code: 0 };
- } else {
- wifiBox = new Doodle3DBox(settings.ip);
- if (! await wifiBox.checkAlive()) throw { message: `can't connect to printer`, code: 4 };
-
- const { state } = await wifiBox.info.status();
- if (state !== 'idle') throw { message: 'printer is busy', code: 0 };
- }
- steps = 2;
- break;
- case 'CUSTOM_UPLOAD':
- steps = 2;
- break;
- default:
- throw { message: 'unknown target', code: 1 };
- }
const { dimensions } = settings;
const centerX = dimensions.x / 2;
@@ -178,9 +98,8 @@ export async function slice(action, name, mesh, settings, updateProgress) {
.multiply(new THREE.Matrix4().makeRotationY(-Math.PI / 2.0))
.multiply(mesh.matrix);
- const { gcode } = await sliceGeometry({
+ const sliceResult = await sliceGeometry({
...settings,
- name: `${name}.gcode`,
printer: { type: settings.printers, title: printerSettings[settings.printer].title },
material: { type: settings.material, title: materialSettings[settings.material].title },
quality: { type: settings.quality, title: qualitySettings[settings.quality].title }
@@ -194,80 +113,7 @@ export async function slice(action, name, mesh, settings, updateProgress) {
});
currentStep ++;
- switch (action.target) {
- case 'DOWNLOAD': {
- fileSaver.saveAs(gcode, `${name}.gcode`);
- break;
- }
-
- case 'WIFI_PRINT': {
- if (settings.printer === 'doodle3d_printer') {
- const body = new FormData();
- body.append('file', gcode, 'doodle.gcode');
-
- // because fetch has no way of retrieving progress we fake progress
- let loaded = 0;
- const interval = setInterval(() => {
- loaded += 15 * 1024;
- updateProgress({
- action: 'Uploading to printer',
- percentage: (currentStep + loaded / gcode.size) / steps
- });
- }, 1000);
-
- // await fetchProgress(`http://${settings.ip}/set?code=M563 S4`, { method: 'GET' });
- await fetch(`http://${settings.ip}/upload`, { method: 'POST', body, mode: 'no-cors' }, (progress) => {
- updateProgress({
- action: 'Uploading to printer',
- percentage: (currentStep + progress.loaded / progress.total) / steps
- });
- });
- clearInterval(interval);
- await fetch(`http://${settings.ip}/set?code=M566 ${name}.gcode`, { method: 'GET', mode: 'no-cors' });
- await fetch(`http://${settings.ip}/set?code=M565`, { method: 'GET', mode: 'no-cors' });
-
- currentStep ++;
- } else {
- // upload G-code file to AWS S3
- const { data: { reservation: { fields, url }, id } } = await fetch(`${GCODE_SERVER_URL}/upload`, { method: 'POST' })
- .then(response => response.json());
-
- const body = new FormData();
- for (const key in fields) {
- body.append(key, fields[key]);
- }
-
- body.append('file', gcode, 'doodle.gcode');
-
- await fetchProgress(url, { method: 'POST', body }, progress => {
- updateProgress({
- action: 'Uploading',
- percentage: (currentStep + progress.loaded / progress.total) / steps
- });
- });
- currentStep ++;
-
- await wifiBox.printer.fetch(id);
- }
- break;
- }
- case 'CUSTOM_UPLOAD': {
- const body = new FormData();
- body.append('file', gcode, 'doodle.gcode');
-
- await fetchProgress(action.url, { method: 'POST', body }, progress => {
- updateProgress({
- action: 'Uploading',
- percentage: (currentStep + progress.loaded / progress.total) / steps
- });
- });
- currentStep ++;
- break;
- }
-
- default:
- throw { message: 'unknown target', code: 1 };
- }
+ return sliceResult;
}
export const TabTemplate = ({ children, selected, style }) => {
diff --git a/src/sliceActions/addBrim.js b/src/sliceActions/addBrim.js
index fb197f7..635df80 100644
--- a/src/sliceActions/addBrim.js
+++ b/src/sliceActions/addBrim.js
@@ -1,4 +1,4 @@
-import Shape from 'clipper-js';
+import Shape from '@doodle3d/clipper-js';
import { PRECISION } from '../constants.js';
const OFFSET_OPTIONS = {
diff --git a/src/sliceActions/generateOutlines.js b/src/sliceActions/generateOutlines.js
index bc2a90d..17955e4 100644
--- a/src/sliceActions/generateOutlines.js
+++ b/src/sliceActions/generateOutlines.js
@@ -1,4 +1,4 @@
-import Shape from 'clipper-js';
+import Shape from '@doodle3d/clipper-js';
export default function calculateOutlines(slices) {
for (let layer = 0; layer < slices.length; layer ++) {
diff --git a/src/sliceActions/generateSupport.js b/src/sliceActions/generateSupport.js
index 1fdee1d..9f6bc1c 100644
--- a/src/sliceActions/generateSupport.js
+++ b/src/sliceActions/generateSupport.js
@@ -1,5 +1,5 @@
import getFillTemplate from './getFillTemplate.js';
-import Shape from 'clipper-js';
+import Shape from '@doodle3d/clipper-js';
import { PRECISION } from '../constants.js';
const PRECISION_SQUARED = Math.pow(PRECISION, 2);
diff --git a/src/sliceActions/getFillTemplate.js b/src/sliceActions/getFillTemplate.js
index 6b3db95..b29262b 100644
--- a/src/sliceActions/getFillTemplate.js
+++ b/src/sliceActions/getFillTemplate.js
@@ -1,4 +1,4 @@
-import Shape from 'clipper-js';
+import Shape from '@doodle3d/clipper-js';
export default function getFillTemplate(bounds, gridSize, even, uneven) {
const paths = [];
diff --git a/src/sliceActions/helpers/Slice.js b/src/sliceActions/helpers/Slice.js
index 2f5c085..0cc6e32 100644
--- a/src/sliceActions/helpers/Slice.js
+++ b/src/sliceActions/helpers/Slice.js
@@ -1,4 +1,4 @@
-import Shape from 'clipper-js';
+import Shape from '@doodle3d/clipper-js';
export default class Slice {
constructor() {
diff --git a/src/sliceActions/optimizePaths.js b/src/sliceActions/optimizePaths.js
index 68e7540..d8a84e1 100644
--- a/src/sliceActions/optimizePaths.js
+++ b/src/sliceActions/optimizePaths.js
@@ -1,5 +1,5 @@
import { distanceTo } from './helpers/vector2.js';
-import Shape from 'clipper-js';
+import Shape from '@doodle3d/clipper-js';
export default function optimizePaths(slices) {
let start = { x: 0, y: 0 };
diff --git a/src/sliceActions/shapesToSlices.js b/src/sliceActions/shapesToSlices.js
index 6f5312b..b867c73 100644
--- a/src/sliceActions/shapesToSlices.js
+++ b/src/sliceActions/shapesToSlices.js
@@ -1,4 +1,4 @@
-import Shape from 'clipper-js';
+import Shape from '@doodle3d/clipper-js';
import Slice from './helpers/Slice.js';
import { PRECISION, MIN_AREA } from '../constants.js';
@@ -14,7 +14,7 @@ export default function shapesToSlices(shapes) {
.simplify('pftNonZero')
.clean(1)
.thresholdArea(MIN_AREA / Math.pow(PRECISION, 2))
- .seperateShapes();
+ .separateShapes();
lineShapesClosed = new Shape(lineShapesClosed, true, true, true, true)
.clean(1);
diff --git a/webpack.config.js b/webpack.config.js
index 8d9f42b..f6ffc62 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -29,16 +29,6 @@ module.exports = {
filename: 'bundle.js',
path: path.resolve(__dirname, 'dist')
},
- resolve: {
- alias: {
- 'doodle3d-slicer': path.resolve(__dirname, 'src/'),
- 'clipper-lib': '@doodle3d/clipper-lib',
- 'clipper-js': '@doodle3d/clipper-js',
- 'doodle3d-core': `@doodle3d/doodle3d-core/${devMode ? 'module' : 'lib'}`,
- 'doodle3d-api': `@doodle3d/doodle3d-api/${devMode ? 'module' : 'lib'}`,
- 'cal': '@doodle3d/cal'
- }
- },
module: {
rules: [
{
@@ -75,7 +65,7 @@ module.exports = {
}
}] : [])]
}, {
- test: /\.(woff)$/,
+ test: /\.stl$/,
use: {
loader: 'file-loader'
}