Infinite stls and nozzle spacing

README.md

@@ -10,7 +10,7 @@ short_description: Upload STLs, export TIFF stacks, and generate G-code.
 
 # STL to G-Code Gradio App
 
-This project provides a Gradio app that takes up to three uploaded STL files, shows interactive 3D viewers, slices each model along the Z axis, saves slices as TIFF images, generates G-code from those TIFF stacks, previews the resulting tool path (a fast line plot or an animated 3D tube plot), and can visualize all three shapes printing in parallel and export that animation as a GIF.
+This project provides a Gradio app that takes any number of uploaded STL files, shows a selected-shape 3D viewer, slices each model along the Z axis, saves slices as TIFF images, generates G-code from those TIFF stacks, previews the resulting tool path (a fast line plot or an animated 3D tube plot), and can visualize the shapes printing in parallel and export that animation as a GIF.
 
 ## Prerequisites
 
@@ -37,24 +37,25 @@ Then open the local Gradio URL in your browser, upload STL files or load the bun
 
 ## What the app does
 
-- Uploads up to three `.stl` files
-- Loads bundled sample STL files
-- Shows interactive 3D viewers for rotating each model
+- Uploads any number of `.stl` files with a single multi-file uploader
+- Loads bundled sample STL files and merges them with already uploaded STLs
+- Syncs the uploaded STL list back into Shape Settings if the table and uploader get out of step
+- Shows an interactive selected-shape 3D viewer for rotating each model
 - Shows model extents, face count, vertex count, and watertight status
-- Optionally scales loaded STLs per shape, either with independent target X/Y/Z dimensions or by keeping proportions while target dimensions update together
+- Scales loaded STLs from editable target X/Y/Z dimensions in the Shape Settings table; new rows default to the STL's original dimensions, **Reset Dimensions** restores them, and **Keep Proportions** updates the other target sides from the edited side
 - Lets you choose layer height and XY pixel size
 - Produces one `.tif` image per slice
 - Encodes material as black (`0`) and empty space as white (`255`) in each TIFF slice
 - Lets you step through the slice stack in the browser
 - Exports a ZIP containing the generated TIFF images
 - Combines generated stacks into a reference TIFF stack
-- Converts generated TIFF ZIPs into G-code files with pressure, valve, and port settings per shape
+- Converts generated TIFF ZIPs into G-code files with pressure, valve, and port settings per shape from the Shape Settings table
 - Offers two G-code generation options: **Use G1 for all moves** (no rapid travel command) and **Use Reference Stack for motion** (all shapes share one nozzle path; each dispenses only its own geometry)
-- Calculates X/Y nozzle spacing from shared or separate Shape 1->2 and Shape 2->3 spacing values, then visualizes the resulting nozzle layout
-- Previews each shape's generated G-code inline (text boxes under the downloads)
-- Visualizes generated or uploaded G-code tool paths, with the source selectable from Shape 1/2/3 or an uploaded file
+- Calculates X/Y nozzle spacing from an editable adjacent-pair spacing table, then visualizes the resulting nozzle layout
+- Previews selected generated G-code inline
+- Visualizes generated or uploaded G-code tool paths, with the source selectable from any active generated shape or an uploaded file
 - Renders the tool path as a fast line plot or an animated 3D tube plot (play/pause, speed, scrub, frame-step, nozzle marker)
-- Plots all three shapes using the configured nozzle spacing and animates them printing in parallel, with a server-side GIF export of that animation
+- Plots the generated shapes using the configured nozzle spacing and animates them printing in parallel, with a server-side GIF export of that animation
 
 ## Behavior and Implementation Notes
 
@@ -93,14 +94,14 @@ The parser also handles standard slicer G-code: single-axis and Z-only moves, ax
 
 ### G-code Visualization
 
-The G-code visualization tab renders the generated Shape 1/2/3 G-code or an uploaded `.txt`, `.gcode`, or `.nc` file. It parses `G0`/`G1` movement lines, supports relative (`G91`) and absolute (`G90`) positioning, and offers two render modes:
+The G-code visualization tab renders generated shape G-code or an uploaded `.txt`, `.gcode`, or `.nc` file. It parses `G0`/`G1` movement lines, supports relative (`G91`) and absolute (`G90`) positioning, and offers two render modes:
 
 - **Line Plot** — fast thin scatter lines (print and travel), with color/opacity controls.
 - **Tube Plot with Animation** — mm-width filament tubes (circular, capped, lit) with a client-side build animation (play/pause, speed, scrub, frame-step) and a moving nozzle marker. Filament/travel widths default to the layer height and its quarter.
 
 ### Parallel Printing Visualization
 
-The fourth tab plots all three shapes' G-code at once using the nozzle spacing configured on the TIFF-to-G-code tab, each in its own color. Like the visualization tab it has a fast **Line Plot** and an animated **Tube Plot**; the animation advances all parts on a shared cumulative-path-length timeline, so a shorter part finishes first.
+The fourth tab plots the generated shapes' G-code at once using the nozzle spacing configured on the TIFF-to-G-code tab, each in its own color. Like the visualization tab it has a fast **Line Plot** and an animated **Tube Plot**; the animation advances all parts on a shared cumulative-path-length timeline, so a shorter part finishes first.
 
 It can also **export the animation as a GIF**, rendered server-side with Matplotlib (the `Agg` CPU backend — no WebGL, no headless browser, and no `ffmpeg`, so it works locally and on Hugging Face). The GIF is line-style with faint grey travel and white, black-outlined nozzle markers drawn on top; controls cover duration, frames per second, elevation/azimuth viewing angle, and travel opacity (0 hides travel).
 

tests/test_nozzle_spacing.py

@@ -3,7 +3,15 @@ from __future__ import annotations
 import numpy as np
 
 from app import (
+    ADVANCED_NOZZLE_SPACING_HEADERS,
+    SCALE_MODE_UNIFORM_FACTOR,
+    SIMPLE_NOZZLE_SPACING_HEADERS,
+    delete_shape_from_settings,
     _format_nozzle_spacing_status,
+    _shape_settings_rows,
+    _spacing_args_from_table,
+    _spacing_table_update,
+    normalize_shape_dimensions_for_mode,
     _resolve_nozzle_layout,
 )
 
@@ -82,6 +90,43 @@ def test_same_spacing_reuses_first_pair_values_for_second_pair() -> None:
     assert spacings[1] == {"from": 2, "to": 3, "dx": 7.0, "dy": 2.0}
 
 
+def test_individual_spacing_has_no_fixed_shape_limit() -> None:
+    parts = [
+        _part(1, ((0.0, 0.0, 0.0), (10.0, 10.0, 1.0))),
+        _part(2, ((0.0, 0.0, 0.0), (4.0, 10.0, 1.0))),
+        _part(3, ((0.0, 0.0, 0.0), (6.0, 10.0, 1.0))),
+        _part(4, ((0.0, 0.0, 0.0), (2.0, 10.0, 1.0))),
+        _part(5, ((0.0, 0.0, 0.0), (3.0, 10.0, 1.0))),
+        _part(6, ((0.0, 0.0, 0.0), (4.0, 10.0, 1.0))),
+        _part(7, ((0.0, 0.0, 0.0), (5.0, 10.0, 1.0))),
+    ]
+
+    offsets, spacings = _resolve_nozzle_layout(
+        parts,
+        False,
+        1.0,
+        0.0,
+        2.0,
+        3.0,
+        4.0,
+        -1.0,
+        6.0,
+        2.0,
+        1.0,
+        1.0,
+        -3.0,
+        0.5,
+    )
+
+    np.testing.assert_allclose(offsets[1], (0.0, 0.0))
+    np.testing.assert_allclose(offsets[2], (11.0, 0.0))
+    np.testing.assert_allclose(offsets[3], (17.0, 3.0))
+    np.testing.assert_allclose(offsets[4], (27.0, 2.0))
+    np.testing.assert_allclose(offsets[7], (40.0, 5.5))
+    assert spacings[2] == {"from": 3, "to": 4, "dx": 10.0, "dy": -1.0}
+    assert spacings[5] == {"from": 6, "to": 7, "dx": 1.0, "dy": 0.5}
+
+
 def test_spacing_status_lists_all_nozzle_pair_distances() -> None:
     parts = [
         _part(1, ((0.0, 0.0, 0.0), (10.0, 10.0, 1.0))),
@@ -103,3 +148,115 @@ def test_spacing_status_lists_all_nozzle_pair_distances() -> None:
     assert "Nozzle 1 -> 2: Delta X 13.00 mm, Delta Y 2.00 mm" in status
     assert "Nozzle 1 -> 3: Delta X 20.00 mm, Delta Y 4.00 mm" in status
     assert "Nozzle 2 -> 3: Delta X 7.00 mm, Delta Y 2.00 mm" in status
+
+
+def test_keep_proportions_uses_most_recently_edited_dimension() -> None:
+    records = [
+        {
+            "idx": 1,
+            "name": "wide_part",
+            "stl_path": "wide_part.stl",
+            "original_x": 10.0,
+            "original_y": 20.0,
+            "original_z": 5.0,
+            "target_x": 10.0,
+            "target_y": 20.0,
+            "target_z": 5.0,
+            "pressure": 25.0,
+            "valve": 4,
+            "port": 1,
+            "color": "#000000",
+            "last_scaled_axis": "target_x",
+        }
+    ]
+    settings = _shape_settings_rows(records)
+    settings[0][3] = 50.0
+
+    updated_records, updated_settings = normalize_shape_dimensions_for_mode(
+        records,
+        settings,
+        SCALE_MODE_UNIFORM_FACTOR,
+    )
+
+    assert updated_records[0]["last_scaled_axis"] == "target_y"
+    assert updated_settings[0][2:5] == [25.0, 50.0, 12.5]
+
+
+def test_simple_spacing_table_uses_one_shared_spacing_row() -> None:
+    records = [
+        {"idx": 1, "name": "first"},
+        {"idx": 2, "name": "second"},
+        {"idx": 3, "name": "third"},
+    ]
+
+    update = _spacing_table_update(records, [["Shape 1", "Shape 2", 7.0, -1.5]], False)
+    gap12x, gap12y, gap23x, gap23y, extra = _spacing_args_from_table(update["value"], False)
+
+    assert update["headers"] == SIMPLE_NOZZLE_SPACING_HEADERS
+    assert update["value"] == [["Same spacing", "All neighboring shapes", 7.0, -1.5]]
+    assert (gap12x, gap12y, gap23x, gap23y, extra) == (7.0, -1.5, 7.0, -1.5, [])
+
+
+def test_advanced_spacing_table_uses_named_shape_pairs() -> None:
+    records = [
+        {"idx": 1, "name": "first"},
+        {"idx": 2, "name": "second"},
+        {"idx": 3, "name": "third"},
+    ]
+
+    update = _spacing_table_update(
+        records,
+        [["Same spacing", "All neighboring shapes", 4.0, 0.5], ["ignored", "ignored", 8.0, 1.0]],
+        True,
+    )
+    gap12x, gap12y, gap23x, gap23y, extra = _spacing_args_from_table(update["value"], True)
+
+    assert update["headers"] == ADVANCED_NOZZLE_SPACING_HEADERS
+    assert update["value"][0][:2] == ["Shape 1: first", "Shape 2: second"]
+    assert update["value"][1][:2] == ["Shape 2: second", "Shape 3: third"]
+    assert (gap12x, gap12y, gap23x, gap23y, extra) == (4.0, 0.5, 8.0, 1.0, [])
+
+
+def test_delete_shape_reindexes_without_losing_shape_data() -> None:
+    class Event:
+        index = (1, 9)
+
+    records = [
+        {"idx": 1, "name": "first", "stl_path": "first.stl", "target_x": 10.0, "target_y": 11.0, "target_z": 12.0, "pressure": 25, "valve": 4, "port": 1, "color": "#111111"},
+        {"idx": 2, "name": "middle", "stl_path": "middle.stl", "target_x": 20.0, "target_y": 21.0, "target_z": 22.0, "pressure": 30, "valve": 5, "port": 2, "color": "#222222"},
+        {"idx": 3, "name": "last", "stl_path": "last.stl", "target_x": 30.0, "target_y": 31.0, "target_z": 32.0, "pressure": 35, "valve": 6, "port": 3, "color": "#333333"},
+    ]
+
+    outputs = delete_shape_from_settings(records, _shape_settings_rows(records), None, False, 0.0, Event())
+    updated_records = outputs[1]
+    updated_settings = outputs[2]
+
+    assert [record["idx"] for record in updated_records] == [1, 2]
+    assert [record["stl_path"] for record in updated_records] == ["first.stl", "last.stl"]
+    assert [record["target_x"] for record in updated_records] == [10.0, 30.0]
+    assert updated_settings[1][0] == 2
+    assert updated_settings[1][1] == "last"
+    assert updated_settings[1][2:5] == [30.0, 31.0, 32.0]
+
+
+def test_delete_shape_cooldown_blocks_immediate_second_delete() -> None:
+    class Event:
+        index = (1, 9)
+
+    records = [
+        {"idx": 1, "name": "first", "stl_path": "first.stl", "target_x": 10.0, "target_y": 11.0, "target_z": 12.0, "pressure": 25, "valve": 4, "port": 1, "color": "#111111"},
+        {"idx": 2, "name": "middle", "stl_path": "middle.stl", "target_x": 20.0, "target_y": 21.0, "target_z": 22.0, "pressure": 30, "valve": 5, "port": 2, "color": "#222222"},
+        {"idx": 3, "name": "last", "stl_path": "last.stl", "target_x": 30.0, "target_y": 31.0, "target_z": 32.0, "pressure": 35, "valve": 6, "port": 3, "color": "#333333"},
+    ]
+
+    first_outputs = delete_shape_from_settings(records, _shape_settings_rows(records), None, False, 0.0, Event())
+    second_outputs = delete_shape_from_settings(
+        first_outputs[1],
+        first_outputs[2],
+        None,
+        False,
+        first_outputs[-1],
+        Event(),
+    )
+
+    assert [record["name"] for record in second_outputs[1]] == ["first", "last"]