Add Travel and Print opacity sliders to G-Code visualization

app.py

@@ -337,26 +337,28 @@ def render_toolpath(
     source: str,
     uploaded_path: str | None,
     shape1_path: str | None,
-) -> tuple[Any, str]:
+    travel_opacity: float = 0.55,
+    print_opacity: float = 1.0,
+) -> tuple[Any, str, dict]:
     if source == GCODE_SOURCE_UPLOAD:
         path = uploaded_path
         if not path:
-            return None, "No G-code file uploaded yet."
+            return None, "No G-code file uploaded yet.", {}
     else:
         path = shape1_path
         if not path:
-            return None, "No Shape 1 G-code available yet. Generate it on the TIFF Slices to GCode tab first."
+            return None, "No Shape 1 G-code available yet. Generate it on the TIFF Slices to GCode tab first.", {}
 
     try:
         text = Path(path).read_text()
     except OSError as exc:
-        return None, f"Failed to read G-code file: {exc}"
+        return None, f"Failed to read G-code file: {exc}", {}
 
     parsed = parse_gcode_path(text)
     if parsed["point_count"] == 0:
-        return None, "No G0/G1 movement lines found in the file."
+        return None, "No G0/G1 movement lines found in the file.", {}
 
-    figure = build_toolpath_figure(parsed)
+    figure = build_toolpath_figure(parsed, travel_opacity=travel_opacity, print_opacity=print_opacity)
     (x_min, y_min, z_min), (x_max, y_max, z_max) = parsed["bounds"]
     summary = (
         f"**{parsed['point_count']} moves parsed** — "
@@ -366,7 +368,17 @@ def render_toolpath(
         f"Y ∈ [{y_min:.2f}, {y_max:.2f}], "
         f"Z ∈ [{z_min:.2f}, {z_max:.2f}] mm."
     )
-    return figure, summary
+    return figure, summary, parsed
+
+
+def update_toolpath_opacity(
+    parsed: dict,
+    travel_opacity: float,
+    print_opacity: float,
+) -> Any:
+    if not parsed or not parsed.get("point_count"):
+        return None
+    return build_toolpath_figure(parsed, travel_opacity=travel_opacity, print_opacity=print_opacity)
 
 
 def shift_slice(state: ViewerState, index: float, delta: int) -> tuple[int, str, Image.Image | None]:
@@ -669,8 +681,24 @@ def build_demo() -> gr.Blocks:
                     interactive=False,
                 )
             render_button = gr.Button("Render Tool Path", variant="primary")
+            with gr.Row():
+                travel_opacity_slider = gr.Slider(
+                    label="Travel (G0) opacity",
+                    minimum=0.0,
+                    maximum=1.0,
+                    value=0.55,
+                    step=0.05,
+                )
+                print_opacity_slider = gr.Slider(
+                    label="Print (G1) opacity",
+                    minimum=0.0,
+                    maximum=1.0,
+                    value=1.0,
+                    step=0.05,
+                )
             toolpath_plot = gr.Plot(label="Tool Path")
             toolpath_status = gr.Markdown("")
+            parsed_state = gr.State({})
 
             gcode_source.change(
                 fn=toggle_gcode_source,
@@ -680,8 +708,20 @@ def build_demo() -> gr.Blocks:
             )
             render_button.click(
                 fn=render_toolpath,
-                inputs=[gcode_source, gcode_upload, gcode_file_1],
-                outputs=[toolpath_plot, toolpath_status],
+                inputs=[gcode_source, gcode_upload, gcode_file_1, travel_opacity_slider, print_opacity_slider],
+                outputs=[toolpath_plot, toolpath_status, parsed_state],
+            )
+            travel_opacity_slider.release(
+                fn=update_toolpath_opacity,
+                inputs=[parsed_state, travel_opacity_slider, print_opacity_slider],
+                outputs=[toolpath_plot],
+                queue=False,
+            )
+            print_opacity_slider.release(
+                fn=update_toolpath_opacity,
+                inputs=[parsed_state, travel_opacity_slider, print_opacity_slider],
+                outputs=[toolpath_plot],
+                queue=False,
             )
 
     return demo

gcode_viewer.py

@@ -117,7 +117,11 @@ def _segments_to_xyz(
     return xs, ys, zs
 
 
-def build_toolpath_figure(parsed: dict) -> go.Figure:
+def build_toolpath_figure(
+    parsed: dict,
+    travel_opacity: float = 0.55,
+    print_opacity: float = 1.0,
+) -> go.Figure:
     print_xs, print_ys, print_zs = _segments_to_xyz(parsed["print_segments"])
     travel_xs, travel_ys, travel_zs = _segments_to_xyz(parsed["travel_segments"])
 
@@ -131,7 +135,8 @@ def build_toolpath_figure(parsed: dict) -> go.Figure:
                 z=travel_zs,
                 mode="lines",
                 name="Travel (G0)",
-                line=dict(color="rgba(150,150,150,0.55)", width=2, dash="dot"),
+                opacity=travel_opacity,
+                line=dict(color="rgb(150,150,150)", width=2, dash="dot"),
                 hoverinfo="skip",
             )
         )
@@ -144,6 +149,7 @@ def build_toolpath_figure(parsed: dict) -> go.Figure:
                 z=print_zs,
                 mode="lines",
                 name="Print (G1)",
+                opacity=print_opacity,
                 line=dict(color="#1f77b4", width=4),
                 hovertemplate="X=%{x:.2f}<br>Y=%{y:.2f}<br>Z=%{z:.2f}<extra></extra>",
             )