Rename Machine to Job

Author: sophiedeziel

demo/js/app.js

@@ -67,16 +67,16 @@ export const app = (window.app = createApp({
         lineWidth,
         renderTubes,
         extrusionWidth,
-        virtualMachine
+        job
       } = preview;
       const { thumbnails } = parser.metadata;
 
       thumbnail.value = thumbnails['220x124']?.src;
-      layerCount.value = virtualMachine.layers().length;
+      layerCount.value = job.layers().length;
       const colors = extrusionColor instanceof Array ? extrusionColor : [extrusionColor];
       const currentSettings = {
-        maxLayer: virtualMachine.layers().length,
-        endLayer: virtualMachine.layers().length,
+        maxLayer: job.layers().length,
+        endLayer: job.layers().length,
         singleLayerMode,
         renderTravel,
         travelColor: '#' + travelColor.getHexString(),
@@ -95,7 +95,7 @@ export const app = (window.app = createApp({
       };
 
       Object.assign(settings.value, currentSettings);
-      preview.endLayer = virtualMachine.layers().length;
+      preview.endLayer = job.layers().length;
     };
 
     const loadGCodeFromServer = async (filename) => {

src/interpreter.ts

@@ -1,27 +1,27 @@
 import { Path, PathType } from './path';
 import { Code, GCodeCommand } from './gcode-parser';
-import { Machine } from './machine';
+import { Job } from './job';
 
 export class Interpreter {
-  execute(commands: GCodeCommand[], machine = new Machine()): Machine {
+  execute(commands: GCodeCommand[], job = new Job()): Job {
     commands.forEach((command) => {
       if (command.code !== undefined) {
-        this[command.code](command, machine);
+        this[command.code](command, job);
       }
     });
 
-    return machine;
+    return job;
   }
 
-  G0(command: GCodeCommand, machine: Machine): void {
+  G0(command: GCodeCommand, job: Job): void {
     const { x, y, z, e } = command.params;
-    const { state } = machine;
+    const { state } = job;
 
-    let lastPath = machine.paths[machine.paths.length - 1];
+    let lastPath = job.paths[job.paths.length - 1];
     const pathType = e ? PathType.Extrusion : PathType.Travel;
 
     if (lastPath === undefined || lastPath.travelType !== pathType) {
-      lastPath = this.breakPath(machine, pathType);
+      lastPath = this.breakPath(job, pathType);
     }
 
     state.x = x || state.x;
@@ -33,17 +33,17 @@ export class Interpreter {
 
   G1 = this.G0;
 
-  G2(command: GCodeCommand, machine: Machine): void {
+  G2(command: GCodeCommand, job: Job): void {
     const { x, y, z, e } = command.params;
     let { i, j, r } = command.params;
-    const { state } = machine;
+    const { state } = job;
 
     const cw = command.code === Code.G2;
-    let lastPath = machine.paths[machine.paths.length - 1];
+    let lastPath = job.paths[job.paths.length - 1];
     const pathType = e ? PathType.Extrusion : PathType.Travel;
 
     if (lastPath === undefined || lastPath.travelType !== pathType) {
-      lastPath = this.breakPath(machine, pathType);
+      lastPath = this.breakPath(job, pathType);
     }
 
     if (r) {
@@ -130,47 +130,47 @@ export class Interpreter {
 
   G3 = this.G2;
 
-  G28(command: GCodeCommand, machine: Machine): void {
-    machine.state.x = 0;
-    machine.state.y = 0;
-    machine.state.z = 0;
+  G28(command: GCodeCommand, job: Job): void {
+    job.state.x = 0;
+    job.state.y = 0;
+    job.state.z = 0;
   }
 
-  T0(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 0;
+  T0(command: GCodeCommand, job: Job): void {
+    job.state.tool = 0;
   }
-  T1(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 1;
+  T1(command: GCodeCommand, job: Job): void {
+    job.state.tool = 1;
   }
-  T2(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 2;
+  T2(command: GCodeCommand, job: Job): void {
+    job.state.tool = 2;
   }
-  T3(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 3;
+  T3(command: GCodeCommand, job: Job): void {
+    job.state.tool = 3;
   }
-  T4(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 4;
+  T4(command: GCodeCommand, job: Job): void {
+    job.state.tool = 4;
   }
-  T5(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 5;
+  T5(command: GCodeCommand, job: Job): void {
+    job.state.tool = 5;
   }
-  T6(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 6;
+  T6(command: GCodeCommand, job: Job): void {
+    job.state.tool = 6;
   }
-  T7(command: GCodeCommand, machine: Machine): void {
-    machine.state.tool = 7;
+  T7(command: GCodeCommand, job: Job): void {
+    job.state.tool = 7;
   }
-  G20(command: GCodeCommand, machine: Machine): void {
-    machine.state.units = 'in';
+  G20(command: GCodeCommand, job: Job): void {
+    job.state.units = 'in';
   }
-  G21(command: GCodeCommand, machine: Machine): void {
-    machine.state.units = 'mm';
+  G21(command: GCodeCommand, job: Job): void {
+    job.state.units = 'mm';
   }
 
-  private breakPath(machine: Machine, newType: PathType): Path {
-    const lastPath = new Path(newType, 0.6, 0.2, machine.state.tool);
-    machine.paths.push(lastPath);
-    lastPath.addPoint(machine.state.x, machine.state.y, machine.state.z);
+  private breakPath(job: Job, newType: PathType): Path {
+    const lastPath = new Path(newType, 0.6, 0.2, job.state.tool);
+    job.paths.push(lastPath);
+    lastPath.addPoint(job.state.x, job.state.y, job.state.z);
     return lastPath;
   }
 }

src/machine.ts src/job.tssrc/machine.ts renamed to src/job.ts

@@ -15,7 +15,7 @@ export class State {
   }
 }
 
-export class Machine {
+export class Job {
   paths: Path[];
   state: State;
 

src/webgl-preview.ts

@@ -6,7 +6,7 @@ import Stats from 'three/examples/jsm/libs/stats.module.js';
 
 import { DevGUI, DevModeOptions } from './dev-gui';
 import { Interpreter } from './interpreter';
-import { Machine } from './machine';
+import { Job } from './job';
 
 import {
   AmbientLight,
@@ -97,7 +97,7 @@ export class WebGLPreview {
   private animationFrameId?: number;
   private _geometries: Record<number, BufferGeometry[]> = {};
   interpreter: Interpreter = new Interpreter();
-  virtualMachine: Machine = new Machine();
+  job: Job = new Job();
 
   // colors
   private _backgroundColor = new Color(0xe0e0e0);
@@ -237,7 +237,7 @@ export class WebGLPreview {
 
   processGCode(gcode: string | string[]): void {
     const { commands } = this.parser.parseGCode(gcode);
-    this.interpreter.execute(commands, this.virtualMachine);
+    this.interpreter.execute(commands, this.job);
     this.render();
   }
 
@@ -313,7 +313,7 @@ export class WebGLPreview {
   clear(): void {
     this.resetState();
     this.parser = new Parser();
-    this.virtualMachine = new Machine();
+    this.job = new Job();
   }
 
   // reset processing state
@@ -353,7 +353,7 @@ export class WebGLPreview {
       const material = new LineBasicMaterial({ color: this._travelColor, linewidth: this.lineWidth });
       this.disposables.push(material);
 
-      this.virtualMachine.travels().forEach((path) => {
+      this.job.travels().forEach((path) => {
         const geometry = path.line();
         const line = new LineSegments(geometry, material);
         this.group?.add(line);
@@ -374,7 +374,7 @@ export class WebGLPreview {
         });
       }
 
-      this.virtualMachine.extrusions().forEach((path) => {
+      this.job.extrusions().forEach((path) => {
         const geometry = path.line();
         const line = new LineSegments(geometry, lineMaterials[path.tool]);
         this.group?.add(line);
@@ -386,7 +386,7 @@ export class WebGLPreview {
     this._geometries = {};
     if (Object.keys(this._geometries).length === 0 && this.renderTubes) {
       let color: number;
-      this.virtualMachine.extrusions().forEach((path) => {
+      this.job.extrusions().forEach((path) => {
         if (Array.isArray(this._extrusionColor)) {
           color = this._extrusionColor[path.tool].getHex();
         } else {