Lots of updates (x-y origin, formatting, combined TIFFS)

README.md

@@ -31,6 +31,10 @@ Then open the local Gradio URL in your browser, upload an STL file, and generate
 - Lets you step through the slice stack in the browser
 - Exports a ZIP containing the generated TIFF images
 
+## Notes
+
+- G-code generation uses the slicer's `Pixel Size/Fill Width` for XY step distance by passing `fil_width=pixel_size` into `generate_snake_path_gcode()`.
+
 ## Test
 
 ```powershell

app.py

@@ -18,7 +18,7 @@ from tiff_to_gcode import generate_snake_path_gcode
 ViewerState = dict[str, Any]
 SAMPLE_STL_FILENAMES = ("Hollow_Pyramid.stl", "Rounded_Cube_Through_Holes.stl", "halfsphere.stl")
 SAMPLE_STL_DIR = Path(__file__).resolve().parent / "sample_stls"
-FRONT_CAMERA = (270, 80, None)
+FRONT_CAMERA = (90, 80, None)
 APP_CSS = """
 .gradio-container {
     font-size: 90%;
@@ -360,17 +360,30 @@ def _opacity_to_alpha(opacity: float) -> int:
     return int(round(255 * bounded))
 
 
-def _build_annotated_scene(mesh: trimesh.Trimesh, opacity: float = 0.96) -> str:
+def _resolve_model_opacity(setting: float | bool | None) -> float:
+    if isinstance(setting, bool):
+        return 0.75 if setting else 1.0
+    if setting is None:
+        return 1.0
+    return max(0.05, min(float(setting), 1.0))
+
+
+def _viewer_update(model_path: str | None) -> dict[str, Any]:
+    return gr.update(value=model_path, camera_position=FRONT_CAMERA)
+
+
+def _build_annotated_scene(mesh: trimesh.Trimesh, opacity: float = 1.0) -> str:
     """Export a GLB containing the mesh, origin axes, and a Z=0 grid plane."""
     scene = trimesh.Scene()
     display_transform = trimesh.transformations.rotation_matrix(-np.pi / 2, [1, 0, 0])
 
-    # --- Model (mostly opaque medium grey so it stands off the background) ---
+    # --- Model (muted orange to match the Gradio theme accent) ---
     model_copy = mesh.copy()
     model_copy.apply_transform(display_transform)
+    bounded_opacity = _resolve_model_opacity(opacity)
     mat = trimesh.visual.material.PBRMaterial(
-        baseColorFactor=[160, 160, 170, _opacity_to_alpha(opacity)],
-        alphaMode="BLEND",
+        baseColorFactor=[230, 150, 90, _opacity_to_alpha(bounded_opacity)],
+        alphaMode="OPAQUE" if bounded_opacity >= 0.999 else "BLEND",
         metallicFactor=0.0,
         roughnessFactor=0.6,
     )
@@ -476,23 +489,24 @@ def _build_annotated_scene(mesh: trimesh.Trimesh, opacity: float = 0.96) -> str:
     return str(out_path)
 
 
-def load_single_model(stl_file: str | None, opacity: float = 0.96) -> tuple[str | None, str]:
+def load_single_model(stl_file: str | None, opacity: float = 1.0) -> tuple[str | None, str]:
     if not stl_file:
-        return None, "No model loaded."
+        return _viewer_update(None), "No model loaded."
     mesh = load_mesh(stl_file)
-    glb_path = _build_annotated_scene(mesh, opacity=opacity)
-    return glb_path, _format_model_details(Path(stl_file).name, mesh)
+    glb_path = _build_annotated_scene(mesh, opacity=_resolve_model_opacity(opacity))
+    return _viewer_update(glb_path), _format_model_details(Path(stl_file).name, mesh)
 
 
-def preload_sample_models(opacity: float = 0.96) -> tuple:
+def preload_sample_models(opacity: float = 1.0) -> tuple:
     outputs: list[Any] = []
+    resolved_opacity = _resolve_model_opacity(opacity)
 
     for filename in SAMPLE_STL_FILENAMES:
         stl_path = SAMPLE_STL_DIR / filename
         if not stl_path.exists():
             outputs.extend([
                 None,
-                None,
+                _viewer_update(None),
                 f"Sample file not found: {stl_path}",
             ])
             continue
@@ -502,14 +516,14 @@ def preload_sample_models(opacity: float = 0.96) -> tuple:
         except Exception as exc:
             outputs.extend([
                 str(stl_path),
-                None,
+                _viewer_update(None),
                 f"Failed to load sample model: {stl_path.name} ({exc})",
             ])
             continue
 
         outputs.extend([
             str(stl_path),
-            _build_annotated_scene(mesh, opacity=opacity),
+            _viewer_update(_build_annotated_scene(mesh, opacity=resolved_opacity)),
             _format_model_details(stl_path.name, mesh),
         ])
 
@@ -523,11 +537,12 @@ def refresh_all_model_viewers(
     opacity: float,
 ) -> tuple:
     outputs: list[Any] = []
+    resolved_opacity = _resolve_model_opacity(opacity)
     for stl_file in (stl1, stl2, stl3):
         if not stl_file:
-            outputs.extend([None, "No model loaded."])
+            outputs.extend([_viewer_update(None), "No model loaded."])
             continue
-        outputs.extend(load_single_model(stl_file, opacity))
+        outputs.extend(load_single_model(stl_file, resolved_opacity))
     return tuple(outputs)
 
 
@@ -848,6 +863,11 @@ def build_demo() -> gr.Blocks:
                     min_width=140,
                     scale=0,
                 )
+                with gr.Column(scale=0, min_width=240):
+                    model_opacity = gr.Checkbox(
+                        label="Use 75% 3D Model Opacity",
+                        value=False,
+                    )
 
             # --- Upload + 3D viewer row ---
             stl_files: list[gr.File] = []
@@ -876,15 +896,13 @@ def build_demo() -> gr.Blocks:
 
             # --- Shared slicing controls ---
             with gr.Row():
-                model_opacity = gr.Slider(
-                    label="3D Model Opacity",
-                    minimum=0.2,
-                    maximum=1.0,
-                    value=0.96,
-                    step=0.05,
-                )
                 layer_height = gr.Number(label="Layer Height", value=0.8, minimum=0.0001, step=0.01)
-                pixel_size = gr.Number(label="Pixel Size/Fill Width", value=0.8, minimum=0.0001, step=0.01)
+                pixel_size = gr.Number(
+                    label="Pixel Size/Fill Width",
+                    value=0.8,
+                    minimum=0.0001,
+                    step=0.01,
+                )
                 generate_button = gr.Button("Generate TIFF Stacks", variant="primary")
 
             # --- Per-object slice browsers ---
@@ -1030,7 +1048,7 @@ def build_demo() -> gr.Blocks:
             for i in range(3):
                 refresh_outputs.extend([model_viewers[i], model_details_list[i]])
 
-            model_opacity.release(
+            model_opacity.change(
                 fn=refresh_all_model_viewers,
                 inputs=[stl_files[0], stl_files[1], stl_files[2], model_opacity],
                 outputs=refresh_outputs,