feat(GcodePreview): adds multi-tool support #1753

pedrolamas · 2025-11-28T21:33:01Z

Adds multi-tool support detection and presentation to the Gcode Previewer.

When parsing a gcode file, we now follow this process:

For any M600 (Filament change), add 0 to the used tools, then take the current index and move to the next one, up to 10.
For any Tn, take n and add it to the used tools.

If neither of these commands is found, no tools will be shown on the frontend, and the behavior will remain the same as before this PR.

Signed-off-by: Pedro Lamas <[email protected]>

Copilot

Pull request overview

This PR adds multi-tool support to the GCode Preview feature, enabling detection and visualization of tool changes for multi-extruder/multi-tool 3D printers. The changes detect tool changes via T commands and M600 (filament change), track tool usage throughout the print, and render extrusions with tool-specific colors derived from file metadata or default color palettes.

Key Changes:

Added tool tracking in GCode parser to detect T commands and M600 filament changes
Modified Move data structures to include tool information with abbreviated property names (t, p, d)
Implemented per-tool extrusion path rendering with color-coded visualization in the preview

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 9 comments.

Show a summary per file

File	Description
src/workers/parseGcode.worker.ts	Added tools array to worker message types and result handling
src/workers/parseGcode.ts	Implemented tool tracking (T commands, M600), updated regex for T commands, renamed properties to abbreviations
src/util/gcode-preview.ts	Updated references from `direction` to `d` property
src/store/gcodePreview/types.ts	Added tools array to state, renamed Move properties to abbreviations, changed LayerPaths.extrusions to per-tool Record
src/store/gcodePreview/state.ts	Added tools array initialization in default state
src/store/gcodePreview/mutations.ts	Added setTools mutation for tools array updates
src/store/gcodePreview/getters.ts	Added getTools getter with color assignment logic, getColorsFromFileMetadata for file-based colors, updated getPaths for per-tool extrusion tracking
src/store/gcodePreview/actions.ts	Added tools commit in loadGcode action and reset operations
src/components/widgets/gcode-preview/GcodePreviewTool.vue	New component to display tool indicators with color and active state
src/components/widgets/gcode-preview/GcodePreview.vue	Updated template to render per-tool extrusions with colors, added tool indicator display, wrapped buttons in container div
src/components/widgets/gcode-preview/GcodePreviewCard.vue	Updated file type to support AppFileWithMeta for color metadata

src/store/gcodePreview/getters.ts

Copilot · 2025-11-28T21:36:30Z

src/components/widgets/gcode-preview/GcodePreviewTool.vue

+      border-color: map-deep-get($material-dark, 'text', 'primary');
+
+      & .extruder-color {
+        border-color: map-deep-get($material-dark, 'text', 'primary');


The active state styling uses hardcoded $material-dark theme variables instead of the dynamic $material variable from the @include theme block. This means the border color won't adapt to the current theme (light/dark). Use map-deep-get($material, 'text', 'primary') instead to match the theme-aware styling on line 40.

Suggested change

border-color: map-deep-get($material-dark, 'text', 'primary');

& .extruder-color {

border-color: map-deep-get($material-dark, 'text', 'primary');

border-color: map-deep-get($material, 'text', 'primary');

& .extruder-color {

border-color: map-deep-get($material, 'text', 'primary');

That's for inverted color, so keep as is.

Copilot · 2025-11-28T21:36:31Z

src/components/widgets/gcode-preview/GcodePreviewTool.vue

+      border-color: map-deep-get($material-dark, 'text', 'primary');
+
+      & .extruder-color {
+        border-color: map-deep-get($material-dark, 'text', 'primary');


The .extruder-color border styling within the active state also uses hardcoded $material-dark instead of the dynamic $material variable. This creates inconsistent theming. Use map-deep-get($material, 'text', 'primary') to match the base styling on line 40.

Suggested change

border-color: map-deep-get($material-dark, 'text', 'primary');

border-color: map-deep-get($material, 'text', 'primary');

That's for inverted color, so keep as is.

Copilot · 2025-11-28T21:36:31Z

src/workers/parseGcode.ts

          fwretraction.z = args.z ?? fwretraction.z
          break
+        case 'M600':
+          toolhead.tool = (toolhead.tool + 1) % 10


M600 (filament change) increments tool with modulo 10, limiting support to 10 tools maximum. This arbitrary limit may not match actual printer configurations. Consider removing the modulo operation or making it configurable, as tool numbers can be higher in some multi-tool setups.

Suggested change

toolhead.tool = (toolhead.tool + 1) % 10

toolhead.tool = toolhead.tool + 1

We are setting an arbitrary maximum of 10 tools, if someone show up needing more, we will then assess the next step.

src/store/gcodePreview/mutations.ts

src/store/gcodePreview/types.ts

Copilot · 2025-11-28T21:36:32Z

src/store/gcodePreview/types.ts

  k?: number;
  r?: number;
-  direction: Rotation;
+  d: Rotation;


Property name d is cryptic and unclear. The original direction was self-documenting. Consider reverting to direction or using a clearer name. Single-letter abbreviations reduce code readability significantly.

Suggested change

d: Rotation;

direction: Rotation;

Keep as is.

Copilot · 2025-11-28T21:36:33Z

src/store/gcodePreview/types.ts

 export type Move = LinearMove | ArcMove

 export type Rotation = 'clockwise' | 'counter-clockwise'



The new Tool type lacks documentation explaining its purpose and usage. Add a JSDoc comment describing that this represents a tool identifier in the format "T0", "T1", etc., used for multi-tool/multi-extruder support.

Suggested change

/**

* Represents a tool identifier for multi-tool/multi-extruder support.

* Format: "T0", "T1", etc.

*/

Signed-off-by: Pedro Lamas <[email protected]>

Copilot

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 4 comments.

src/components/widgets/gcode-preview/GcodePreview.vue

Copilot · 2025-11-29T01:09:22Z

src/util/gcode-preview.ts

  throw new TypeError('Move is not a valid arc')
 }

 // Assumes the path is pr


Incomplete comment: "Assumes the path is pr" appears to be truncated. Please complete or remove this comment.

Suggested change

// Assumes the path is pr

src/store/gcodePreview/getters.ts

src/workers/parseGcode.ts

Signed-off-by: Pedro Lamas <[email protected]>

Copilot

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 2 comments.

Copilot · 2025-11-29T01:31:13Z

src/store/gcodePreview/getters.ts

+      const tool: Tool = `T${toolIndex}`
+      const color = (
+        colorsFromFileMetadata[index] ||
+        defaultColors[index - colorsFromFileMetadata.length] ||


Color indexing logic is incorrect. When colorsFromFileMetadata has colors, index - colorsFromFileMetadata.length will be negative for early tools, causing wrong color selection. Should use: defaultColors[index] || defaultColors[0] or check index >= colorsFromFileMetadata.length before subtracting.

Suggested change

defaultColors[index - colorsFromFileMetadata.length] ||

defaultColors[index] ||

This is correct, keep as is.

src/workers/parseGcode.ts

Signed-off-by: Pedro Lamas <[email protected]>

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 3 comments.

Copilot · 2025-11-29T15:01:02Z

src/workers/parseGcode.ts

+        case 'M600':
+          tools.add(0)
+          tool = (tool + 1) % 10
+          tools.add(tool)
+          break


M600 (filament change) increments tool with modulo 10, which assumes max 10 tools and cycles back to 0. This creates incorrect tool tracking if there are actual T commands. M600 should either: (1) not modify tool state if using explicit T commands, or (2) use a dedicated color-change counter separate from tool index.

I see no reason why M600 would be used together with Tx commands... for now, let's keep as is.

Copilot · 2025-11-29T15:01:02Z

src/components/widgets/gcode-preview/GcodePreviewTool.vue

+    &.active {
+      border-color: map-deep-get($material-dark, 'text', 'primary');
+
+      & .extruder-color {
+        border-color: map-deep-get($material-dark, 'text', 'primary');
+      }
+    }


The active state always uses $material-dark theme colors regardless of current theme. Should use $material variable (line 38-41 pattern) to respect light/dark theme.

That's for inverted color, so keep as is.

src/store/gcodePreview/getters.ts

Signed-off-by: Pedro Lamas <[email protected]>

feat(GcodePreview): adds multi-tool support

c693d3b

Signed-off-by: Pedro Lamas <[email protected]>

pedrolamas added this to the 1.35.2 milestone Nov 28, 2025

pedrolamas requested a review from Copilot November 28, 2025 21:33

pedrolamas added the FR - Enhancement New feature or request label Nov 28, 2025

Copilot started reviewing on behalf of pedrolamas November 28, 2025 21:33 View session

Copilot finished reviewing on behalf of pedrolamas November 28, 2025 21:35

Copilot AI reviewed Nov 28, 2025

View reviewed changes

refactor(GcodePreview): namings

0a84fe6

Signed-off-by: Pedro Lamas <[email protected]>

pedrolamas requested a review from Copilot November 29, 2025 01:05

Copilot started reviewing on behalf of pedrolamas November 29, 2025 01:05 View session

Copilot finished reviewing on behalf of pedrolamas November 29, 2025 01:08

Copilot AI reviewed Nov 29, 2025

View reviewed changes

pedrolamas added 2 commits November 29, 2025 01:25

fix: sort as number

8d5703a

Signed-off-by: Pedro Lamas <[email protected]>

refactor: default colors

e0a5244

Signed-off-by: Pedro Lamas <[email protected]>

pedrolamas requested a review from Copilot November 29, 2025 01:26

Copilot started reviewing on behalf of pedrolamas November 29, 2025 01:27 View session

Copilot finished reviewing on behalf of pedrolamas November 29, 2025 01:30

Copilot AI reviewed Nov 29, 2025

View reviewed changes

fix: only show tools found in gcode

3f65d5d

Signed-off-by: Pedro Lamas <[email protected]>

pedrolamas requested a review from Copilot November 29, 2025 14:58

Copilot started reviewing on behalf of pedrolamas November 29, 2025 14:59 View session

Copilot finished reviewing on behalf of pedrolamas November 29, 2025 15:00

Copilot AI reviewed Nov 29, 2025

View reviewed changes

refactor: invert parameter default value

28478b4

Signed-off-by: Pedro Lamas <[email protected]>

	border-color: map-deep-get($material-dark, 'text', 'primary');
	border-color: map-deep-get($material, 'text', 'primary');

	toolhead.tool = (toolhead.tool + 1) % 10
	toolhead.tool = toolhead.tool + 1

		export type Move = LinearMove \| ArcMove

		export type Rotation = 'clockwise' \| 'counter-clockwise'

+/**
+ * Represents a tool identifier for multi-tool/multi-extruder support.
+ * Format: "T0", "T1", etc.
+ */

	defaultColors[index - colorsFromFileMetadata.length] \|\|
	defaultColors[index] \|\|

Uh oh!

feat(GcodePreview): adds multi-tool support #1753

Are you sure you want to change the base?

feat(GcodePreview): adds multi-tool support #1753

Conversation

pedrolamas commented Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Nov 29, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Nov 29, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Nov 29, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 29, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

pedrolamas commented Nov 28, 2025 •

edited

Loading