Skip to content

Improve the paths subsets of jobs #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sophiedeziel merged 6 commits into from
Oct 16, 2024
Merged

Improve the paths subsets of jobs #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d89519
Introduce the traveltype indexer
sophiedeziel Oct 12, 2024
bbd385b
Add the layer indexer
sophiedeziel Oct 12, 2024
a31f9ee
don't clear for all types
sophiedeziel Oct 12, 2024
e39d313
Fix the calls to the getters
sophiedeziel Oct 12, 2024
08d2959
Cleaner error management
sophiedeziel Oct 12, 2024
8c2c327
Fix all tests
sophiedeziel Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions demo/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ export const app = (window.app = createApp({
const { thumbnails } = parser.metadata;

thumbnail.value = thumbnails['220x124']?.src;
layerCount.value = job.layers()?.length;
layerCount.value = job.layers?.length;
const colors = extrusionColor instanceof Array ? extrusionColor : [extrusionColor];
const currentSettings = {
maxLayer: job.layers()?.length,
endLayer: job.layers()?.length,
maxLayer: job.layers?.length,
endLayer: job.layers?.length,
singleLayerMode,
renderTravel,
travelColor: '#' + travelColor.getHexString(),
Expand All @@ -93,7 +93,7 @@ export const app = (window.app = createApp({
};

Object.assign(settings.value, currentSettings);
preview.endLayer = job.layers()?.length;
preview.endLayer = job.layers?.length;
};

const loadGCodeFromServer = async (filename) => {
Expand Down Expand Up @@ -121,12 +121,12 @@ export const app = (window.app = createApp({
const render = async () => {
debounce(async () => {
if (loadProgressive) {
if (preview.job.layers() === null) {
if (preview.job.layers === null) {
console.warn('Job is not planar');
preview.render();
return;
}
await preview.renderAnimated(Math.ceil(preview.job.layers().length / 60));
await preview.renderAnimated(Math.ceil(preview.job.layers?.length / 60));
} else {
preview.render();
}
Expand Down
72 changes: 41 additions & 31 deletions src/__tests__/interpreter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,15 @@ test('.G0 starts a path if the job has none', () => {

const job = interpreter.execute([command]);

expect(job.paths.length).toEqual(1);
expect(job.paths[0].vertices.length).toEqual(6);
expect(job.paths[0].vertices[0]).toEqual(0);
expect(job.paths[0].vertices[1]).toEqual(0);
expect(job.paths[0].vertices[2]).toEqual(0);
expect(job.paths[0].vertices[3]).toEqual(1);
expect(job.paths[0].vertices[4]).toEqual(2);
expect(job.paths[0].vertices[5]).toEqual(0);
expect(job.paths.length).toEqual(0);
expect(job.inprogressPath).not.toBeNull();
expect(job.inprogressPath?.vertices.length).toEqual(6);
expect(job.inprogressPath?.vertices[0]).toEqual(0);
expect(job.inprogressPath?.vertices[1]).toEqual(0);
expect(job.inprogressPath?.vertices[2]).toEqual(0);
expect(job.inprogressPath?.vertices[3]).toEqual(1);
expect(job.inprogressPath?.vertices[4]).toEqual(2);
expect(job.inprogressPath?.vertices[5]).toEqual(0);
});

test('.G0 starts a path if the job has none, starting at the job current state', () => {
Expand All @@ -94,12 +95,12 @@ test('.G0 starts a path if the job has none, starting at the job current state',

interpreter.execute([command], job);

expect(job.paths.length).toEqual(1);
expect(job.paths[0].vertices.length).toEqual(6);
expect(job.paths[0].vertices[0]).toEqual(3);
expect(job.paths[0].vertices[1]).toEqual(4);
expect(job.paths[0].vertices[2]).toEqual(0);
expect(job.paths[0].tool).toEqual(5);
expect(job.paths.length).toEqual(0);
expect(job.inprogressPath?.vertices.length).toEqual(6);
expect(job.inprogressPath?.vertices[0]).toEqual(3);
expect(job.inprogressPath?.vertices[1]).toEqual(4);
expect(job.inprogressPath?.vertices[2]).toEqual(0);
expect(job.inprogressPath?.tool).toEqual(5);
});

test('.G0 continues the path if the job has one', () => {
Expand All @@ -113,11 +114,11 @@ test('.G0 continues the path if the job has one', () => {

interpreter.G0(command2, job);

expect(job.paths.length).toEqual(1);
expect(job.paths[0].vertices.length).toEqual(9);
expect(job.paths[0].vertices[6]).toEqual(3);
expect(job.paths[0].vertices[7]).toEqual(4);
expect(job.paths[0].vertices[8]).toEqual(5);
expect(job.paths.length).toEqual(0);
expect(job.inprogressPath?.vertices.length).toEqual(9);
expect(job.inprogressPath?.vertices[6]).toEqual(3);
expect(job.inprogressPath?.vertices[7]).toEqual(4);
expect(job.inprogressPath?.vertices[8]).toEqual(5);
});

test(".G0 assigns the travel type if there's no extrusion", () => {
Expand All @@ -127,8 +128,8 @@ test(".G0 assigns the travel type if there's no extrusion", () => {

interpreter.G0(command, job);

expect(job.paths.length).toEqual(1);
expect(job.paths[0].travelType).toEqual(PathType.Travel);
expect(job.paths.length).toEqual(0);
expect(job.inprogressPath?.travelType).toEqual(PathType.Travel);
});

test(".G0 assigns the extrusion type if there's extrusion", () => {
Expand All @@ -138,8 +139,8 @@ test(".G0 assigns the extrusion type if there's extrusion", () => {

interpreter.G0(command, job);

expect(job.paths.length).toEqual(1);
expect(job.paths[0].travelType).toEqual('Extrusion');
expect(job.paths.length).toEqual(0);
expect(job.inprogressPath?.travelType).toEqual('Extrusion');
});

test('.G0 assigns the travel type if the extrusion is a retraction', () => {
Expand All @@ -149,8 +150,19 @@ test('.G0 assigns the travel type if the extrusion is a retraction', () => {

interpreter.G0(command, job);

expect(job.paths.length).toEqual(1);
expect(job.paths[0].travelType).toEqual('Travel');
expect(job.paths.length).toEqual(0);
expect(job.inprogressPath?.travelType).toEqual('Travel');
});

test('.G0 assigns the travel type if the extrusion is a retraction', () => {
const command = new GCodeCommand('G0 E-2', 'g0', { e: -2 });
const interpreter = new Interpreter();
const job = new Job();

interpreter.G0(command, job);

expect(job.paths.length).toEqual(0);
expect(job.inprogressPath?.travelType).toEqual('Travel');
});

test('.G0 starts a new path if the travel type changes from Travel to Extrusion', () => {
Expand All @@ -162,9 +174,8 @@ test('.G0 starts a new path if the travel type changes from Travel to Extrusion'

interpreter.G0(command2, job);

expect(job.paths.length).toEqual(2);
expect(job.paths[0].travelType).toEqual('Travel');
expect(job.paths[1].travelType).toEqual('Extrusion');
expect(job.paths.length).toEqual(1);
expect(job.inprogressPath?.travelType).toEqual('Extrusion');
});

test('.G0 starts a new path if the travel type changes from Extrusion to Travel', () => {
Expand All @@ -176,9 +187,8 @@ test('.G0 starts a new path if the travel type changes from Extrusion to Travel'

interpreter.G0(command2, job);

expect(job.paths.length).toEqual(2);
expect(job.paths[0].travelType).toEqual('Extrusion');
expect(job.paths[1].travelType).toEqual('Travel');
expect(job.paths.length).toEqual(1);
expect(job.inprogressPath?.travelType).toEqual('Travel');
});

test('.G1 is an alias to .G0', () => {
Expand Down
Loading