Skip to content

The cutlery plant's 83 machines stand where studio drew them, each with its model - #253

Merged
kalwei merged 3 commits into
mainfrom
lab/cutlery-3d-models
Nov 15, 2026
Merged

kalwei merged 3 commits into
mainfrom
lab/cutlery-3d-models

Conversation

@kalwei

@kalwei kalwei commented Nov 14, 2026

Copy link
Copy Markdown
Contributor

What Scott will see

  • Engineering > Line > 3D tab, pick FORK1LINE (or any of the 61 lines): the machines are studio's cutlery models — a moulding press, a degating head, a laser marker — standing where studio's plant drawing puts them, instead of three grey boxes in a row.
  • Nothing else on any screen changes. Files only, in the cutlery pack: no product code.

What is in it

  • labs/cutlery/line_layout.json: 61 lines, 83 machines, x/z in metres and the model each is drawn with. Written by labs/cutlery/make_layout.py, which is fsmes layout from-freecad run once per line over labs/cutlery/positions/<LINE>.json (studio's plant design, 2026-11-12, one entry per equipment code in line.json, none missing, none extra).
  • labs/cutlery/models/*.glb: seven models, 22–75 KB each, glTF 2.0, metres, y up, origin at the floor centre, front toward −Z — the same conventions as the body shop's. Studio's own generic massing: no vendor STEP, no logos.
  • labs/cutlery/plant.toml [files] line_layout = "line_layout.json"; one README line.

Proof

  • fsmes layout from-freecad labs/cutlery/positions/<LINE>.json --layout labs/cutlery/line_layout.json --line <LINE>LINE --check → 0 changed, 0 new and 0 stations in the layout are missing from the drawing for all 61 lines.
  • fsmes pack check labs/cutlery: 12 files read, nothing refused.
  • pytest tests/test_pack_format.py tests/test_no_tenant_literals.py tests/test_the_wheel_ships_the_lab_packs.py tests/test_the_docker_image_carries_the_packs.py tests/test_the_cutlery_pack_builds_the_plant_init_py_builds.py tests/test_cutlery.py tests/test_packaged_config.py tests/test_plant_identity.py: 121 passed, 1 skipped.
  • Name check over the diff: 0 hits.

Honest marks

  • The belts between machines carry the view's small default unit, not a fork; a cutlery piece on the belt is a later job (after 2026-11-20).
  • The frame block in the positions files is studio's frame (x = plant X, z = −plant Y) written in the importer's words, because the importer accepts exactly one wording; studio's README says it is the body-shop macro's frame.
  • Merge waits for Scott's yes on a screenshot of the lab's 3D tab.

🤖 Generated with Claude Code

https://claude.ai/code/session_019JwyiB19Ugcp2v4Y263yZP

…th its model

labs/cutlery gains the 3D line view's geometry: `line_layout.json` (61 lines,
83 machines, metres, from studio's plant design of 2026-11-12), the seven
machine models in `models/` (mold, degate, mark, stacker, wrapper, palletizer,
stretchwrap - studio's own generic massing, no vendor geometry, no logos), the
61 per-line positions files the layout is derived from, and `make_layout.py`,
which is `fsmes layout from-freecad` run once per line. plant.toml names the
layout under [files]. No product code changes.

Proof: `fsmes layout from-freecad positions/<LINE>.json --layout
line_layout.json --line <LINE>LINE --check` says 0 changed, 0 new for all 61;
`fsmes pack check labs/cutlery` reads 12 files and refuses nothing; the pack,
tenant-literal, wheel, docker-image and cutlery tests pass (121 passed).

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019JwyiB19Ugcp2v4Y263yZP
Signed-off-by: scottkalw <scottkalwei@gmail.com>
@github-actions

Copy link
Copy Markdown

Thanks for the first pull request. Checks: every commit signed off (git commit -s), ruff and pytest green, and the house-rules checklist in the template. The maintainer reviews within a few days.

kalwei and others added 2 commits November 14, 2026 21:04
plant.toml names line_layout.json since the last commit, and the pack check
refuses a pack that names a file it does not hold, so `fsmes demo cutlery`
from the built wheel stopped (both wheel-plant cells on CI). The wheel's
force-include, the Dockerfile and the wheel-plant script now carry
line_layout.json and models/ beside masterdata/; positions/ and
make_layout.py are generators and stay in the checkout. Proof: the wheel
built here carries 12 files under fsmes/data/packs/cutlery and
`fsmes pack check` on that copy says usable; the wheel, pack-format,
docker-image and cutlery tests pass.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019JwyiB19Ugcp2v4Y263yZP
Signed-off-by: scottkalw <scottkalwei@gmail.com>
Signed-off-by: scottkalw <scottkalwei@gmail.com>
@kalwei
kalwei merged commit 89a4225 into main Nov 15, 2026
47 of 48 checks passed
@kalwei
kalwei deleted the lab/cutlery-3d-models branch November 15, 2026 04:21
kalwei added a commit that referenced this pull request Nov 15, 2026
Class 2.1 of the course, draft 2: the station screen, one machine at
arm's length. This adds its scene, its tests, its three outcomes and its
`scene =` line in `course.toml`, and one recorder fix. It is the fifth
class filmed.

**Stacked on #256.** This branch starts from
`feat/course-draft2-class-14`, because #256 is still open (#255 has
merged). The four commits after #256's tip are this PR. Merge #256
first.

## What the film shows

Scratch cutlery plant (`labs/cutlery`) on loopback, 10× replay.
FORK1_Mold's station screen, one panel per caption:

1. state;
2. the queue;
3. booking 500 good / 3 scrap against WO-FORK1-0001, with the queue's
count rising;
4. issuing 2 kg of the order's own resin lot, LOT-PP-FORK1-001 (4,485.5
left);
5. a length reading of 165.1 mm, in spec, beside the simulated floor's
readings;
6. maintenance owed: "Nothing owed on this machine." (the pack has no
maintenance plan).

**What it refuses:** WO-FORK1-0002, on the same mould but only planned,
is not in the Against list. Nothing can be booked against it.

**What it does not refuse:** a typed 5,000 good, more than the counter
has seen, is booked as typed, and the queue then reads 6,597 of 2,778.
The scene says so in its captions and in `honesty`. No product code
changes.

## Recorder fix

`scroll_to` puts a row `offset` px from the top of the window as near as
the page allows. A row at the foot of a short page cannot get there, and
it was left under the caption bar ("Nothing owed on this machine" in
take 2).

The recorder now adds room below the page, the way `clear_of_caption`
does, and lifts the row clear, never higher than the asked-for offset.
Rows that already reached their offset do not move.

New test:
`tests/test_a_scene_scrolled_to_the_foot_of_a_short_page_lifts_the_row_clear_of_the_caption_bar.py`.
It fails with the fix stashed.

## How it was verified

- **Filmed** to
`~/Work/gifs/course/03-the-floor/01-the-station-screen/`.
  - 1280×720, 317.7 s, no audio, GIF teaser 28.7 s.
  - Badge on 6,354/6,354 mp4 frames; corner check clean.
  - Every one of the 13 stills looked at.
- Four takes; three of them caught real faults: a card over the corner,
captions flashing, the queue out of frame, a row under the caption bar.
- **Filmed on the commit before the rebase onto #256's new tip.** That
rebase brings in #253 (3D models and layout for the cutlery pack). It
changes nothing the station screen draws.
- **`course.json`:** 7 modules / 25 lessons; exactly 0.1, 0.2, 1.3, 1.4
and 2.1 are `recorded`. Outside the 2.1 folder only `course.json`
changed (checksums before and after).
- **Tests:**
  - Class 2.1's 20 tests pass.
  - The scene, course and recorder tests pass under `-m browser` (94).
- In the fast suite the only failure is the known
`test_the_calibration_the_supervisor_records_is_on_the_gauges_own_register`,
which fails on clean main after 18:00 Central.
  - `ruff check .` is clean.
- **Name check:** `namegrep.py` over the diff: `0 hit(s) over 3333
names`.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Signed-off-by: scottkalw <scottkalwei@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant