mirror of
https://github.com/bherbruck/solidcraft.git
synced 2026-11-03 18:45:55 +00:00
Compare commits
107 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 586a358ed4 | |||
| 4d61100534 | |||
| 4ced1d7bcf | |||
| a82f839255 | |||
| 08484af293 | |||
| d29e70bad9 | |||
| 1d482aff74 | |||
| 2445c0f13d | |||
| 3d0e2a8b3c | |||
| 2a01cca00e | |||
| d7cc5621fa | |||
| be6c7fc17c | |||
| f006eefd6e | |||
| 15269f85a1 | |||
| e53390ea1b | |||
| c8314687fc | |||
| 878339cac8 | |||
| 348bbc1dfa | |||
| 262f5c61c0 | |||
| ece2a8693a | |||
| 0f77199449 | |||
| e02ef3246f | |||
| ffbeb42b5c | |||
| 816bcf10de | |||
| 28689e784e | |||
| d396be78a2 | |||
| cbac207852 | |||
| ff2ca2d462 | |||
| 7770f8982d | |||
| 8e61eb7d6f | |||
| ab80a410a1 | |||
| b94692497e | |||
| 7bcc1ee0eb | |||
| 36a60a70d9 | |||
| 5d17fa970b | |||
| b5bab3f663 | |||
| ccea34e73c | |||
| c7f86c7309 | |||
| 4355d117ef | |||
| 39951a22ff | |||
| a3890b3bd5 | |||
| 59cad5f0bb | |||
| 5fbe058051 | |||
| 0752d8d79c | |||
| 0344a41dc4 | |||
| dba8108369 | |||
| 57d787f5ba | |||
| 2eaa15ea04 | |||
| f512d4a004 | |||
| 62d55c3b29 | |||
| 826244bb28 | |||
| 111dbc6855 | |||
| ab7602fd0e | |||
| b1d4293cf0 | |||
| 99d5b43024 | |||
| f937905cf3 | |||
| 46f7d4d8dc | |||
| 8071096a99 | |||
| d17b70241f | |||
| fbe778a1e8 | |||
| 0252f0bf30 | |||
| 633ce20563 | |||
| 0c0c4db612 | |||
| 16bb97f065 | |||
| 3e6c039985 | |||
| 7734ba2300 | |||
| 0e916ee598 | |||
| 87c9a37663 | |||
| 10124c8ccf | |||
| 0870d6474a | |||
| e9b9c8f697 | |||
| cbcf1fe716 | |||
| e21760e46d | |||
| df01e59716 | |||
| 3045d0787e | |||
| d876f475a6 | |||
| ef1a400bb3 | |||
| 53c84eb3a7 | |||
| 9a7a75788e | |||
| 92dc6bc987 | |||
| b5af4a80fa | |||
| 309eda87a2 | |||
| c3fd7aa048 | |||
| 2e6e05bc9a | |||
| 7cea146438 | |||
| 492bba9242 | |||
| 9be14db8c0 | |||
| b8c496f37a | |||
| aeb406188f | |||
| ceed604498 | |||
| 44bd29acc3 | |||
| aa8e8cf69c | |||
| 669e14b3bf | |||
| 1ee65cf70a | |||
| 129364be5e | |||
| 3be4727ca6 | |||
| a53eb927d1 | |||
| c3dd40405d | |||
| 5012f33c85 | |||
| eb37a82bc0 | |||
| b1da434458 | |||
| e1d99ef0ce | |||
| 4f2c133d01 | |||
| 0f90fb7e8d | |||
| 52e5bc114e | |||
| 4cd9a4f4d4 | |||
| 4577dffb36 |
@@ -6,6 +6,7 @@ body:
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for taking the time to report this! Inside the app, **Report an Issue** fills most of this in for you, with the command, its settings and your environment.
|
||||
Before reporting a boolean or modelling failure, please try to reproduce it on the latest nightly or a build from current `main`, and say which build you used.
|
||||
- type: textarea
|
||||
id: what
|
||||
attributes:
|
||||
@@ -19,6 +20,7 @@ body:
|
||||
label: Steps to reproduce
|
||||
description: |
|
||||
What you clicked or typed, in order. For a problem on a particular design, `solidcraft-cli script design.solidcraft --out repro.json` turns its history into a script that `solidcraft-cli eval repro.json` replays; attach it, trimmed to the failing step if you can.
|
||||
Using an AI agent with SolidCraft's MCP server? The `solidcraft-reporting` skill in [`skills/`](https://github.com/tangency-labs/solidcraft/tree/main/skills) has it reproduce the problem in a fresh design and write these steps for you.
|
||||
placeholder: |
|
||||
1. Sketch a circle on the XY plane
|
||||
2. Extrude it 10 mm
|
||||
|
||||
@@ -65,6 +65,7 @@ jobs:
|
||||
run: |
|
||||
mkdir -p site
|
||||
cp -r target/book/. site/
|
||||
bash docs/book/seo.sh site # canonical links, robots.txt, sitemap.xml
|
||||
cp -r dist/web site/app
|
||||
- uses: actions/configure-pages@v5
|
||||
id: pages
|
||||
|
||||
@@ -15,14 +15,18 @@ new uses of it anywhere else. Public docs/web/Flatpak deployments use project Pa
|
||||
`/solidcraft/`; do not add permanent old-name Pages aliases.
|
||||
|
||||
## Start every session here
|
||||
1. Read `plan/STATUS.md` (current milestone, next task), then the task in `plan/execution-plan.md`
|
||||
and the relevant `plan/architecture.md` section.
|
||||
2. Kernel and library decisions: `plan/adr/0001-geometry-kernel.md` (what we may depend on, what
|
||||
is rejected for licence reasons).
|
||||
3. Follow the autonomous operation protocol (`plan/execution-plan.md` §6). Don't stop to ask
|
||||
unless it lists the decision as the owner's.
|
||||
1. What to work on: [ROADMAP.md](ROADMAP.md) (status and milestones), "Where help is wanted most"
|
||||
in CONTRIBUTING.md, and the open issues labelled `help wanted`, `good first issue` and
|
||||
`needs-triage`. Check what is already open first (below).
|
||||
2. How the code fits together: [docs/architecture.md](docs/architecture.md) (the layer table) and
|
||||
"How the code is laid out" in CONTRIBUTING.md. Kernel work is paused ("Kernel work is paused"
|
||||
in CONTRIBUTING.md).
|
||||
3. What we may depend on: the licence rules under Non-negotiables below, `deny.toml`, and
|
||||
`cargo xtask licences --check`. Only `crates/kernel` may use `truck`.
|
||||
4. Work on your own: when the code, the docs and these rules settle a question, act on it. Ask on
|
||||
the issue or the PR only when the answer changes what users see or what the change covers.
|
||||
|
||||
`plan/` is gitignored (local only).
|
||||
Maintainers may keep local notes in `plan/` (gitignored); nothing in this file depends on them.
|
||||
|
||||
## Never crash
|
||||
People trust SolidCraft with their designs; a crash loses their work. **This outranks feature work.**
|
||||
@@ -82,7 +86,10 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
||||
- **Everything is a command.** User-visible behaviour = a command in `crates/engine/src/cmd/*`
|
||||
(`CommandSpec`: id = our own dotted, lower-case id `<area>.<thing>[.<variant>]` such as
|
||||
`solid.extrude` or `sketch.rectangle.two_point`, never another product's command id; label;
|
||||
toolbar tab and panel; icon; shortcut; params doc; `enabled`; JSON `run`) + tests. The toolbar,
|
||||
toolbar tab and panel; icon; shortcut; params doc; `enabled`; JSON `run`) + input and output
|
||||
schemas (a contract and a reply type in `crates/engine/src/schema/`, registered with
|
||||
`checked!`, `.contract` and `.output`; a command should have them, and a test warns
|
||||
without them (it will become required); `schema/unconverted.txt` only shrinks; how: docs/book/src/dev/schemas.md) + tests. The toolbar,
|
||||
dialogs, sketch tools, palette, scripts, CLI and control channel all reach the same commands.
|
||||
- **Programmatic calls never open dialogs.** `engine.execute` runs the JSON form; only toolbar
|
||||
clicks (`ui.start`) start interactive tools and dialogs, which then run commands.
|
||||
@@ -110,7 +117,9 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
|
||||
run service workers as JavaScript) and the small inline scripts in `apps/solidcraft-web/index.html`.
|
||||
Keep them minimal; `cargo xtask web-offline-test` covers the service worker.
|
||||
- **Quality gates** before every commit: `cargo xtask ci` (fmt, clippy -D warnings, tests,
|
||||
assets, layers). Commit after every feature arc that builds.
|
||||
assets, layers). Commit after every feature arc that builds. The gate reads the working tree,
|
||||
so do not switch branches while it runs: it compiles the other branch's code and fails on a
|
||||
change that is not in the PR. Run it in the background and wait for its log.
|
||||
- **Publishing**: the repository is github.com/tangency-labs/solidcraft. Changes land through
|
||||
**pull requests** and the **merge queue**: push a branch and open a PR. The heavy CI jobs start
|
||||
when a maintainer adds `approved-for-ci` after reviewing the code. Approved PRs go into the queue
|
||||
@@ -209,7 +218,7 @@ before the draft is verified.
|
||||
- Build with `CARGO_TARGET_DIR=<repo>/target`. Windows: `cargo xwin build --release --target x86_64-pc-windows-msvc -p solidcraft`.
|
||||
|
||||
## Roadmap
|
||||
`ROADMAP.md` (committed) tracks status, milestones and estimates. Update it whenever a
|
||||
`docs/roadmap-detail.md` (committed) tracks status, milestones and estimates; `ROADMAP.md` is the short user-facing roadmap. Update it whenever a
|
||||
milestone task lands. `docs/features.md` (SolidCraft's commands by area, from the registry) and
|
||||
`THIRD-PARTY-LICENSES.txt` are regenerated on `main` after each merge by the Generated files
|
||||
workflow; never regenerate them in a PR.
|
||||
|
||||
+13
-8
@@ -51,10 +51,10 @@ Editable drawing code, native projects and shipped exports are collected under `
|
||||
| assets/icons/app/macos/exports/icon.icns | SolidCraft contributors | macOS fallback compiled by Apple's actool from the approved assets/icons/app/macos/source/SolidCraft.icon composition | MIT OR Apache-2.0 |
|
||||
| assets/models/test_boat.bin | 3DBenchy.com | 3DBenchy.com | Public Domain |
|
||||
| assets/models/make_test_boat.py | SolidCraft contributors | original script that packs a model into the compact file above | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/class-a-blend.png | SolidCraft contributors | screenshot of SolidCraft itself: two boxes bridged by `surface.blend` (a 40x10 sheet, `solidcraft-cli snapshot` of plan/evidence script ev_blend) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/class-a-crown.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch crowned with `surface.patch crown=0.3` over a saddle rim (`solidcraft-cli snapshot`) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/class-a-boundary.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch through two sketch lines built by `surface.boundary` with `crown: 0.4` (`solidcraft-cli snapshot`) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/sample-plate.png | SolidCraft contributors | screenshot of SolidCraft itself (`solidcraft --sample`) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/class-a-blend.png | SolidCraft contributors | screenshot of SolidCraft itself: a 24 mm and a 10 mm box bridged by a `surface.blend` sheet (G1 at both edges), rendered by the app's `ui.render` in the dark theme with examples/demo/class_a_shots.py | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/class-a-crown.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch crowned with `surface.patch crown=0.3` over a skew four-line rim, rendered by the app's `ui.render` in the dark theme with examples/demo/class_a_shots.py | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/class-a-boundary.png | SolidCraft contributors | screenshot of SolidCraft itself: a surface through two 3D sketch splines built by `surface.boundary`, rendered by the app's `ui.render` in the dark theme with examples/demo/class_a_shots.py | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/sample-plate.png | SolidCraft contributors | screenshot of SolidCraft 0.22.1 itself (`solidcraft --sample`, default dark theme, 1600x1000) | MIT OR Apache-2.0 |
|
||||
| assets/samples/exports/0.png | SolidCraft contributors | original Sample Plate from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||
| assets/samples/exports/1.png | SolidCraft contributors | original Sheet Metal Bracket from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||
| assets/samples/exports/2.png | SolidCraft contributors | original Hinge Assembly from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||
@@ -62,10 +62,10 @@ Editable drawing code, native projects and shipped exports are collected under `
|
||||
| assets/samples/exports/4.png | SolidCraft contributors | original Bolted Flange from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||
| assets/samples/exports/5.png | SolidCraft contributors | original Vent Plate from `crates/engine/src/sample.rs`, exported by the SolidCraft thumbnail renderer | MIT OR Apache-2.0 |
|
||||
| assets/samples/exports/scripts.json | SolidCraft contributors | SHA-256 fingerprints of the original sample scripts, generated with the shipped thumbnails | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/demo-0.8.gif | SolidCraft contributors | original screen recording of the actual SolidCraft 0.8 English desktop UI modelling an original Raspberry Pi 4 case (no logos or branding; the engraved text is set in the system's DejaVu Sans Bold), generated with examples/demo/record_ui.sh and its original animated pointer overlay (9× playback) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/demo-0.8.mp4 | SolidCraft contributors | original screen recording of the actual SolidCraft 0.8 English desktop UI modelling an original Raspberry Pi 4 case (no logos or branding; the engraved text is set in the system's DejaVu Sans Bold), generated with examples/demo/record_ui.sh and its original animated pointer overlay (9× playback) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/rover-build.gif | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft desktop UI replaying the timeline of the SELENE rover (`Rover-recorded.solidcraft` from https://github.com/0xlillith/solidcraft-rover, an original model by 0xlillith built through SolidCraft MCP); the model's lettering follows Ubuntu Light outlines (Canonical Ltd., Ubuntu Font Licence 1.0, as noted in that repository); the emblem is the SolidCraft project icon (2× playback) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/rover-build.mp4 | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft desktop UI replaying the timeline of the SELENE rover (`Rover-recorded.solidcraft` from https://github.com/0xlillith/solidcraft-rover, an original model by 0xlillith built through SolidCraft MCP); the model's lettering follows Ubuntu Light outlines (Canonical Ltd., Ubuntu Font Licence 1.0, as noted in that repository); the emblem is the SolidCraft project icon | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/demo.gif | SolidCraft contributors | original screen recording of the actual SolidCraft 0.22.1 English desktop UI (default dark theme, software renderer) modelling an original Raspberry Pi 4 case (no logos or branding; the engraved text is set in the system's DejaVu Sans Bold), generated with examples/demo/record_ui.sh and its original animated pointer overlay (6× playback, idle pauses cut) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/demo.mp4 | SolidCraft contributors | original screen recording of the actual SolidCraft 0.22.1 English desktop UI (default dark theme, software renderer) modelling an original Raspberry Pi 4 case (no logos or branding; the engraved text is set in the system's DejaVu Sans Bold), generated with examples/demo/record_ui.sh and its original animated pointer overlay (6× playback, idle pauses cut) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/rover-build.gif | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft 0.22.1 desktop UI (default dark theme, software renderer) replaying the timeline of the SELENE rover (`Rover-recorded.solidcraft` from https://github.com/0xlillith/solidcraft-rover, an original model by 0xlillith built through SolidCraft MCP); the model's lettering follows Ubuntu Light outlines (Canonical Ltd., Ubuntu Font Licence 1.0, as noted in that repository); the emblem is the SolidCraft project icon (15× playback, idle pauses cut, constant-rate camera orbit) | MIT OR Apache-2.0 |
|
||||
| docs/screenshots/rover-build.mp4 | 0xlillith (model); SolidCraft contributors (recording) | screen recording of the actual SolidCraft 0.22.1 desktop UI (default dark theme, software renderer) replaying the timeline of the SELENE rover (`Rover-recorded.solidcraft` from https://github.com/0xlillith/solidcraft-rover, an original model by 0xlillith built through SolidCraft MCP); the model's lettering follows Ubuntu Light outlines (Canonical Ltd., Ubuntu Font Licence 1.0, as noted in that repository); the emblem is the SolidCraft project icon | MIT OR Apache-2.0 |
|
||||
| docs/design/ux-redesign/model-floating.png | SolidCraft contributors | original UX mockup (Model tab, floating layout) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||
| docs/design/ux-redesign/model-compact.png | SolidCraft contributors | original UX mockup (Model tab, compact docked layout) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||
| docs/design/ux-redesign/sketch.png | SolidCraft contributors | original UX mockup (Sketch tab) rendered from an HTML mockup that uses the original Technical Accent icon set; no third-party artwork, and not a screenshot of any other CAD product | MIT OR Apache-2.0 |
|
||||
@@ -158,6 +158,7 @@ Editable drawing code, native projects and shipped exports are collected under `
|
||||
| assets/locales/ja.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||
| assets/locales/ko.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||
| assets/locales/ms.json | A.Hakim (a-hakim) | Malay translation of the English message catalog | MIT OR Apache-2.0 |
|
||||
| assets/locales/nb.json | SolidCraft contributors | Original Norwegian Bokmål translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
||||
| assets/locales/nl.json | SolidCraft contributors | Original Dutch translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
|
||||
| assets/locales/pl.json | cyryllo | Polish translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||
| assets/locales/ru.json | Alex Pro (del000) | Russian translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
|
||||
@@ -199,6 +200,8 @@ Editable drawing code, native projects and shipped exports are collected under `
|
||||
| assets/styles/ui/themes/graphite.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
|
||||
| assets/styles/ui/themes/nosferatu.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Dracula by Zeno Rocha and the Dracula Theme contributors, https://github.com/dracula/dracula-theme, MIT) | MIT OR Apache-2.0 |
|
||||
| assets/styles/ui/themes/catppuccin-mocha.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Catppuccin by the Catppuccin organisation, https://github.com/catppuccin/catppuccin, MIT) | MIT OR Apache-2.0 |
|
||||
| assets/styles/ui/themes/okibi.json | SolidCraft contributors (Kai Evans) | original SolidCraft theme file mapping SolidCraft's UI colours to the Okibi palette (dark) of the Okibi design system by Kai Evans (https://kaievns.github.io/okibi-akiri-design-system-spec/) | MIT OR Apache-2.0 |
|
||||
| assets/styles/ui/themes/akari.json | SolidCraft contributors (Kai Evans) | original SolidCraft theme file mapping SolidCraft's UI colours to the Akari palette (light) of the Okibi design system by Kai Evans (https://kaievns.github.io/okibi-akiri-design-system-spec/) | MIT OR Apache-2.0 |
|
||||
| assets/styles/web/loading-logo.svg | SolidCraft contributors | Animation of the SolidCraft mark, built from the paths and gradients of assets/icons/app/macos/source/SolidCraft.icon/Assets/03-solid-blue-cutout.svg; original animation | MIT OR Apache-2.0 |
|
||||
| assets/styles/web/loading.css | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
|
||||
| crates/io/src/native_cad/fixtures/block.FCStd | SolidCraft contributors | original 10 × 20 × 30 mm test box saved by FreeCAD 1.1.4 run as an external program (`make_block_fcstd.py` beside it); no third-party geometry | MIT OR Apache-2.0 |
|
||||
@@ -281,6 +284,8 @@ Editable drawing code, native projects and shipped exports are collected under `
|
||||
| assets/icons/ui/design/svg/model/circle_tt.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/model/circle_ttt.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/model/coil.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/model/colored_components.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/model/colored_components_off.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/model/combine.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/model/component.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/model/compute.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
|
||||
|
||||
+18
-3
@@ -11,7 +11,7 @@ build it, how the code is laid out, the few rules that aren't negotiable, and wh
|
||||
needed most.
|
||||
|
||||
Before choosing a task, check the [command inventory](docs/features.md) and
|
||||
[roadmap](ROADMAP.md) for implemented capabilities and current priorities.
|
||||
[roadmap](docs/roadmap-detail.md) for implemented capabilities and current priorities.
|
||||
|
||||
Questions, ideas or want to say what you're working on? Join the [Discord](https://discord.gg/FtU4NQNVDH).
|
||||
|
||||
@@ -130,7 +130,9 @@ The [architecture page](docs/architecture.md) has the layer table. The short ver
|
||||
- Every call into truck goes through `solidcraft_kernel::guard`.
|
||||
- Every crash fix comes with a regression test.
|
||||
5. **Everything is a command, with a test.** A new feature means a `CommandSpec` in
|
||||
`crates/engine/src/cmd/`, engine tests that measure the result (volume, area,
|
||||
`crates/engine/src/cmd/` with input and output schemas (see
|
||||
[Adding a command](docs/book/src/dev/commands.md#adding-a-command); a test warns about a
|
||||
command without them, and will fail it once required), engine tests that measure the result (volume, area,
|
||||
face/edge/vertex counts against a value you can derive), and for UI work a scenario (below).
|
||||
6. **One set of camera controls.** Every page or canvas that shows a view (the modelling
|
||||
viewport, the Render preview, and any new page such as a flat pattern or drawing) calls
|
||||
@@ -274,6 +276,9 @@ and a fresh CI run:
|
||||
and the Lists workflow) fails on an unsorted catalog or an id that appears twice.
|
||||
- **`mod` lines**: one per line, in the sorted group they belong to (`cargo fmt` keeps each group
|
||||
sorted). Add a new module into the existing group, not as a new group at the end.
|
||||
- **Commands without schemas** (`crates/engine/src/schema/unconverted.txt`): sorted, one id per
|
||||
line, and it only shrinks. Converting a command removes its line; a new command is never added
|
||||
to it.
|
||||
- **Languages** (`crates/ui-egui/src/i18n.rs`): one per line, English first, then by id (a test
|
||||
checks it).
|
||||
- **Generated files**: `THIRD-PARTY-LICENSES.txt` and `docs/features.md` are rewritten on `main`
|
||||
@@ -334,6 +339,16 @@ Changes with no useful observable behavior do not need screenshot or video evide
|
||||
small example without private designs or sensitive details; attach the media or link to an
|
||||
accessible recording rather than committing generated review artifacts.
|
||||
|
||||
To show a picture without committing it, attach the media to the PR (it goes to the PR's own
|
||||
attachment storage and renders inline in the comment). A gist is the better home for a log or
|
||||
another text file, and you link it; a gist does not render a picture inline. The review artifacts
|
||||
stay out of the diff that way, and nothing has to be pushed to a branch of its own.
|
||||
|
||||
Attaching works in the browser for anyone who can comment: drag the file into a comment on the
|
||||
pull request. A command-line agent without a browser session usually cannot attach a file (the
|
||||
upload needs write access to this repository). Say so in the pull request, and the person running
|
||||
the agent or a maintainer can attach it.
|
||||
|
||||
Keep an eye on your PR's status, but don't push to it only to catch up with `main` (no merge of
|
||||
`main`, no Update branch button, no rebase for that alone): every push restarts the whole CI
|
||||
run for everyone waiting behind it, and `main`'s own run catches what lands in between. When you
|
||||
@@ -389,7 +404,7 @@ In order of how much they'd help users:
|
||||
2. **Boolean robustness.** A random-design fuzzer currently gets about half of its designs
|
||||
through without a kernel error. Each failing seed is a reproducible bug.
|
||||
3. **Drawings, CAM and mesh tools.** These are out of scope for now (see
|
||||
[ROADMAP.md](ROADMAP.md)), but anyone who wants to own one is welcome.
|
||||
[ROADMAP.md](docs/roadmap-detail.md)), but anyone who wants to own one is welcome.
|
||||
|
||||
## Updating the generated feature list
|
||||
|
||||
|
||||
Generated
+18
-17
@@ -4208,7 +4208,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"block2 0.6.2",
|
||||
"eframe",
|
||||
@@ -4240,11 +4240,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-3dx-client"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-cli"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"image",
|
||||
"log",
|
||||
@@ -4256,7 +4256,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-derive"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -4265,7 +4265,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-doc"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"log",
|
||||
"serde",
|
||||
@@ -4282,7 +4282,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-engine"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"log",
|
||||
"schemars",
|
||||
@@ -4302,7 +4302,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-geom"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -4311,7 +4311,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-gpu"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"image",
|
||||
"log",
|
||||
@@ -4331,7 +4331,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-io"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"cadmpeg-core",
|
||||
"cadmpeg-ir",
|
||||
@@ -4355,7 +4355,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-kernel"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"log",
|
||||
"proptest",
|
||||
@@ -4375,7 +4375,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-mcp"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"serde_json",
|
||||
"solidcraft-engine",
|
||||
@@ -4384,7 +4384,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-render"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"image",
|
||||
"moxcms",
|
||||
@@ -4398,7 +4398,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-sketch"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -4409,14 +4409,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-space-mouse"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-ui-egui"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"arboard",
|
||||
"egui",
|
||||
@@ -4445,7 +4445,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "solidcraft-web"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"eframe",
|
||||
"egui",
|
||||
@@ -4454,6 +4454,7 @@ dependencies = [
|
||||
"serde_json",
|
||||
"solidcraft-engine",
|
||||
"solidcraft-ui-egui",
|
||||
"url",
|
||||
"wasm-bindgen",
|
||||
"wasm-bindgen-futures",
|
||||
"web-sys",
|
||||
@@ -5982,7 +5983,7 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"serde_json",
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ members = ["crates/*", "apps/*", "xtask"]
|
||||
exclude = ["vendor"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.22.1"
|
||||
version = "0.23.1"
|
||||
edition = "2024"
|
||||
license = "MIT OR Apache-2.0"
|
||||
rust-version = "1.95"
|
||||
|
||||
@@ -46,13 +46,13 @@
|
||||
<a href="https://trendshift.io/repositories/296178?utm_source=trendshift-badge&utm_medium=badge&utm_campaign=badge-trendshift-296178" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/296178/daily?language=Rust" alt="tangency-labs%2Fsolidcraft | Trendshift (Rust)" width="250" height="55"/></a>
|
||||
</p>
|
||||
|
||||

|
||||

|
||||
|
||||
*A Raspberry Pi 4 case from an empty design: a sketch dimensioned with the board's parameters, extrude, fillet, shell, the rim rounded in one pick, an M2.5 standoff patterned on the 58 × 49 mm hole rectangle, port cut-outs, vent slots, "Pi 4" engraved in DejaVu Sans Bold and a PETG material defined in the design, with its mass in Properties, then height 24 → 32 mm in Parameters and it all rebuilds. 9× playback. [Full video](https://github.com/tangency-labs/solidcraft/raw/refs/heads/main/docs/screenshots/demo-0.8.mp4), recorded with the [demo script](examples/demo/record_ui.sh).*
|
||||
*A Raspberry Pi 4 case from an empty design: a sketch dimensioned with the board's parameters, extrude, fillet, shell, the rim rounded in one pick, an M2.5 standoff patterned on the 58 × 49 mm hole rectangle, port cut-outs, vent slots, "Pi 4" engraved in DejaVu Sans Bold and a PETG material defined in the design, with its mass in Properties, then height 24 → 32 mm in Parameters and it all rebuilds. 6× playback with the idle pauses cut. [Full video](https://github.com/tangency-labs/solidcraft/raw/refs/heads/main/docs/screenshots/demo.mp4), recorded with the [demo script](examples/demo/record_ui.sh).*
|
||||
|
||||
## Download
|
||||
|
||||
- **Windows:** the [installer][windows-msi], or `winget install bherbruck.SolidCraft`.
|
||||
- **Windows:** the [installer][windows-msi].
|
||||
- **macOS:** the [disk image][macos-dmg] (Apple silicon and Intel).
|
||||
- **Linux:** the [AppImage][linux-appimage], or `sudo snap install solidcraft` ([Snap Store][snap-store]).
|
||||
- **Web:** [try it in your browser][web-app], no install.
|
||||
|
||||
+80
-694
@@ -1,696 +1,82 @@
|
||||
# SolidCraft roadmap
|
||||
|
||||
Status as of **2026-10-14**. SolidCraft supports parametric modelling (sketch →
|
||||
features → parametric timeline) as an open, pure-Rust, agent-drivable application.
|
||||
|
||||
## At a glance
|
||||
|
||||
| Question | Answer |
|
||||
|---|---|
|
||||
| Where are we? | **M0 and M13 done; M1, M2, M5–M7, M9, M10, M14 in progress.** Sketch with solver and the full SKETCH create/modify set; extrude, revolve (two sides, symmetric, to object), fillet/chamfer (variable radius, chord length, a radius per edge, corner patches), holes, threads (cosmetic and modelled), patterns, mirror, shell (inside/outside/both), draft, loft, sweep, coil, split body and split face, delete face, construction planes, axes and points; persistent naming of faces and edges; parameters and configurations; components, joints, motion studies, exploded views; sheet metal and a plastic enclosure subset; STEP/IGES/3MF/STL/OBJ/DXF; FreeCAD/Rhino import; autosave and crash recovery; desktop and browser (wasm) app, CLI, MCP server. |
|
||||
| Features | Every registered command by area — [docs/features.md](docs/features.md) (`cargo xtask features`); registry breadth does not establish workflow or geometric depth |
|
||||
| Reference tests | [Current case count and results](docs/oracle.md): public cases in `tests/oracle/` with analytic or FreeCAD-computed expected values, checked by the reference-test job in [CI](.github/workflows/ci.yml). |
|
||||
| Tests | Solver, profiles, kernel booleans/blends/measures, expressions, timeline, persistent naming, file formats and migrations, assemblies, sheet metal, engine end-to-end, hostile-input fuzz over every command and headless UI scenarios. `cargo xtask ci` reports the current passing counts. |
|
||||
| Gates | `cargo xtask ci`: fmt, clippy -D warnings, tests, asset attribution, layering, wasm32 build — green |
|
||||
| Time to a useful alpha (M0–M6) | ≈ **82 agent hours** remain (sum of the M1–M6 estimates below) |
|
||||
|
||||
Optional GPU viewport ambient occlusion is available in View settings and Graphics preferences,
|
||||
with persistent settings, Performance/Quality graphics presets (Quality combines AO, Fine tessellation and adaptive 2× supersampling; manual combinations show Custom), and the
|
||||
`view.ambient_occlusion` and `view.graphics_preset` commands. See [display settings](docs/ambient-occlusion.md).
|
||||
|
||||
## Scope (owner decision, 2026-10-07)
|
||||
|
||||
The issue batch adds preservation of blind pockets in through cuts, associative projected
|
||||
offsets and plastic face placements, XZ (+Y normal) with a v6 migration preserving older
|
||||
designs, interactive angle placement, file-picker sketch imports, Home/recent controls,
|
||||
toolbar overflow, and the remaining component-frame and assembly WIP work. The enclosure
|
||||
acceptance scenarios now include board resizes; STEP reopening is automated. See [WIP reconciliation](docs/wip-reconciliation.md).
|
||||
Face-based Extrude Join (including outward Press Pull) now defaults to the picked body,
|
||||
so edge-touching assembly neighbours stay separate regardless of body order (#226).
|
||||
|
||||
In scope, in priority order:
|
||||
1. SOLID and SKETCH (now).
|
||||
2. Parameters / functional constraints (done: see `parameters.*`, `expr.evaluate`; unit-aware,
|
||||
cycles reported with their path, rename follows references, deletes list their users):
|
||||
user parameters with units and expressions (+-*/, ^,
|
||||
parentheses, sin/cos/sqrt/min/max/floor/ceil/round, unit conversion), model parameters
|
||||
d1, d2… for every dimension and feature input, references between parameters with a
|
||||
dependency graph and cycle detection, re-evaluation on change, comments, favourites,
|
||||
CSV/JSON import and export.
|
||||
3. Components and assemblies with joints (M9).
|
||||
4. SHEET METAL: flange, contour flange, bend, unfold/refold, flat pattern with DXF export, sheet
|
||||
metal rules (thickness, K-factor, bend radius) (M10).
|
||||
5. A small PLASTIC subset for enclosures, after sheet metal: Boss, Rib, Web, Lip/Groove, Snap Fit.
|
||||
|
||||
Deferred until further notice: MESH, FORM (T-splines), SURFACE beyond what solids need (scope proposed in #772), PCB / 3D
|
||||
PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
|
||||
|
||||
## Milestones
|
||||
|
||||
| # | Milestone | Status | Hours left |
|
||||
|---|---|---|---|
|
||||
| M0 | Vertical slice | done | — |
|
||||
| M1 | Sketch depth: command coverage implemented — projection/intersect/include as linked geometry (auto-project on faces, lost-reference warnings, break link), full SKETCH create/modify set (slots, polygons, tangent arcs/circles, ellipse, fit/control splines, conic, text, trim/extend/break, fillet/chamfer, offset, mirror, patterns, move/scale, blend curve, centerline), constraints incl. curvature and polygon with over-constraint refusal, Shift-picked line midpoints in Horizontal/Vertical using persisted points and ordinary constraints (#2087), driven/arc-length/linear-diameter dimensions, AutoConstrain, DXF/SVG insert, 3D sketch curves (Project To Surface, Intersection Curve, Isoparametric Curve, Spun Profile), exact free-form profiles (B-spline/NURBS edges, any spline degree, curves cut by crossings), sweeps and pipes along 3D sketch curves, canvases and decals, curvature combs. Exact free-form Extend and certified associative offsets now preserve geometry and IDs through edits, deletion and reopen. Occurrence-frame 3D wires now store explicit coordinate spaces and retain points and analytic fits through moves, refresh, undo and reopen. Constructive sketch solving (Owen 1991, Fudos & Hoffmann 1997) ahead of the numerical solver: points and rigid clusters are placed on the branch the sketch had, so dimension edits and drags keep their solution; edits that would turn a sketch over are refused; drags re-solve only the sketch per frame. Remaining workflow repairs: mixed offset junctions, legacy natural-spline seams, and damaged legacy wire links lacking frame provenance | in progress | 4 |
|
||||
| M2 | Robust modelling: coplanar booleans in the kernel, holes (placed on faces, at distances from reference edges, and on sketch points), threads (cosmetic, then modelled), patterns, mirror, shell, draft, split, construction geometry | in progress | 16 |
|
||||
| M1 | Sketch depth: command coverage implemented — projection/intersect/include as linked geometry (auto-project on faces, lost-reference warnings, break link), full SKETCH create/modify set (slots, polygons, tangent arcs/circles, ellipse, fit/control splines, conic, text, trim/extend/break, fillet/chamfer, offset, mirror, patterns, move/scale, blend curve, centerline), constraints incl. curvature and polygon with over-constraint refusal, Shift-picked line midpoints in Horizontal/Vertical using persisted points and ordinary constraints (#2087), drawing snaps to where two lines, circles or arcs cross (#4967), driven/arc-length/linear-diameter dimensions, AutoConstrain, DXF/SVG insert, 3D sketch curves (Project To Surface, Intersection Curve, Isoparametric Curve, Spun Profile), exact free-form profiles (B-spline/NURBS edges, any spline degree, curves cut by crossings), sweeps and pipes along 3D sketch curves, canvases and decals, curvature combs. Exact free-form Extend and certified associative offsets now preserve geometry and IDs through edits, deletion and reopen. Occurrence-frame 3D wires now store explicit coordinate spaces and retain points and analytic fits through moves, refresh, undo and reopen. Constructive sketch solving (Owen 1991, Fudos & Hoffmann 1997) ahead of the numerical solver: points and rigid clusters are placed on the branch the sketch had, so dimension edits and drags keep their solution; edits that would turn a sketch over are refused; drags re-solve only the sketch per frame. Remaining workflow repairs: mixed offset junctions, legacy natural-spline seams, and damaged legacy wire links lacking frame provenance | in progress | 4 |
|
||||
| M2 | Robust modelling: coplanar booleans in the kernel, holes (placed on faces and on sketch points), threads (cosmetic, then modelled), patterns, mirror, shell, draft, split, construction geometry | in progress | 16 |
|
||||
| M3 | General fillets and chamfers (curved edges, chains, vertex blends); saddle rolling-ball surfaces now use continuous seam sections and arc-length fitting with shared contact boundaries and bounded accuracy checks; tiny rim edges remain selected instead of nearby wall seams when filleting (#2498) | in progress | 30 |
|
||||
| M4 | Files: STEP import (done — [docs/step-import.md](docs/step-import.md)), FreeCAD/Rhino solids through cadmpeg (done, desktop, browser and CLI), 3MF export and 3MF/STL import as mesh bodies (done), 3MF with B-rep face tags ([docs/formats/3mf-face-tags.md](docs/formats/3mf-face-tags.md), done), constant-section parametric mesh reconstruction, DXF sketches, OBJ import | in progress | 6 |
|
||||
| M5 | Persistent naming of faces and edges (docs/book/src/dev/naming.md): faces named from their exact kernel-reported history (sketch curve sides, caps, revolve sections, primitive sides, blends, shell inner walls, pattern/mirror copies; split pieces told apart by the faces around them, lumps of a cut body named after their faces), edges by their faces; fillets/chamfers, sketches on faces, shell/draft/offset/replace faces, hole placements, joint origins and face appearances resolve by name first and warn when the entity split or vanished: done. sheet metal edges by base sketch line and flange side, shell inner faces, sweep and loft roles: done. kernel-reported face history: done (merged faces answer to every name; operations without history yet fall back to geometric names, flagged unverified; format 14 keeps older designs' geometric names). Left: history through sheet metal, plastic, surface and emboss features; FaceSource certificates through history | in progress | 20 |
|
||||
| M6 | UI depth: selection feedback and origin (done), timeline editing (done: hover and selection highlight modifier faces, including fillets and chamfers; edit feature, history marker drag, dependency-checked single and multi-item reorder, suppress, rename, delete with dependents, re-resolved references; redefining selections refreshes persistent edge/face references while retaining feature identity and dimension names; responsive feature history with width-driven icons/names/title, snapping width resize, bottom/left/browser-stack docking, shared-column collapse, rollback bar, multi-selection and persistent folders), right-docked dialogs (done), live previews for every feature dialog (done), keyboard-first commands with on-canvas value boxes and sketch inline dimensions (done), drag manipulators with automatic join/cut (done: extrude incl. two sides, fillet, shell, hole depth, move, pattern spacing, revolve rotator, extrude taper), dark theme (done), right-click menu with Repeat (done), measure tool (done), section analysis (done), selection filter (done), drag-solve of sketch points (done); appearance controls now preserve body/face/component targeting, named transparent looks, reuse/search and override removal; Browser Expand All / Collapse All (`browser.expand_all`, `browser.collapse_all`) on the design and component menus; preferences | in progress | 6 |
|
||||
| M7 | Thin extrude (walls along open or closed curves: centre, inside, outside or two sides; mitred corners, crossing walls joined; #721), sweep, loft (incl. to a point), rib and web (to next / depth), emboss (planar faces and exact radial emboss/deboss of bounded orthogonal profiles on complete exterior cylinders/sleeves), thread (cosmetic, and modelled M3–M20 outside and inside: the ISO profile screwed in as a faceted cut), coil (smooth B-spline helical walls), pipe, pattern on path, patterns of bodies and components, replace face (parallel), align, remove, feature copy/paste: done. Unique eligible cylindrical targets are inferred for new Emboss features. Left: general curved-face emboss and exact (unfaceted) modelled threads | in progress | 12 |
|
||||
| M8 | Surface workspace (#772). Done: Patch (sketch regions; edge loops filled G0, plus `crown`), Stitch, Thicken (planes and cylinders), Extend (straight edges of planar surfaces), Trim (by a plane, a face or sketch curves swept onto the surface, keeping a side or the picked regions; mutual trim of two surfaces, extended to meet and stitched, #767), Delete Face (healing), Boundary Fill, zebra/draft/curvature-map analysis, Surface Extrude/Revolve/Sweep/Loft from open and closed curves, Offset, Unstitch and Reverse Normal; the continuity-driven core (`kernel/src/bridge.rs`, G0–G3 Hermite rows) with **Blend** (`surface.blend`, #764: edge chains along one or several faces, closed rims paired seam to seam or from picked seams, a dialog), **Match** (`surface.match`), **Boundary** (`surface.boundary`, #763 — two sketch curves exact with G0–G3, three or four as the flat patch of their loop, and curve networks: Coons and Gordon surfaces through sketch, 3D-sketch or edge curves, a point for a three-sided side, G1/G2 against the faces along one direction's edges, joined into their body on request; G1/G2 on two sides that meet at a corner waits for the Gregory-type corner), **Fair** (`surface.fair`, CV fairing), **continuity analysis** (`inspect.continuity`, #770; a toolbar tool with edge markers and a legend, and curvature combs along face isocurves) and a multi-section **loft** with per-end continuity and crown, and guide rails on solid and surface lofts (one or two, scaling or stretching the sections between; #201). Also in the Class-A pass: G1…G4 blend curves in the sketch, chord and variable-radius fillets on curved edges (with honest refusals where the fit cannot hold), and a G2 corner patch where filleted edges meet (kernel; the command refuses until the patch's sections can be sewn to the blends' contacts). Left: bias/form-factor fillet sections (design recorded), a Gregory-type corner, surface Fillet between separate surface bodies (#769), Ruled (#762), Untrim (#761), curved-face Extend (#760), and every remaining #757–#772 item | deferred | — |
|
||||
| M9 | Components and assemblies: New Component / Create Components from Bodies, active component, per-component origin/bodies/sketches/timeline entries, occurrences with transforms, Copy/Paste vs Paste New, nested Browser tree with visibility and isolate; Ground, Move/Copy of occurrences, joints (rigid, revolute, slider, cylindrical, pin-slot, planar, ball) by joint origins with limits and Drive Joints, closed kinematic loops (four-bar, slider-crank: the loop's other joints follow the driven one on its branch, and driving stops where a loop can no longer close), cams (`joint.cam`: a revolute cam drives a slider or revolute follower along a closed sketch profile or the cam's edges, knife, roller or flat followers, worked out again when the profile changes; drives, studies, closed loops, contact sets), As-built Joint, Rigid Group, Contact Sets (driving and motion studies stop where bodies in a set would pass through each other), Motion Study (joint values keyed along a timeline, playback, export of occurrence positions as JSON/CSV), motion analysis (joint values and a point's path charted over a study as value, velocity and acceleration; the parts that collide along a study, with the steps where they do), Exploded views (automatic or by hand, shown without changing placements, and exported as an animation coming apart and back together); interference, per-component physical properties; STEP with assembly structure; URDF export for robot simulators (links with meshes, mass and inertia; joint chains whose values match Drive Joints; docs/urdf.md). Physical properties now measure material-aware component/occurrence placements, descendants and repeated instances, including pending moves and body reassignment offsets; contact geometry and automatic exploded centres respect those offsets. Groundwork done: component tree, occurrences with transforms (instances, Paste New), world placement, active component as authoring frame, ground, Capture/Revert Position, moving bodies and sketches. UI: ASSEMBLE panel dialogs for New Component, Joint (snaps on faces, edges, circles and vertices; animated motion preview; offsets, flip, limits), As-built Joint, Joint Origin, Rigid Group, Drive Joints (live slider), Motion Link, Cam and Interference (overlaps shown red); joints in the timeline and the Browser | in progress | 32 |
|
||||
| M10 | Sheet metal: flange (base, edge, contour), hem, unfold/refold, convert, flat pattern + DXF, rules: done. PLASTIC enclosure subset: Boss, Rib, Web, Lip/Groove, Snap Fit, Rest, Plastic Rules (library, edit, assign; rule draft and clearance as feature defaults): done, tested against hand-computed geometry. UI: SHEET METAL and PLASTIC tabs with dialogs (live preview, Edit Feature, pre-selection) for Flange, Hem, Unfold/Refold, Convert, Sheet Metal Rules, Create Flat Pattern (flat view with bend lines, bend table CSV/JSON and DXF export with exact circle/arc/line cutouts), Boss, Lip/Groove, Snap Fit, Rest, Manage and Assign Plastic Rules; Fold (bend along a sketch line); flanges meeting at a corner closed at any angle with the rule's gap; edge flanges with their own angle and height per edge in one feature; corner reliefs (notch, round, rectangular, tear) chosen by the rule; Convert to Sheet Metal from a solid or shelled body by its bend edges (flat faces, sharp bends) | in progress | 36 |
|
||||
| M11 | 2D drawings | deferred | — |
|
||||
| M12 | Release: cross-platform packages, verification and deliberate publication implemented; original current-UI demo refreshed. macOS Developer ID signing and notarization are in the release workflow (#5749; they switch on when the Apple secrets exist). Windows installer signing and broader performance work remain | in progress | 16 |
|
||||
| M14 | Configurations: a table of rows (parameter expressions and feature suppressions per row) switched with config.activate (undoable, all or nothing), kept through parameter renames and feature deletes (config.configure, config.table, config.column/row/activate). Per-row body materials and appearances (library looks, custom colour/opacity and clearing overrides), undoable activation and save/reopen: done. Ordered typed configuration rules, atomic validation and structured rule editing: done. Component appearance and certified semantic face style columns, atomic preview/apply and independent-copy remapping: done. Exact constructed sketch-side and immutable imported-face lineage now preserve legacy names and reject retargeting. Left: ambiguous shifted/two-sided caps | in progress | 4 |
|
||||
| M13 | Never lose work: atomic saves (temporary file, flush, rename; a crash at any moment leaves the old file or the new one) with the replaced version kept as `<file>.bak`; autosave of unsaved changes to the recovery folder every 5 minutes (preference) and after big operations, only when something changed; "Recover unsaved design?" on the next launch (`doc.recovery_list`, `doc.recover`, `doc.recovery_discard`); a kill-mid-save test (process killed while saving a 0.5 MB design 25 times). File format: `"format": "solidcraft/12"`, older formats upgraded step by step (`doc::format`), newer ones refused with a message, out-of-range numbers and broken placements refused; a corpus of designs saved by M0, components-era, joints-era and current builds (apps/solidcraft-cli/tests/corpus) that must open and evaluate as saved; damaged and hostile variants (truncation, bit flips, hostile values, removed keys, repeated features, deep nesting) never panic | done | 6 |
|
||||
| M15 | Frames and weldments (#4003): structural members along 2D and 3D sketch lines, butt and mitre corners, trim to faces and bodies, end caps, gussets, cosmetic welds and a cut list. Done: the profile library (`frame.profile.list`, `frame.profile.properties`, `frame.profile.insert`): bar, round bar, rectangular and round tube, angle, channel and I-beam, each SolidCraft's own parametric definition with exact fillet arcs and exact section properties (area, centroid, second moments), tested against hand-computed values; members (`frame.member`): one body per straight line of a 2D or 3D frame sketch, following parameter edits, with a built-in profile (its dimensions parameter expressions) or a profile sketch (its drawn material by alternating nested loops), anchor, angle and mirror; each member's name kept with its line. Left: corners, trims, end caps, gussets, welds, cut list, FRAME tab and dialogs | in progress | 60 |
|
||||
|
||||
M6 navigation preferences include **Touchpad**: Shift + pointer movement pans, Alt/Option +
|
||||
pointer movement orbits without a mouse button, and vertical scrolling zooms. Other presets
|
||||
retain their saved two-finger scroll preference; camera motion is available through
|
||||
`view.navigate` and modifier-aware `ui.move` automation.
|
||||
With the **Fusion** preset and two-finger pan enabled, two fingers pan and Shift + two fingers
|
||||
orbit freely, with pinch zoom and mouse bindings unchanged. The shared navigation handler
|
||||
applies the same gestures to model and Render views and blocks orbit on flat pages.
|
||||
|
||||
UI redesign (#2016): the File/start view (#2027) uses shared light/dark navigation,
|
||||
action tiles, recent rows and sample cards, with recovery review and Save As/Export
|
||||
entry points. Document loading, sample caches and recovery safety retain their
|
||||
existing command paths.
|
||||
|
||||
M11 precursor: File → Export Current View as DXF exports shown placed bodies and sketches from the current
|
||||
camera as a 2D millimetre drawing, with hidden edges omitted or dashed. Vector occlusion splits
|
||||
partly hidden edges and includes curved silhouettes. Repeated part meshes and triangle
|
||||
hierarchies are shared; bounded desktop preparation and occlusion use up to eight workers.
|
||||
Curves are approximated; drawing sheets,
|
||||
annotations and exact projected curves remain deferred. See [view DXF](docs/view-dxf.md).
|
||||
|
||||
Drawing foundations: [RFC #860](https://github.com/tangency-labs/solidcraft/issues/860)
|
||||
and the [foundation ledger](docs/drawing-foundations.md) track the bounded implementation
|
||||
packages. The first geometry increment defines validated section records in a plane-local
|
||||
frame; the ledger separates that contract from section producers and the Drawing workspace.
|
||||
|
||||
Desktop view DXF export runs in the file-operation worker with five-stage progress and
|
||||
cooperative cancellation. Curve tolerance (0.0001–1 mm, default 0.01 mm) is remembered alongside
|
||||
the hidden-edge setting. Cancelled exports preserve the model and the previous destination;
|
||||
completed drawings publish atomically. The browser still exports synchronously.
|
||||
|
||||
## Interactive modelling
|
||||
|
||||
- Modelled threads preview their cut before OK using the background worker on desktop.
|
||||
Browser users apply the cut with OK to avoid blocking on every edit.
|
||||
|
||||
- Thread resolves a suggested metric size when a cylindrical face is picked. Diameter and
|
||||
pitch selectors expose the existing metric designation parameter; custom designations stay
|
||||
editable, and Automatic size returns to the face's suggestion. Cosmetic/modelled and
|
||||
full/partial-length options remain available. This does not add tolerance classes or
|
||||
left-hand threads.
|
||||
- New Body extrusion and face-offset previews show completed intermediate geometry while a
|
||||
drag continues, then catch up to the exact final value. Changes to the selected geometry,
|
||||
operation or feature still discard obsolete results. Distance arrows and their value boxes
|
||||
follow the current frame's input.
|
||||
- Large fine modelled threads use pitch-based helix resolution and tighter faceted
|
||||
reconstruction fallbacks, preserving thin crests and closed shells on large shafts.
|
||||
|
||||
## Physical material data
|
||||
|
||||
- Physical material card validation (#923/#922) provides typed SI mechanical and
|
||||
thermal data, per-property sources/conditions and isotropic/orthotropic stability
|
||||
checks through read-only `material.properties.validate`. It does not assign or
|
||||
persist properties, provide a solver or enable rendering; see
|
||||
[the contract and staged follow-ups](docs/physical-material-cards.md).
|
||||
|
||||
- Directional elasticity (#994) queries the validated card in material-local axes
|
||||
through read-only `material.properties.directional`, with source/condition review.
|
||||
It does not assign body frames, predict structural behavior or enable a solver.
|
||||
|
||||
## Library foundations (#785, #786, #787)
|
||||
|
||||
- Local scalar libraries (#846) inspect/export bounded portable catalogs and copy exact
|
||||
selected appearance/material revisions into existing design definitions in one undo step.
|
||||
Appearance offers local loading/search/export; physical materials use existing commands.
|
||||
This slice is independent of the render stack and does not change the document format.
|
||||
See [the contract and limits](docs/book/src/dev/local-libraries.md).
|
||||
|
||||
- Proposed phases cover offline bundled/project/user packs, physical materials and
|
||||
appearances, editable wood mapping, and parameterized component/assembly families.
|
||||
Stable identity/revision, copied design definitions, provenance and resource limits
|
||||
apply from the first implementation. Existing material, appearance and standard-part
|
||||
commands remain the application paths. See [the proposal](docs/book/src/dev/libraries.md)
|
||||
for source/license review and acceptance gates. This is planning only: pack loading,
|
||||
texture rendering and expanded component families are not implemented by this entry.
|
||||
|
||||
## Render foundation
|
||||
|
||||
- Original starter appearances (#1722): 34 opaque recipes through existing commands, with six explicitly unavailable glass recipes and preserved legacy looks; see [the contract](docs/render-starter-appearances.md).
|
||||
|
||||
- Bounded linear film accumulation (#1696) supplies caller-admitted mean/variance storage and complete-pass views; actual progressive consumers remain separate. See [the film contract](docs/render-film.md).
|
||||
|
||||
- Definition-local visual mapping (#1214) supplies a bounded numerical frame, physical repeat coordinates and a deterministic one-time grain-axis suggestion. It adds no saved record or texture consumer; see [the mapping contract](docs/render-visual-mapping.md).
|
||||
|
||||
- Explicit texture normalization (#1218) produces completed float RGBA with
|
||||
role-aware linear color/data semantics, bounded matrix/TRC ICC conversion and
|
||||
opt-in EXIF orientation. It retains high-precision raw samples and records lossy
|
||||
gamut clipping only when explicitly requested. It is not a renderer/resource
|
||||
consumer; see [the supported policy and limits](docs/render-texture-normalization.md).
|
||||
|
||||
- Opt-in opaque PBR (#1046) connects persisted surface parameters to the integrated
|
||||
product viewport and CPU PNG, using a fixed direct-light studio. Geometry and mass
|
||||
stay unchanged. HDRI, transmission and textures remain separate gates.
|
||||
See [the consumer and limitations](docs/render-opaque-pbr.md).
|
||||
|
||||
- Combined integration is tracked in #842, with independent scalar libraries in
|
||||
#863 and richer PBR/material-card transport in #1086. See [phase boundaries and validation gates](docs/render-integration.md).
|
||||
Render/library consumers use the merged asynchronous picker (#1127). Material-card
|
||||
UI (#1094), texture mapping and HDRI lighting remain explicit follow-ups.
|
||||
|
||||
- R4a adds bounded CPU product-image jobs, cancellation and atomic PNG export through
|
||||
engine commands, the Render panel, CLI and persistent MCP. Immutable captures and
|
||||
results stay outside persistence/undo; native workers and cooperative browser tasks
|
||||
share the same work protocol. See [jobs, limits and export](docs/render-jobs.md).
|
||||
|
||||
- R3 adds an overlay-free product scene and the integrated Render workspace, with
|
||||
runtime GPU host capabilities, per-document drafts and named camera/background
|
||||
controls. Design keeps its camera and drawing policy. Raster transparency remains
|
||||
approximate; PBR and environments are later slices. See
|
||||
[workspace and scene contracts](docs/render-workspace.md).
|
||||
|
||||
- R2 adds bounded named render setups in document format 21 and the read/save
|
||||
`render.settings.get/set` commands. Proven render-only changes preserve geometry
|
||||
and prepared world data through undo/redo and checkpoint restore. This slice does
|
||||
not add a Render workspace, PBR, environments or image jobs; see
|
||||
[settings and refresh policy](docs/render-settings.md).
|
||||
- Bounded PNG/JPEG texture admission (#900) validates in-memory sources and returns
|
||||
completed RGBA8 pixels with explicit color/data roles. It is an input utility only:
|
||||
ICC/16-bit normalization, local wood mapping, resource persistence and the renderer
|
||||
consumer remain separate work. See [limits and licensed-file probes](docs/render-texture-input.md).
|
||||
|
||||
- The initial opaque surface numerical contract for #1004 provides bounded linear
|
||||
color/metallic/roughness/IOR admission and an original tested direct-light BRDF.
|
||||
The numerical module alone advertises no capabilities; the installed consumer above
|
||||
provides rendering. See
|
||||
[the model, evidence and remaining consumer gates](docs/render-surface.md).
|
||||
|
||||
- A bounded cooperative Radiance RGBE input utility is available in L1 render;
|
||||
it does not yet enable HDRI/PBR rendering or a document import command. See
|
||||
[the input contract](docs/render-hdr-input.md) and #813 for integration work.
|
||||
- R1 adds renderer-independent backend/profile metadata, strict request resolution and
|
||||
bounded image/scratch admission checks, exposed by the read-only `render.backends`
|
||||
command. It describes the current CPU raster snapshot path without evaluating the model.
|
||||
The legacy Design snapshot route remains unchanged. Later slices above provide the
|
||||
workspace/jobs and opaque PBR; HDRI and optional engines remain future work. See [the contract](docs/render-backends.md)
|
||||
and [the phased proposal (#620)](https://github.com/bherbruck/solidcraft/issues/620).
|
||||
|
||||
## Dimensioning and error reporting
|
||||
|
||||
- Operation length fields share design-unit defaults and input evaluation, including secondary
|
||||
distances, thin walls, blend controls, sheet/plastic rules, joints and motion keys. Canvas
|
||||
handles and sketch previews use the same lengths as committed geometry. Existing stored
|
||||
millimetre values retain their size when edited in a design using another unit (#3271).
|
||||
|
||||
- MCP `execute` accepts `verbose: false`, sharing the compact reply helper used by
|
||||
`batch`: body changes and created sketch IDs stay, while repeated lists are omitted.
|
||||
Both tools retain full replies by default.
|
||||
|
||||
- Sketch Create groups drawing variants under Line, Rectangle, Circle, Arc, Slot,
|
||||
Polygon and Spline. Each open part remembers its last interactive choice per family
|
||||
across sketch sessions and document-tab switches; closing the part resets these UI choices.
|
||||
- Inscribed, circumscribed and edge polygon tools preview their actual outline before
|
||||
placement, including orientation and the selected side count.
|
||||
- Construction (X) preserves the active sketch drawing tool, picked anchors and inline
|
||||
dimension values, so line type can change while a shape is in progress.
|
||||
- Planar sketch construction previews and hover feedback keep the same dashed pattern as
|
||||
committed geometry; centerlines retain their dash-dot pattern.
|
||||
|
||||
- Point has a default Sketch CREATE toolbar button alongside the existing drawing tools.
|
||||
Saved custom layouts are preserved; Reset Toolbar restores the default Point button.
|
||||
- Construction planes cannot take an origin-plane name (XY, XZ, YZ, Top, Front, Right). Plane
|
||||
arguments reject such a name when an older design's construction plane already has it. Use
|
||||
the other alias, the construction feature's numeric ID or an explicit plane; existing
|
||||
stored references keep their saved meaning. Section Analysis uses the same check.
|
||||
- Sketch text can be edited from a letter interior or outline's context menu or the Edit Text command.
|
||||
Interior selection requires every profile boundary to belong to the same text source;
|
||||
the editor highlights the whole source without replacing profile selections.
|
||||
Content, baseline X/Y, height and rotation update the original text source in one undo step;
|
||||
cancelling or rejecting an invalid value preserves the sketch. Position and height fields
|
||||
use the document units captured when editing starts; generated outlines remain associated
|
||||
with their text source, and untouched inputs preserve their saved internal values.
|
||||
Dragging a text outline moves the entire source in one undo step; Escape restores the
|
||||
gesture. Move/Copy on a selected text outline provides unit-aware X/Y distances and rotation
|
||||
about its baseline; copies keep an independent editable text source.
|
||||
- Repeating the initial point of a planar multi-point sketch drawing tool is neutral: the tool
|
||||
waits for a distinct point without a degenerate-shape error or history entry. Typed input
|
||||
and programmatic commands retain their validation.
|
||||
- Circular-pattern and angled-plane axes reject explicitly supplied malformed or expression
|
||||
origins instead of silently rotating about zero. Numeric origins remain in millimetres;
|
||||
associative axis expressions and construction-axis references remain unsupported.
|
||||
- Single-line and rectangle-side dimensioning supports selecting a line or its two endpoints.
|
||||
Type a value and press Enter to commit one undo step; rejected values remain editable and
|
||||
cancellation leaves the sketch unchanged. Fit keeps geometry clear of the Sketch Palette
|
||||
and navigation controls, including enlarged displays and nested pending placements.
|
||||
- Sketch Dimension takes a line and a circle or arc (#1803): it measures from the line to the
|
||||
circle's edge (the gap, 0 when tangent, or how far the edge reaches past a line that cuts
|
||||
it), drives it like any other dimension and keeps the circle on its side of the line.
|
||||
- Sketch Dimension takes a point and a circle or arc, or two circles or arcs (#4064): it
|
||||
measures to the circle's edge (from the point, or between the two edges: the gap, 0 when
|
||||
they touch, how far they overlap, or the narrowest gap between nested circles).
|
||||
- Sketch annotations, live drawing lengths and Measure use document units. Inches show
|
||||
three decimals and retain a meaningful fourth digit. Bare length dimension entry captures
|
||||
the current design unit; changing units leaves existing geometry and expressions intact.
|
||||
Component/canvas distance controls, sketch cursor coordinates, flat-pattern dimensions
|
||||
and pocket depths, interference volumes and parts-library lengths also use design units.
|
||||
- Curvature and Polygon constraints accept complete preselected operands. Fix/Unfix
|
||||
consumes complete point/curve selections consistently; mixed or ambiguous selections
|
||||
retain the picking workflow. Rejected constraints preserve selection and undo history.
|
||||
- Contextual error reporting: a **Create Issue** action beside feature errors opens a
|
||||
reviewable GitHub issue draft with the error, operation settings, build diagnostics and
|
||||
useful reproduction context. The draft is editable, with optional capture of the actual
|
||||
viewport and copy/save controls. Opening GitHub does not submit the issue. Help also exposes
|
||||
reporting for unexpected results that did not produce an error.
|
||||
- The header exposes **Report a bug**, including an accessible compact control on
|
||||
narrow windows. It opens the same editable report and screenshot review without
|
||||
changing the active model or a pending dimension.
|
||||
- Crash reports: every panic (in a command, in the kernel, anywhere else) and every unclean
|
||||
exit (abort, stack overflow, kill: found at the next start through a locked per-run command
|
||||
journal) leaves a local report with the backtrace, version and commit, the command and the
|
||||
design that reproduce it (`solidcraft-cli crashes replay <id>`). Repeats are counted, not
|
||||
rewritten; at most 20 reports, 50 MB and 90 days. The app shows them after a crash (Help >
|
||||
Crash Reports…) with a reviewed issue draft; agents read them through
|
||||
`diagnostics.crash_reports`, the MCP `crash_reports` tool or the CLI. Nothing is sent
|
||||
anywhere. See [crash reports](docs/crash-reports.md).
|
||||
- Agent chat (off by default, desktop): a side panel that drives a coding agent the user
|
||||
already has (Claude Code through its ACP adapter, Codex, Gemini CLI, OpenCode, Grok Build, …) over the
|
||||
Agent Client Protocol, under the user's own login; SolidCraft stores no keys. The agent works
|
||||
through SolidCraft's MCP tools on a gated endpoint of its own: file actions wait for Allow or
|
||||
Deny, crash reports are off limits, 24 changes per message, one undo step per message, and
|
||||
the agent's whole process group ends with the panel or the app. Docks left or right,
|
||||
minimises to a strip. Grok Build discovery includes `~/.grok/bin` and reuses the user's
|
||||
Grok login. See [agent chat](docs/agent-chat.md).
|
||||
- Command scripts from designs (#886): `timeline.export_script` (CLI `solidcraft-cli script`)
|
||||
writes a design's history as a script that `eval` and `run` replay into the same design —
|
||||
user parameters, units, sheet metal and plastic rules and materials as their own commands,
|
||||
then each feature through `timeline.add` with its ids, names and dimension parameters kept,
|
||||
so every feature kind replays exactly and a failing feature fails the same way. Trimming the
|
||||
script after a step gives the design at that step. Appearances, folders, views and
|
||||
configurations are listed as left out; components and joints are not supported yet.
|
||||
|
||||
## 0.2.0 release batch
|
||||
|
||||
- Includes the new axis navigation, adaptive sketch drawing/picking, origin-corner repairs,
|
||||
durable supported profile/face references, endpoint dimensioning and contextual reporting.
|
||||
- Smooth ruled-wall display joins are hidden only within the supported geometric certificate;
|
||||
authored splits and actual creases remain protected. Wireframe retains physical edges.
|
||||
- Paste New uses a bounded current-geometry comparison for supported convex line/circle
|
||||
prisms with separated circular holes; unsupported shapes retain the existing strict check.
|
||||
- Common-bore Union retries check additional boundary curves before recutting the bore,
|
||||
preventing the reproduced thin-web loss. Unknown additional trims refuse; inherited
|
||||
common-cylinder trims retain their existing policy, so this is not a general Boolean proof.
|
||||
- Exact full-path assembly joint editing remains separate work and is not part of this batch.
|
||||
- Stable 0.2.0 is published: all release payload checksums, native cold reopening, deployed
|
||||
web app and both Flatpak architectures were verified. The replacement README demo uses
|
||||
the original electronics enclosure story and animated pointer in the actual English
|
||||
0.2.0 UI, at 4× playback. Publication follows [the release workflow](docs/releasing.md).
|
||||
|
||||
## 0.2.1 critical fixes
|
||||
|
||||
- Separated multi-profile Join/Cut extrusions into one solid target batch their tools using
|
||||
conservative construction bounds, avoiding a Boolean rebuild for every profile. Live
|
||||
extrusion previews build only their tools; confirmation validates the final Boolean.
|
||||
- Coplanar selected body faces share one linked sketch and one extrusion. Automatic Join/Cut
|
||||
keeps the evaluator's participant scope, including parts of an empty imported component. Desktop OK/Enter
|
||||
computes on a scratch session in the background, with atomic acceptance and cancellation.
|
||||
Planar section stitching projects lines/arcs analytically and removes duplicate endpoints.
|
||||
- Imported rotated face groups can check all full start-face seams in one guarded
|
||||
construction. Separated tools may batch a Join when each meets the same single body;
|
||||
nearby uninvolved bodies retain the original contact decisions. Regression comparisons
|
||||
cover all four extrusion operations.
|
||||
- Inward multi-face cuts retain every eligible target and subtract separated tools together.
|
||||
Safe interior classification handles roundoff at shared imported line/arc endpoints.
|
||||
Straight extrusion feedback caches existing face/profile triangles and updates the display
|
||||
directly, including a newly opened STEP's single identity component placement; other
|
||||
extents, moved or repeated components and curved sketch profiles keep the Engine preview.
|
||||
- The extrusion fixes retain tracked Boolean history and the current `solidcraft` packages.
|
||||
Confirmation and tool previews use main's shared background calculation. Main's collapsed
|
||||
blend-wall refusal and its tests are retained, including smaller valid radii and mirrored parts.
|
||||
- Axis view and navigation controls stay anchored to the viewport when feature dialogs or
|
||||
the command palette open, at normal and enlarged display scales. Fit still accounts for
|
||||
dialog coverage; covered controls do not receive clicks through dialogs.
|
||||
- Eligible planar faces survive fillet, chamfer and shell operations with exact source
|
||||
certificates. Sketches placed directly on the enclosure wall and inner floor follow
|
||||
width and wall changes, including after the USB cut and cold reopening.
|
||||
- Remove artificial straight-wall and rounded-corner subdivisions left by shell and
|
||||
extrusion cuts. Identical generated wall segments span adjacent slabs as one physical
|
||||
face, with exact full-height supports and boundary stitching. Preserve authored face
|
||||
splits and face appearances. Permanent regressions cover material, STEP, reopening and
|
||||
unaffected bodies across the extrusion end plane.
|
||||
- Feature dialogs use the available screen height for their fields, with OK and Cancel
|
||||
outside the scrolling region, including enlarged display scales.
|
||||
- Design format 13 records shell-face attachments. Older designs remain readable;
|
||||
newly saved designs require 0.2.1 or later. Ambiguous or unsupported faces still refuse
|
||||
attachment rather than guessing a plane.
|
||||
- Saved projections from a removed strip retain their geometry and report the lost
|
||||
reference. Explicitly reselect the wall to repair that projection.
|
||||
|
||||
## Workspace layouts (#2029)
|
||||
|
||||
- General preferences save Floating or Compact using the universal UI containers.
|
||||
Compact joins the workspace selector and ribbon, docks the content-hugging Browser
|
||||
flush beneath them with a square join, and opens tool sheets below the compass.
|
||||
Sheets remain draggable, rounding all corners away from their right dock; footer
|
||||
backgrounds follow the same corners. A separate preference hides ribbon icon labels
|
||||
for a shorter ribbon in either layout.
|
||||
Assistant keeps the outermost edge and History keeps its chosen dock. Switching
|
||||
retains the active tool, camera, selection and design; system windows and menus
|
||||
keep their existing behavior.
|
||||
|
||||
## View navigation
|
||||
|
||||
- Navigation has an opt-in Free orbit preference for mouse and 3D-mouse rotation through
|
||||
both poles with roll. It defaults off, preserving existing preset snapping and pole limits.
|
||||
The SolidWorks face menu offers Normal to Selection (`view.normal_to`), shared with Look At
|
||||
and Ctrl+8, including repeat-to-flip, preserving scale and projection.
|
||||
|
||||
- Desktop Ctrl/Cmd +/- and 0 change or reset the saved UI scale. The scale slider keeps
|
||||
its layout stable during a drag and applies the selected scale on release.
|
||||
|
||||
- OpenSCAD navigation preset: left drag orbits, right/middle drag pans, Shift+right/middle
|
||||
drag zooms, and the wheel zooms. Available in the shared desktop/web Navigation preferences.
|
||||
- Compact clickable signed X/Y/Z axis tips, smooth drag-to-orbit, and Shift-orbit snapping
|
||||
to 26 standard and diagonal views. Pointer motion accumulates independently of a lightly
|
||||
damped spring, with a boundary margin to prevent flicker. Z-up/Y-up and the nearest square
|
||||
top/bottom heading are preserved. Diagonals include 45-degree edge and isometric corner views.
|
||||
|
||||
## Known limitations
|
||||
|
||||
- Scheduled and manual CI scan locked dependency advisories, bans and sources with
|
||||
cargo-deny. Vulnerabilities fail the scan; unmaintained crates warn. Local vendored
|
||||
patches require separate upstream review because advisory databases cannot version-match
|
||||
their path dependencies. Pull requests retain the existing licence checks.
|
||||
|
||||
- Associative shell-face sketches require a unique certified planar source. Nested shell
|
||||
attachments and ambiguous coincident sources remain unsupported.
|
||||
- G2 fillets: exact quintic blends of straight edges between planar faces, with one planar
|
||||
end face at each end, including sloped ends (#2708). The UI and `solid.fillet` expose
|
||||
`curvature` (alias `g2`); the size is an equivalent circular setback. Curved faces/edges,
|
||||
multi-face ends and corner junctions remain unsupported.
|
||||
- Fillets and chamfers: constant, variable-radius and chord-length fillets; a radius per edge,
|
||||
rounds next to earlier rounds of another radius, and smooth corner patches where three rounds
|
||||
meet (a sphere for equal radii); perpendicular corner fillets after a closed ring of earlier
|
||||
rounds preserve the ring's radii and the enclosed planar face (#1557);
|
||||
mitres between separate rounds of the same radius keep their endpoint tangent, so a later
|
||||
fillet can select an upright and its adjoining bottom mitre as one chain (#2422);
|
||||
straight edges (convex or concave) between planar faces with perpendicular
|
||||
planar end faces (equal-distance chamfers also meet sloped planar end faces, including inner
|
||||
basin rims within the rim width); convex fillets also meet sloped planar ends and reflex
|
||||
corners around pocket rims, with unequal wall slopes and extensions confined to the face;
|
||||
connected equal-distance chamfers also trim each other across unequal sloped rim walls;
|
||||
curved chamfer chains with straight planar ends can terminate across two existing planar
|
||||
bevel faces, splitting their shared seam; picks on the same tangent chain are applied once (#1303);
|
||||
whole smooth loops of a planar face, picked whole or by one edge (tangent
|
||||
chain), including circles and walls at any angle (boss bases and tops, bores, pocket floors,
|
||||
plate outlines), loops with sharp corners between straight or mixed arc/line edges (straight
|
||||
blends meet in mitres; perpendicular curved walls use offset intersections, with D-rim removal
|
||||
checked within 0.1% of analytic offset slices), runs of
|
||||
neighbouring edges along a planar face's loop (two top edges of a box: mitred, ending square;
|
||||
with the edge between them too, the corner becomes a sphere octant),
|
||||
rounded corners rounded again (sphere octants, tori at concave corners); every edge of a
|
||||
convex planar body or of an extruded part; fillets inside patterns; closed chains of curved
|
||||
edges between any two smooth sides (a branch pipe on a main pipe), by a rolling ball (the
|
||||
blend a rational B-spline through exact arcs), closed or ending at planar faces square to the
|
||||
edges, where straight or curved cap edges are trimmed to the contacts (the straight edge
|
||||
between two overlapping extruded arcs); knife edges, where the two faces have opposite
|
||||
normals (a wall that runs out tangent into a face: the ball that fits there); an edge that
|
||||
runs out along an end face tangent to one side (the arc top edge of that wall), cut where the
|
||||
blend meets it; rounds that end in an earlier round on curved faces, in any order (the rounds
|
||||
of two edges at a vertex meet in a crease, as on a box), picked together or one after the
|
||||
other, except a round after a round of the edge between the wall and a flat face that it
|
||||
would run over; the three edges at a vertex of any smooth faces, of one radius, end in a
|
||||
piece of sphere. A limiting blend that collapses a side wall into coincident boundary
|
||||
curves is refused as too large rather than returning an unmeshable face (#1113).
|
||||
- Booleans: prisms along one direction (plates with holes, slots, patterns of them, equal
|
||||
sections stacked end to end) are combined exactly in 2D. Qualified axial cuts preserve
|
||||
annular holes with overrun cutters, including inward Press Pull after a joined extrusion;
|
||||
curved wall qualification rejects false transverse axes instead of filling holes.
|
||||
Bodies touching along one whole face
|
||||
(a part and its mirror image) are stitched; coincident planar faces are pushed apart when
|
||||
their neighbours are planes or cylinders. Other coincident curved configurations can still
|
||||
fail. Bounded containment classification preserves fully internal cavities and nested
|
||||
material islands independently of shell order, with STEP round-trip and material-membership
|
||||
regressions. Near-contact curved shells use the general boolean path rather than a
|
||||
containment shortcut. Spheres are built from six pole-free patches.
|
||||
- Mass properties come from fine tessellation (curved faces within ~1e-4 relative); triangles
|
||||
that cut through curved faces (trimmed faces after booleans) are split onto the surface first.
|
||||
- STEP import (our own reader, crates/kernel/src/step_in) reads solids (B-rep with analytic and B-spline geometry), units,
|
||||
product names, colours and assemblies; analytic offsets on planes, cylinders, cones, spheres
|
||||
and regular tori are read exactly (signed/nested distances, units and face sense). Freeform
|
||||
offset surfaces and pcurve-only edges are not read yet,
|
||||
and assembly components are flattened into bodies. Closed periodic faces (torus, B-spline
|
||||
bands) are split in two for meshing; measure() uses a finer tolerance for small radii.
|
||||
- Persistent naming follows the kernel's exact face history (docs/book/src/dev/naming.md):
|
||||
references resolve by name first, follow splits and merges, and warn when the entity split,
|
||||
merged or vanished, or was found by geometry only (operations that report no history yet).
|
||||
New planar sketch attachments use exact box, extrusion cap/side and immutable imported-face
|
||||
source certificates with checked target and author occurrence paths. A missing or changed
|
||||
source fails explicitly; Redefine Sketch Plane previews reattachment or a fixed plane while
|
||||
retaining current geometry and dimension identities. Unsupported modified faces need an
|
||||
explicit fixed plane. Legacy attachments retain their original resolver behavior.
|
||||
- Modelled threads are cut as a faceted body (curved faces within 1/200 of the pitch); Extrude
|
||||
and Revolve To Object on a curved face cut the tool back to the target's surface.
|
||||
- Explicit sketch breaks preserve exact ellipses, fit/control splines (including high degrees)
|
||||
and conics; analytic trim/break also sees free-form cutters. Free-form curves cut at a tangent
|
||||
touch (no clean crossing) enter that profile as polylines.
|
||||
Sweeps along 3D sketch curves follow their polyline (smooth walls when the path is smooth).
|
||||
A sweep with a twist, an end scale or a parallel or direction orientation (#771) follows its
|
||||
path that way too, even along sketch lines and arcs: B-spline walls through stations, ruled
|
||||
walls through denser stations where the path has corners or the profile has holes.
|
||||
Guide rails (one or two, #771) do the same: each station meets every rail once, and the rail
|
||||
turns the profile and scales it (or stretches it across to the rail) against the start; two
|
||||
rails carry it between them. Rails along a path with sharp corners are refused for now.
|
||||
- Extend intersects exact ellipses and rational/high-degree splines without moving the line or
|
||||
circular support. Associative free-form offsets have a whole-span 0.002 mm normal-distance
|
||||
certificate and refine within bounded node limits while retaining existing IDs.
|
||||
At the node limit, geometric certificate subdivisions accommodate unequal spline parameter
|
||||
speeds without changing stored nodes or relaxing the distance tolerance (#971).
|
||||
Associated offset fit nodes stay hidden from display, picking and snapping; dragging the
|
||||
editable source updates the derived boundary live. Break Association restores point editing.
|
||||
Singular, self-intersecting and ambiguous curves refuse atomically; mixed junctions and nonsmooth
|
||||
closed natural-spline seams remain limitations. New explicitly closed fit splines and closed
|
||||
offset outputs use periodic C2 interpolation, supporting repeated certified offsets; older
|
||||
natural splines are preserved. Clicking the starting fit point deliberately closes a new loop.
|
||||
Newly captured adaptive profile references with complete source coverage retain their outer
|
||||
and hole identities through span-count changes, including parameter edits after extrusion.
|
||||
Partial, intersected or ambiguous boundaries do not qualify for these whole-source references.
|
||||
Legacy curve-span multisets remain exact and unchanged; already-lost selections may need
|
||||
reselection. Format 12 stores the new bounded whole-boundary references.
|
||||
Projected analytic boundaries follow nested loop identities through resizing, including
|
||||
stationary holes and rounded corners. Supported convex, tangent line-and-arc boundaries
|
||||
can lose or regain corner arcs during an inset while preserving reserved curve identities
|
||||
and linked profile selections. Format 12 saves those associations; compatible older closed
|
||||
offsets upgrade structurally without changing their curve IDs. Breaking an association
|
||||
freezes its current boundary and materializes downstream profile references. Child offsets
|
||||
of a boundary with retired arcs still require breaking its association first; mixed or
|
||||
nonconvex junctions and retained references to disappearing individual arcs remain limited.
|
||||
- Extrude and Revolve editors retain original direction, extent expressions, explicit targets,
|
||||
axes, From/To inputs and All-profile intent. No-op edits preserve downstream dimension names
|
||||
and selected occurrence frames; cancel and successful edits preserve one-step undo history.
|
||||
Placed feature edits preview through the edited timeline entry, and cylindrical Emboss guides
|
||||
use the sketch's actual target, author or uniquely placed third-component frame.
|
||||
Revolve rotators follow the actual signed axis and support symmetric and two-sided extents;
|
||||
dragging a To Object extent converts its derived value to an explicit angle. Legacy reversed-axis
|
||||
symmetric geometry is preserved through format 11's explicit legacy convention. New revolves
|
||||
use the sketch-normal direction for each selected profile, including To Object and curved
|
||||
target trimming, independently of the selected axis sign.
|
||||
- Cylindrical emboss/deboss wraps bounded orthogonal line profiles, including holes, concave
|
||||
outlines and nested islands, onto complete exterior cylinders or coaxial sleeves with exact
|
||||
radial walls. New features infer a unique eligible cylinder when the face field is empty;
|
||||
ambiguous targets require an explicit face. Saved target
|
||||
and author occurrence paths retain the chosen placements; missing/split faces refuse rather
|
||||
than retarget. General free-form profiles, seams, stepped cylinders and other curved surfaces
|
||||
remain unsupported. STEP round-trip and independent radial/volume checks cover this subset.
|
||||
- Shell and offset faces work on bodies of planes, cylinders, cones, spheres and tori (convex or not:
|
||||
filleted boxes, bosses, domes, countersinks; corners where four or more planes meet, such as a
|
||||
floor falling to a drain, as long as the corner's edges are all convex or all concave); draft on convex planar bodies and on walls (planes, cylinders → cones) between caps; lofts through three or more sections are smooth (B-spline sides through every section), two
|
||||
sections ruled. Circular-meridian barrels retain curved inner walls through either axial
|
||||
opening (#2421). Solid lofts preserve holes through sections with matching hole counts
|
||||
(#2435), including inner walls and caps with openings; a hole cannot appear or disappear
|
||||
between sections, and sections with holes cannot collapse to a point.
|
||||
|
||||
- Sketch corner tools: fillet and all three chamfer modes pick a connected corner even when
|
||||
its endpoint overlaps the fixed origin or a loose point. Ordinary drawing still snaps to
|
||||
the origin; clicked UI regressions verify geometry, closed profiles and undo.
|
||||
- Sketch display: drawing, picking, highlighting, tool previews and profile shading share
|
||||
adaptive projected curve boundaries. Fit, zoom, display scale and placed sketch frames
|
||||
invalidate the display cache without changing CAD geometry or timeline history. Work
|
||||
budgets and clipped paths prevent unbounded sampling or invented edges across the eye plane.
|
||||
The Sketch Palette scrolls its options on short windows and enlarged displays while
|
||||
keeping constraint status and Finish Sketch visible.
|
||||
- Face projection: closed boundaries have a deterministic outer-first order. Refresh matches
|
||||
existing geometry before assigning positions, retaining saved curve IDs and constraints
|
||||
across enumeration changes and resize, including concentric circles. Ambiguous identities
|
||||
retain the last geometry and report a lost reference; permutation matching is bounded.
|
||||
- Project accepts complete supported preselection in one undo step. Visible external sketch
|
||||
curves and points retain their source sketch identity; model geometry, axes and planes use
|
||||
the existing linked projection commands. Rejection preserves the document and selection;
|
||||
mixed selections retain ordinary tool-first picking.
|
||||
- Inline sketch dimensions: Tab and Shift+Tab cycle within the active shape's value boxes,
|
||||
selecting visited values for replacement. Expression completion retains forward-Tab
|
||||
priority; real keyboard regressions cover rectangles, lines and single-value circles.
|
||||
Typed lengths, radii, line angles, signed arc sweeps and slot lengths persist as constraints
|
||||
and expressions through save/reopen. Shape creation and its dimensions form one undo step;
|
||||
rejected values keep the editable field focused.
|
||||
- Repeated components: Browser selection, visibility, properties, copy and Move/Copy use
|
||||
checked occurrence paths. Active nested occurrences author planar sketches and solids in
|
||||
their selected frame. Pending moves compose through parents; dialog cancellation restores
|
||||
its selected move. Source materials and body/face appearances follow transformed instances.
|
||||
Shared nested definitions remain shared. Deep Paste New copies reachable definition graphs,
|
||||
independent feature/input histories, styles and internal motion records, with bounded geometry
|
||||
checks and explicit external-link notices. Paste New selects the copy while preserving the active
|
||||
authoring context. Imported periodic STEP seams survive placement and reexport with shared
|
||||
topology and appearances intact. Recorded body transfers preserve historical Join/Cut membership,
|
||||
material, placements and machining data through edits, copying, undo and reopen. New 3D wires
|
||||
record their coordinate frame; legacy wires migrate from known provenance without changing
|
||||
coordinates. Broken legacy links with missing provenance can require explicit refresh or relink.
|
||||
See [occurrence workflows](docs/occurrence-workflows.md).
|
||||
- Toolbar drops on panel labels, gaps and margins append commands with insertion feedback;
|
||||
button drops keep insert-before ordering.
|
||||
- Parameters and Configurations have distinct actions in the SOLID toolbar's CONFIGURE panel.
|
||||
Parameters opens the user/model variable editor; Configurations opens the configuration table.
|
||||
Configure remains available in the panel dropdown.
|
||||
- Parameter creation supports Enter with validation and continued keyboard entry. Shared
|
||||
expression autocomplete supports Up/Down selection, Enter/Tab acceptance and Escape dismissal;
|
||||
accepting a suggestion does not submit a parameter or trigger viewport shortcuts.
|
||||
- Movable window title bars follow the app's dark/light header palette. Radial right-click
|
||||
menus are opt-in in Preferences > Navigation; ordinary context menus remain the default.
|
||||
- Desktop distribution: running Windows windows and executable resources use the app icon;
|
||||
packaging validates icon resources. Nix installs launchers, MIME data and generated icons,
|
||||
with explicit launch apps and Vulkan-loader/driver discovery. Flatpak feed instructions
|
||||
register the required runtime source; release checks exercise desktop modelling on X11/Wayland.
|
||||
- OpenGL rendering clamps effective anti-aliasing to 1x across UI pipelines, textures and CAD
|
||||
callbacks to prevent black frames. Other backends retain the requested sample count, and
|
||||
stored preferences remain unchanged.
|
||||
- Configuration rules: ordered typed conditions can drive parameters and suppressions or
|
||||
restrict values. Preview explains effective values without modifying the document; applying
|
||||
rules validates rows atomically. Length expressions retain their authoring units across
|
||||
document-unit changes. The UI supports structured All/Any/Not conditions and rule ordering.
|
||||
Component styles and certified semantic face styles are available; unsupported lineage refuses
|
||||
atomically, and stale certified face paint cannot jump to another surface. See [configurations](docs/configurations.md).
|
||||
- Sheet-metal material: inherited holes, crossing edge notches, overlapping cuts and retained
|
||||
islands share the same boundaries in flat preview, DXF and unfolded solids. Detached material
|
||||
pieces survive unfold/refold as one logical sheet group, including split flanged sheets.
|
||||
Cut-outs made in the flat pattern cross bends at any angle or curved: their edges fold to
|
||||
helices and curves on the bend, their walls square to the sheet. Free-form bases use bounded
|
||||
sampling.
|
||||
Parallel prismatic partial-depth cuts retain pocket side and depth through transfer and
|
||||
unfold/refold, with separate pocket contours in preview and DXF. Planar Intersect preserves
|
||||
exact holes and retained islands, including the union of multiple selected profiles, and
|
||||
records complementary depth layers as pockets while retaining the stock gauge. Unsupported
|
||||
tapered or bend-crossing machining refuses atomically instead of restoring material later.
|
||||
Sketches attach to a sheet's flat faces (base and flanges, either side) by panel, in the
|
||||
flat pattern's coordinates, and follow it through rebuilds and unfold/refold.
|
||||
A flange on another flange's far edge (a return) follows that flange's closed end and keeps
|
||||
clear of the flange beside it, and the returns of one feature are mitred toward each other
|
||||
with the rule's gap where their flanges meet at a corner; returns of separate features, and
|
||||
flanges on returns, are not closed toward each other.
|
||||
- Rolling-ball fillet accuracy: independent offset-cylinder tee references check surface
|
||||
distance, actual trimmed tessellation, supporting-cylinder contacts and tangency at two
|
||||
scales. The measured trimmed-part error is below 0.0001 mm; this is an analytic geometry
|
||||
check. Under-resolved fits return an error.
|
||||
- Contact driving checks the trajectory between clear endpoints, including linked joints,
|
||||
playback and sparse motion exports. Checks use bounded tessellation samples, not exact
|
||||
continuous collision detection; local thin walls and small details remain limitations.
|
||||
See [contact-set limits and recovery](docs/contact-sets.md).
|
||||
|
||||
## Assembly dragging
|
||||
|
||||
The design's first part is grounded when it is made, and a left-button drag repositions a free part (`occurrence.drag`: one undo step, exact occurrence paths including repeated jointed definitions, any floating-chain member carries the chain, grounded parts and joints hold where present, Escape cancels).
|
||||
|
||||
## 3D sketch bridges
|
||||
|
||||
3D sketch drawing snaps to points on other visible sketch planes without flattening them onto
|
||||
the active plane. Bridge endpoints capture their source positions; associative endpoint links,
|
||||
construction-plane selection of 3D wires and loft guide rails remain separate work.
|
||||
Feature dialog header chevrons collapse and restore the form without discarding selections
|
||||
or edited values, including the Appearance panel.
|
||||
## Construction on 3D paths
|
||||
|
||||
Plane Along Path has a viewport path selector, fractional position, live preview and timeline
|
||||
editing. Construction planes and points resolve drawn 3D wires without applying their sketch
|
||||
plane a second time. Curved paths use sampled segments; multi-curve chains, absolute distance
|
||||
and reference-object placement remain separate work, as do loft rails and centerlines.
|
||||
|
||||
## Design properties (#1015)
|
||||
|
||||
- Designs carry project, part number, revision, author, organization, description and licence
|
||||
in an optional `metadata` object (File → Design Properties…, `document.metadata.*`,
|
||||
`inspect_design`). STEP and IGES headers and 3MF model metadata take the fields their format
|
||||
has a place for. Other tools keep their own data under a reverse-DNS key, kept as it is
|
||||
through open, edit and save and never exported. See [design properties](docs/book/src/guide/files.md#design-properties).
|
||||
Per-component properties (a part number per component) can follow with the same type.
|
||||
|
||||
## Document-opening performance
|
||||
|
||||
- Desktop STEP import prepares consecutive independent solids in bounded batches with up
|
||||
to eight workers, retaining serial traversal, result order and persistent source identities.
|
||||
The web path remains serial. Original multi-solid fixtures show 64–81% lower complete
|
||||
import times; single-solid assembly parts are not scheduled across nodes. See
|
||||
[measurements and limits](docs/perf.md#parallel-step-body-preparation-2026-10-12).
|
||||
- Design containers (#303, phase one) separate and deduplicate STEP, raw images and
|
||||
lossless binary mesh arrays while keeping plain JSON as a supported Save As/export
|
||||
format. Generated-mesh storage measurements reduce serialization and decoding work;
|
||||
a seekable reader defers original blobs until after provisional display.
|
||||
See [container format](docs/design-container.md) and [performance measurements](docs/perf.md).
|
||||
- Warm saves with explicit `cache: true` can include a versioned native B-rep cache through SolidCraft-owned topology
|
||||
and geometry records, with a separate truck adapter and bounded binary reader. Exact
|
||||
face-source certificates and operation history survive codec round trips. A provisional
|
||||
picture can be generated before original blobs are read; editing and measurement wait
|
||||
for authoritative reconstruction. Cached metadata binds preview and reconstruction to
|
||||
the same document despite concurrent file writes. Default saves omit this cache and never force cold
|
||||
evaluation or meshing; explicit `preview: true` remains a separate warm-mesh option.
|
||||
Keys, resource budgets and document/revision guards reject incompatible, hostile or
|
||||
stale results. A second modelling kernel still requires its own tested adapter.
|
||||
- Warm saves with explicit `cache: true` can also carry a bounded PNG thumbnail from already cached meshes.
|
||||
Home reads it without rebuilding the design when its local picture is missing;
|
||||
mismatched or malformed thumbnails fall back to normal generation. The image is
|
||||
kernel-independent and saving never forces cold meshing to produce it.
|
||||
|
||||
- Cold rebuild profiling separates parsing, geometry, placement, display meshing and
|
||||
thumbnails. Straight-line closest-point projection and exact curved-surface evaluation
|
||||
reuse reduce repeated work without relaxing geometry checks. Three alternating optimized
|
||||
benchmark runs reduce median rebuild time by 26% on the public sensor enclosure and 22%
|
||||
on a local case assembly; shape measurements and topology match the original build.
|
||||
See [performance measurements](docs/perf.md). Further cold Boolean and import costs remain.
|
||||
- Prepared assembly geometry survives selection and view changes while real geometry and
|
||||
placement changes invalidate it. A Pi assembly edge-selection probe drops from 9.24 s to
|
||||
0.57 s; initial opening is unchanged. Actual Windows desktop profiling measures 15.87 s
|
||||
median opening, with 82% spent rebuilding geometry; halving full opening remains open.
|
||||
|
||||
## Kernel
|
||||
|
||||
- Successful Boolean retries report their strategy and numerical adjustments as
|
||||
feature warnings and structured inspection data. Diagnostics survive cached
|
||||
evaluation, undo/redo and cold reopening; the robustness runner counts retry
|
||||
events by strategy and reports any bounded-log truncation. Existing geometry
|
||||
acceptance checks remain in force.
|
||||
|
||||
- Cylinders of one radius whose axes cross (a second bore across a bore of the same size, a pipe
|
||||
tee of equal pipes) touch at two points, where the mesh intersection cannot trace the curves
|
||||
and a boolean cannot tell the four arms of the crossing apart. When the ordinary boolean fails
|
||||
on such a pair, both faces are split along the line of their cylinder through the touching
|
||||
points (the solids are unchanged), the boolean is taken of those, and its history is composed
|
||||
back over the operands as given (#788). The result keeps the split lines as edges of the bore
|
||||
walls. A crossing the ordinary route fails on and the split faces do not help (a radius of 17.5
|
||||
in a 45 mm block with a tool of 80 mm) is still refused.
|
||||
- Boolean intersection-curve construction refuses point-only, collapsed and non-finite
|
||||
polylines without panicking. Direct constructor regressions retain valid open endpoints
|
||||
and closed spherical intersections; the original interactive trigger remains unidentified.
|
||||
- Shell of a stepped, joined planar body no longer creates horizontal subdivisions across
|
||||
continuous walls. Fresh axis-aligned Cut walls are stitched using their exact construction
|
||||
support and shared topology, preserving real steps and intentional boundaries. The local
|
||||
reported case returns from 86 to 49 faces with unchanged material and bounds; regressions
|
||||
cover stepped stock, STEP round trips and saved projections from removed pieces.
|
||||
|
||||
truck (Apache-2.0) behind our own `kernel` crate, with our own blend operation and boolean
|
||||
retry/validation; see `plan/adr/0001-geometry-kernel.md` (local) — summary in README.
|
||||
The short version, for people who use SolidCraft. The detailed developer status (milestone
|
||||
tables, limitations, measurements) is in [docs/roadmap-detail.md](docs/roadmap-detail.md).
|
||||
|
||||
## What SolidCraft is
|
||||
|
||||
SolidCraft is open-source parametric 3D CAD written in Rust. You sketch, constrain, extrude, and
|
||||
change a parameter to watch the timeline rebuild. It runs as a desktop app and in the browser
|
||||
([try it](https://solidcraft.io/app)), and it has a command-line tool and an MCP server so that
|
||||
scripts and AI agents can drive the same commands you use.
|
||||
|
||||
## Works today
|
||||
|
||||
- Sketching with a constraint solver, and the usual create and modify tools.
|
||||
- Extrude, revolve, loft, sweep, coil, fillet, chamfer, shell, draft, holes, threads,
|
||||
patterns, mirror and split.
|
||||
- Parameters with units and expressions, and configurations.
|
||||
- Faces and edges keep their names through edits, so references survive changes.
|
||||
- Components, assemblies, joints, motion studies and exploded views.
|
||||
- Sheet metal with flat patterns and DXF export, and a plastic-enclosure subset.
|
||||
- A Render workspace with GPU rendering, studio lighting, materials and image export
|
||||
(first release in 0.22.0).
|
||||
- Import and export of STEP, IGES, 3MF, STL, OBJ and DXF, and FreeCAD and Rhino files.
|
||||
- Autosave and crash recovery, and the browser build of the same app.
|
||||
|
||||
The full list of commands is in [docs/features.md](docs/features.md). Release notes for each
|
||||
version are on the [releases page](https://github.com/tangency-labs/solidcraft/releases).
|
||||
|
||||
## In progress now
|
||||
|
||||
Each feature below is a [milestone](https://github.com/tangency-labs/solidcraft/milestones) holding
|
||||
the issues for it, so the count shows how far along it is. Counts are as of 2026-10-25, one per
|
||||
feature or request. Work merged on a feature branch (`drawings`, `render`) counts as built but
|
||||
reaches the app only when that branch merges. They are rough, not a promise.
|
||||
|
||||
- **[Rendering & materials](https://github.com/tangency-labs/solidcraft/milestone/17)**: in progress, 9 of 34 pieces done, 3 of them built only on the `render` branch and in the app when it merges. The basic Render workspace is already in releases (0.22.0); the interface rework (#6281) and the material and light libraries are what is left.
|
||||
- **[Drawings](https://github.com/tangency-labs/solidcraft/milestone/8)**: in progress, 3 of 21 pieces built (2 in releases, 1 on the `drawings` branch), and 3 more partly built there (sheets and borders, bill-of-materials types, the paper scene). Not in the app yet: it lands when the `drawings` branch merges. Today you can export the current view as a DXF.
|
||||
- **[Sheet metal](https://github.com/tangency-labs/solidcraft/milestone/15)**: in progress, 1 of 30 requests done. Flanges, hems, unfold and flat patterns already work; the 30 are extensions, mostly the per-edge flange options (segments, miters, partial flanges, reliefs) and bend allowance.
|
||||
- **[Sketching](https://github.com/tangency-labs/solidcraft/milestone/14)**: in progress, 12 of 50 pieces done. Dimension types, selection and snapping options.
|
||||
- **[Solid modeling](https://github.com/tangency-labs/solidcraft/milestone/2)**: in progress, 9 of 50 pieces done. Blends, holes, threads and patterns.
|
||||
- **[Assemblies & joints](https://github.com/tangency-labs/solidcraft/milestone/3)**: in progress, 4 of 19 pieces done. Joints, motion studies and exploded views already work; placement rules, linked sub-assemblies, fastener stacks and weldment corners are the pieces left.
|
||||
- **[Import & export](https://github.com/tangency-labs/solidcraft/milestone/5)**: in progress, 7 of 39 pieces done. FreeCAD, SolidWorks and point-cloud import, and mesh export options.
|
||||
- **[AI agents & MCP](https://github.com/tangency-labs/solidcraft/milestone/18)**: in progress, 2 of 8 pieces done. Agent chat and the MCP server.
|
||||
- **[Interface, web app & plugins](https://github.com/tangency-labs/solidcraft/milestone/4)**: in progress, 31 of 96 pieces done. Ribbon redesign, navigation, themes, the web app and plugins.
|
||||
- **[SMLib kernel migration](https://github.com/tangency-labs/solidcraft/milestone/1)**: in progress, 1 tracking issue open. The kernel is moving from truck to NVIDIA's SMLib (usd-brep, Apache-2.0) on the `kernel-smlib` branch; it is not in releases yet. Tracked in [#4012](https://github.com/tangency-labs/solidcraft/issues/4012).
|
||||
|
||||
## Next
|
||||
|
||||
- **[Surfacing](https://github.com/tangency-labs/solidcraft/milestone/16)**: next, 6 of 14 pieces done. Patch, trim, blend and match exist; the rest of the surface toolset is planned.
|
||||
- **[Manufacturing / CAM](https://github.com/tangency-labs/solidcraft/milestone/9)**: next, 1 pieces tracked, none done. There is no CAM in SolidCraft yet. Send to Slicer and a first toolpath slice are in review; proposals are [#1153](https://github.com/tangency-labs/solidcraft/issues/1153) and [#1621](https://github.com/tangency-labs/solidcraft/issues/1621).
|
||||
|
||||
Features are not tied to a release or a date. Work lands in the daily releases as it is finished.
|
||||
Anything without a milestone, such as bug fixes, is not a feature and is not listed here.
|
||||
|
||||
## How releases work
|
||||
|
||||
- Releases ship daily, as numbered versions (v0.22.0, v0.22.1) with nightly pre-releases in
|
||||
between. They are delivered through the in-app updater.
|
||||
- SolidCraft tells you when a newer stable release exists and never updates without asking.
|
||||
Where it can replace itself safely (AppImage, Windows installer and portable builds) there is
|
||||
an **Update now** button; downloads are checked against the release's SHA-256 list. See
|
||||
[updates and privacy](docs/book/src/guide/updates.md).
|
||||
- Design files carry a format number. A new version opens designs from older versions, but an
|
||||
older version refuses a design saved by a newer one (0.22.0 writes format 35, and 0.21.0 and
|
||||
earlier will not open it). Each release's notes say when the format changed. Keep a copy of
|
||||
an important design before you move to a new version.
|
||||
|
||||
## Licence
|
||||
|
||||
SolidCraft is licensed MIT OR Apache-2.0, at your option; see [LICENSE-MIT](LICENSE-MIT) and
|
||||
[LICENSE-APACHE](LICENSE-APACHE). Versions already released stay available under those licences
|
||||
permanently.
|
||||
|
||||
## How to follow along
|
||||
|
||||
- Feature milestones: <https://github.com/tangency-labs/solidcraft/milestones>
|
||||
- Issues: <https://github.com/tangency-labs/solidcraft/issues> (area labels such as
|
||||
`area:kernel`, `area:sketch` and `area:ui` group them)
|
||||
- Discord: <https://discord.gg/FtU4NQNVDH>
|
||||
- Releases: <https://github.com/tangency-labs/solidcraft/releases>
|
||||
- Contributing: [CONTRIBUTING.md](CONTRIBUTING.md)
|
||||
|
||||
@@ -22,6 +22,7 @@ solidcraft-engine = { workspace = true }
|
||||
solidcraft-ui-egui = { workspace = true }
|
||||
egui = { workspace = true }
|
||||
log = { workspace = true }
|
||||
url = "2"
|
||||
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit"] }
|
||||
@@ -34,5 +35,6 @@ web-sys = { version = "0.3", features = [
|
||||
"FileSystemHandle", "FileSystemDirectoryHandle", "FileSystemFileHandle", "FileSystemGetFileOptions", "FileSystemWritableFileStream",
|
||||
"WritableStream", "File", "FileList", "Blob", "BlobPropertyBag", "Url", "HtmlAnchorElement", "HtmlInputElement", "Storage",
|
||||
"IdbFactory", "IdbDatabase", "IdbObjectStore", "IdbOpenDbRequest", "IdbRequest", "IdbTransaction", "IdbTransactionMode",
|
||||
"Headers", "ReadableStream", "ReadableStreamDefaultReader",
|
||||
"BeforeUnloadEvent", "Event", "EventTarget", "KeyboardEvent", "Response", "MediaQueryList", "Gamepad", "Performance",
|
||||
] }
|
||||
|
||||
@@ -114,6 +114,46 @@ pub fn opens_design(extensions: &[&str]) -> bool {
|
||||
extensions.is_empty() || extensions.iter().any(|e| solidcraft_engine::io::DESIGN_EXTS.contains(e))
|
||||
}
|
||||
|
||||
/// Where an Open for `extensions` (what the command reads; `&[]`: anything) is answered.
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub enum OpenRoute {
|
||||
/// The browser's open dialog for a design: the file keeps its handle, so Save writes back.
|
||||
Disk,
|
||||
/// The "Files in this browser" window, where the browser can't open a design from the disk.
|
||||
Panel,
|
||||
/// A plain file input that offers these types: the file is read into the engine's files and
|
||||
/// the command runs on it (Insert DXF or SVG, images, meshes, imported settings).
|
||||
Upload,
|
||||
}
|
||||
|
||||
/// Choose how an Open for `extensions` asks for its file; `api`: the browser can open a file
|
||||
/// from the disk and keep its handle.
|
||||
pub fn open_route(api: bool, extensions: &[&str]) -> OpenRoute {
|
||||
match (opens_design(extensions), api) {
|
||||
(true, true) => OpenRoute::Disk,
|
||||
(true, false) => OpenRoute::Panel,
|
||||
(false, _) => OpenRoute::Upload,
|
||||
}
|
||||
}
|
||||
|
||||
/// The `accept` list of a file input for `extensions` (with or without their dot): ".dxf,.svg".
|
||||
pub fn accept_list(extensions: &[&str]) -> String {
|
||||
let list: Vec<String> = extensions
|
||||
.iter()
|
||||
.map(|e| e.trim().trim_start_matches('.'))
|
||||
.filter(|e| !e.is_empty())
|
||||
.map(|e| format!(".{}", e.to_ascii_lowercase()))
|
||||
.collect();
|
||||
list.join(",")
|
||||
}
|
||||
|
||||
/// The largest file an upload for `extensions` reads: images go into a canvas, which has a size
|
||||
/// limit, so a bigger one is refused before it is read. `None`: the importer checks the file.
|
||||
pub fn upload_limit(extensions: &[&str]) -> Option<usize> {
|
||||
let image = |e: &&str| ["png", "jpg", "jpeg"].contains(&e.trim_start_matches('.').to_ascii_lowercase().as_str());
|
||||
(!extensions.is_empty() && extensions.iter().all(image)).then_some(solidcraft_engine::doc::canvas::MAX_CANVAS_BYTES)
|
||||
}
|
||||
|
||||
/// The file type a Save As dialog offers for `name`: (description, MIME type, extension).
|
||||
pub fn save_type(name: &str) -> (&'static str, &'static str, &'static str) {
|
||||
let json = std::path::Path::new(name).extension().is_some_and(|e| e.eq_ignore_ascii_case("json"));
|
||||
@@ -140,7 +180,7 @@ mod web {
|
||||
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
||||
use web_sys::{FileSystemFileHandle, IdbDatabase, IdbObjectStore, IdbOpenDbRequest, IdbRequest, IdbTransactionMode};
|
||||
|
||||
use super::{HANDLE_MAX_AGE_MS, is_abort, make_id, opens_design, parse, path, plan_prune, save_type};
|
||||
use super::{HANDLE_MAX_AGE_MS, is_abort, make_id, parse, path, plan_prune, save_type};
|
||||
use crate::files::{Files, err, read_handle};
|
||||
|
||||
const DB: &str = "solidcraft-disk-handles";
|
||||
@@ -294,7 +334,7 @@ mod web {
|
||||
let options = Object::new();
|
||||
let _ = Reflect::set(&options, &"multiple".into(), &JsValue::FALSE);
|
||||
let extensions = Array::new();
|
||||
for e in [".solidcraft", ".solvecraft", ".json", ".step", ".stp", ".3mf", ".stl", ".obj", ".glb", ".gltf", ".fcstd", ".3dm"] {
|
||||
for e in [".solidcraft", ".solvecraft", ".json", ".step", ".stp", ".3mf", ".stl", ".obj", ".glb", ".gltf", ".fcstd", ".3dm", ".dxf", ".svg"] {
|
||||
extensions.push(&e.into());
|
||||
}
|
||||
let accept = Object::new();
|
||||
@@ -315,11 +355,6 @@ mod web {
|
||||
p
|
||||
}
|
||||
|
||||
/// Does an Open for `extensions` use the browser's open dialog?
|
||||
pub fn handles_open(extensions: &[&str]) -> bool {
|
||||
supported() && opens_design(extensions)
|
||||
}
|
||||
|
||||
// ---- writing ------------------------------------------------------------------------
|
||||
|
||||
/// Queue what a command wrote to a disk path. Writes go one at a time; a newer write of the
|
||||
@@ -621,6 +656,21 @@ mod tests {
|
||||
assert!(!opens_design(&["json"]));
|
||||
}
|
||||
|
||||
/// Insert DXF or SVG, images and other non-design files get a file input that offers their
|
||||
/// types in every browser (#2052); designs keep the disk dialog or the browser's files.
|
||||
#[test]
|
||||
fn opens_of_other_files_use_a_file_input_for_their_types() {
|
||||
assert_eq!(open_route(true, &["dxf"]), OpenRoute::Upload);
|
||||
assert_eq!(open_route(false, &["png", "jpg", "jpeg"]), OpenRoute::Upload);
|
||||
assert_eq!(open_route(true, &[]), OpenRoute::Disk);
|
||||
assert_eq!(open_route(false, &["solidcraft"]), OpenRoute::Panel);
|
||||
assert_eq!(accept_list(&["dxf"]), ".dxf");
|
||||
assert_eq!(accept_list(&["png", ".JPG", "", "jpeg"]), ".png,.jpg,.jpeg");
|
||||
assert_eq!(accept_list(&[]), "");
|
||||
assert!(upload_limit(&["png", "jpg", "jpeg"]).is_some());
|
||||
assert_eq!(upload_limit(&["dxf"]), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_save_dialog_offers_the_type_of_the_name() {
|
||||
assert_eq!(save_type("Plate.solidcraft").2, ".solidcraft");
|
||||
|
||||
@@ -500,8 +500,9 @@ fn input_picker(files: &Rc<Files>, intent: Intent) {
|
||||
let Ok(input) = doc.create_element("input").map(|e| e.unchecked_into::<web_sys::HtmlInputElement>()) else { return };
|
||||
input.set_type("file");
|
||||
// Everything the browser build imports, from the format registry: cadmpeg is pure Rust, so
|
||||
// FreeCAD and Rhino files are part of it.
|
||||
let accept = solidcraft_engine::io::formats::open_extensions(true).iter().map(|e| format!(".{e}")).collect::<Vec<_>>().join(",");
|
||||
// FreeCAD and Rhino files are part of it; plus the DXF and SVG drawings Open and Insert take.
|
||||
let accept =
|
||||
solidcraft_engine::io::formats::open_extensions(true).iter().chain(&["dxf", "svg"]).map(|e| format!(".{e}")).collect::<Vec<_>>().join(",");
|
||||
input.set_accept(&accept);
|
||||
// Attached (hidden) while it is open: some browsers ignore a click on a detached input.
|
||||
let _ = input.set_attribute("style", "display:none");
|
||||
@@ -527,6 +528,67 @@ fn input_picker(files: &Rc<Files>, intent: Intent) {
|
||||
input.click();
|
||||
}
|
||||
|
||||
/// Ask for one file of these types (`extensions`, e.g. `["dxf"]`) with a plain file input, the
|
||||
/// dialog every browser has. The answer is the file's path in the engine's files (under
|
||||
/// [`UPLOAD`], as for a file picked in the disk dialog), so the command that asked runs on it;
|
||||
/// `None` when the dialog was closed or the file could not be read.
|
||||
pub fn pick_upload(files: &Rc<Files>, extensions: &[&str]) -> impl std::future::Future<Output = Option<String>> + use<> {
|
||||
// Shown now, in the click: a file dialog needs the user's gesture.
|
||||
let chosen = choose_file(&disk::accept_list(extensions));
|
||||
let limit = disk::upload_limit(extensions);
|
||||
let files = files.clone();
|
||||
async move {
|
||||
let read = async {
|
||||
let value = JsFuture::from(chosen?).await.map_err(err)?;
|
||||
// Closing the dialog answers no file: nothing to say.
|
||||
let Ok(file) = value.dyn_into::<web_sys::File>() else { return Ok(None) };
|
||||
let name = file.name();
|
||||
if limit.is_some_and(|max| !file.size().is_finite() || file.size() > max as f64) {
|
||||
return Err(format!("{name}: the file is too large"));
|
||||
}
|
||||
let bytes = blob_bytes(&file).await.map_err(|e| format!("{name}: {e}"))?;
|
||||
let path = format!("{UPLOAD}{name}");
|
||||
vfs::insert(&path, bytes);
|
||||
Ok(Some(path))
|
||||
};
|
||||
match read.await {
|
||||
Ok(path) => path,
|
||||
Err(e) => {
|
||||
files.say(format!("open: {e}"), true);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Show a hidden `<input type=file>` offering `accept` (call in the click). The promise answers
|
||||
/// the picked `File`, or `null` when the dialog is closed (the input's `cancel` event).
|
||||
fn choose_file(accept: &str) -> Result<js_sys::Promise, String> {
|
||||
let doc = web_sys::window().and_then(|w| w.document()).ok_or("this page can't show a file dialog")?;
|
||||
let input = doc.create_element("input").map_err(err)?.dyn_into::<web_sys::HtmlInputElement>().map_err(|_| "no file input".to_string())?;
|
||||
input.set_type("file");
|
||||
input.set_accept(accept);
|
||||
// Attached (hidden) while it is open: some browsers ignore a click on a detached input.
|
||||
input.set_attribute("style", "display:none").map_err(err)?;
|
||||
doc.body().ok_or("this page has no body")?.append_child(&input).map_err(err)?;
|
||||
let promise = js_sys::Promise::new(&mut |resolve: Function, _reject: Function| {
|
||||
// One answer for a pick or a cancel; read from the event, so it does not keep the input.
|
||||
let done = Closure::once_into_js(move |event: web_sys::Event| {
|
||||
let file = event.target().and_then(|t| t.dyn_into::<web_sys::HtmlInputElement>().ok()).and_then(|input| {
|
||||
input.set_onchange(None);
|
||||
input.set_oncancel(None);
|
||||
input.remove();
|
||||
input.files().and_then(|list| list.get(0))
|
||||
});
|
||||
let _ = resolve.call1(&JsValue::UNDEFINED, &file.map_or(JsValue::NULL, JsValue::from));
|
||||
});
|
||||
input.set_onchange(Some(done.unchecked_ref()));
|
||||
input.set_oncancel(Some(done.unchecked_ref()));
|
||||
});
|
||||
input.click();
|
||||
Ok(promise)
|
||||
}
|
||||
|
||||
/// Read files dropped on the page.
|
||||
pub fn take_drops(files: &Rc<Files>, raw: &mut egui::RawInput) {
|
||||
for f in std::mem::take(&mut raw.dropped_files) {
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
//! Bounded HTTPS downloads, handed to the normal design-open command as unsaved copies.
|
||||
use std::{cell::RefCell, rc::Rc};
|
||||
|
||||
use js_sys::{Reflect, Uint8Array};
|
||||
use solidcraft_engine::io::vfs;
|
||||
use solidcraft_ui_egui::{SolveApp, ui_kit};
|
||||
use wasm_bindgen::{JsCast as _, JsValue};
|
||||
use wasm_bindgen_futures::{JsFuture, spawn_local};
|
||||
|
||||
use crate::{check_download_size, design_url};
|
||||
|
||||
type Reply = Result<(String, Vec<u8>), String>;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Download {
|
||||
reply: Rc<RefCell<Option<Reply>>>,
|
||||
pending: Option<(String, Vec<u8>)>,
|
||||
}
|
||||
|
||||
impl Download {
|
||||
pub fn start(url: Option<&str>, ctx: &egui::Context) -> Self {
|
||||
let download = Self::default();
|
||||
if let Some(url) = url {
|
||||
let url = url.to_owned();
|
||||
let slot = download.reply.clone();
|
||||
let ctx = ctx.clone();
|
||||
spawn_local(async move {
|
||||
*slot.borrow_mut() = Some(fetch(&url).await);
|
||||
ctx.request_repaint();
|
||||
});
|
||||
}
|
||||
download
|
||||
}
|
||||
|
||||
pub fn tick(&mut self, app: &mut SolveApp, ctx: &egui::Context) {
|
||||
if let Some(reply) = self.reply.borrow_mut().take() {
|
||||
match reply {
|
||||
Ok(file) => self.pending = Some(file),
|
||||
Err(error) => app.set_status(format!("Could not open design link: {error}"), true),
|
||||
}
|
||||
}
|
||||
if self.pending.is_none() || app.file_picker_busy() {
|
||||
return;
|
||||
}
|
||||
if solidcraft_ui_egui::documents::any_dirty(app) {
|
||||
let mut answer = None;
|
||||
let closed = ui_kit::Window::new(egui::Id::new("open_link"), "status_warning", solidcraft_ui_egui::i18n::tr("web.open_link"))
|
||||
.required()
|
||||
.show_body(ctx, |ui| {
|
||||
ui.label(solidcraft_ui_egui::i18n::tr("web.open_link_confirm"));
|
||||
ui.horizontal(|ui| {
|
||||
if ui_kit::button(ui, solidcraft_ui_egui::i18n::tr("ui.open"), ui_kit::Button::Normal).clicked() {
|
||||
answer = Some(true);
|
||||
}
|
||||
if ui_kit::button(ui, solidcraft_ui_egui::i18n::tr("ui.cancel"), ui_kit::Button::Normal).clicked() {
|
||||
answer = Some(false);
|
||||
}
|
||||
});
|
||||
});
|
||||
match answer {
|
||||
Some(true) => {}
|
||||
Some(false) => {
|
||||
self.pending = None;
|
||||
return;
|
||||
}
|
||||
None if closed => {
|
||||
self.pending = None;
|
||||
return;
|
||||
}
|
||||
None => return,
|
||||
}
|
||||
}
|
||||
let Some((name, bytes)) = self.pending.take() else { return };
|
||||
// The extension selects the design loader even when the URL has no extension.
|
||||
let path = "/linked/design.solidcraft";
|
||||
vfs::insert(path, bytes);
|
||||
app.open_path(path);
|
||||
if app.session.path.as_deref() == Some(path) {
|
||||
app.session.path = None;
|
||||
app.session.doc_mut().name = name;
|
||||
app.session.mark_unsaved();
|
||||
} else {
|
||||
app.set_status("Could not open design link: the downloaded file is not a valid SolidCraft design", true);
|
||||
}
|
||||
let _ = vfs::remove(path);
|
||||
}
|
||||
}
|
||||
|
||||
async fn fetch(value: &str) -> Reply {
|
||||
let url = design_url(value)?;
|
||||
let name = url.path_segments().and_then(|mut segments| segments.next_back()).filter(|name| !name.is_empty()).unwrap_or("Design.solidcraft");
|
||||
let decoded = js_sys::decode_uri_component(name).ok().and_then(|name| name.as_string()).unwrap_or_else(|| name.to_owned());
|
||||
let name: String = decoded.strip_suffix(".solidcraft").unwrap_or(&decoded).chars().take(255).collect();
|
||||
let window = web_sys::window().ok_or("No browser window")?;
|
||||
let response = JsFuture::from(window.fetch_with_str(url.as_str())).await.map_err(|_| "Network request failed or the host refused CORS access")?;
|
||||
let response: web_sys::Response = response.dyn_into().map_err(|_| "Invalid download response")?;
|
||||
design_url(&response.url()).map_err(|_| "Design redirected to a URL that does not use HTTPS")?;
|
||||
if !response.ok() {
|
||||
return Err(format!("HTTP {} {}", response.status(), response.status_text()));
|
||||
}
|
||||
let length = response
|
||||
.headers()
|
||||
.get("Content-Length")
|
||||
.map_err(|_| "Cannot read download size")?
|
||||
.map(|value| value.parse::<u64>().map_err(|_| "Invalid Content-Length"))
|
||||
.transpose()?;
|
||||
if let Some(length) = length {
|
||||
check_download_size(0, length)?;
|
||||
}
|
||||
let stream = response.body().ok_or("Download has no body")?;
|
||||
let reader: web_sys::ReadableStreamDefaultReader = stream.get_reader().dyn_into().map_err(|_| "Cannot read download stream")?;
|
||||
let result = read(&reader).await;
|
||||
if result.is_err() {
|
||||
let _ = JsFuture::from(reader.cancel()).await;
|
||||
}
|
||||
// Fetch rejects interrupted HTTP bodies and decodes Content-Encoding. Content-Length
|
||||
// can describe compressed bytes, so the streamed limit also checks the decoded size.
|
||||
let bytes = result?;
|
||||
Ok((name, bytes))
|
||||
}
|
||||
|
||||
async fn read(reader: &web_sys::ReadableStreamDefaultReader) -> Result<Vec<u8>, String> {
|
||||
let mut bytes = Vec::new();
|
||||
// Bound even a stream which keeps returning empty chunks.
|
||||
for _ in 0..1_000_000 {
|
||||
let chunk = JsFuture::from(reader.read()).await.map_err(|_| "Download interrupted")?;
|
||||
if Reflect::get(&chunk, &JsValue::from_str("done")).map_err(|_| "Invalid download stream")?.as_bool() == Some(true) {
|
||||
return Ok(bytes);
|
||||
}
|
||||
let value = Reflect::get(&chunk, &JsValue::from_str("value")).map_err(|_| "Invalid download chunk")?;
|
||||
let chunk: Uint8Array = value.dyn_into().map_err(|_| "Invalid download bytes")?;
|
||||
check_download_size(bytes.len(), u64::from(chunk.length()))?;
|
||||
bytes.extend_from_slice(&chunk.to_vec());
|
||||
}
|
||||
Err("Download returned too many chunks".into())
|
||||
}
|
||||
+171
-22
@@ -14,6 +14,8 @@ mod disk;
|
||||
mod files;
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
mod install;
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
mod linked;
|
||||
#[cfg(any(target_arch = "wasm32", test))]
|
||||
mod space_mouse;
|
||||
|
||||
@@ -25,6 +27,61 @@ fn browser_switches_tabs(key: &str, ctrl: bool) -> bool {
|
||||
ctrl && key == "Tab"
|
||||
}
|
||||
|
||||
#[cfg(any(target_arch = "wasm32", test))]
|
||||
fn query_flag(query: &str, name: &str) -> bool {
|
||||
url::form_urlencoded::parse(query.trim_start_matches('?').as_bytes()).any(|(key, _)| key == name)
|
||||
}
|
||||
|
||||
/// Launch options use exact query keys; URL values are decoded only once.
|
||||
#[cfg(any(target_arch = "wasm32", test))]
|
||||
#[derive(Default, Debug)]
|
||||
struct Launch {
|
||||
open: Option<String>,
|
||||
embed: bool,
|
||||
}
|
||||
|
||||
#[cfg(any(target_arch = "wasm32", test))]
|
||||
impl Launch {
|
||||
fn parse(query: &str) -> Self {
|
||||
let mut launch = Self::default();
|
||||
let mut embed = false;
|
||||
for (key, value) in url::form_urlencoded::parse(query.trim_start_matches('?').as_bytes()) {
|
||||
match key.as_ref() {
|
||||
"open" if launch.open.is_none() => launch.open = Some(value.into_owned()),
|
||||
"embed" => embed = true,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
launch.embed = embed && launch.open.is_some();
|
||||
launch
|
||||
}
|
||||
|
||||
fn persists(&self) -> bool {
|
||||
!self.embed
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(any(target_arch = "wasm32", test))]
|
||||
fn design_url(value: &str) -> Result<url::Url, String> {
|
||||
if value.len() > 16_384 {
|
||||
return Err("Design URL is too long".into());
|
||||
}
|
||||
let url = url::Url::parse(value).map_err(|_| "Invalid design URL")?;
|
||||
if url.scheme() != "https" || url.host_str().is_none() || !url.username().is_empty() || url.password().is_some() {
|
||||
return Err("Design links must use HTTPS without credentials".into());
|
||||
}
|
||||
Ok(url)
|
||||
}
|
||||
|
||||
#[cfg(any(target_arch = "wasm32", test))]
|
||||
fn check_download_size(current: usize, incoming: u64) -> Result<(), String> {
|
||||
let cap = solidcraft_engine::io::MAX_DESIGN_BYTES as u64;
|
||||
if current as u64 > cap || incoming > cap.saturating_sub(current as u64) {
|
||||
return Err(format!("Design exceeds the {} MB size limit", cap / (1024 * 1024)));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
mod web {
|
||||
use std::rc::Rc;
|
||||
@@ -112,6 +169,9 @@ mod web {
|
||||
|
||||
struct Shell {
|
||||
app: SolveApp,
|
||||
launch: crate::Launch,
|
||||
linked: crate::linked::Download,
|
||||
full_url: Option<String>,
|
||||
api: Api,
|
||||
files: Rc<Files>,
|
||||
/// When the last autosave was (seconds), and the revision it holds (none stored: `None`).
|
||||
@@ -137,6 +197,9 @@ mod web {
|
||||
impl Shell {
|
||||
/// Files from the computer, writes to store, messages and the autosave.
|
||||
fn files_tick(&mut self, ctx: &egui::Context) {
|
||||
if !self.launch.persists() {
|
||||
return;
|
||||
}
|
||||
if self.files.ctx.borrow().is_none() {
|
||||
*self.files.ctx.borrow_mut() = Some(ctx.clone());
|
||||
}
|
||||
@@ -267,7 +330,7 @@ mod web {
|
||||
files::pick_from_disk(&self.files, Intent::Open);
|
||||
}
|
||||
if ui_kit::button(ui, "Insert from computer…", ui_kit::Button::Normal)
|
||||
.on_hover_text("STEP, 3MF or STL into the open design")
|
||||
.on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_drawings_hint"))
|
||||
.clicked()
|
||||
{
|
||||
files::pick_from_disk(&self.files, Intent::Insert);
|
||||
@@ -320,7 +383,7 @@ mod web {
|
||||
let design = solidcraft_engine::io::is_design_path(&e.name);
|
||||
if !design
|
||||
&& ui_kit::button(ui, "Insert", ui_kit::Button::Small)
|
||||
.on_hover_text("Into the open design (STEP, 3MF, STL)")
|
||||
.on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_stored_drawings_hint"))
|
||||
.clicked()
|
||||
{
|
||||
act = Some(("insert", e.name.clone()));
|
||||
@@ -526,19 +589,42 @@ mod web {
|
||||
if let Some(delay) = self.wheel_gestures.update(raw, now) {
|
||||
ctx.request_repaint_after(delay);
|
||||
}
|
||||
files::take_drops(&self.files, raw);
|
||||
if self.launch.persists() {
|
||||
files::take_drops(&self.files, raw);
|
||||
} else {
|
||||
raw.dropped_files.clear();
|
||||
}
|
||||
// Before the app's own hook, which adds the control channel's events.
|
||||
self.space_mouse.raw_input_hook(ctx, self.app.preferences.space_mouse_enabled, raw);
|
||||
self.app.raw_input_hook(raw);
|
||||
}
|
||||
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
|
||||
self.linked.tick(&mut self.app, ui.ctx());
|
||||
UNSAVED.with(|u| u.set(self.launch.persists() && solidcraft_ui_egui::documents::any_dirty(&self.app)));
|
||||
if self.launch.embed {
|
||||
ui_kit::Container::new(ui.ctx(), ui_kit::Surface::Chrome).edge("embed_header", ui_kit::Edge::Top).show(ui, |ui| {
|
||||
if ui_kit::button(ui, solidcraft_ui_egui::i18n::tr("web.open_full"), ui_kit::Button::Normal).clicked()
|
||||
&& let (Some(window), Some(url)) = (web_sys::window(), &self.full_url)
|
||||
{
|
||||
let _ = window.open_with_url_and_target_and_features(url, "_blank", "noopener");
|
||||
}
|
||||
});
|
||||
}
|
||||
self.app.ui(ui);
|
||||
let ctx = ui.ctx().clone();
|
||||
self.file_panel(&ctx);
|
||||
self.recovery_prompt(&ctx);
|
||||
if self.launch.persists() {
|
||||
self.file_panel(&ctx);
|
||||
self.recovery_prompt(&ctx);
|
||||
}
|
||||
self.watch_text_for_font(&ctx);
|
||||
}
|
||||
fn persist_egui_memory(&self) -> bool {
|
||||
self.launch.persists()
|
||||
}
|
||||
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
||||
if !self.launch.persists() {
|
||||
return;
|
||||
}
|
||||
// Persist the user's own language, not a session-only English fallback.
|
||||
let saved = self.font.persisted_language(&self.app.preferences.language).to_owned();
|
||||
let live = std::mem::replace(&mut self.app.preferences.language, saved);
|
||||
@@ -557,15 +643,15 @@ mod web {
|
||||
|
||||
/// Render with WebGL2: asked for now (`?webgl`, remembered) or before (until `?webgpu`).
|
||||
fn webgl() -> bool {
|
||||
let storage = web_sys::window().and_then(|w| w.local_storage().ok().flatten());
|
||||
let storage = crate::Launch::parse(&query()).persists().then(|| web_sys::window().and_then(|w| w.local_storage().ok().flatten())).flatten();
|
||||
let q = query();
|
||||
if q.contains("webgl") {
|
||||
if crate::query_flag(&q, "webgl") {
|
||||
if let Some(s) = &storage {
|
||||
let _ = s.set_item(WEBGL_KEY, "1");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if q.contains("webgpu") {
|
||||
if crate::query_flag(&q, "webgpu") {
|
||||
if let Some(s) = &storage {
|
||||
let _ = s.remove_item(WEBGL_KEY);
|
||||
}
|
||||
@@ -591,7 +677,10 @@ mod web {
|
||||
eframe::WebLogger::init(log::LevelFilter::Info).ok();
|
||||
wasm_bindgen_futures::spawn_local(async {
|
||||
let Some(window) = web_sys::window() else { return };
|
||||
ask_before_unload(&window);
|
||||
let launch = crate::Launch::parse(&query());
|
||||
if launch.persists() {
|
||||
ask_before_unload(&window);
|
||||
}
|
||||
leave_tab_switching_to_browser(&window);
|
||||
let Some(document) = window.document() else { return };
|
||||
let Some(canvas) = document.get_element_by_id(CANVAS_ID).and_then(|e| e.dyn_into::<web_sys::HtmlCanvasElement>().ok()) else {
|
||||
@@ -611,19 +700,24 @@ mod web {
|
||||
Box::new(move |cc| {
|
||||
solidcraft_ui_egui::fonts::setup_fonts(&cc.egui_ctx);
|
||||
let files = Rc::new(Files::default());
|
||||
files::start(&files);
|
||||
if launch.persists() {
|
||||
files::start(&files);
|
||||
}
|
||||
let (panel, opener, saver, shown) = (files.clone(), files.clone(), files.clone(), files.clone());
|
||||
let (restorable, restorer) = (files.clone(), files.clone());
|
||||
let services = Services {
|
||||
let services = if launch.embed { Services::default() } else { Services {
|
||||
// Open shows the browser's open dialog for a design where it has one
|
||||
// (the file keeps its handle, so Save writes back to it); otherwise,
|
||||
// and for inserting STEP or meshes, the browser's files window.
|
||||
pick_open: Some(Box::new(move |exts: &[&str]| {
|
||||
if disk::handles_open(exts) {
|
||||
return Box::pin(disk::pick_open(&opener));
|
||||
// (the file keeps its handle, so Save writes back to it), else the
|
||||
// browser's files window. A command that reads another kind of file
|
||||
// (Insert DXF or SVG, an image, a mesh, settings) gets a file dialog
|
||||
// offering that kind, and runs on the picked file.
|
||||
pick_open: Some(Box::new(move |exts: &[&str]| match disk::open_route(disk::supported(), exts) {
|
||||
disk::OpenRoute::Disk => Box::pin(disk::pick_open(&opener)),
|
||||
disk::OpenRoute::Upload => Box::pin(files::pick_upload(&opener, exts)),
|
||||
disk::OpenRoute::Panel => {
|
||||
panel.panel.set(true);
|
||||
Box::pin(std::future::ready(None))
|
||||
}
|
||||
panel.panel.set(true);
|
||||
Box::pin(std::future::ready(None))
|
||||
})),
|
||||
// A design is saved to a file the user picks, or kept in the browser
|
||||
// where the browser can't pick one; everything else is downloaded.
|
||||
@@ -648,26 +742,27 @@ mod web {
|
||||
browser_files: Some(Box::new(move || shown.panel.set(true))),
|
||||
install_app: Some(crate::install::service(&cc.egui_ctx)),
|
||||
..Default::default()
|
||||
};
|
||||
}};
|
||||
// Thumbnails of saves and start-page cards.
|
||||
solidcraft_ui_egui::gpu::install_cpu_picture_renderer();
|
||||
let (sender, receiver) = std::sync::mpsc::channel();
|
||||
let mut app = SolveApp::new(Session::default(), services).with_control(receiver);
|
||||
if let Some(p) = cc.storage.and_then(|s| solidcraft_ui_egui::prefs::stored(|k| s.get_string(k))) {
|
||||
app.embedded = launch.embed;
|
||||
if launch.persists() && let Some(p) = cc.storage.and_then(|s| solidcraft_ui_egui::prefs::stored(|k| s.get_string(k))) {
|
||||
app.load_prefs(&p);
|
||||
}
|
||||
if let Some(rs) = &cc.wgpu_render_state {
|
||||
// eframe's web painter has no stencil buffer.
|
||||
app.set_wgpu(rs, DEPTH_BITS, 0, 1);
|
||||
}
|
||||
if query().contains("sample") {
|
||||
if launch.open.is_none() && crate::query_flag(&query(), "sample") {
|
||||
if let Err(e) = app.session.run_script(&solidcraft_engine::sample::script()) {
|
||||
app.set_status(format!("sample: {e}"), true);
|
||||
}
|
||||
app.session.doc_mut().name = "Sample Plate".into();
|
||||
app.session.mark_saved();
|
||||
}
|
||||
if !query().contains("sample") {
|
||||
if launch.open.is_none() && !crate::query_flag(&query(), "sample") {
|
||||
// The empty design takes Units of new designs (#1205). The sample
|
||||
// part is built in millimetres and is left that way.
|
||||
solidcraft_ui_egui::prefs::apply_new_design(&mut app);
|
||||
@@ -676,8 +771,20 @@ mod web {
|
||||
}
|
||||
let api = Api::install(sender, cc.egui_ctx.clone()).map_err(|e| format!("SolidCraft browser API: {e:?}"))?;
|
||||
let font_language = app.preferences.language.clone();
|
||||
let linked = crate::linked::Download::start(launch.open.as_deref(), &cc.egui_ctx);
|
||||
let full_url = window.location().href().ok().and_then(|value| url::Url::parse(&value).ok()).map(|mut url| {
|
||||
url.set_query(None);
|
||||
url.set_fragment(None);
|
||||
if let Some(open) = &launch.open {
|
||||
url.query_pairs_mut().append_pair("open", open);
|
||||
}
|
||||
url.to_string()
|
||||
});
|
||||
Ok(Box::new(Shell {
|
||||
app,
|
||||
launch,
|
||||
linked,
|
||||
full_url,
|
||||
api,
|
||||
files,
|
||||
autosaved_at: f64::NEG_INFINITY,
|
||||
@@ -721,6 +828,48 @@ fn main() {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn link_query_decodes_once_and_embed_disables_persistence() {
|
||||
assert!(!query_flag("?open=https://example.org/webgl?sample", "webgl"));
|
||||
assert!(!query_flag("?open=https://example.org/webgl?sample", "sample"));
|
||||
assert!(query_flag("?embed&webgl", "webgl"));
|
||||
let launch = Launch::parse("?embed&open=https%3A%2F%2Fexample.org%2Farm.solidcraft%3Fx%3Da%2520b%26y%3D1");
|
||||
assert_eq!(launch.open.as_deref(), Some("https://example.org/arm.solidcraft?x=a%20b&y=1"));
|
||||
assert!(launch.embed);
|
||||
assert!(!launch.persists());
|
||||
assert!(!Launch::parse("?embed").embed);
|
||||
assert!(!Launch::parse("?other=embed&reopen=https://example.org").embed);
|
||||
assert!(Launch::parse("?open=https://example.org/a").persists());
|
||||
assert_eq!(Launch::parse("?open=first&open=second").open.as_deref(), Some("first"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn design_links_refuse_hostile_schemes_credentials_and_sizes() {
|
||||
assert!(design_url("https://example.org/arm.solidcraft?download=1").is_ok());
|
||||
for value in [
|
||||
"http://example.org/a",
|
||||
"data:application/json,{}",
|
||||
"blob:https://example.org/a",
|
||||
"javascript:alert(1)",
|
||||
"/arm.solidcraft",
|
||||
"https://user:secret@example.org/a",
|
||||
"",
|
||||
] {
|
||||
assert!(design_url(value).is_err(), "{value}");
|
||||
}
|
||||
assert!(design_url(&format!("https://example.org/{}", "x".repeat(16_384))).is_err());
|
||||
assert!(design_url("http://redirect.example.org/a").is_err());
|
||||
|
||||
let cap = solidcraft_engine::io::MAX_DESIGN_BYTES;
|
||||
assert!(check_download_size(0, cap as u64).is_ok());
|
||||
assert!(check_download_size(0, cap as u64 + 1).is_err());
|
||||
assert!(check_download_size(cap - 2, 2).is_ok());
|
||||
assert!(check_download_size(cap - 2, 3).is_err());
|
||||
assert!(check_download_size(0, u64::MAX).is_err());
|
||||
assert!(check_download_size(cap, 1).is_err());
|
||||
assert!(check_download_size(usize::MAX, 0).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn only_ctrl_tab_is_left_to_the_browser() {
|
||||
// Ctrl+Tab and Ctrl+Shift+Tab (the event's key is "Tab" either way) switch browser tabs.
|
||||
|
||||
@@ -127,7 +127,7 @@ fn listen_on_listener(listener: TcpListener, token: String, tx: Sender<ControlRe
|
||||
if OPEN.fetch_add(1, Ordering::Relaxed) >= MAX_CONNECTIONS {
|
||||
OPEN.fetch_sub(1, Ordering::Relaxed);
|
||||
let mut refused = stream;
|
||||
let _ = writeln!(refused, "{}", json!({"ok": false, "error": "too many connections"}));
|
||||
let _ = send(&mut refused, &json!({"ok": false, "error": "too many connections"}));
|
||||
continue;
|
||||
}
|
||||
let tx = tx.clone();
|
||||
@@ -174,6 +174,15 @@ fn read_line(r: &mut impl BufRead, max: usize) -> std::io::Result<Option<Vec<u8>
|
||||
}
|
||||
}
|
||||
|
||||
/// A reply line, written to the socket at once. `writeln!` with a JSON value hands the socket each
|
||||
/// of its pieces apart, a system call for every string, number and comma: half a second for a
|
||||
/// design's component tree when it has thousands of components.
|
||||
fn send(out: &mut impl Write, reply: &Value) -> std::io::Result<()> {
|
||||
let mut line = serde_json::to_vec(reply).map_err(std::io::Error::other)?;
|
||||
line.push(b'\n');
|
||||
out.write_all(&line)
|
||||
}
|
||||
|
||||
/// The reply to a connection that didn't show the token; the connection is then closed.
|
||||
fn unauthorized() -> Value {
|
||||
json!({"ok": false, "error": "unauthorized: send the control token as \"token\" (see docs/control-protocol.md)"})
|
||||
@@ -184,7 +193,7 @@ fn unauthorized() -> Value {
|
||||
/// the connection, and a reset can reach the client before it has read the refusal.
|
||||
fn refuse(out: &mut TcpStream, reader: &mut BufReader<TcpStream>) {
|
||||
use std::io::Read;
|
||||
let _ = writeln!(out, "{}", unauthorized());
|
||||
let _ = send(out, &unauthorized());
|
||||
let _ = out.shutdown(std::net::Shutdown::Write);
|
||||
let _ = reader.get_ref().set_read_timeout(Some(Duration::from_millis(500)));
|
||||
let _ = std::io::copy(&mut reader.by_ref().take(64 * 1024), &mut std::io::sink());
|
||||
@@ -381,7 +390,7 @@ fn serve_with(
|
||||
Ok(Some(l)) => String::from_utf8_lossy(&l).into_owned(),
|
||||
Ok(None) => break,
|
||||
Err(e) => {
|
||||
let _ = writeln!(out, "{}", json!({"ok": false, "error": e.to_string()}));
|
||||
let _ = send(&mut out, &json!({"ok": false, "error": e.to_string()}));
|
||||
break;
|
||||
}
|
||||
};
|
||||
@@ -463,7 +472,7 @@ fn serve_with(
|
||||
json!({"ok": false, "error": format!("bad JSON: {e}")})
|
||||
}
|
||||
};
|
||||
if writeln!(out, "{reply}").is_err() {
|
||||
if send(&mut out, &reply).is_err() {
|
||||
break;
|
||||
}
|
||||
if bad >= MAX_BAD_LINES {
|
||||
@@ -750,4 +759,31 @@ mod tests {
|
||||
let mut r = BufReader::with_capacity(64, text.as_slice());
|
||||
assert!(read_line(&mut r, 1000).is_err());
|
||||
}
|
||||
|
||||
/// A large reply reaches the socket in one write, not one per JSON piece (a component tree of
|
||||
/// thousands of components took half a second to send), and reads back as it was.
|
||||
#[test]
|
||||
fn a_large_reply_is_written_at_once() {
|
||||
struct Counted {
|
||||
writes: usize,
|
||||
bytes: Vec<u8>,
|
||||
}
|
||||
impl Write for Counted {
|
||||
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
||||
self.writes += 1;
|
||||
self.bytes.extend_from_slice(buf);
|
||||
Ok(buf.len())
|
||||
}
|
||||
fn flush(&mut self) -> std::io::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
let components: Vec<Value> = (0..2000).map(|i| json!({"id": i, "name": format!("Part {i}"), "bodies": ["a", "b"], "parent": 0})).collect();
|
||||
let reply = json!({"ok": true, "id": 7, "result": {"components": components}});
|
||||
let mut out = Counted { writes: 0, bytes: Vec::new() };
|
||||
send(&mut out, &reply).unwrap();
|
||||
assert_eq!(out.writes, 1);
|
||||
assert_eq!(out.bytes.last(), Some(&b'\n'));
|
||||
assert_eq!(serde_json::from_slice::<Value>(&out.bytes).unwrap(), reply);
|
||||
}
|
||||
}
|
||||
|
||||
+70
-12
@@ -292,7 +292,9 @@ fn services(cc: &eframe::CreationContext<'_>) -> Services {
|
||||
dialog = dialog.add_filter(label, &case_variants(first));
|
||||
}
|
||||
// The groups come from the format registry, so a new format joins this dialog by itself.
|
||||
dialog = dialog.add_filter("Designs, CAD files and meshes", &case_variants(&io::formats::open_extensions(true)));
|
||||
let mut everything = io::formats::open_extensions(true);
|
||||
everything.extend(["dxf", "svg"]);
|
||||
dialog = dialog.add_filter(solidcraft_ui_egui::i18n::tr("file.open.drawing_filter"), &case_variants(&everything));
|
||||
for (label, exts) in io::formats::import_filters(true) {
|
||||
dialog = dialog.add_filter(label, &case_variants(&exts));
|
||||
}
|
||||
@@ -335,6 +337,7 @@ fn services(cc: &eframe::CreationContext<'_>) -> Services {
|
||||
let future = dialog.save_file();
|
||||
Box::pin(async move { future.await.map(|p| p.path().to_string_lossy().into_owned()) })
|
||||
})),
|
||||
graphics_adapters: Vec::new(),
|
||||
graphics_path: graphics_path().map(|p| p.to_string_lossy().to_string()),
|
||||
window_system: window_system_now(),
|
||||
http_get: Some(std::sync::Arc::new(http_get)),
|
||||
@@ -575,13 +578,22 @@ fn scene_samples(backend: eframe::wgpu::Backend, samples: u32, supported: &[u32]
|
||||
}
|
||||
}
|
||||
|
||||
/// Anti-aliasing samples from Preferences (4 when unset).
|
||||
fn msaa() -> u16 {
|
||||
/// Keep the default until the installed renderer's startup check proves a fallback is needed.
|
||||
fn scene_msaa_request(saved: Option<u16>) -> u16 {
|
||||
saved.unwrap_or(MSAA)
|
||||
}
|
||||
|
||||
/// Query the scene's colour/depth intersection, rather than the depthless window's counts.
|
||||
fn scene_sample_choices(depth_bits: u8, stencil_bits: u8, query: impl FnOnce(Option<eframe::wgpu::TextureFormat>) -> Vec<u32>) -> Vec<u32> {
|
||||
query(eframe::egui_wgpu::depth_format_from_bits(depth_bits, stencil_bits))
|
||||
}
|
||||
|
||||
/// An explicitly saved anti-aliasing choice, absent until Graphics changes it.
|
||||
fn msaa() -> Option<u16> {
|
||||
graphics()
|
||||
.and_then(|v| v.get("msaa").and_then(serde_json::Value::as_u64))
|
||||
.and_then(|m| u16::try_from(m).ok())
|
||||
.filter(|m| [1, 2, 4, 8].contains(m))
|
||||
.unwrap_or(MSAA)
|
||||
}
|
||||
|
||||
/// Windows and Linux: no OS title bar; the application bar is the title bar
|
||||
@@ -685,7 +697,7 @@ fn main() -> eframe::Result {
|
||||
if safe_mode {
|
||||
notes.push("Safe mode: default settings (yours are kept for the next normal start), no recovery offer, software rendering.".into());
|
||||
}
|
||||
let samples = if safe_mode { MSAA } else { msaa() };
|
||||
let saved_samples = if safe_mode { None } else { msaa() };
|
||||
let wgpu_options = wgpu_options(cpu_renderer, if safe_mode { None } else { backend_preference() }.as_deref());
|
||||
let depth_bits = if !safe_mode && startup::float_depth_everywhere(&wgpu_options) { FLOAT_DEPTH_BITS } else { DEPTH_BITS };
|
||||
// Crashes leave a report in the crash folder (solidcraft_engine::crash, docs/crash-reports.md).
|
||||
@@ -802,19 +814,37 @@ fn main() -> eframe::Result {
|
||||
restart_on_software: device_lost::restart_on_software(after_loss, cpu_renderer),
|
||||
lost_at: None,
|
||||
});
|
||||
if !safe_mode {
|
||||
app.preferences.graphics_adapter =
|
||||
graphics().and_then(|v| v.get("adapter").and_then(serde_json::Value::as_str).map(str::to_string)).unwrap_or_default();
|
||||
}
|
||||
if let Some(rs) = &cc.wgpu_render_state {
|
||||
let scene_samples = scene_samples(rs.adapter.get_info().backend, u32::from(samples), &rs.msaa_supported);
|
||||
app.services.graphics_adapters = rs
|
||||
.available_adapters
|
||||
.iter()
|
||||
.map(|adapter| {
|
||||
let info = adapter.get_info();
|
||||
(info.name.clone(), format!("{} ({:?}, {:?})", info.name, info.device_type, info.backend))
|
||||
})
|
||||
.collect();
|
||||
let info = rs.adapter.get_info();
|
||||
let samples = scene_msaa_request(saved_samples);
|
||||
let supported = scene_sample_choices(depth_bits, STENCIL_BITS, |depth| {
|
||||
eframe::egui_wgpu::supported_msaa_samples(&rs.adapter, &rs.device, rs.target_format, depth)
|
||||
});
|
||||
let scene_samples = scene_samples(info.backend, u32::from(samples), &supported);
|
||||
eprintln!("SolidCraft graphics: {:?}, MSAA {scene_samples}x (requested {}x)", rs.adapter.get_info().backend, samples);
|
||||
solidcraft_engine::crash::phase("viewport pipelines (shader compile)");
|
||||
app.set_wgpu_split(rs, depth_bits, STENCIL_BITS, scene_samples);
|
||||
let scene_samples = app.set_wgpu_split(rs, depth_bits, STENCIL_BITS, scene_samples);
|
||||
app.msaa_supported = supported;
|
||||
app.preferences.msaa = u32::from(samples);
|
||||
solidcraft_ui_egui::gpu::install_picture_renderer(rs);
|
||||
// The graphics driver is loaded now; it may have put its own exception filter
|
||||
// in front of ours.
|
||||
#[cfg(target_os = "windows")]
|
||||
native_crash::reinstall();
|
||||
// A saved anti-aliasing the device can't do: back to the default, with a notice.
|
||||
// Reflect a confirmed probe fallback or an unsupported saved count in Graphics.
|
||||
solidcraft_ui_egui::prefs::check_msaa(&mut app, u32::from(samples));
|
||||
let info = rs.adapter.get_info();
|
||||
solidcraft_engine::crash::set_environment(&format!(
|
||||
"Renderer: {:?} {} ({}), MSAA {scene_samples}x",
|
||||
info.backend, info.name, info.driver
|
||||
@@ -935,9 +965,9 @@ fn wgpu_options(cpu: bool, preference: Option<&str>) -> eframe::egui_wgpu::WgpuC
|
||||
let intel_mac = cfg!(all(target_os = "macos", target_arch = "x86_64"));
|
||||
let indirect = std::env::var(startup::INDIRECT_VALIDATION_ENV).ok();
|
||||
setup.instance_descriptor.flags = startup::window_instance_flags(setup.instance_descriptor.flags, intel_mac, indirect.as_deref());
|
||||
if cpu {
|
||||
setup.native_adapter_selector = Some(std::sync::Arc::new(startup::pick_cpu_adapter));
|
||||
}
|
||||
let environment = std::env::var("WGPU_ADAPTER_NAME").ok();
|
||||
let adapter = graphics().and_then(|v| v.get("adapter").and_then(serde_json::Value::as_str).map(str::to_string));
|
||||
startup::configure_adapter(setup, cpu, environment, adapter);
|
||||
// A float depth buffer with a stencil, wherever the adapter has it (see `FLOAT_DEPTH_BITS`).
|
||||
let base = setup.device_descriptor.clone();
|
||||
setup.device_descriptor = std::sync::Arc::new(move |adapter| {
|
||||
@@ -1187,6 +1217,34 @@ mod msaa_tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scene_sample_choices_include_the_scene_depth_format() {
|
||||
use eframe::wgpu::TextureFormat;
|
||||
for (bits, expected) in [(24, TextureFormat::Depth24PlusStencil8), (32, TextureFormat::Depth32FloatStencil8)] {
|
||||
// A synthetic colour target supports 8x, but the scene depth supports only 1x/4x.
|
||||
let supported = super::scene_sample_choices(bits, 8, |depth| match depth {
|
||||
Some(format) if format == expected => vec![1, 4],
|
||||
None => vec![1, 4, 8],
|
||||
other => panic!("unexpected scene depth: {other:?}"),
|
||||
});
|
||||
assert_eq!(supported, [1, 4]);
|
||||
assert_eq!(super::scene_samples(eframe::wgpu::Backend::Dx12, 8, &supported), 4);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scene_msaa_keeps_four_samples_by_default_and_explicit_choices() {
|
||||
use eframe::wgpu::Backend;
|
||||
let default = super::scene_msaa_request(None);
|
||||
assert_eq!(default, 4);
|
||||
for backend in [Backend::Dx12, Backend::Vulkan, Backend::Metal] {
|
||||
assert_eq!(super::scene_samples(backend, u32::from(default), &[1, 4]), 4);
|
||||
}
|
||||
for saved in [1, 2, 4, 8] {
|
||||
assert_eq!(super::scene_msaa_request(Some(saved)), saved);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_scene_follows_the_backend_policy_too() {
|
||||
use eframe::wgpu::Backend;
|
||||
|
||||
@@ -129,6 +129,48 @@ pub fn pick_cpu_adapter(adapters: &[eframe::wgpu::Adapter], surface: Option<&efr
|
||||
})
|
||||
}
|
||||
|
||||
/// Adapter properties used to choose a card without opening a device.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct AdapterChoice {
|
||||
pub name: String,
|
||||
pub compatible: bool,
|
||||
}
|
||||
|
||||
/// Choose only surface-compatible adapters. Names saved in preferences are exact; the
|
||||
/// environment override follows wgpu's case-insensitive substring convention.
|
||||
/// No match leaves selection to the normal wgpu request.
|
||||
pub fn choose_adapter(adapters: &[AdapterChoice], environment: Option<&str>, preference: Option<&str>) -> Option<usize> {
|
||||
// wgpu's environment helper panics on a missing name; an override must remain recoverable.
|
||||
let compatible = || adapters.iter().enumerate().filter(|(_, a)| a.compatible);
|
||||
if let Some(name) = environment.filter(|s| !s.is_empty()) {
|
||||
let name = name.to_lowercase();
|
||||
if let Some((index, _)) = compatible().find(|(_, a)| a.name.to_lowercase().contains(&name)) {
|
||||
return Some(index);
|
||||
}
|
||||
}
|
||||
if let Some(name) = preference.filter(|s| !s.is_empty())
|
||||
&& let Some((index, _)) = compatible().find(|(_, a)| a.name == name)
|
||||
{
|
||||
return Some(index);
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// Leave Automatic on wgpu's normal request path; named choices may defer to it too.
|
||||
pub fn configure_adapter(setup: &mut eframe::egui_wgpu::WgpuSetupCreateNew, cpu: bool, environment: Option<String>, preference: Option<String>) {
|
||||
if cpu {
|
||||
setup.native_adapter_selector = Some(std::sync::Arc::new(|adapters, surface| pick_cpu_adapter(adapters, surface).map(Some)));
|
||||
} else if environment.as_deref().is_some_and(|s| !s.is_empty()) || preference.as_deref().is_some_and(|s| !s.is_empty()) {
|
||||
setup.native_adapter_selector = Some(std::sync::Arc::new(move |adapters, surface| {
|
||||
let choices: Vec<_> = adapters
|
||||
.iter()
|
||||
.map(|a| AdapterChoice { name: a.get_info().name, compatible: surface.is_none_or(|s| a.is_surface_supported(s)) })
|
||||
.collect();
|
||||
Ok(choose_adapter(&choices, environment.as_deref(), preference.as_deref()).and_then(|i| adapters.get(i)).cloned())
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
/// `WGPU_BACKEND`: when set, wgpu picks the backends from it and the order below is not used.
|
||||
pub const WGPU_BACKEND_ENV: &str = "WGPU_BACKEND";
|
||||
|
||||
@@ -249,6 +291,48 @@ pub fn no_window_message(error: &str, settings: Option<&Path>) -> String {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn cards() -> Vec<AdapterChoice> {
|
||||
["Integrated", "Discrete small", "Discrete large"].into_iter().map(|name| AdapterChoice { name: name.into(), compatible: true }).collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn adapter_names_environment_override_and_missing_card_fallback() {
|
||||
let cards = cards();
|
||||
assert_eq!(choose_adapter(&cards, None, Some("Discrete small")), Some(1));
|
||||
assert_eq!(choose_adapter(&cards, Some("LARGE"), Some("Discrete small")), Some(2));
|
||||
assert_eq!(choose_adapter(&cards, None, Some("removed")), None);
|
||||
assert_eq!(choose_adapter(&cards, Some("missing"), Some("Discrete small")), Some(1));
|
||||
assert_eq!(choose_adapter(&cards, Some(""), Some("Discrete small")), Some(1));
|
||||
assert_eq!(choose_adapter(&cards, None, Some("Discrete")), None, "saved names are exact");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn automatic_adapter_leaves_selection_to_wgpu() {
|
||||
let mut cards = cards();
|
||||
assert_eq!(choose_adapter(&cards, None, None), None);
|
||||
assert_eq!(choose_adapter(&cards, Some(""), Some("")), None);
|
||||
cards[2].compatible = false;
|
||||
assert_eq!(choose_adapter(&cards, Some("large"), Some("Discrete large")), None);
|
||||
assert_eq!(choose_adapter(&cards, Some("small"), None), Some(1));
|
||||
assert_eq!(choose_adapter(&[], None, None), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn automatic_adapter_preserves_the_previous_request_configuration() {
|
||||
use eframe::egui_wgpu::WgpuSetupCreateNew;
|
||||
let previous = WgpuSetupCreateNew::without_display_handle();
|
||||
for preference in [None, Some(String::new())] {
|
||||
let mut setup = WgpuSetupCreateNew::without_display_handle();
|
||||
configure_adapter(&mut setup, false, None, preference);
|
||||
assert!(setup.native_adapter_selector.is_none(), "Automatic must use the normal wgpu request");
|
||||
assert_eq!(setup.power_preference, previous.power_preference);
|
||||
assert_eq!(setup.instance_descriptor.backends, previous.instance_descriptor.backends);
|
||||
}
|
||||
let mut setup = WgpuSetupCreateNew::without_display_handle();
|
||||
configure_adapter(&mut setup, false, Some("missing".into()), Some("removed".into()));
|
||||
assert!(setup.native_adapter_selector.unwrap()(&[], None).unwrap().is_none(), "missing names must use the normal request too");
|
||||
}
|
||||
|
||||
fn scratch(name: &str) -> PathBuf {
|
||||
let d = std::env::temp_dir().join(format!("solidcraft-startup-{name}-{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&d);
|
||||
|
||||
@@ -48,6 +48,38 @@ source = "#236ead"
|
||||
light = "#236ead"
|
||||
dark = "#2976b8"
|
||||
|
||||
# Simultaneous component colours for inspection icons; existing workspace ramps stay unchanged.
|
||||
|
||||
[roles.component-orange-1]
|
||||
source = "#f1d2af"
|
||||
light = "#f1d2af"
|
||||
dark = "#ba8f6a"
|
||||
|
||||
[roles.component-orange-2]
|
||||
source = "#c06f00"
|
||||
light = "#c06f00"
|
||||
dark = "#b86f04"
|
||||
|
||||
[roles.component-orange-3]
|
||||
source = "#a45000"
|
||||
light = "#a45000"
|
||||
dark = "#95682d"
|
||||
|
||||
[roles.component-yellow-1]
|
||||
source = "#e5d99b"
|
||||
light = "#e5d99b"
|
||||
dark = "#a9985f"
|
||||
|
||||
[roles.component-yellow-2]
|
||||
source = "#a28200"
|
||||
light = "#a28200"
|
||||
dark = "#9a8100"
|
||||
|
||||
[roles.component-yellow-3]
|
||||
source = "#826700"
|
||||
light = "#826700"
|
||||
dark = "#857100"
|
||||
|
||||
[strokes] # on the 64 grid
|
||||
geometry = 2.55
|
||||
action = 4.25
|
||||
|
||||
@@ -57,6 +57,8 @@ circle_tt false
|
||||
circle_ttt false
|
||||
close false
|
||||
coil false
|
||||
colored_components false
|
||||
colored_components_off false
|
||||
combine false
|
||||
compare false
|
||||
component false
|
||||
@@ -245,6 +247,7 @@ status_error false
|
||||
status_recovery false
|
||||
style false
|
||||
suppress false
|
||||
surface false
|
||||
surface_blend false
|
||||
surface_boundary false
|
||||
surface_extend false
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||
<title>Colored components</title>
|
||||
<path d="M9.235 17.706L15.059 20.882L15.059 48.941L9.235 44.926Z" fill="#c06f00"/>
|
||||
<path d="M35.176 9.235L15.059 20.882L15.059 48.941L36.765 35.139Z" fill="#a45000"/>
|
||||
<path d="M29.046 5L35.176 8.176L15.196 19.718L9.066 16.541Z" fill="#f1d2af"/>
|
||||
<path d="M29.046 5.529L35.176 8.706L35.176 36.235L15.059 49.471L9.235 45.765L9.066 17.071Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M9.066 17.6L15.059 20.882L34.647 9.235" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M15.059 20.882L15.059 47.067" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M32.222 18.595L44.949 25.944L44.949 51.122L32.222 43.774Z" fill="#328bd3"/>
|
||||
<path d="M54.934 20.173L44.949 25.944L44.949 51.122L54.934 45.352Z" fill="#236ead"/>
|
||||
<path d="M42.059 12.412L54.934 20.173L44.949 25.944L32 17.706Z" fill="#b9ddf8"/>
|
||||
<path d="M41.159 11.766L54.934 20.173L54.934 45.352L44.949 51.122L31.164 42.715L31.164 17.536Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M32.222 18.595L44.949 25.944L54.934 20.173" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M44.949 25.944L44.949 51.122" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M18.299 39.062L31.015 46.411L31.015 59L18.299 51.652Z" fill="#a28200"/>
|
||||
<path d="M41.921 40.121L31.015 46.411L31.015 59L41.921 52.711Z" fill="#826700"/>
|
||||
<path d="M29.194 32.773L41.921 40.121L31.015 46.411L18.299 39.062Z" fill="#e5d99b"/>
|
||||
<path d="M29.194 32.773L41.921 40.121L41.921 52.711L31.015 59L18.299 51.652L18.299 39.062Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M18.299 39.062L31.015 46.411L41.921 40.121" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M31.015 46.411L31.015 59" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
@@ -0,0 +1,21 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||
<title>Disable component colors</title>
|
||||
<path d="M9.235 17.706L15.059 20.882L15.059 48.941L9.235 44.926Z" fill="#328bd3"/>
|
||||
<path d="M35.176 9.235L15.059 20.882L15.059 48.941L36.765 35.139Z" fill="#236ead"/>
|
||||
<path d="M29.046 5L35.176 8.176L15.196 19.718L9.066 16.541Z" fill="#b9ddf8"/>
|
||||
<path d="M29.046 5.529L35.176 8.706L35.176 36.235L15.059 49.471L9.235 45.765L9.066 17.071Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M9.066 17.6L15.059 20.882L34.647 9.235" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M15.059 20.882L15.059 47.067" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M32.222 18.595L44.949 25.944L44.949 51.122L32.222 43.774Z" fill="#328bd3"/>
|
||||
<path d="M54.934 20.173L44.949 25.944L44.949 51.122L54.934 45.352Z" fill="#236ead"/>
|
||||
<path d="M42.059 12.412L54.934 20.173L44.949 25.944L32 17.706Z" fill="#b9ddf8"/>
|
||||
<path d="M41.159 11.766L54.934 20.173L54.934 45.352L44.949 51.122L31.164 42.715L31.164 17.536Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M32.222 18.595L44.949 25.944L54.934 20.173" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M44.949 25.944L44.949 51.122" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M18.299 39.062L31.015 46.411L31.015 59L18.299 51.652Z" fill="#328bd3"/>
|
||||
<path d="M41.921 40.121L31.015 46.411L31.015 59L41.921 52.711Z" fill="#236ead"/>
|
||||
<path d="M29.194 32.773L41.921 40.121L31.015 46.411L18.299 39.062Z" fill="#b9ddf8"/>
|
||||
<path d="M29.194 32.773L41.921 40.121L41.921 52.711L31.015 59L18.299 51.652L18.299 39.062Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M18.299 39.062L31.015 46.411L41.921 40.121" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M31.015 46.411L31.015 59" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
@@ -152,11 +152,11 @@ pub(crate) fn curved_arrow(painter: &egui::Painter, at: Pos2, clockwise: bool, h
|
||||
pub(crate) const AXIS_RADIUS: f32 = 15.0;
|
||||
pub(crate) fn axis_tip(painter: &egui::Painter, c: Pos2, name: &str, d: &Vec3, at: Pos2, depth: f64, hovered: bool, t: Tokens) {
|
||||
let col = if d.x != 0.0 {
|
||||
t.triad[0]
|
||||
t.axis_x
|
||||
} else if d.y != 0.0 {
|
||||
t.triad[1]
|
||||
t.axis_y
|
||||
} else {
|
||||
t.triad[2]
|
||||
t.axis_z
|
||||
};
|
||||
let positive = !name.starts_with('-');
|
||||
let light = t.panel.r() > 128;
|
||||
|
||||
@@ -1759,6 +1759,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrovat příkazy nebo klávesy",
|
||||
"ui.findInTimeline": "Najít na časové ose",
|
||||
"ui.findInWindow": "Najít v okně",
|
||||
"ui.fine": "Jemná",
|
||||
"ui.finest": "Nejjemnější",
|
||||
"ui.finish_sketch": "Dokončit náčrt",
|
||||
"ui.fit": "Přizpůsobit",
|
||||
"ui.fix_unfix": "Zafixovat/uvolnit",
|
||||
@@ -1986,6 +1988,7 @@
|
||||
"ui.project_face_edges_sketch": "Promítat hrany plochy do nových náčrtů",
|
||||
"ui.properties": "Vlastnosti",
|
||||
"ui.pull_direction": "Směr vyjímání",
|
||||
"ui.quality": "Kvalita",
|
||||
"ui.quantity": "Počet",
|
||||
"ui.quantity_2": "Počet 2",
|
||||
"ui.quit": "Ukončit",
|
||||
@@ -2080,6 +2083,7 @@
|
||||
"ui.spline": "Splajn",
|
||||
"ui.split_body": "Rozdělit těleso",
|
||||
"ui.stand_up_tip": "Když se soubor STEP nebo IGES otevře s osou Z nahoru, nabídnout otočení o čtvrt otáčky kolem X",
|
||||
"ui.standard": "Standardní",
|
||||
"ui.start": "Start",
|
||||
"ui.start_over": "Začít znovu",
|
||||
"ui.start_page": "Úvodní stránka",
|
||||
|
||||
+389
-6
@@ -5,7 +5,9 @@
|
||||
"2. Attach your screenshot: copy and paste it, or save and upload the PNG.": "2. Vedhæft dit skærmbillede: Kopiér og indsæt det, eller gem og upload PNG-filen.",
|
||||
"2D": "2D",
|
||||
"3. Click Submit new issue on GitHub to send your report.": "3. Klik på Submit new issue på GitHub for at sende rapporten.",
|
||||
"A Single hole snaps to the middle of its face and to the centres of its round edges": "Et enkelt hul snapper til fladens midtpunkt og centrene af dens cirkulære kanter",
|
||||
"A new configuration, a copy of the active one": "Opret en ny konfiguration som en kopi af den aktive",
|
||||
"A placed Single hole has a handle to drag it, and picking its face again moves the hole there instead of taking it out": "Et placeret enkelt hul har et håndtag til at trække i. Hvis fladen vælges igen, flyttes hullet dertil i stedet for at blive fjernet",
|
||||
"ARRANGE": "ARRANGER",
|
||||
"About SolidCraft": "Om SolidCraft",
|
||||
"Acceleration": "Acceleration",
|
||||
@@ -14,23 +16,31 @@
|
||||
"Active": "Aktiv",
|
||||
"Active rule": "Aktiv regel",
|
||||
"Add": "Tilføj",
|
||||
"Add Column": "Tilføj kolonne",
|
||||
"Add Key": "Tilføj animationspunkt",
|
||||
"Add Mid Radius": "Tilføj mellemradius",
|
||||
"Add Row": "Tilføj række",
|
||||
"Add a tool": "Tilføj et værktøj",
|
||||
"Add condition": "Tilføj betingelse",
|
||||
"Add or edit rule": "Tilføj eller redigér regel",
|
||||
"Add to New Folder": "Føj til ny mappe",
|
||||
"Advanced": "Avanceret",
|
||||
"Against": "Mod",
|
||||
"Alignment": "Justering",
|
||||
"All Lines": "Alle linjer",
|
||||
"All Sketch Points": "Alle skitsepunkter",
|
||||
"All components": "Alle komponenter",
|
||||
"All open designs": "Alle åbne designs",
|
||||
"Allowed expressions, separated by semicolons": "Tilladte udtryk adskilt af semikolon",
|
||||
"Also deletes": "Sletter også",
|
||||
"Anchor": "Forankring",
|
||||
"Angle 2": "Vinkel 2",
|
||||
"Animate": "Animér",
|
||||
"App/system information and command settings are included. Review private details before sharing.": "Oplysninger om programmet, systemet og kommandoindstillingerne er inkluderet. Gennemgå private oplysninger, før du deler rapporten.",
|
||||
"Appearance name": "Navn på udseende",
|
||||
"Applied Radius": "Anvendt radius",
|
||||
"Apply To": "Anvend på",
|
||||
"Apply library appearance": "Anvend udseende fra biblioteket",
|
||||
"Apply to selection": "Anvend på markering",
|
||||
"Apply your appearance first. Exports assigned appearances and materials created in this design.": "Anvend først dit udseende. Eksporterer tildelte udseender og materialer oprettet i dette design.",
|
||||
"Arc length": "Buelængde",
|
||||
@@ -41,13 +51,22 @@
|
||||
"BLEND SURFACE": "OVERGANGSFLADE",
|
||||
"BOUNDARY SURFACE": "AFGRÆNSET OVERFLADE",
|
||||
"BROWSER": "MODELTRÆ",
|
||||
"Bar": "Stang",
|
||||
"Bend Edges": "Bøjningskanter",
|
||||
"Bend Line Position": "Bukkelinjens placering",
|
||||
"Bend Position": "Bukningens placering",
|
||||
"Bend Radius": "Bukkeradius",
|
||||
"Bend Table": "Bukketabel",
|
||||
"Bends": "Bukninger",
|
||||
"Bodies": "Emner",
|
||||
"Bodies (optional)": "Legemer (valgfrit)",
|
||||
"Body": "Emne",
|
||||
"Body (last if none)": "Legeme (det sidste, hvis intet er valgt)",
|
||||
"Body to split": "Legeme, der skal opdeles",
|
||||
"Body, or faces to take out": "Legeme eller flader, der skal fjernes",
|
||||
"Bottom Left": "Nederst til venstre",
|
||||
"Bottom Middle": "Nederst i midten",
|
||||
"Bottom Right": "Nederst til højre",
|
||||
"Boundary": "Afgrænsning",
|
||||
"Bounding box": "Omsluttende boks",
|
||||
"CHECK": "KONTROLLÉR",
|
||||
@@ -59,32 +78,45 @@
|
||||
"CSV or JSON: updates existing parameters, adds new ones": "CSV eller JSON: Opdaterer eksisterende parametre og tilføjer nye",
|
||||
"Capture All Positions": "Registrér alle positioner",
|
||||
"Capture Pos.": "Registrér pos.",
|
||||
"Catch Depth": "Låsedybde",
|
||||
"Catch Direction": "Indgrebsretning",
|
||||
"Catch Length": "Låselængde",
|
||||
"Cells": "Celler",
|
||||
"Center X": "Centrum X",
|
||||
"Center Y": "Centrum Y",
|
||||
"Center of mass": "Massecentrum",
|
||||
"Centre to centre": "Centrum til centrum",
|
||||
"Centroid": "Tyngdepunkt",
|
||||
"Chamfer Type": "Affasningstype",
|
||||
"Channel": "U-profil",
|
||||
"Check collisions": "Kontrollér kollisioner",
|
||||
"Checked": "Kontrolleret",
|
||||
"Choose Variable radius or Spline in Type.": "Vælg variabel radius eller spline under Type.",
|
||||
"Choose a new plane. Sketch geometry and dimensions stay unchanged in its two-dimensional coordinates.": "Vælg et nyt plan. Skitsegeometri og mål bevarer deres todimensionelle koordinater.",
|
||||
"Choose…": "Vælg…",
|
||||
"Circle center": "Cirklens centrum",
|
||||
"Circular": "Cirkulær",
|
||||
"Circumference": "Omkreds",
|
||||
"Clockwise": "Med uret",
|
||||
"Close draft": "Luk kladde",
|
||||
"Collapse": "Fold sammen",
|
||||
"Collisions": "Kollisioner",
|
||||
"Colour": "Farve",
|
||||
"Command": "Kommando",
|
||||
"Comment": "Kommentar",
|
||||
"Component 1": "Komponent 1",
|
||||
"Component 2": "Komponent 2",
|
||||
"Component1": "Komponent1",
|
||||
"Components": "Komponenter",
|
||||
"Config Table": "Konfig.tabel",
|
||||
"Configuration": "Konfiguration",
|
||||
"Configuration rules": "Konfigurationsregler",
|
||||
"Contact": "Kontakt",
|
||||
"Contact Sets": "Kontaktsæt",
|
||||
"Contact sets": "Kontaktsæt",
|
||||
"Continue on GitHub": "Fortsæt på GitHub",
|
||||
"Continuity": "Kontinuitet",
|
||||
"Control Radius": "Styreradius",
|
||||
"Copy Error Message": "Kopiér fejlmeddelelse",
|
||||
"Copy Warning Message": "Kopiér advarselsmeddelelse",
|
||||
"Copy all licences": "Kopiér alle licenser",
|
||||
@@ -93,9 +125,14 @@
|
||||
"Copy screenshot": "Kopiér skærmbillede",
|
||||
"Corner Relief": "Hjørneaflastning",
|
||||
"Corner Relief Shape": "Hjørneaflastningens form",
|
||||
"Corner radius": "Hjørneradius",
|
||||
"Counterbore depth": "Dybde af cylindrisk forsænkning",
|
||||
"Counterbore Ø": "Cylindrisk forsænkning Ø",
|
||||
"Countersink angle": "Vinkel på konisk forsænkning",
|
||||
"Countersink Ø": "Konisk forsænkning Ø",
|
||||
"Create Hole": "Opret hul",
|
||||
"Create Issue — review draft": "Opret issue — gennemgå kladde",
|
||||
"Create Issue…": "Opret fejlrapport…",
|
||||
"Cross curves": "Tværkurver",
|
||||
"Cube": "Terning",
|
||||
"Current orthographic view (1:1 mm)": "Aktuel visning uden perspektiv (1:1 mm)",
|
||||
@@ -103,22 +140,33 @@
|
||||
"Curv. Comb": "Krumningskam",
|
||||
"Curvature (G2)": "Krumningskontinuitet (G2)",
|
||||
"Curvature change (G3)": "Ændring i krumning (G3)",
|
||||
"Custom": "Brugerdefineret",
|
||||
"Customize Toolbar": "Tilpas værktøjslinje",
|
||||
"Customize…": "Tilpas…",
|
||||
"Cylindrical face": "Cylindrisk flade",
|
||||
"Delete": "Slet",
|
||||
"Delete Selected Features…": "Slet valgte features…",
|
||||
"Delete Selected Folders": "Slet valgte mapper",
|
||||
"Delete all": "Slet alle",
|
||||
"Delete rule": "Slet regel",
|
||||
"Delete the row": "Slet rækken",
|
||||
"Delete the set": "Slet sættet",
|
||||
"Density": "Densitet",
|
||||
"Dependents": "Afhængige",
|
||||
"Describe the problem you saw": "Beskriv problemet, du oplevede",
|
||||
"Describe what happened before continuing.": "Beskriv, hvad der skete, før du fortsætter.",
|
||||
"Designs you open or save appear here.": "Designs, du åbner eller gemmer, vises her.",
|
||||
"Determined by To Object. Choose Angle to edit the angular extent.": "Bestemmes af Til objekt. Vælg Vinkel for at ændre vinkeludstrækningen.",
|
||||
"Diameter": "Diameter",
|
||||
"Direction": "Retning",
|
||||
"Discard": "Kassér",
|
||||
"Distance": "Afstand",
|
||||
"Distance 1": "Afstand 1",
|
||||
"Do not export hidden edges": "Eksportér ikke skjulte kanter",
|
||||
"Don't ask again": "Spørg ikke igen",
|
||||
"Double-click to rename": "Dobbeltklik for at omdøbe",
|
||||
"Double-clicking the middle button in the view: Home (the home view, framing what is shown), Fit (frame what is shown, keeping the orientation) or nothing": "Dobbeltklik på den midterste museknap i visningen: Hjem (hjemmevisningen, der indrammer det viste), Tilpas (indrammer det viste og bevarer orienteringen) eller ingen handling",
|
||||
"Drag to move the hole; click to remove it": "Træk for at flytte hullet; klik for at fjerne det",
|
||||
"Drive Joint": "Bevæg led",
|
||||
"Duration": "Varighed",
|
||||
"Edges": "Kanter",
|
||||
@@ -126,80 +174,113 @@
|
||||
"Edit Profile Sketch": "Redigér profilskitse",
|
||||
"Enable rule": "Aktivér regel",
|
||||
"Enabled": "Aktiveret",
|
||||
"End Radius": "Slutradius",
|
||||
"End bulge": "Udbuling ved slutningen",
|
||||
"End continuity": "Overgang ved slutningen",
|
||||
"Expand": "Fold ud",
|
||||
"Expected result (optional)": "Forventet resultat (valgfrit)",
|
||||
"Explode": "Adskil",
|
||||
"Explode Text": "Opløs tekst",
|
||||
"Export Animation…": "Eksportér animation…",
|
||||
"Export Bend Table…": "Eksportér bøjningstabel…",
|
||||
"Export CSV…": "Eksportér CSV…",
|
||||
"Export Current View as DXF": "Eksportér aktuel visning som DXF",
|
||||
"Export Current View as DXF…": "Eksportér aktuel visning som DXF…",
|
||||
"Export DXF": "Eksportér DXF",
|
||||
"Export DXF…": "Eksportér DXF…",
|
||||
"Export JSON…": "Eksportér JSON…",
|
||||
"Export design library...": "Eksportér designbibliotek...",
|
||||
"Export hidden edges as dashed lines": "Eksportér skjulte kanter som stiplede linjer",
|
||||
"Exported by SolidWorks, which usually saves Y up": "Eksporteret af SolidWorks, som normalt gemmer med Y opad",
|
||||
"Expression": "Udtryk",
|
||||
"Extend to meet": "Forlæng, til de mødes",
|
||||
"Extents": "Udstrækning",
|
||||
"FILES": "FILER",
|
||||
"FLAT": "FLAD",
|
||||
"Face": "Flade",
|
||||
"Face Appearance": "Fladens udseende",
|
||||
"Face attachment lost": "Forbindelsen til fladen er mistet",
|
||||
"Face center": "Fladens midtpunkt",
|
||||
"Faces": "Flader",
|
||||
"Faces / edges / vertices": "Flader / kanter / hjørnepunkter",
|
||||
"Faces to split": "Flader, der skal opdeles",
|
||||
"Fastener": "Befæstigelse",
|
||||
"Favorites": "Favoritter",
|
||||
"Favourite": "Favorit",
|
||||
"Feature": "Feature",
|
||||
"Files from many CAD programs have Y up, so they open lying on their back here (Z up).": "Filer fra mange CAD-programmer har Y opad og åbnes derfor liggende på ryggen her (Z opad).",
|
||||
"Filter": "Filter",
|
||||
"Filter…": "Filtrér…",
|
||||
"Find in Browser": "Find i modeltræ",
|
||||
"Finish": "Afslut",
|
||||
"First plane": "Første plan",
|
||||
"Fit and G2 corners require Constant radius.": "Tilpasning og G2-hjørner kræver konstant radius.",
|
||||
"Fixed Face": "Fast flade",
|
||||
"Flange thickness": "Flangetykkelse",
|
||||
"Flat Pattern": "Flad afvikling",
|
||||
"Flat size": "Bredde mellem flader",
|
||||
"Follow camera (Look At sketches)": "Følg kamera (Se på skitser)",
|
||||
"Follow the camera (Look At sketches)": "Følg kameraet (Se på skitser)",
|
||||
"Font": "Skrifttype",
|
||||
"From": "Fra",
|
||||
"From Bodies": "Fra emner",
|
||||
"From edges": "Fra kanter",
|
||||
"Full Length": "Fuld længde",
|
||||
"G2 corners require a constant radius and Exact fit. G2 corner construction is not supported yet.": "G2-hjørner kræver konstant radius og præcis tilpasning. Konstruktion af G2-hjørner understøttes endnu ikke.",
|
||||
"Gap": "Spalte",
|
||||
"Grid": "Gitter",
|
||||
"HISTORY": "HISTORIK",
|
||||
"Height": "Højde",
|
||||
"Hidden edges": "Skjulte kanter",
|
||||
"History layout": "Historiklayout",
|
||||
"History names": "Navne i historikken",
|
||||
"Hole (optional)": "Hul (valgfrit)",
|
||||
"Holes": "Huller",
|
||||
"Holes (edges on them)": "Huller (kanterne omkring dem)",
|
||||
"Home view": "Hjemmevisning",
|
||||
"Horiz./Vert.": "Vandr./Lodr.",
|
||||
"I-Beam": "I-profil",
|
||||
"IMAGES": "BILLEDER",
|
||||
"Import…": "Importér…",
|
||||
"In This Design": "I dette design",
|
||||
"In place (surfaces)": "På stedet (overflader)",
|
||||
"In plane": "I planet",
|
||||
"Inside": "Indvendigt",
|
||||
"Instant": "Øjeblikkelig",
|
||||
"Interface font": "Skrifttype i brugergrænsefladen",
|
||||
"Interferes": "Overlapper",
|
||||
"Invert": "Invertér",
|
||||
"Isocurve": "Isokurve",
|
||||
"Issue title": "Titel på issue",
|
||||
"Items": "Elementer",
|
||||
"JOINTS": "LED",
|
||||
"Joint Origin1": "Lednulpunkt1",
|
||||
"Keep (points on it)": "Behold (punkter på fladen)",
|
||||
"Keep Tools": "Behold værktøjsemner",
|
||||
"Keep of the other surface": "Behold fra den anden overflade",
|
||||
"Key a joint's value at this step": "Indsæt en nøgle for leddets værdi på dette trin",
|
||||
"Keys": "Nøgler",
|
||||
"L-Angle": "L-profil",
|
||||
"LIBRARY": "BIBLIOTEK",
|
||||
"LINKS": "LINKS",
|
||||
"Later": "Senere",
|
||||
"Leave it": "Lad det være",
|
||||
"Left Middle": "Til venstre i midten",
|
||||
"Legacy face attachment. Rebinding to a certified face creates an exact attachment.": "Ældre fladetilknytning. Ny tilknytning til en certificeret flade giver en præcis tilknytning.",
|
||||
"Length": "Længde",
|
||||
"Length units": "Længdeenheder",
|
||||
"Letter Spacing": "Tegnafstand",
|
||||
"Library": "Bibliotek",
|
||||
"Library file": "Biblioteksfil",
|
||||
"Limits": "Grænser",
|
||||
"Line Spacing": "Linjeafstand",
|
||||
"Line Type": "Linjetype",
|
||||
"Lines": "Linjer",
|
||||
"Listing the installed fonts…": "Henter listen over installerede skrifttyper…",
|
||||
"Load library": "Indlæs bibliotek",
|
||||
"Local library": "Lokalt bibliotek",
|
||||
"Loop": "Løkke",
|
||||
"M5 or M5x0.5": "M5 eller M5x0.5",
|
||||
"MANAGE": "ADMINISTRÉR",
|
||||
"MATERIALS": "MATERIALER",
|
||||
"MODEL": "MODEL",
|
||||
@@ -210,18 +291,25 @@
|
||||
"Matched restrictions check the final values.": "Matchede begrænsninger kontrollerer de endelige værdier.",
|
||||
"Material": "Materiale",
|
||||
"Max": "Maks.",
|
||||
"Maximum": "Maksimum",
|
||||
"Mesh body": "Meshlegeme",
|
||||
"Mid Radius": "Mellemradius",
|
||||
"Middle double-click": "Dobbeltklik med midterste museknap",
|
||||
"Min": "Min.",
|
||||
"Minimum": "Minimum",
|
||||
"Mirror Plane": "Spejlingsplan",
|
||||
"Mitre": "Gering",
|
||||
"Model Parameters": "Modelparametre",
|
||||
"Modeled": "Modelleret",
|
||||
"More toolbar panels": "Flere værktøjspaneler",
|
||||
"Motion": "Bevægelse",
|
||||
"Mouse gestures": "Musebevægelser",
|
||||
"Mouse gestures only work with the SolidWorks mouse mode (the wheel orbits, Ctrl + wheel pans).": "Musebevægelser virker kun med SolidWorks-musetilstanden (musehjulet roterer visningen, Ctrl + musehjul panorerer).",
|
||||
"Move / Copy": "Flyt / Kopiér",
|
||||
"Move Type": "Flytningstype",
|
||||
"Move down": "Flyt ned",
|
||||
"Move earlier": "Flyt tidligere",
|
||||
"Move holes by clicking or dragging": "Flyt huller ved at klikke eller trække",
|
||||
"Move later": "Flyt senere",
|
||||
"Move up": "Flyt op",
|
||||
"Name": "Navn",
|
||||
@@ -235,17 +323,25 @@
|
||||
"No matching appearance presets.": "Ingen matchende udseendeforudindstillinger.",
|
||||
"No matching appearances": "Ingen matchende udseender",
|
||||
"No visible bodies or sketches to export.": "Der er ingen synlige emner eller skitser at eksportere.",
|
||||
"Nominal diameter": "Nominel diameter",
|
||||
"None": "Ingen",
|
||||
"Not available yet": "Endnu ikke tilgængelig",
|
||||
"Notch": "Udskæring",
|
||||
"OUTPUT": "OUTPUT",
|
||||
"Of": "Af",
|
||||
"On your computer": "På din computer",
|
||||
"Opacity": "Opacitet",
|
||||
"Open GitHub draft": "Åbn GitHub-kladde",
|
||||
"Open library...": "Åbn bibliotek...",
|
||||
"Open local libraries in the desktop app. You can export this design's library here.": "Åbn lokale biblioteker i desktopappen. Du kan eksportere dette designs bibliotek her.",
|
||||
"Open-source parametric 3D CAD in Rust. Licensed MIT OR Apache-2.0.": "Parametrisk 3D-CAD i Rust med åben kildekode. Licenseret under MIT OR Apache-2.0.",
|
||||
"Opens your browser and copies the report text for you to paste into GitHub.": "Åbner din browser og kopierer rapportteksten, så du kan indsætte den på GitHub.",
|
||||
"Opens your browser. Review and submit your report on GitHub.": "Åbner din browser. Gennemgå og indsend rapporten på GitHub.",
|
||||
"Operator": "Operator",
|
||||
"Orbit (right drag)": "Rotér visningen (træk med højre museknap)",
|
||||
"Other side": "Anden side",
|
||||
"Other surface (mutual trim)": "Anden overflade (trim begge)",
|
||||
"Outer radius": "Udvendig radius",
|
||||
"Outside": "Udvendigt",
|
||||
"Overall length": "Samlet længde",
|
||||
"Param. Graph": "Param.graf",
|
||||
@@ -258,8 +354,11 @@
|
||||
"Pick the tool bodies": "Vælg værktøjsemnerne",
|
||||
"Picked": "Valgt",
|
||||
"Picked point": "Valgt punkt",
|
||||
"Pitch": "Stigning",
|
||||
"Pivot": "Drejepunkt",
|
||||
"Place at the origin instead": "Placér ved nulpunktet i stedet",
|
||||
"Plastic Rules": "Plastregler",
|
||||
"Play the joint's motion in the view": "Afspil leddets bevægelse i visningen",
|
||||
"Playback": "Afspilning",
|
||||
"Plot": "Diagram",
|
||||
"Position": "Position",
|
||||
@@ -267,22 +366,29 @@
|
||||
"Position (G0)": "Positionskontinuitet (G0)",
|
||||
"Position along the edge, 0 at the start end, 1 at the other": "Position langs kanten: 0 ved den ene ende, 1 ved den anden",
|
||||
"Preferences › Design turns the offer back on": "Indstillinger › Design slår tilbuddet til igen",
|
||||
"Preview": "Forhåndsvisning",
|
||||
"Preview Row": "Forhåndsvis række",
|
||||
"Preview leaves the current design unchanged.": "Forhåndsvisning ændrer ikke det aktuelle design.",
|
||||
"Profile / Edges": "Profil / kanter",
|
||||
"Profiles or curves": "Profiler eller kurver",
|
||||
"Profiles/Curves": "Profiler/kurver",
|
||||
"Quantity": "Antal",
|
||||
"RECENT": "SENESTE",
|
||||
"REFERENCE": "REFERENCE",
|
||||
"RULED SURFACE": "REGELFLADE",
|
||||
"RULES": "REGLER",
|
||||
"Radius": "Radius",
|
||||
"Radius Fit": "Tilpasning af radius",
|
||||
"Ratio": "Forhold",
|
||||
"Reattach selected face": "Tilknyt den valgte flade igen",
|
||||
"Recover": "Gendan",
|
||||
"Recover unsaved design?": "Gendan design, der ikke er gemt?",
|
||||
"Rectangular": "Rektangulær",
|
||||
"Rectangular Tube": "Rektangulært hulprofil",
|
||||
"Reference face": "Referenceflade",
|
||||
"Remove Tools": "Fjern værktøjsemner",
|
||||
"Remove condition": "Fjern betingelse",
|
||||
"Remove from Folder": "Fjern fra mappe",
|
||||
"Remove from list": "Fjern fra liste",
|
||||
"Remove override": "Fjern tilsidesættelse",
|
||||
"Remove private design details or paths before sharing.": "Fjern private designoplysninger eller filstier, før du deler.",
|
||||
@@ -290,12 +396,18 @@
|
||||
"Remove the column": "Fjern kolonnen",
|
||||
"Remove the track": "Fjern sporet",
|
||||
"Remove this point": "Fjern dette punkt",
|
||||
"Rename Feature": "Omdøb feature",
|
||||
"Rename Folder": "Omdøb mappe",
|
||||
"Replace existing library file": "Erstat eksisterende biblioteksfil",
|
||||
"Report a bug — review a screenshot and open a GitHub draft": "Rapportér en fejl — gennemgå et skærmbillede, og åbn en GitHub-kladde",
|
||||
"Report text copied. Paste it into GitHub and submit your report there.": "Rapportteksten er kopieret. Indsæt den på GitHub, og indsend rapporten der.",
|
||||
"Reports are public. A GitHub account is required.": "Rapporter er offentlige. Du skal have en GitHub-konto.",
|
||||
"Reset Toolbar": "Nulstil værktøjslinje",
|
||||
"Resize Part": "Ændr størrelse på del",
|
||||
"Restore View": "Gendan visning",
|
||||
"Restore outer boundary": "Gendan ydre afgrænsning",
|
||||
"Restore the inherited component or physical material appearance": "Gendan udseendet fra komponenten eller det fysiske materiale",
|
||||
"Restore this studio's tools": "Gendan værktøjerne i dette arbejdsområde",
|
||||
"Result": "Resultat",
|
||||
"Retake screenshot": "Tag skærmbillede igen",
|
||||
"Reverse": "Vend om",
|
||||
@@ -305,9 +417,20 @@
|
||||
"Revert Pos.": "Fortryd pos.",
|
||||
"Revert Position": "Tilbagefør position",
|
||||
"Review the report and screenshot before opening GitHub.": "Gennemgå rapport og skærmbillede, før du åbner GitHub.",
|
||||
"Review your report on GitHub and click Submit new issue to publish it.": "Gennemgå rapporten på GitHub, og klik på Submit new issue for at offentliggøre den.",
|
||||
"Rib Length": "Ribbelængde",
|
||||
"Rib Offset": "Ribbeforskydning",
|
||||
"Rib Thickness": "Ribbetykkelse",
|
||||
"Ribs": "Ribber",
|
||||
"Right Middle": "Til højre i midten",
|
||||
"Rim Edge": "Randkant",
|
||||
"Ring of tools on the right button": "Værktøjsring på højre museknap",
|
||||
"Roll Back Here": "Rul tilbage hertil",
|
||||
"Roll History Marker Here": "Flyt tilbagerulningsmarkør hertil",
|
||||
"Root radius": "Rodradius",
|
||||
"Round": "Rund",
|
||||
"Round Bar": "Rundstang",
|
||||
"Round Tube": "Rundt hulprofil",
|
||||
"Rule": "Regel",
|
||||
"Rule name": "Regelnavn",
|
||||
"Rules run from top to bottom. Matched drives change effective values.": "Regler køres oppefra og ned. Matchede drivere ændrer de effektive værdier.",
|
||||
@@ -315,21 +438,29 @@
|
||||
"SURFACE QUALITY": "OVERFLADEKVALITET",
|
||||
"Save Rule": "Gem regel",
|
||||
"Save View": "Gem visning",
|
||||
"Save screenshot…": "Gem skærmbillede…",
|
||||
"Save the study as an animated GIF, seen as the viewport shows it": "Gem undersøgelsen som en animeret GIF med samme visning som i modelvinduet",
|
||||
"Saved preview. Geometry is being checked before editing.": "Gemt forhåndsvisning. Geometrien kontrolleres før redigering.",
|
||||
"Scale factor": "Skaleringsfaktor",
|
||||
"Scene": "Scene",
|
||||
"Screenshot (optional)": "Skærmbillede (valgfrit)",
|
||||
"Search": "Søg",
|
||||
"Search commands": "Søg efter kommandoer",
|
||||
"Search this library": "Søg i dette bibliotek",
|
||||
"Second plane": "Andet plan",
|
||||
"Section": "Snit",
|
||||
"Section (optional)": "Tværsnit (valgfrit)",
|
||||
"Section position": "Profilets placering",
|
||||
"Sections (one sketch each)": "Tværsnit (én skitse til hvert)",
|
||||
"Select Other": "Vælg andet",
|
||||
"Select Other: hold the left button still on the model (or right-click › Select Other…) to list everything under the cursor; click again on the same spot to select the next thing there. Double-click the middle button to go Home (Preferences › Navigation).": "Vælg andet: Hold venstre museknap nede uden at flytte markøren på modellen (eller højreklik › Vælg andet…) for at vise alt under markøren. Klik igen samme sted for at vælge næste objekt. Dobbeltklik på den midterste museknap for at gå til Hjem (Indstillinger › Navigation).",
|
||||
"Select bodies (a face picks its body)": "Vælg emner (en flade vælger sit emne)",
|
||||
"Select bodies or faces instead": "Vælg emner eller flader i stedet",
|
||||
"Select edges": "Vælg kanter",
|
||||
"Selection filter": "Markeringsfilter",
|
||||
"Semantic faces share their appearance across instances.": "Semantiske flader deler udseende på tværs af instanser.",
|
||||
"Send your report on GitHub": "Send din rapport på GitHub",
|
||||
"Shaded": "Skyggelagt",
|
||||
"Shape": "Form",
|
||||
"Sheet Rules": "Pladeregler",
|
||||
"Show Agent Cursor": "Vis agentmarkør",
|
||||
@@ -345,9 +476,11 @@
|
||||
"Sketch plane has no body-face attachment.": "Skitseplanet er ikke tilknyttet en flade på et emne.",
|
||||
"Sketch points": "Skitsepunkter",
|
||||
"Slot width": "Slidsbredde",
|
||||
"Snap to face and edge centres": "Snap til flade- og kantcentre",
|
||||
"SolidCraft closed before these designs were saved. Their last autosave can be opened.": "SolidCraft lukkede, før disse designs blev gemt. Den seneste automatiske lagring kan åbnes.",
|
||||
"Specialise": "Specialisér",
|
||||
"Speed": "Hastighed",
|
||||
"Splitting tool": "Opdelingsværktøj",
|
||||
"Square": "Kvadrat",
|
||||
"Stand it up": "Stil op",
|
||||
"Stand it up: a quarter turn about X, as one Move feature you can undo.": "Stil op: En kvart omdrejning om X som én flyttefeature, der kan fortrydes.",
|
||||
@@ -357,17 +490,27 @@
|
||||
"Start continuity": "Overgang ved starten",
|
||||
"Step": "Trin",
|
||||
"Steps": "Trin",
|
||||
"Steps to reproduce (optional)": "Trin til at genskabe problemet (valgfrit)",
|
||||
"Stitch the kept pieces": "Sammenføj de bevarede dele",
|
||||
"Stitch to both bodies": "Sammenføj med begge emner",
|
||||
"Studio": "Arbejdsområde",
|
||||
"Study": "Undersøgelse",
|
||||
"Style": "Stil",
|
||||
"Summary": "Resumé",
|
||||
"Suppress": "Undertryk",
|
||||
"Suppressed": "Undertrykt",
|
||||
"Surface": "Overflade",
|
||||
"Surface, or faces to turn over": "Overflade eller flader, der skal vendes",
|
||||
"Swap Ends": "Ombyt ender",
|
||||
"TRIM": "TRIM",
|
||||
"Tangent (G1)": "Tangentkontinuitet (G1)",
|
||||
"Tangent Chain": "Tangentkæde",
|
||||
"Tangent chain": "Tangentkæde",
|
||||
"Tap drill diameter": "Diameter på gevindbor",
|
||||
"Target": "Mål",
|
||||
"Target Body": "Mållegeme",
|
||||
"Tear": "Rivning",
|
||||
"Technical details": "Tekniske detaljer",
|
||||
"The dashed sketch is a saved plane guide. Select a new face to repair the attachment.": "Den stiplede skitse er en gemt planreference. Vælg en ny flade for at reparere tilknytningen.",
|
||||
"The saved author occurrence is missing. Select a valid author placement before rebinding.": "Den gemte oprindelige komponentforekomst mangler. Vælg en gyldig oprindelig placering før ny tilknytning.",
|
||||
"Then": "Så",
|
||||
@@ -379,24 +522,36 @@
|
||||
"This child is shared. Deleting it removes it from every copy of its parent.": "Dette underobjekt er delt. Sletning fjerner det fra alle kopier af dets overordnede objekt.",
|
||||
"This child is shared. Position changes apply to every copy of its parent.": "Dette underobjekt er delt. Positionsændringer gælder for alle kopier af dets overordnede objekt.",
|
||||
"This face cannot provide a durable attachment. Choose another face or explicitly use a fixed plane.": "Denne flade kan ikke give en varig tilknytning. Vælg en anden flade, eller vælg udtrykkeligt et fast plan.",
|
||||
"This image is not attached to GitHub yet. Copy or save it, then attach it on GitHub.": "Dette billede er endnu ikke vedhæftet på GitHub. Kopiér eller gem det, og vedhæft det derefter på GitHub.",
|
||||
"To": "Til",
|
||||
"To Offset": "Til forskydning",
|
||||
"To edges": "Til kanter",
|
||||
"Toe radius": "Tåradius",
|
||||
"Tolerance": "Tolerance",
|
||||
"Too close": "For tæt på",
|
||||
"Tool Bodies": "Værktøjslegemer",
|
||||
"Tools": "Værktøjer",
|
||||
"Tools, clockwise from the top": "Værktøjer, med uret fra toppen",
|
||||
"Top Left": "Øverst til venstre",
|
||||
"Top Middle": "Øverst i midten",
|
||||
"Top Right": "Øverst til højre",
|
||||
"Trimming tool (plane, face or curves)": "Trim med plan, flade eller kurver",
|
||||
"Turn off section analysis before exporting the view.": "Slå snitanalyse fra, før visningen eksporteres.",
|
||||
"Type": "Type",
|
||||
"UNTRIM": "FJERN BESKÆRING",
|
||||
"Unit": "Enhed",
|
||||
"Unsuppress": "Ophæv undertrykkelse",
|
||||
"Updating the preview": "Opdaterer forhåndsvisningen",
|
||||
"Use active author placement": "Brug den aktive komponents placering",
|
||||
"Use fixed plane": "Brug fast plan",
|
||||
"Use saved fixed plane": "Brug gemt fast plan",
|
||||
"Use selected face as fixed plane": "Brug valgt flade som fast plan",
|
||||
"Use the SolidWorks mouse mode": "Brug SolidWorks-musetilstanden",
|
||||
"User Parameters": "Brugerparametre",
|
||||
"VIEW": "VISNING",
|
||||
"VIEWS": "VISNINGER",
|
||||
"Value": "Værdi",
|
||||
"Variable Radius": "Variabel radius",
|
||||
"Velocity": "Hastighed",
|
||||
"Vertices": "Hjørnepunkter",
|
||||
"View navigator": "Visningsnavigator",
|
||||
@@ -404,16 +559,53 @@
|
||||
"Wall": "Væg",
|
||||
"Wall Location": "Vægplacering",
|
||||
"Wall Thickness": "Vægtykkelse",
|
||||
"Web thickness": "Kroptykkelse",
|
||||
"What did you do just before the problem? A short list is enough": "Hvad gjorde du lige før problemet opstod? En kort liste er nok",
|
||||
"What did you expect to see?": "Hvad forventede du at se?",
|
||||
"What happened?": "Hvad skete der?",
|
||||
"When": "Når",
|
||||
"Width": "Bredde",
|
||||
"Will fail": "Vil fejle",
|
||||
"With gestures on, the right button no longer orbits the view: hold it and move to open the ring, then touch a tool's zone. A plain right-click still opens the menu.": "Når musebevægelser er slået til, roterer højre museknap ikke længere visningen: Hold den nede, og bevæg musen for at åbne ringen. Før derefter markøren ind i et værktøjs område. Et almindeligt højreklik åbner stadig menuen.",
|
||||
"X": "X",
|
||||
"X Angle": "X-vinkel",
|
||||
"X angle": "X-vinkel",
|
||||
"X distance": "X-afstand",
|
||||
"Y": "Y",
|
||||
"Y Angle": "Y-vinkel",
|
||||
"Y angle": "Y-vinkel",
|
||||
"Y distance": "Y-afstand",
|
||||
"Z": "Z",
|
||||
"Z Angle": "Z-vinkel",
|
||||
"Z Distance": "Z-afstand",
|
||||
"Z angle": "Z-vinkel",
|
||||
"Z distance": "Z-afstand",
|
||||
"Zebra": "Zebra",
|
||||
"ai.prefs.allow_control": "Tillad AI-agenter at oprette forbindelse (kontrolkanal / MCP)",
|
||||
"ai.prefs.allow_control_note": "Åbner kun en kontrolkanal på denne computer (127.0.0.1, port 27878 eller den næste ledige). Et program, der opretter forbindelse, skal også fremvise et hemmeligt token, som kun din brugerkonto kan læse, og som oprettes på ny ved hver start. Træder i kraft, næste gang SolidCraft starter. Fra: Ingen port lytter, medmindre du starter SolidCraft med --control.",
|
||||
"ai.prefs.availability": "Assistentstyring",
|
||||
"ai.prefs.background_commands": "Kør agentkommandoer i baggrunden",
|
||||
"ai.prefs.follow_camera": "Vend kameraet mod skitser",
|
||||
"ai.prefs.follow_camera_off": "Automatisk kamerafølgning er slået fra.",
|
||||
"ai.prefs.follow_camera_on": "Kameraet vender sig mod skitser, som agenten opretter.",
|
||||
"ai.prefs.intro": "Agenter, tilladelser og visning af deres arbejde.",
|
||||
"ai.prefs.make_default": "Brug som standard",
|
||||
"ai.prefs.no_agents": "Ingen agenter endnu. Tilføj en agent, eller opdatér for at finde installerede agenter.",
|
||||
"ai.prefs.no_saved_approvals": "Ingen gemte godkendelser.",
|
||||
"ai.prefs.override_all_warning": "Denne agent kan gemme, overskrive, eksportere eller erstatte designet uden at spørge.",
|
||||
"ai.prefs.permission_all": "Tillad alt",
|
||||
"ai.prefs.permission_all_summary": "Tilgængelige SolidCraft-værktøjer kører uden at spørge.",
|
||||
"ai.prefs.permission_ask": "Spørg før ændringer",
|
||||
"ai.prefs.permission_ask_summary": "Godkend hver modelændring og filhandling.",
|
||||
"ai.prefs.permission_edits": "Tillad modelændringer",
|
||||
"ai.prefs.permission_edits_summary": "Modelændringer udføres; filhandlinger og destruktive handlinger kræver stadig godkendelse.",
|
||||
"ai.prefs.permission_scope": "Gælder kun SolidCraft-værktøjer. Agentens shell og filændringer bruger dens egne tilladelser.",
|
||||
"ai.prefs.pointer_preview_hidden": "Markør skjult",
|
||||
"ai.prefs.pointer_preview_speed": "Agentmarkør · {speed}",
|
||||
"ai.prefs.pointer_speed": "Bevægelseshastighed",
|
||||
"ai.prefs.privacy_note": "Kun din valgte agent eller dit valgte slutpunkt modtager samtalen. Slutpunktsnøgler gemmes i systemets nøglering.",
|
||||
"ai.prefs.show_pointer": "Vis agentmarkør",
|
||||
"ai.prefs.turn_limit_hint": "Det maksimale antal værktøjskald, der ændrer designet, som assistenten må foretage for én besked.",
|
||||
"angle, height": "vinkel, højde",
|
||||
"appearance.dielectric_ior": "Dielektrisk brydningsindeks",
|
||||
"appearance.metallic": "Metallisk",
|
||||
@@ -460,8 +652,10 @@
|
||||
"cmd.component_activate": "Aktivér komponent",
|
||||
"cmd.component_break_link": "Bryd forbindelse",
|
||||
"cmd.component_capture_position": "Registrér position",
|
||||
"cmd.component_copies": "Find identiske kopier",
|
||||
"cmd.component_create": "Ny komponent",
|
||||
"cmd.component_delete": "Slet komponent",
|
||||
"cmd.component_extract": "Udtræk til fil",
|
||||
"cmd.component_from_bodies": "Opret komponenter fra emner",
|
||||
"cmd.component_insert_design": "Indsæt design",
|
||||
"cmd.component_links": "Vis forbindelser",
|
||||
@@ -474,6 +668,7 @@
|
||||
"cmd.component_properties": "Komponentens fysiske egenskaber",
|
||||
"cmd.component_relink": "Skift kilde",
|
||||
"cmd.component_rename": "Omdøb komponent",
|
||||
"cmd.component_replace_with_link": "Erstat med link",
|
||||
"cmd.component_revert_position": "Tilbagefør position",
|
||||
"cmd.component_unlock": "Lås indhold op",
|
||||
"cmd.component_update_links": "Opdatér forbindelser",
|
||||
@@ -596,8 +791,10 @@
|
||||
"cmd.motion_plot": "Vis diagram for bevægelsesanalyse",
|
||||
"cmd.motion_study": "Bevægelsesanalyse",
|
||||
"cmd.motion_trace": "Bevægelsesspor",
|
||||
"cmd.motion_trace_edit": "Redigér bevægelsesspor",
|
||||
"cmd.motion_trace_keep": "Behold bevægelsesspor",
|
||||
"cmd.occurrence_copy": "Indsæt (komponentforekomst)",
|
||||
"cmd.occurrence_drag": "Træk forekomst",
|
||||
"cmd.occurrence_ground": "Fastgør",
|
||||
"cmd.occurrence_move": "Flyt komponentforekomst",
|
||||
"cmd.occurrence_properties": "Komponentforekomstens fysiske egenskaber",
|
||||
@@ -655,6 +852,7 @@
|
||||
"cmd.sketch_auto_constrain_from_datum": "Automatisk binding ud fra reference",
|
||||
"cmd.sketch_auto_project": "Projektér referencekanter automatisk",
|
||||
"cmd.sketch_blend_curve": "Overgangskurve",
|
||||
"cmd.sketch_cancel": "Annullér skitse",
|
||||
"cmd.sketch_chain": "Kæde",
|
||||
"cmd.sketch_chamfer_distance_angle": "Affasning med afstand og vinkel",
|
||||
"cmd.sketch_chamfer_equal_distance": "Affasning med ens afstande",
|
||||
@@ -770,6 +968,7 @@
|
||||
"cmd.view_graphics_preset": "Grafikprofil",
|
||||
"cmd.view_list": "Vis navngivne visninger",
|
||||
"cmd.view_navigate": "Navigér i visning",
|
||||
"cmd.view_normal_to": "Vinkelret på markering",
|
||||
"cmd.view_rename": "Omdøb navngiven visning",
|
||||
"cmd.view_save": "Ny navngiven visning",
|
||||
"color.copy": "Klik for at kopiere farveværdier",
|
||||
@@ -858,6 +1057,7 @@
|
||||
"file_load.stopping": "Venter på, at den forrige handling stopper...",
|
||||
"file_load.waiting": "Venter på filhandling",
|
||||
"fits the face, e.g. M8": "passer til fladen, f.eks. M8",
|
||||
"from the profile": "fra profilen",
|
||||
"from the rule": "fra reglen",
|
||||
"help.apache": "Apache-licens 2.0",
|
||||
"help.attributions": "Tilskrivninger (ATTRIBUTION.md)",
|
||||
@@ -867,6 +1067,12 @@
|
||||
"help.licences": "Licenser",
|
||||
"help.mit": "MIT-licens",
|
||||
"help.notice": "NOTICE",
|
||||
"help.solid.chamfer": "Affasning skærer de valgte kanter skråt med den angivne afstand. Brug den til at fjerne skarpe kanter eller lette indføringen af en tap eller skrue.",
|
||||
"help.solid.extrude": "Ekstrudering giver en skitseprofil dybde ved at tilføje eller fjerne materiale langs en retning. Angiv afstanden for at danne en klods, en forhøjning eller en lomme. Brug Udhulning, hvis en massiv model i stedet skal gøres hul med en bestemt vægtykkelse.",
|
||||
"help.solid.fillet": "Afrunding erstatter de valgte kanter med en glat, cirkulær overgang med den angivne radius. Den kan blødgøre skarpe kanter af hensyn til styrke, komfort eller udseende.",
|
||||
"help.solid.hole": "Hul opretter et rundt hul ved et valgt punkt på en flade. Angiv diameteren, og vælg eventuelt konisk forsænkning, cylindrisk forsænkning eller gevind. Ved gevind vælges en gevindbetegnelse, f.eks. M6.",
|
||||
"help.solid.revolve": "Omdrejning drejer en skitseprofil omkring en valgt akse og danner et omdrejningslegeme. Brug den f.eks. til aksler, knopper og skåle, der er runde omkring en centerlinje.",
|
||||
"help.solid.shell": "Udhulning gør et massivt legeme hult med den angivne vægtykkelse. Vælg de flader, der skal åbnes. Indvendig udhulning bevarer de udvendige mål, mens udvendig udhulning bevarer de indvendige mål. Brug den f.eks. til kasser, dæksler og andre tyndvæggede dele.",
|
||||
"help.third_party": "Tredjepartslicenser",
|
||||
"home.back": "Tilbage til {name}",
|
||||
"home.crashes": "Nedbrudsrapporter",
|
||||
@@ -976,6 +1182,15 @@
|
||||
"motion.to_end": "Til slutningen",
|
||||
"motion.to_start": "Til starten",
|
||||
"motion.track_name": "Spor {number}",
|
||||
"nav.alias.help": "Shift+Alt+træk med venstre museknap roterer visningen, Shift+Alt+midterste panorerer, Shift+Alt+højre zoomer; træk med midterste museknap panorerer også, og træk med højre roterer visningen",
|
||||
"nav.blender.help": "Træk med midterste museknap roterer visningen, Shift+midterste panorerer, Ctrl+midterste zoomer; træk med højre museknap påvirker ikke kameraet",
|
||||
"nav.free_orbit.help": "Musen og 3D-musen roterer gennem begge poler og bevarer rulning. Snap til akser med Shift er slået fra.",
|
||||
"nav.free_orbit.label": "Fri rotation af visningen",
|
||||
"nav.fusion.help": "Træk med midterste museknap panorerer, Shift+midterste roterer visningen, træk med højre roterer visningen",
|
||||
"nav.inventor.help": "Træk med midterste museknap panorerer, Shift+midterste roterer visningen, Ctrl+midterste zoomer, træk med højre roterer visningen",
|
||||
"nav.openscad.help": "Træk med venstre museknap i et tomt område roterer visningen, Shift+venstre markerer med en ramme, træk i skitsegeometri redigerer den; træk med højre eller midterste museknap panorerer, Shift+højre eller Shift+midterste zoomer",
|
||||
"nav.solidworks.help": "Træk med midterste museknap roterer visningen, Ctrl+midterste panorerer, Shift+midterste zoomer, træk med højre roterer visningen",
|
||||
"nav.tinkercad.help": "Træk med højre museknap roterer visningen, træk med midterste eller Shift+højre panorerer",
|
||||
"nav.touchpad.help": "Hold Shift nede, og bevæg markøren for at panorere; hold Alt/Option nede, og bevæg den for at rotere visningen. Ingen museknap behøver at være trykket ned. Lodret rulning zoomer.",
|
||||
"nav.touchpad.label": "Pegefelt",
|
||||
"nav.touchpad.orbit": "Rotér visning (hold Alt/Option nede og bevæg markøren; ingen museknap)",
|
||||
@@ -998,8 +1213,130 @@
|
||||
"pattern.flip_direction": "Vend retning",
|
||||
"pick a hole to seat it, or OK places it at the origin": "vælg et hul til placeringen, eller tryk OK for at placere ved nulpunktet",
|
||||
"pick one or two vertices, edges or faces": "vælg et eller to hjørnepunkter, kanter eller flader",
|
||||
"prefs.add_item": "Tilføj elementet",
|
||||
"prefs.alt_frees_manipulators": "Alt / Option frigør også manipulatorpilene",
|
||||
"prefs.anti_aliasing_note": "Udjævner takkede kanter.",
|
||||
"prefs.applies_on_restart": "Træder i kraft efter genstart",
|
||||
"prefs.assistant": "Assistent",
|
||||
"prefs.axes": "Akser",
|
||||
"prefs.axis": "Akse",
|
||||
"prefs.bottom": "Bund",
|
||||
"prefs.browser": "Modelbrowser",
|
||||
"prefs.built_in": "Indbygget",
|
||||
"prefs.button_left": "Træk med venstre museknap",
|
||||
"prefs.button_middle": "Træk med midterste museknap",
|
||||
"prefs.button_right": "Træk med højre museknap",
|
||||
"prefs.choose_font": "Vælg skrifttypefil…",
|
||||
"prefs.click": "Klik",
|
||||
"prefs.contact_shading": "Blød kontaktskygning",
|
||||
"prefs.contact_shading_note": "Blød skygning, hvor dele er tæt på hinanden.",
|
||||
"prefs.context_menu": "Genvejsmenu",
|
||||
"prefs.context_menu_ring": "Genvejsmenu · hold nede for at åbne den radiale menu",
|
||||
"prefs.cpu": "CPU (software)",
|
||||
"prefs.crash_reports": "Åbn nedbrudsrapporter…",
|
||||
"prefs.crash_reports_note": "Rapporter gemmes på denne computer med designet og de kommandoer, der genskaber problemet.",
|
||||
"prefs.ctrl_cmd": "Ctrl / Cmd",
|
||||
"prefs.curved_surfaces": "Krumme overflader",
|
||||
"prefs.curves": "Krumme overflader",
|
||||
"prefs.dead_zone_note": "Det skraverede bånd er dødzonen: Bevægelser inden for det ignoreres.",
|
||||
"prefs.default": "standard",
|
||||
"prefs.design": "Standardindstillinger for design",
|
||||
"prefs.design_note": "Udgangspunktet for nye design. Åbne design beholder deres egne indstillinger.",
|
||||
"prefs.devices": "3D-mus",
|
||||
"prefs.display": "Visning",
|
||||
"prefs.edges": "Kanter og skygning",
|
||||
"prefs.extend": "Udvid",
|
||||
"prefs.extra_navigation": "Ctrl+træk med venstre museknap i et tomt område roterer visningen; hold mellemrumstasten nede for at panorere.",
|
||||
"prefs.follows_os": "Følger operativsystemet",
|
||||
"prefs.font": "Skrifttype",
|
||||
"prefs.font_fallback": "Tegn, som den valgte skrifttype mangler, vises med den indbyggede skrifttype, så ingen tekst viser en tom firkant.",
|
||||
"prefs.font_sample": "Høj bly gom vandt fræk sexquiz · Ø12,50 mm · 45,0° · 0123456789",
|
||||
"prefs.font_unreadable": "Den valgte skrifttype kunne ikke læses.",
|
||||
"prefs.general": "Generelt",
|
||||
"prefs.general_note": "Sprog, lagring og opdateringer.",
|
||||
"prefs.gesture_orbit": "Rotér visningen",
|
||||
"prefs.gesture_pan": "Panorér",
|
||||
"prefs.gesture_zoom": "Zoom",
|
||||
"prefs.graphics": "Grafik",
|
||||
"prefs.graphics_note": "Afvej hastighed mod udjævning. Hvert valg viser sin virkning på et eksempel.",
|
||||
"prefs.graphics_presets_note": "Forudindstillinger angiver de nedenstående valg samlet.",
|
||||
"prefs.history": "Historik",
|
||||
"prefs.hold_stop_snapping": "Hold nede for at slå snapping fra",
|
||||
"prefs.icons_only": "Kun ikoner",
|
||||
"prefs.imported_file": "Importeret fil",
|
||||
"prefs.input": "Input",
|
||||
"prefs.interface": "Brugergrænseflade",
|
||||
"prefs.interface_language": "Sprog i brugergrænsefladen",
|
||||
"prefs.interface_note": "SolidCrafts udseende og placeringen af dets dele.",
|
||||
"prefs.interval_minutes": "{n} min",
|
||||
"prefs.labels": "Etiketter",
|
||||
"prefs.layout": "Layout",
|
||||
"prefs.layout_note": "Kompakt fastgør panelerne til vinduets kanter. Gennemsigtighed i modelbrowseren er tilgængelig i Flydende. Skift assistentens side på siden Assistent.",
|
||||
"prefs.left": "Venstre",
|
||||
"prefs.left_click": "Venstreklik",
|
||||
"prefs.live_input": "Løbende input",
|
||||
"prefs.live_preview": "Løbende forhåndsvisning",
|
||||
"prefs.minutes": "minutter",
|
||||
"prefs.minutes_suffix": " min",
|
||||
"prefs.mouse": "Mus og pegefelt",
|
||||
"prefs.mouse_heading": "Mus",
|
||||
"prefs.mouse_mapping": "Musetildeling",
|
||||
"prefs.navigation": "Navigation",
|
||||
"prefs.navigation_note": "Hvordan musen, pegefeltet og 3D-musen styrer visningen.",
|
||||
"prefs.not_on_gpu": "ikke på denne GPU",
|
||||
"prefs.on": "Til",
|
||||
"prefs.opaque": "Uigennemsigtig",
|
||||
"prefs.orbit_snap": "Hold Shift nede under rotation af visningen for at snappe til en akse.",
|
||||
"prefs.orientation": "Orientering",
|
||||
"prefs.overall_speed": "Samlet hastighed",
|
||||
"prefs.preview_choices": "Forhåndsvisning af dine valg",
|
||||
"prefs.quality_default": "standard",
|
||||
"prefs.quality_fastest": "hurtigst",
|
||||
"prefs.quality_slowest": "langsomst",
|
||||
"prefs.quality_smoother": "mere udjævnet",
|
||||
"prefs.reports_saved": "{n} gemt",
|
||||
"prefs.right_click": "Højreklik",
|
||||
"prefs.saving": "Automatisk lagring og gendannelse",
|
||||
"prefs.scale_note": "Også Ctrl + / Ctrl − i vinduet. Knapper er 28 px ved 100%.",
|
||||
"prefs.scale_text": "Skalering og tekst",
|
||||
"prefs.select": "Vælg",
|
||||
"prefs.select_one_item": "Vælg ét element",
|
||||
"prefs.selecting": "Markering",
|
||||
"prefs.shift": "Shift",
|
||||
"prefs.shift_add_ctrl_toggle": "Shift tilføjer kun; Ctrl / Cmd skifter markeringen",
|
||||
"prefs.shift_add_note": "Til: Shift tilføjer, Ctrl / Cmd skifter markeringen. Fra (standard): Begge skifter markeringen.",
|
||||
"prefs.shortcuts": "Genveje",
|
||||
"prefs.sketch_selection": "Skitse og markering",
|
||||
"prefs.sketch_selection_heading": "Skitse og markering",
|
||||
"prefs.sketch_selection_note": "Hvordan skitser snapper, og hvordan klik markerer.",
|
||||
"prefs.sketching": "Skitsering",
|
||||
"prefs.snap_drawing_note": "Mens du tegner eller trækker et skitsepunkt.",
|
||||
"prefs.source": "Kilde",
|
||||
"prefs.speed": "Hastighed",
|
||||
"prefs.stand_up_note": "Når en STEP- eller IGES-fil åbnes med Z opad, tilbydes en kvart omdrejning om X.",
|
||||
"prefs.status_done": "Færdig",
|
||||
"prefs.status_error": "Fejl",
|
||||
"prefs.status_selected": "Valgt",
|
||||
"prefs.status_warning": "Advarsel",
|
||||
"prefs.supersampling_brief": "Tegner visningen i større størrelse og nedskalerer den med filtrering: meget skarpt og mere krævende.",
|
||||
"prefs.tab_accent_note": "Accentfarven følger den aktive fane",
|
||||
"prefs.theme_file": "temafil",
|
||||
"prefs.timeline_half_hour": "−30 min",
|
||||
"prefs.timeline_now": "nu",
|
||||
"prefs.timeline_quarter_hour": "−15",
|
||||
"prefs.toggle_item": "Tilføj elementet, eller fjern det igen",
|
||||
"prefs.toolbar": "Værktøjslinje",
|
||||
"prefs.translucent": "Halvgennemsigtig",
|
||||
"prefs.under_browser": "Under modelbrowseren",
|
||||
"prefs.under_cursor": "Under markøren",
|
||||
"prefs.units_precision": "Enheder og præcision",
|
||||
"prefs.updates": "Opdateringer",
|
||||
"prefs.view": "Visningens adfærd",
|
||||
"prefs.viewport": "Visningsområde",
|
||||
"prefs.wheel": "Musehjul",
|
||||
"prefs.wheel_trackpad": "Musehjul og pegefelt",
|
||||
"prefs.workspace": "Arbejdsområde",
|
||||
"prefs.zoom_toward_cursor": "Zoom mod markøren",
|
||||
"properties.title": "Egenskaber: {name}",
|
||||
"recovery.days_ago": "for {count} dage siden",
|
||||
"recovery.detail": "{file} · {features} features · autogemt {when}",
|
||||
@@ -1070,16 +1407,20 @@
|
||||
"search.suggest": "Mente du {label}?",
|
||||
"search.try": "Skriv et kommandonavn, en feature i dette design eller en parameter. Du kører en kommando med værdier ved at skrive dens id og et JSON-objekt: {example}",
|
||||
"search.valid": "Gyldig",
|
||||
"settings.display_quality_note": "Finere niveauer viser krumme flader og kanter mere jævnt og tager længere tid at opbygge mesh til. Kun modelvisningen ændres, aldrig designet eller eksporten.",
|
||||
"section.off_hint": "Intet plan valgt: OK slår snittet fra.",
|
||||
"settings.display_quality_note": "Gælder kun visningen. Design og eksport påvirkes ikke.",
|
||||
"settings.frame_rate_note": "Viser billeder pr. sekund nederst til højre i modelvisningen.",
|
||||
"settings.measure_axis_distances": "Vis X/Y/Z-afstande",
|
||||
"settings.measure_axis_distances_help": "Vis afstanden langs X-, Y- og Z-aksen sammen med den samlede afstand i Mål.",
|
||||
"settings.msaa_applies_on_restart": "Kantudjævning træder i kraft, næste gang SolidCraft starter",
|
||||
"settings.msaa_reset": "{setting}: {requested}× understøttes ikke af denne grafikenhed; værdien er nu {reset}× (understøttet: {supported}).",
|
||||
"settings.msaa_unsupported": "Understøttes ikke af denne grafikenhed",
|
||||
"settings.reference_geometry_through_bodies": "Vis referencegeometri gennem legemer",
|
||||
"settings.reference_geometry_through_bodies_help": "Tegn inaktive skitsekonturer og referenceplaner oven på skyggelagte legemer",
|
||||
"settings.reset_intro": "Disse indstillinger virker ikke på denne computer og ville forhindre SolidCraft i at starte. De er derfor ændret:",
|
||||
"settings.reset_title": "Indstillinger blev ændret",
|
||||
"settings.supersampling_note": "Tegner visningen med højere opløsning og nedskalerer den: Jævnere kanter, linjer og gitter på skærme under 4K. Det kræver GPU-tid: ca. 2,25× så mange pixels ved 1,5× og 4× ved 2×.",
|
||||
"sheet.no_body": "der er intet pladelegeme: Start et med Flange > Basis, eller omdan en plade til et pladelegeme med Konvertér til plade (vælg dens store plane flade)",
|
||||
"shortcut.json_error": "parametre skal være JSON: {error}",
|
||||
"shortcut.no_command": "ingen kommando `{id}`; teksten før JSON skal være et kommando-id",
|
||||
"shortcut.pin": "Fastgør øverst i S-boksen",
|
||||
@@ -1116,6 +1457,9 @@
|
||||
"thread.designation": "Betegnelse",
|
||||
"thread.iso_metric": "ISO-metrisk",
|
||||
"thread.select_size": "Vælg størrelse",
|
||||
"timeline.delete_after_marker_one": "Slet 1 feature efter historikmarkøren",
|
||||
"timeline.delete_after_marker_other": "Slet {count} features efter historikmarkøren",
|
||||
"timeline.delete_many": "Slet {count} valgte features",
|
||||
"timeline.group": "Ny featuremappe",
|
||||
"timeline.move_many": "Flyt elementer i tidslinjen",
|
||||
"timeline.move_to_group": "Flyt features til mappe",
|
||||
@@ -1361,11 +1705,15 @@
|
||||
"ui.agent_chat_waiting": "Venter på dig",
|
||||
"ui.agent_cursor": "Agentmarkør",
|
||||
"ui.agent_cursor_speed": "Agentmarkørens hastighed",
|
||||
"ui.agent_off_thread": "Hold programvinduet responsivt, mens agenter udfører kommandoer",
|
||||
"ui.agent_off_thread_note": "Langsomme kommandoer fra en agent (via AI-panelet eller en MCP-klient) køres i en separat tråd, så du stadig kan rotere og undersøge modellen. Du kan stoppe en kommando via statusfeltet i visningen. Når funktionen er slået fra, køres kommandoerne på programvinduets tråd, og vinduet venter, indtil de er færdige.",
|
||||
"ui.ai_add": "Tilføj",
|
||||
"ui.ai_add_agent": "Tilføj agent…",
|
||||
"ui.ai_add_agent_title": "Tilføj agent",
|
||||
"ui.ai_add_anthropic": "Anthropic-kompatibel API",
|
||||
"ui.ai_add_api": "OpenAI-kompatibel API",
|
||||
"ui.ai_add_custom": "Brugerdefineret kommando",
|
||||
"ui.ai_add_endpoint": "API-slutpunkt",
|
||||
"ui.ai_add_installed": "Installeret agent",
|
||||
"ui.ai_add_installed_note": "Din egen opsætning af en installeret agent, f.eks. med andre argumenter. Installerede agenter vises automatisk.",
|
||||
"ui.ai_added": "tilføjet",
|
||||
@@ -1394,6 +1742,7 @@
|
||||
"ui.ai_key_needs_https": "En nøgle sendes kun via HTTPS eller til denne computer.",
|
||||
"ui.ai_key_note": "Gemmes i systemets nøglering, aldrig i SolidCrafts indstillinger. Lad feltet være tomt ved en lokal server.",
|
||||
"ui.ai_keychain_error": "Systemets nøglering afviste anmodningen: {error}",
|
||||
"ui.ai_kind": "Type",
|
||||
"ui.ai_mode_all": "Tillad alt",
|
||||
"ui.ai_mode_all_note": "Intet kræver godkendelse først. Nedbrudsrapporter er stadig utilgængelige, og mappebegrænsningerne gælder fortsat.",
|
||||
"ui.ai_mode_all_warning": "Agenten kan gemme, overskrive, eksportere og erstatte dit design uden at spørge. Brug kun dette med en agent, du har tillid til, og på designs, du har gemt.",
|
||||
@@ -1415,6 +1764,7 @@
|
||||
"ui.ai_panel": "Panel",
|
||||
"ui.ai_permissions": "Tilladelser",
|
||||
"ui.ai_preset": "Forudindstilling",
|
||||
"ui.ai_protocol": "Protokol",
|
||||
"ui.ai_remove": "Fjern",
|
||||
"ui.ai_reset": "Nulstil",
|
||||
"ui.ai_settings": "AI-indstillinger…",
|
||||
@@ -1424,6 +1774,8 @@
|
||||
"ui.ai_test": "Test",
|
||||
"ui.ai_test_acp_ok": "Svarer: {agent}",
|
||||
"ui.ai_test_acp_tip": "Starter agenten kortvarigt og anmoder om en session; afslutter den derefter igen",
|
||||
"ui.ai_test_answered": "Forbindelse oprettet: {model} svarede",
|
||||
"ui.ai_test_anthropic_tip": "Sender en kort besked til slutpunktet",
|
||||
"ui.ai_test_api_tip": "Henter endepunktets modeller",
|
||||
"ui.ai_test_no_model": "Forbindelse oprettet: {count} modeller, men ikke {model}",
|
||||
"ui.ai_test_ok": "Forbindelse oprettet: {count} modeller",
|
||||
@@ -1433,8 +1785,8 @@
|
||||
"ui.ai_tool_running": "kører",
|
||||
"ui.ai_tool_unfold": "Klik for at vise svaret",
|
||||
"ui.ai_tool_waiting": "venter",
|
||||
"ui.ai_toolbar_button": "Vis knap på værktøjslinjen",
|
||||
"ui.ai_toolbar_button_note": "AI-knappen i højre ende af værktøjslinjen. Ctrl+Shift+A og menuen Vis åbner stadig panelet.",
|
||||
"ui.ai_toolbar_button": "Vis Assistent-knappen på programlinjen",
|
||||
"ui.ai_toolbar_button_note": "Assistent-knappen på programlinjen. Du kan stadig åbne panelet med Ctrl+Shift+A eller via menuen Vis.",
|
||||
"ui.ai_undo_tip": "Fortryd alt, agenten ændrede for denne besked, som ét trin",
|
||||
"ui.ai_url_hint": "https://example.com/v1",
|
||||
"ui.all": "Alle",
|
||||
@@ -1582,7 +1934,12 @@
|
||||
"ui.export_keymap_tip": "Gem tastaturgenveje, favoritter i S-menuen og værktøjslinjen i en fil",
|
||||
"ui.extend": "Forlæng",
|
||||
"ui.extent_type": "Udstrækningstype",
|
||||
"ui.extract_component": "Udtræk til fil…",
|
||||
"ui.extract_design_changed": "Designet blev ændret, mens du valgte en fil. Start Udtræk til fil igen.",
|
||||
"ui.extract_done": "Komponenten er nu et selvstændigt design, der er linket hertil.",
|
||||
"ui.extrude": "Ekstrudering",
|
||||
"ui.extrude_auto_to_object": "Ekstrudér til et valgt mål",
|
||||
"ui.extrude_auto_to_object_tip": "Når en profil er valgt i Ekstrudering, skifter udstrækningen til Til objekt, hvis du vælger en flade, et hjørnepunkt eller et parallelt plan uden for profilens plan",
|
||||
"ui.factor": "Faktor",
|
||||
"ui.feature_history": "Featuretidslinje",
|
||||
"ui.feature_options": "Featureindstillinger",
|
||||
@@ -1592,6 +1949,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrér kommandoer eller taster",
|
||||
"ui.findInTimeline": "Find i tidslinje",
|
||||
"ui.findInWindow": "Find i vindue",
|
||||
"ui.fine": "Fin",
|
||||
"ui.finest": "Fineste",
|
||||
"ui.finish_sketch": "Afslut skitse",
|
||||
"ui.fit": "Tilpas",
|
||||
"ui.fix_unfix": "Lås fast/frigør",
|
||||
@@ -1689,10 +2048,17 @@
|
||||
"ui.hideProfile": "Skjul profil",
|
||||
"ui.history_back": "Gå ét trin tilbage",
|
||||
"ui.history_below_browser": "Under browseren",
|
||||
"ui.history_edge_hint": "dobbeltklik på kanten",
|
||||
"ui.history_first": "Gå til begyndelsen",
|
||||
"ui.history_forward": "Gå ét trin frem",
|
||||
"ui.history_hide_names": "Skjul navne",
|
||||
"ui.history_last": "Gå til slutningen",
|
||||
"ui.history_marker_tip": "Historikmarkør: Træk for at rulle modellen tilbage; nye features indsættes her",
|
||||
"ui.history_names": "Navne",
|
||||
"ui.history_play": "Afspil til slutningen",
|
||||
"ui.history_show_names": "Vis navne",
|
||||
"ui.history_title": "Historik",
|
||||
"ui.history_toggle_names": "Vis eller skjul featurenavne",
|
||||
"ui.hole": "Hul",
|
||||
"ui.hole_tap_type": "Hullets gevindtype",
|
||||
"ui.hole_type": "Hultype",
|
||||
@@ -1714,6 +2080,10 @@
|
||||
"ui.length_decimals": "Længdedecimaler",
|
||||
"ui.light": "Lys",
|
||||
"ui.line": "Linje",
|
||||
"ui.link_copies": "Link identiske kopier",
|
||||
"ui.link_copies_keep": "Behold",
|
||||
"ui.link_copies_link": "Link",
|
||||
"ui.link_copies_text": "Disse komponenter danner de samme legemer som {name}. Skal de gøres til placeringer af dens link?",
|
||||
"ui.lock": "Lås",
|
||||
"ui.loft": "Loft",
|
||||
"ui.look_at": "Se på",
|
||||
@@ -1816,6 +2186,7 @@
|
||||
"ui.project_face_edges_sketch": "Projektér fladekanter til nye skitser",
|
||||
"ui.properties": "Egenskaber",
|
||||
"ui.pull_direction": "Udtræksretning",
|
||||
"ui.quality": "Kvalitet",
|
||||
"ui.quantity": "Antal",
|
||||
"ui.quantity_2": "Antal 2",
|
||||
"ui.quit": "Afslut",
|
||||
@@ -1827,6 +2198,9 @@
|
||||
"ui.rectangle": "Rektangel",
|
||||
"ui.rectangular_pattern": "Rektangulært mønster",
|
||||
"ui.redo": "Gentag",
|
||||
"ui.reference_1": "Reference 1",
|
||||
"ui.reference_2": "Reference 2",
|
||||
"ui.reference_distance": "Referenceafstand",
|
||||
"ui.relink_design_changed": "Samlingen blev ændret, mens du valgte en kilde. Start Skift kilde igen.",
|
||||
"ui.relink_done": "Kilden er ændret for alle forekomster.",
|
||||
"ui.relink_not_linked": "Denne komponent er ikke knyttet til et kildedesign.",
|
||||
@@ -1837,6 +2211,7 @@
|
||||
"ui.render": "Rendering",
|
||||
"ui.renderer": "Renderingsmotor",
|
||||
"ui.repeat": "Gentag",
|
||||
"ui.replace_with_link_done": "Kopierne er nu placeringer af det linkede design.",
|
||||
"ui.report_a_bug": "Rapportér en fejl",
|
||||
"ui.reset": "Nulstil",
|
||||
"ui.reset_all": "Nulstil alle",
|
||||
@@ -1875,6 +2250,12 @@
|
||||
"ui.sent_to_slicer": "Sendt til {slicer}",
|
||||
"ui.sheet_gap": "Mellemrum",
|
||||
"ui.shell": "Udhulning",
|
||||
"ui.shortcut_capture_add_key": "Tilføj én almindelig tast. Escape annullerer.",
|
||||
"ui.shortcut_capture_hint": "Klik på en tastetildeling, og tryk derefter på modifikationstaster og én tast. Tilføj modifikationstaster inden for ét sekund; slip alle taster for at bekræfte. Escape annullerer.",
|
||||
"ui.shortcut_capture_press": "Tryk på modifikationstaster og én tast. Escape annullerer.",
|
||||
"ui.shortcut_capture_release": "Slip alle taster for at bekræfte. Escape annullerer.",
|
||||
"ui.shortcut_capture_settling": "Bekræfter genvej… Escape annullerer.",
|
||||
"ui.shortcut_multiple_keys": "Brug modifikationstaster og kun én anden tast. Klik på tastetildelingen for at prøve igen.",
|
||||
"ui.show": "Vis",
|
||||
"ui.showAll": "Vis alle",
|
||||
"ui.showAllBodies": "Vis alle emner",
|
||||
@@ -1910,6 +2291,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Opdel emne",
|
||||
"ui.stand_up_tip": "Når en STEP- eller IGES-fil åbnes med Z opad, tilbydes en kvart omdrejning om X",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Start",
|
||||
"ui.start_over": "Start forfra",
|
||||
"ui.start_page": "Startside",
|
||||
@@ -1937,7 +2319,7 @@
|
||||
"ui.tie_ends": "Sammenbind",
|
||||
"ui.tie_ends_tip": "Bind alle ubundne ender",
|
||||
"ui.timeline_bottom": "Tidslinje nederst",
|
||||
"ui.timeline_left_note": "Layoutet til venstre viser tilbagerulningslinjen over modeltræet med emner og scene.",
|
||||
"ui.timeline_left_note": "Den lodrette historik vises til venstre for modelbrowseren. Featurenavne kan vises eller skjules på strimlen.",
|
||||
"ui.timeline_left_sidebar": "Venstre sidepanel",
|
||||
"ui.tip_angle": "Spidsvinkel",
|
||||
"ui.to_object": "Til objekt",
|
||||
@@ -1945,7 +2327,7 @@
|
||||
"ui.top": "Ovenfra",
|
||||
"ui.torus": "Torus",
|
||||
"ui.total_angle": "Samlet vinkel",
|
||||
"ui.trackpad_pan_tip": "Bevægelser på pegefeltet panorerer (slået fra: zoomer som musehjulet); musehjulet zoomer, tommelfingerhjulet panorerer sidelæns, og knibebevægelse zoomer altid",
|
||||
"ui.trackpad_pan_tip": "Rulning med to fingre panorerer; i Fusion roterer Shift + to fingre visningen. Fra: Rulning zoomer. Musehjul og knibebevægelser zoomer; tommelfingerhjulet panorerer sidelæns.",
|
||||
"ui.trim": "Trim",
|
||||
"ui.twist": "Vridning",
|
||||
"ui.two_finger_scroll_pans": "Rulning med to fingre panorerer",
|
||||
@@ -2022,5 +2404,6 @@
|
||||
"update.up_to_date": "SolidCraft er opdateret.",
|
||||
"update.update_now": "Opdatér nu",
|
||||
"update.you_have": "Du har {version}.",
|
||||
"↑ ↓ choose · Enter / Tab complete · Esc dismiss": "↑ ↓ vælg · Enter / Tab udfyld · Esc luk"
|
||||
"↑ ↓ choose · Enter / Tab complete · Esc dismiss": "↑ ↓ vælg · Enter / Tab udfyld · Esc luk",
|
||||
"↑ ↓ choose · Enter applies what you typed · Esc dismiss": "↑ ↓ vælg · Enter anvender det indtastede · Esc lukker"
|
||||
}
|
||||
|
||||
@@ -1847,6 +1847,8 @@
|
||||
"ui.filter_commands_or_keys": "Befehle oder Tasten filtern",
|
||||
"ui.findInTimeline": "In der Zeitleiste suchen",
|
||||
"ui.findInWindow": "Im Fenster suchen",
|
||||
"ui.fine": "Fein",
|
||||
"ui.finest": "Sehr fein",
|
||||
"ui.finish_sketch": "Skizze beenden",
|
||||
"ui.fit": "Einpassen",
|
||||
"ui.fix_unfix": "Fixieren/Lösen",
|
||||
@@ -2029,6 +2031,7 @@
|
||||
"ui.one_side": "Einseitig",
|
||||
"ui.open": "Öffnen",
|
||||
"ui.open_ends_tip": "Berührt nichts",
|
||||
"ui.open_linked_design": "Verknüpftes Design öffnen",
|
||||
"ui.open_preferences": "Einstellungen öffnen",
|
||||
"ui.open_recent": "Zuletzt verwendet",
|
||||
"ui.operation": "Operation",
|
||||
@@ -2075,6 +2078,7 @@
|
||||
"ui.project_face_edges_sketch": "Flächenkanten in neue Skizzen projizieren",
|
||||
"ui.properties": "Eigenschaften",
|
||||
"ui.pull_direction": "Entformungsrichtung",
|
||||
"ui.quality": "Qualität",
|
||||
"ui.quantity": "Anzahl",
|
||||
"ui.quantity_2": "Anzahl 2",
|
||||
"ui.quit": "Beenden",
|
||||
@@ -2176,6 +2180,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Körper trennen",
|
||||
"ui.stand_up_tip": "Nach dem Öffnen einer STEP- oder IGES-Datei mit Z nach oben eine Vierteldrehung um X anbieten",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Start",
|
||||
"ui.start_over": "Von vorn beginnen",
|
||||
"ui.start_page": "Startseite",
|
||||
@@ -2229,6 +2234,7 @@
|
||||
"ui.up_axis_note": "Welche Achse in den Ansichten nach oben zeigt (Achsenansicht, Home, Ansehen). Designs bleiben unverändert.",
|
||||
"ui.updateToCurrentView": "Auf aktuelle Ansicht aktualisieren",
|
||||
"ui.view_centre": "Ansichtszentrum",
|
||||
"ui.viewport_theme_follow": "Dem Design folgen",
|
||||
"ui.visual_shaded_hidden_edges": "Schattiert mit verdeckten Kanten",
|
||||
"ui.visual_shaded_with_edges": "Schattiert mit Kanten",
|
||||
"ui.visual_style": "Ansichtsstil",
|
||||
@@ -2278,6 +2284,7 @@
|
||||
"update.prefs_flatpak": "Flatpak aktualisiert diese Installation ({version}): {command} ausführen oder die Softwareverwaltung nutzen. SolidCraft sucht nicht selbst.",
|
||||
"update.prefs_label": "Updates",
|
||||
"update.prefs_note": "Dies ist SolidCraft {version} ({kind}). Die Suche fragt GitHub nach dem neuesten Release und sendet sonst nichts.",
|
||||
"update.prefs_web": "Laden Sie die Seite neu, um die neueste Web-App zu erhalten. Ist das Netzwerk nicht verfügbar oder kann das Update nicht rechtzeitig vollständig heruntergeladen werden, wird die gespeicherte Version geöffnet. Ein laufender Download wird für das nächste Neuladen fortgesetzt.",
|
||||
"update.release_page": "Release-Seite öffnen",
|
||||
"update.restart": "Jetzt neu starten",
|
||||
"update.restart_later": "Später",
|
||||
|
||||
+58
-2
@@ -143,6 +143,7 @@
|
||||
"Cube": "Cube",
|
||||
"Current orthographic view (1:1 mm)": "Current orthographic view (1:1 mm)",
|
||||
"Current perspective view": "Current perspective view",
|
||||
"Current plane": "Current plane",
|
||||
"Curv. Comb": "Curv. Comb",
|
||||
"Curvature (G2)": "Curvature (G2)",
|
||||
"Curvature change (G3)": "Curvature change (G3)",
|
||||
@@ -239,7 +240,9 @@
|
||||
"Gap": "Gap",
|
||||
"Grid": "Grid",
|
||||
"HISTORY": "HISTORY",
|
||||
"Halo under sketch curves": "Halo under sketch curves",
|
||||
"Height": "Height",
|
||||
"Height From": "Height From",
|
||||
"Hidden edges": "Hidden edges",
|
||||
"History layout": "History layout",
|
||||
"History names": "History names",
|
||||
@@ -256,6 +259,7 @@
|
||||
"In place (surfaces)": "In place (surfaces)",
|
||||
"In plane": "In plane",
|
||||
"Included": "Included",
|
||||
"Inner Sharp": "Inner Sharp",
|
||||
"Inside": "Inside",
|
||||
"Instant": "Instant",
|
||||
"Interface font": "Interface font",
|
||||
@@ -302,6 +306,7 @@
|
||||
"Mass Center": "Mass Center",
|
||||
"Matched restrictions check the final values.": "Matched restrictions check the final values.",
|
||||
"Material": "Material",
|
||||
"Material Outside": "Material Outside",
|
||||
"Material copied. Existing body assignments are unchanged.": "Material copied. Existing body assignments are unchanged.",
|
||||
"Max": "Max",
|
||||
"Maximum": "Maximum",
|
||||
@@ -314,7 +319,6 @@
|
||||
"Mitre": "Mitre",
|
||||
"Model Parameters": "Model Parameters",
|
||||
"Modeled": "Modeled",
|
||||
"More themes": "More themes",
|
||||
"More toolbar panels": "More toolbar panels",
|
||||
"Motion": "Motion",
|
||||
"Mouse gestures": "Mouse gestures",
|
||||
@@ -349,8 +353,10 @@
|
||||
"On your computer": "On your computer",
|
||||
"Opacity": "Opacity",
|
||||
"Open GitHub draft": "Open GitHub draft",
|
||||
"Open bodies (no volume)": "Open bodies (no volume)",
|
||||
"Open library...": "Open library...",
|
||||
"Open local libraries in the desktop app. You can export this design's library here.": "Open local libraries in the desktop app. You can export this design's library here.",
|
||||
"Open surface — no volume": "Open surface — no volume",
|
||||
"Open-source parametric 3D CAD in Rust. Licensed MIT OR Apache-2.0.": "Open-source parametric 3D CAD in Rust. Licensed MIT OR Apache-2.0.",
|
||||
"Opens your browser and copies the report text for you to paste into GitHub.": "Opens your browser and copies the report text for you to paste into GitHub.",
|
||||
"Opens your browser. Review and submit your report on GitHub.": "Opens your browser. Review and submit your report on GitHub.",
|
||||
@@ -359,6 +365,7 @@
|
||||
"Other side": "Other side",
|
||||
"Other surface (mutual trim)": "Other surface (mutual trim)",
|
||||
"Other way": "Other way",
|
||||
"Outer Sharp": "Outer Sharp",
|
||||
"Outer radius": "Outer radius",
|
||||
"Outside": "Outside",
|
||||
"Overall length": "Overall length",
|
||||
@@ -388,7 +395,6 @@
|
||||
"Preview": "Preview",
|
||||
"Preview Row": "Preview Row",
|
||||
"Preview leaves the current design unchanged.": "Preview leaves the current design unchanged.",
|
||||
"Previous themes": "Previous themes",
|
||||
"Profile / Edges": "Profile / Edges",
|
||||
"Profiles or curves": "Profiles or curves",
|
||||
"Profiles/Curves": "Profiles/Curves",
|
||||
@@ -526,9 +532,11 @@
|
||||
"Surface, or faces to turn over": "Surface, or faces to turn over",
|
||||
"Swap Ends": "Swap Ends",
|
||||
"TRIM": "TRIM",
|
||||
"Tangent": "Tangent",
|
||||
"Tangent (G1)": "Tangent (G1)",
|
||||
"Tangent Chain": "Tangent Chain",
|
||||
"Tangent chain": "Tangent chain",
|
||||
"Tangent to Edge": "Tangent to Edge",
|
||||
"Tap drill diameter": "Tap drill diameter",
|
||||
"Target": "Target",
|
||||
"Target Body": "Target Body",
|
||||
@@ -684,6 +692,7 @@
|
||||
"cmd.component_capture_position": "Capture Position",
|
||||
"cmd.component_copies": "Find Identical Copies",
|
||||
"cmd.component_create": "New Component",
|
||||
"cmd.component_cycle_color": "Cycle Component Color",
|
||||
"cmd.component_delete": "Delete Component",
|
||||
"cmd.component_extract": "Extract to File",
|
||||
"cmd.component_from_bodies": "Create Components from Bodies",
|
||||
@@ -768,6 +777,8 @@
|
||||
"cmd.inspect_accessibility": "Accessibility Analysis",
|
||||
"cmd.inspect_center_of_mass": "Center of Mass",
|
||||
"cmd.inspect_clearance": "Clearance",
|
||||
"cmd.inspect_colored_components": "Enable Component Colors",
|
||||
"cmd.inspect_colored_components_disable": "Disable Component Colors",
|
||||
"cmd.inspect_compare": "Compare Bodies",
|
||||
"cmd.inspect_continuity": "Continuity Analysis",
|
||||
"cmd.inspect_curvature_comb": "Curvature Comb Analysis",
|
||||
@@ -1081,6 +1092,7 @@
|
||||
"crash.report": "Report…",
|
||||
"crash.unclean_explanation": "Detected on a later launch; the exact exit time was not recorded. A system shutdown or forced stop can also cause an unclean exit.",
|
||||
"delete.and_more": "… and {count} more",
|
||||
"diagnostic.empty_boolean_component": "there is no body to cut or intersect in component '{component}'; the tool may overlap '{body}' in component '{other}' — activate that component or pick the body as a target",
|
||||
"dialog.bodies_count": "{count} bodies",
|
||||
"dialog.clearance_invalid": "the clearance must be a length of 0 or more",
|
||||
"dialog.compute": "Compute",
|
||||
@@ -1124,9 +1136,11 @@
|
||||
"dxf.progress.write": "Writing DXF (5/5)",
|
||||
"dxf.tolerance": "Curve tolerance",
|
||||
"dxf.tolerance_help": "Visible bodies and shown sketches only. Curves use straight segments. Smaller tolerance gives finer curves and uses more time and memory.",
|
||||
"file.open.drawing_filter": "Designs, CAD files, meshes and drawings",
|
||||
"file_load.built": "Built so far: {built} of {total} features.",
|
||||
"file_load.converting": "Converting solid {done} of {total}",
|
||||
"file_load.inserting": "Inserting geometry",
|
||||
"file_load.link_item": "{name} ({done} of {total})",
|
||||
"file_load.opening": "Opening design",
|
||||
"file_load.preparing_thumbnail": "Preparing the thumbnail...",
|
||||
"file_load.preparing_view": "Preparing the view...",
|
||||
@@ -1136,6 +1150,7 @@
|
||||
"file_load.rebuilding": "Rebuilding feature {done} of {total}",
|
||||
"file_load.recovering": "Recovering design",
|
||||
"file_load.stopping": "Waiting for the previous operation to stop...",
|
||||
"file_load.updating_links": "Updating links",
|
||||
"file_load.waiting": "Waiting for file operation",
|
||||
"fits the face, e.g. M8": "fits the face, e.g. M8",
|
||||
"from the profile": "from the profile",
|
||||
@@ -1238,6 +1253,8 @@
|
||||
"joint.from_bodies_hint": "Each picked body moves into a new component of its own and stays where it is.",
|
||||
"joint.one_body": "Both picks are on {body}. Pick the second one on another part.",
|
||||
"joint.one_component": "These parts are bodies of one component: {bodies}. A joint moves one component against another, so each part needs a component of its own.",
|
||||
"joint.rigid_group_one_component": "These {count} bodies are all in one component (or in the design itself): use {command} first.",
|
||||
"joint.rigid_group_select_components": "Select two or more components.",
|
||||
"keymap.command_id": "Command ID",
|
||||
"keymap.empty": "No matching commands",
|
||||
"keymap.use_anyway": "Use {key} here anyway",
|
||||
@@ -1358,6 +1375,7 @@
|
||||
"pick the path": "pick the path",
|
||||
"prefs.add_item": "Add the item",
|
||||
"prefs.alt_frees_manipulators": "Alt / Option also frees manipulator arrows",
|
||||
"prefs.anti_aliasing_amd_dx12": "Anti-aliasing uses 1× because the startup check drew nothing with multisampling and passed at 1×. You can choose another setting above; restart to apply it if the check passes.",
|
||||
"prefs.anti_aliasing_note": "Smooths jagged edges.",
|
||||
"prefs.applies_on_restart": "Applies on restart",
|
||||
"prefs.assistant": "Assistant",
|
||||
@@ -1401,6 +1419,10 @@
|
||||
"prefs.gesture_pan": "Pan",
|
||||
"prefs.gesture_zoom": "Zoom",
|
||||
"prefs.graphics": "Graphics",
|
||||
"prefs.graphics_card": "Graphics card",
|
||||
"prefs.graphics_card_auto": "Automatic",
|
||||
"prefs.graphics_card_missing": "The saved graphics card is unavailable; Automatic is used.",
|
||||
"prefs.graphics_card_restart": "Takes effect after restarting SolidCraft. WGPU_ADAPTER_NAME overrides this choice.",
|
||||
"prefs.graphics_note": "Trade speed for smoothness. Each choice shows its effect on a sample.",
|
||||
"prefs.graphics_presets_note": "Presets set the choices below together.",
|
||||
"prefs.history": "History",
|
||||
@@ -1432,6 +1454,7 @@
|
||||
"prefs.orbit_snap": "Hold Shift during orbit to snap to an axis.",
|
||||
"prefs.orientation": "Orientation",
|
||||
"prefs.overall_speed": "Overall speed",
|
||||
"prefs.prefer_free_sketch_points": "Prefer movable sketch points when points overlap",
|
||||
"prefs.preview_choices": "Preview of your choices",
|
||||
"prefs.quality_default": "default",
|
||||
"prefs.quality_fastest": "fastest",
|
||||
@@ -2138,6 +2161,11 @@
|
||||
"sketch_panel.author": "Author placement: {path}",
|
||||
"sketch_panel.dimension_hint": "Enter a value or expression, then press OK.",
|
||||
"sketch_panel.move_hint": "Enter distances and an angle, then press OK.",
|
||||
"sketch_panel.plane_angle": "{plane}, turned by {angle}",
|
||||
"sketch_panel.plane_fixed": "A fixed plane",
|
||||
"sketch_panel.plane_flipped": "{plane}, from its other side",
|
||||
"sketch_panel.plane_offset": "{plane}, offset by {distance}",
|
||||
"sketch_panel.plane_origin": "The {plane} plane",
|
||||
"sketch_panel.redefine_title": "{command}: {name}",
|
||||
"sketch_panel.sheet_attachment": "Attached to a flat face of a sheet metal body; it follows that panel when the sheet changes.",
|
||||
"sketch_panel.text_hint": "Edit the text and its placement, then press OK.",
|
||||
@@ -2312,6 +2340,7 @@
|
||||
"ui.agent_chat_changes": "Changes: {n}, one undo step",
|
||||
"ui.agent_chat_changes_n": "{n} changes",
|
||||
"ui.agent_chat_changes_of": "{n}/{limit} changes",
|
||||
"ui.agent_chat_choose_model": "Choose a model",
|
||||
"ui.agent_chat_close": "Close",
|
||||
"ui.agent_chat_command": "Agent command",
|
||||
"ui.agent_chat_connect": "Connect",
|
||||
@@ -2362,6 +2391,7 @@
|
||||
"ui.agent_chat_mode_all": "All",
|
||||
"ui.agent_chat_mode_ask": "Ask",
|
||||
"ui.agent_chat_mode_edits": "Edits",
|
||||
"ui.agent_chat_model_no_tools": "{model} can't use SolidCraft's tools, so it can only chat. Pick a model with tool support.",
|
||||
"ui.agent_chat_model_tip": "The model the agent uses. Your choice is remembered for this agent.",
|
||||
"ui.agent_chat_new": "New chat",
|
||||
"ui.agent_chat_new_confirm": "Start a new chat? The current one is cleared.",
|
||||
@@ -2370,6 +2400,7 @@
|
||||
"ui.agent_chat_no_control": "The agent chat's endpoint did not start, so the agent can't reach the design.",
|
||||
"ui.agent_chat_no_images": "This agent doesn't take pictures",
|
||||
"ui.agent_chat_no_picture": "There is no picture on the clipboard",
|
||||
"ui.agent_chat_no_tool_call": "The model didn't use SolidCraft's tools, so the design wasn't changed. Choose a model that supports tool calling; see Local models in the agent chat guide.",
|
||||
"ui.agent_chat_none_found": "No coding agent found. Install one of these, then press Refresh:",
|
||||
"ui.agent_chat_none_found_short": "No agent found",
|
||||
"ui.agent_chat_not_installed": "Not installed",
|
||||
@@ -2387,6 +2418,9 @@
|
||||
"ui.agent_chat_previous_picture": "Previous picture",
|
||||
"ui.agent_chat_privacy": "Nothing goes anywhere except to the agent you run, under your own account.",
|
||||
"ui.agent_chat_privacy_note": "SolidCraft sends nothing anywhere: the agent you run talks to its own service under your own account. SolidCraft never sees or stores a key or password.",
|
||||
"ui.agent_chat_provider_models": "{count} models",
|
||||
"ui.agent_chat_provider_other": "Other",
|
||||
"ui.agent_chat_provider_tip": "The provider whose models the next list shows.",
|
||||
"ui.agent_chat_queue": "Queue",
|
||||
"ui.agent_chat_queue_full": "Too many messages are waiting: remove one or wait for the agent.",
|
||||
"ui.agent_chat_queued": "Queued",
|
||||
@@ -2594,6 +2628,8 @@
|
||||
"ui.copy": "Copy",
|
||||
"ui.corner": "Corner",
|
||||
"ui.corners": "Corners",
|
||||
"ui.cosmetic_thread_markings": "Cosmetic thread markings",
|
||||
"ui.cosmetic_thread_markings_help": "Show schematic markings on threaded cylindrical walls. Changes only the display, never the design or exports.",
|
||||
"ui.counterbore": "Counterbore",
|
||||
"ui.countersink": "Countersink",
|
||||
"ui.create": "Create",
|
||||
@@ -2670,6 +2706,8 @@
|
||||
"ui.filter_commands_or_keys": "Filter commands or keys",
|
||||
"ui.findInTimeline": "Find in Timeline",
|
||||
"ui.findInWindow": "Find in Window",
|
||||
"ui.fine": "Fine",
|
||||
"ui.finest": "Finest",
|
||||
"ui.finish_sketch": "Finish Sketch",
|
||||
"ui.fit": "Fit",
|
||||
"ui.fix_unfix": "Fix/Unfix",
|
||||
@@ -2863,6 +2901,7 @@
|
||||
"ui.one_side": "One Side",
|
||||
"ui.open": "Open",
|
||||
"ui.open_ends_tip": "Touches nothing",
|
||||
"ui.open_linked_design": "Open Linked Design",
|
||||
"ui.open_preferences": "Open Preferences",
|
||||
"ui.open_recent": "Open Recent",
|
||||
"ui.operation": "Operation",
|
||||
@@ -2882,6 +2921,11 @@
|
||||
"ui.paste": "Paste",
|
||||
"ui.path": "Path",
|
||||
"ui.pattern_on_path": "Pattern on Path",
|
||||
"ui.perforate_margin_default": "from the diameter",
|
||||
"ui.perforate_pitch": "Pitch",
|
||||
"ui.perforate_square": "Square",
|
||||
"ui.perforate_staggered": "Staggered (60°)",
|
||||
"ui.perforate_title": "PERFORATE",
|
||||
"ui.perpendicular": "Perpendicular",
|
||||
"ui.perspective_view": "Perspective view",
|
||||
"ui.pinToShortcuts": "Pin to Shortcuts",
|
||||
@@ -2893,7 +2937,9 @@
|
||||
"ui.plugins": "Plugins",
|
||||
"ui.plugins_desktop": "Plugins are available in the desktop app.",
|
||||
"ui.plugins_empty": "No plugins installed.",
|
||||
"ui.plugins_none": "No plugins match this search.",
|
||||
"ui.plugins_note": "Each plugin is a folder inside {path} with a plugin.json. SolidCraft reads that file and does not run any code from the folder. Turning a plugin off keeps it installed.",
|
||||
"ui.plugins_search": "Search plugins",
|
||||
"ui.plugins_skipped": "{count} folder(s) could not be read.",
|
||||
"ui.plugins_version": "{version}",
|
||||
"ui.point": "Point",
|
||||
@@ -2909,6 +2955,7 @@
|
||||
"ui.project_face_edges_sketch": "Project face edges into new sketches",
|
||||
"ui.properties": "Properties",
|
||||
"ui.pull_direction": "Pull direction",
|
||||
"ui.quality": "Quality",
|
||||
"ui.quantity": "Quantity",
|
||||
"ui.quantity_2": "Quantity 2",
|
||||
"ui.quit": "Quit",
|
||||
@@ -3015,6 +3062,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Split Body",
|
||||
"ui.stand_up_tip": "After a STEP or IGES file opens with Z up, offer a quarter turn about X",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Start",
|
||||
"ui.start_over": "Start over",
|
||||
"ui.start_page": "Start page",
|
||||
@@ -3054,6 +3102,7 @@
|
||||
"ui.total_angle": "Total angle",
|
||||
"ui.trackpad_pan_tip": "Two-finger scroll pans; in Fusion, Shift + two fingers orbits. Off: scroll zooms. Mouse wheel and pinch zoom; thumb wheel pans sideways.",
|
||||
"ui.trim": "Trim",
|
||||
"ui.turn_up_axis": "Turn Up Axis",
|
||||
"ui.twist": "Twist",
|
||||
"ui.two_finger_scroll_pans": "Two-finger scroll pans",
|
||||
"ui.two_sides": "Two Sides",
|
||||
@@ -3071,6 +3120,7 @@
|
||||
"ui.updateToCurrentView": "Update to Current View",
|
||||
"ui.vertical_constraint": "Vertical Constraint",
|
||||
"ui.view_centre": "View centre",
|
||||
"ui.viewport_theme_follow": "Follow theme",
|
||||
"ui.visual_shaded_hidden_edges": "Shaded with hidden edges",
|
||||
"ui.visual_shaded_with_edges": "Shaded with edges",
|
||||
"ui.visual_style": "Visual style",
|
||||
@@ -3124,6 +3174,7 @@
|
||||
"update.prefs_flatpak": "Flatpak updates this copy ({version}): run {command} or use your software center. SolidCraft doesn't check.",
|
||||
"update.prefs_label": "Updates",
|
||||
"update.prefs_note": "This is SolidCraft {version} ({kind}). A check asks GitHub for the latest release and sends nothing else.",
|
||||
"update.prefs_web": "Reload the page to get the latest web app. If the network is unavailable or the update cannot finish downloading in time, the saved version opens instead; a download in progress continues for the next reload.",
|
||||
"update.release_page": "Open release page",
|
||||
"update.restart": "Restart now",
|
||||
"update.restart_later": "Later",
|
||||
@@ -3134,6 +3185,11 @@
|
||||
"update.up_to_date": "SolidCraft is up to date.",
|
||||
"update.update_now": "Update now",
|
||||
"update.you_have": "You have {version}.",
|
||||
"web.files.insert_drawings_hint": "CAD files, meshes, DXF or SVG into the open design",
|
||||
"web.files.insert_stored_drawings_hint": "Into the open design (CAD files, meshes, DXF, SVG)",
|
||||
"web.open_full": "Open in SolidCraft",
|
||||
"web.open_link": "Open linked design?",
|
||||
"web.open_link_confirm": "There are unsaved changes. Open the linked design in a new tab?",
|
||||
"↑ ↓ choose · Enter / Tab complete · Esc dismiss": "↑ ↓ choose · Enter / Tab complete · Esc dismiss",
|
||||
"↑ ↓ choose · Enter applies what you typed · Esc dismiss": "↑ ↓ choose · Enter applies what you typed · Esc dismiss"
|
||||
}
|
||||
|
||||
@@ -2240,6 +2240,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrar comandos o teclas",
|
||||
"ui.findInTimeline": "Buscar en la línea de tiempo",
|
||||
"ui.findInWindow": "Buscar en la ventana",
|
||||
"ui.fine": "Fina",
|
||||
"ui.finest": "Muy fina",
|
||||
"ui.finish_sketch": "Finalizar boceto",
|
||||
"ui.fit": "Ajustar",
|
||||
"ui.fix_unfix": "Fijar/liberar",
|
||||
@@ -2464,6 +2466,7 @@
|
||||
"ui.project_face_edges_sketch": "Proyectar aristas de caras en bocetos nuevos",
|
||||
"ui.properties": "Propiedades",
|
||||
"ui.pull_direction": "Dirección de tracción",
|
||||
"ui.quality": "Calidad",
|
||||
"ui.quantity": "Cantidad",
|
||||
"ui.quantity_2": "Cantidad 2",
|
||||
"ui.quit": "Salir",
|
||||
@@ -2558,6 +2561,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Dividir cuerpo",
|
||||
"ui.stand_up_tip": "Tras abrir un archivo STEP o IGES con Z hacia arriba, ofrecer un cuarto de vuelta alrededor de X",
|
||||
"ui.standard": "Estándar",
|
||||
"ui.start": "Iniciar",
|
||||
"ui.start_over": "Volver a empezar",
|
||||
"ui.start_page": "Página de inicio",
|
||||
|
||||
@@ -1606,6 +1606,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrer les commandes ou les touches",
|
||||
"ui.findInTimeline": "Trouver dans la chronologie",
|
||||
"ui.findInWindow": "Trouver dans la fenêtre",
|
||||
"ui.fine": "Fine",
|
||||
"ui.finest": "Très fine",
|
||||
"ui.finish_sketch": "Terminer l'esquisse",
|
||||
"ui.fit": "Cadrer",
|
||||
"ui.fix_unfix": "Fixer/Libérer",
|
||||
@@ -1830,6 +1832,7 @@
|
||||
"ui.project_face_edges_sketch": "Projeter les arêtes de la face dans les nouvelles esquisses",
|
||||
"ui.properties": "Propriétés",
|
||||
"ui.pull_direction": "Direction de démoulage",
|
||||
"ui.quality": "Qualité",
|
||||
"ui.quantity": "Quantité",
|
||||
"ui.quantity_2": "Quantité 2",
|
||||
"ui.quit": "Quitter",
|
||||
@@ -1924,6 +1927,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Scinder le corps",
|
||||
"ui.stand_up_tip": "Après l'ouverture d'un fichier STEP ou IGES avec Z vers le haut, proposer un quart de tour autour de X",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Début",
|
||||
"ui.start_over": "Recommencer",
|
||||
"ui.start_page": "Page d’accueil",
|
||||
|
||||
@@ -1592,6 +1592,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrar ordes ou teclas",
|
||||
"ui.findInTimeline": "Buscar na liña de tempo",
|
||||
"ui.findInWindow": "Buscar na xanela",
|
||||
"ui.fine": "Fina",
|
||||
"ui.finest": "Moi fina",
|
||||
"ui.finish_sketch": "Rematar o bosquexo",
|
||||
"ui.fit": "Axustar",
|
||||
"ui.fix_unfix": "Fixar/Liberar",
|
||||
@@ -1816,6 +1818,7 @@
|
||||
"ui.project_face_edges_sketch": "Proxectar as arestas da cara en bosquexos novos",
|
||||
"ui.properties": "Propiedades",
|
||||
"ui.pull_direction": "Dirección de extracción",
|
||||
"ui.quality": "Calidade",
|
||||
"ui.quantity": "Cantidade",
|
||||
"ui.quantity_2": "Cantidade 2",
|
||||
"ui.quit": "Saír",
|
||||
@@ -1910,6 +1913,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Dividir o corpo",
|
||||
"ui.stand_up_tip": "Despois de abrir un ficheiro STEP ou IGES con Z cara arriba, ofrecer un cuarto de volta arredor de X",
|
||||
"ui.standard": "Estándar",
|
||||
"ui.start": "Inicio",
|
||||
"ui.start_over": "Volver comezar",
|
||||
"ui.start_page": "Páxina de inicio",
|
||||
|
||||
@@ -1534,6 +1534,8 @@
|
||||
"ui.filter_commands_or_keys": "Parancsok vagy billentyűk szűrése",
|
||||
"ui.findInTimeline": "Keresés az idővonalon",
|
||||
"ui.findInWindow": "Keresés az ablakban",
|
||||
"ui.fine": "Finom",
|
||||
"ui.finest": "Legfinomabb",
|
||||
"ui.finish_sketch": "Vázlat befejezése",
|
||||
"ui.fit": "Illesztés",
|
||||
"ui.fix_unfix": "Rögzítés/feloldás",
|
||||
@@ -1758,6 +1760,7 @@
|
||||
"ui.project_face_edges_sketch": "Lapélek vetítése új vázlatokba",
|
||||
"ui.properties": "Tulajdonságok",
|
||||
"ui.pull_direction": "Húzási irány",
|
||||
"ui.quality": "Minőség",
|
||||
"ui.quantity": "Mennyiség",
|
||||
"ui.quantity_2": "2. mennyiség",
|
||||
"ui.quit": "Kilépés",
|
||||
@@ -1852,6 +1855,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Test felosztása",
|
||||
"ui.stand_up_tip": "Miután egy STEP vagy IGES fájl Z felfelé tájolással megnyílik, negyedfordulat felajánlása az X körül",
|
||||
"ui.standard": "Normál",
|
||||
"ui.start": "Kezdés",
|
||||
"ui.start_over": "Újrakezdés",
|
||||
"ui.start_page": "Kezdőoldal",
|
||||
|
||||
@@ -1534,6 +1534,8 @@
|
||||
"ui.filter_commands_or_keys": "Filter perintah atau tombol",
|
||||
"ui.findInTimeline": "Cari di Linimasa",
|
||||
"ui.findInWindow": "Cari di Jendela",
|
||||
"ui.fine": "Halus",
|
||||
"ui.finest": "Sangat halus",
|
||||
"ui.finish_sketch": "Selesai Sketsa",
|
||||
"ui.fit": "Pas",
|
||||
"ui.fix_unfix": "Kunci/Lepas Kunci",
|
||||
@@ -1758,6 +1760,7 @@
|
||||
"ui.project_face_edges_sketch": "Proyeksikan tepi muka ke sketsa baru",
|
||||
"ui.properties": "Properti",
|
||||
"ui.pull_direction": "Arah tarik",
|
||||
"ui.quality": "Kualitas",
|
||||
"ui.quantity": "Jumlah",
|
||||
"ui.quantity_2": "Jumlah 2",
|
||||
"ui.quit": "Keluar",
|
||||
@@ -1852,6 +1855,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Belah Bodi",
|
||||
"ui.stand_up_tip": "Setelah file STEP atau IGES terbuka dengan Z ke atas, tawarkan putaran seperempat terhadap X",
|
||||
"ui.standard": "Standar",
|
||||
"ui.start": "Mulai",
|
||||
"ui.start_over": "Mulai ulang",
|
||||
"ui.start_page": "Halaman awal",
|
||||
|
||||
@@ -1608,6 +1608,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtra comandi o tasti",
|
||||
"ui.findInTimeline": "Trova nella sequenza temporale",
|
||||
"ui.findInWindow": "Trova nella finestra",
|
||||
"ui.fine": "Fine",
|
||||
"ui.finest": "Finissima",
|
||||
"ui.finish_sketch": "Termina schizzo",
|
||||
"ui.fit": "Adatta",
|
||||
"ui.fix_unfix": "Fissa/Libera",
|
||||
@@ -1833,6 +1835,7 @@
|
||||
"ui.project_face_edges_sketch": "Proietta gli spigoli delle facce nei nuovi schizzi",
|
||||
"ui.properties": "Proprietà",
|
||||
"ui.pull_direction": "Direzione di estrazione",
|
||||
"ui.quality": "Qualità",
|
||||
"ui.quantity": "Quantità",
|
||||
"ui.quantity_2": "Quantità 2",
|
||||
"ui.quit": "Esci",
|
||||
@@ -1927,6 +1930,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Dividi corpo",
|
||||
"ui.stand_up_tip": "Dopo l'apertura di un file STEP o IGES con asse Z verticale, proponi un quarto di giro attorno a X",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Inizio",
|
||||
"ui.start_over": "Ricomincia",
|
||||
"ui.start_page": "Pagina iniziale",
|
||||
|
||||
+58
-2
@@ -143,6 +143,7 @@
|
||||
"Cube": "キューブ",
|
||||
"Current orthographic view (1:1 mm)": "現在の平行投影(実寸・mm)",
|
||||
"Current perspective view": "現在の透視投影",
|
||||
"Current plane": "現在の平面",
|
||||
"Curv. Comb": "曲率コーム",
|
||||
"Curvature (G2)": "曲率 (G2)",
|
||||
"Curvature change (G3)": "曲率変化 (G3)",
|
||||
@@ -239,7 +240,9 @@
|
||||
"Gap": "間隔",
|
||||
"Grid": "グリッド",
|
||||
"HISTORY": "履歴",
|
||||
"Halo under sketch curves": "スケッチ曲線の下に縁取りを表示",
|
||||
"Height": "高さ",
|
||||
"Height From": "高さの基準",
|
||||
"Hidden edges": "隠線",
|
||||
"History layout": "履歴のレイアウト",
|
||||
"History names": "履歴名",
|
||||
@@ -256,6 +259,7 @@
|
||||
"In place (surfaces)": "その場で(サーフェス)",
|
||||
"In plane": "平面内",
|
||||
"Included": "挟角",
|
||||
"Inner Sharp": "内側仮想シャープ",
|
||||
"Inside": "内側",
|
||||
"Instant": "即時",
|
||||
"Interface font": "インターフェースフォント",
|
||||
@@ -302,6 +306,7 @@
|
||||
"Mass Center": "重心",
|
||||
"Matched restrictions check the final values.": "条件に一致する制限ルールが最終値を確認します。",
|
||||
"Material": "材料",
|
||||
"Material Outside": "材料外側",
|
||||
"Material copied. Existing body assignments are unchanged.": "マテリアルをコピーしました。既存のボディの割り当ては変わりません。",
|
||||
"Max": "最大",
|
||||
"Maximum": "最大",
|
||||
@@ -314,7 +319,6 @@
|
||||
"Mitre": "留め継ぎ",
|
||||
"Model Parameters": "モデルパラメータ",
|
||||
"Modeled": "モデル化済み",
|
||||
"More themes": "その他のテーマ",
|
||||
"More toolbar panels": "その他のツールバーパネル",
|
||||
"Motion": "モーション",
|
||||
"Mouse gestures": "マウス ジェスチャ",
|
||||
@@ -349,8 +353,10 @@
|
||||
"On your computer": "このコンピューター上",
|
||||
"Opacity": "不透明度",
|
||||
"Open GitHub draft": "GitHubの下書きを開く",
|
||||
"Open bodies (no volume)": "開いたボディ(体積なし)",
|
||||
"Open library...": "ライブラリを開く...",
|
||||
"Open local libraries in the desktop app. You can export this design's library here.": "ローカルライブラリはデスクトップアプリで開いてください。このデザインのライブラリはここで書き出せます。",
|
||||
"Open surface — no volume": "開いたサーフェス — 体積なし",
|
||||
"Open-source parametric 3D CAD in Rust. Licensed MIT OR Apache-2.0.": "Rust製オープンソース・パラメトリック3D CAD。ライセンス: MIT または Apache-2.0。",
|
||||
"Opens your browser and copies the report text for you to paste into GitHub.": "ブラウザーを開き、GitHubに貼り付ける報告本文をコピーします。",
|
||||
"Opens your browser. Review and submit your report on GitHub.": "ブラウザーを開きます。GitHubで内容を確認して投稿してください。",
|
||||
@@ -359,6 +365,7 @@
|
||||
"Other side": "反対側",
|
||||
"Other surface (mutual trim)": "相手のサーフェス(相互トリム)",
|
||||
"Other way": "反対方向",
|
||||
"Outer Sharp": "外側仮想シャープ",
|
||||
"Outer radius": "外側コーナー半径",
|
||||
"Outside": "外側",
|
||||
"Overall length": "全長",
|
||||
@@ -388,7 +395,6 @@
|
||||
"Preview": "プレビュー",
|
||||
"Preview Row": "行をプレビュー",
|
||||
"Preview leaves the current design unchanged.": "プレビューは現在のデザインを変更しません。",
|
||||
"Previous themes": "前のテーマ",
|
||||
"Profile / Edges": "プロファイル / エッジ",
|
||||
"Profiles or curves": "プロファイルまたは曲線",
|
||||
"Profiles/Curves": "プロファイル/曲線",
|
||||
@@ -526,9 +532,11 @@
|
||||
"Surface, or faces to turn over": "サーフェス、または裏返す面",
|
||||
"Swap Ends": "端点を入れ替え",
|
||||
"TRIM": "トリム",
|
||||
"Tangent": "正接",
|
||||
"Tangent (G1)": "接線 (G1)",
|
||||
"Tangent Chain": "正接チェーン",
|
||||
"Tangent chain": "接線チェーン",
|
||||
"Tangent to Edge": "エッジに正接",
|
||||
"Tap drill diameter": "タップ下穴径",
|
||||
"Target": "ターゲット",
|
||||
"Target Body": "ターゲットボディ",
|
||||
@@ -684,6 +692,7 @@
|
||||
"cmd.component_capture_position": "位置をキャプチャ",
|
||||
"cmd.component_copies": "同一のコピーを検索",
|
||||
"cmd.component_create": "新規コンポーネント",
|
||||
"cmd.component_cycle_color": "コンポーネントの色を順に変更",
|
||||
"cmd.component_delete": "コンポーネントを削除",
|
||||
"cmd.component_extract": "ファイルに抽出",
|
||||
"cmd.component_from_bodies": "ボディからコンポーネントを作成",
|
||||
@@ -768,6 +777,8 @@
|
||||
"cmd.inspect_accessibility": "アクセシビリティ解析",
|
||||
"cmd.inspect_center_of_mass": "重心",
|
||||
"cmd.inspect_clearance": "クリアランス",
|
||||
"cmd.inspect_colored_components": "コンポーネントの色分けを有効化",
|
||||
"cmd.inspect_colored_components_disable": "コンポーネントの色分けを無効化",
|
||||
"cmd.inspect_compare": "ボディを比較",
|
||||
"cmd.inspect_continuity": "連続性解析",
|
||||
"cmd.inspect_curvature_comb": "曲率コーム解析",
|
||||
@@ -1081,6 +1092,7 @@
|
||||
"crash.report": "報告…",
|
||||
"crash.unclean_explanation": "次回以降の起動時に検出されました。正確な終了時刻は記録されていません。システムのシャットダウンや強制停止によっても、正常終了が記録されない場合があります。",
|
||||
"delete.and_more": "…ほか{count}件",
|
||||
"diagnostic.empty_boolean_component": "コンポーネント '{component}' に切り取りまたは交差の対象となるボディがありません。ツールはコンポーネント '{other}' の '{body}' と重なる可能性があります。そのコンポーネントをアクティブにするか、ボディを対象として選択してください",
|
||||
"dialog.bodies_count": "{count} ボディ",
|
||||
"dialog.clearance_invalid": "クリアランスは 0 以上の長さにしてください",
|
||||
"dialog.compute": "計算",
|
||||
@@ -1124,9 +1136,11 @@
|
||||
"dxf.progress.write": "DXFを書き込み中 (5/5)",
|
||||
"dxf.tolerance": "曲線の許容誤差",
|
||||
"dxf.tolerance_help": "表示中のボディとスケッチを出力し、曲線は線分で近似します。許容誤差を小さくすると曲線が滑らかになりますが、処理時間とメモリ使用量が増えます。",
|
||||
"file.open.drawing_filter": "デザイン、CADファイル、メッシュ、図面",
|
||||
"file_load.built": "構築済み: 全{total}フィーチャー中{built}件。",
|
||||
"file_load.converting": "ソリッドを変換中: {done}/{total}",
|
||||
"file_load.inserting": "ジオメトリを挿入中",
|
||||
"file_load.link_item": "{name} ({done}/{total})",
|
||||
"file_load.opening": "デザインを開いています",
|
||||
"file_load.preparing_thumbnail": "サムネイルを準備中...",
|
||||
"file_load.preparing_view": "ビューを準備中...",
|
||||
@@ -1136,6 +1150,7 @@
|
||||
"file_load.rebuilding": "フィーチャーを再構築中: {done}/{total}",
|
||||
"file_load.recovering": "デザインを復元中",
|
||||
"file_load.stopping": "前の操作の停止を待っています...",
|
||||
"file_load.updating_links": "リンクを更新中",
|
||||
"file_load.waiting": "ファイル操作を待っています",
|
||||
"fits the face, e.g. M8": "面に適合するサイズ (例: M8)",
|
||||
"from the profile": "形材から",
|
||||
@@ -1238,6 +1253,8 @@
|
||||
"joint.from_bodies_hint": "選択した各ボディを、位置はそのままで専用の新しいコンポーネントに移動します。",
|
||||
"joint.one_body": "両方の選択が {body} 上にあります。2 つ目は別の部品で選択してください。",
|
||||
"joint.one_component": "これらの部品は 1 つのコンポーネントのボディです: {bodies}。ジョイントはコンポーネント同士を動かすため、部品ごとに専用のコンポーネントが必要です。",
|
||||
"joint.rigid_group_one_component": "これらの {count} 個のボディは、すべて 1 つのコンポーネント内(またはデザイン自体)にあります。先に「{command}」を使用してください。",
|
||||
"joint.rigid_group_select_components": "2 つ以上のコンポーネントを選択してください。",
|
||||
"keymap.command_id": "コマンドID",
|
||||
"keymap.empty": "一致するコマンドはありません",
|
||||
"keymap.use_anyway": "ここでは{key}をそのまま使用",
|
||||
@@ -1358,6 +1375,7 @@
|
||||
"pick the path": "パスを選択",
|
||||
"prefs.add_item": "項目を追加",
|
||||
"prefs.alt_frees_manipulators": "Alt / Option でマニピュレーターの矢印も自由に動かす",
|
||||
"prefs.anti_aliasing_amd_dx12": "起動時のチェックでマルチサンプリングでは何も描画されず、1×では正常に描画されたため、アンチエイリアシングを1×に設定しました。上で別の設定を選択できます。再起動後のチェックに合格すると、その設定が適用されます。",
|
||||
"prefs.anti_aliasing_note": "輪郭のぎざぎざを滑らかにします。",
|
||||
"prefs.applies_on_restart": "再起動後に適用",
|
||||
"prefs.assistant": "アシスタント",
|
||||
@@ -1401,6 +1419,10 @@
|
||||
"prefs.gesture_pan": "移動",
|
||||
"prefs.gesture_zoom": "ズーム",
|
||||
"prefs.graphics": "グラフィックス",
|
||||
"prefs.graphics_card": "グラフィックスカード",
|
||||
"prefs.graphics_card_auto": "自動",
|
||||
"prefs.graphics_card_missing": "保存されたグラフィックスカードが利用できないため、自動選択を使用します。",
|
||||
"prefs.graphics_card_restart": "SolidCraft の再起動後に有効になります。WGPU_ADAPTER_NAME がこの選択より優先されます。",
|
||||
"prefs.graphics_note": "速度と滑らかさのバランスを調整します。各選択肢の効果をサンプルで確認できます。",
|
||||
"prefs.graphics_presets_note": "プリセットは以下の設定をまとめて変更します。",
|
||||
"prefs.history": "履歴",
|
||||
@@ -1432,6 +1454,7 @@
|
||||
"prefs.orbit_snap": "回転中にShiftを押すと軸にスナップします。",
|
||||
"prefs.orientation": "方向",
|
||||
"prefs.overall_speed": "全体の速度",
|
||||
"prefs.prefer_free_sketch_points": "スケッチ点が重なったときは移動可能な点を優先する",
|
||||
"prefs.preview_choices": "選択した設定のプレビュー",
|
||||
"prefs.quality_default": "既定",
|
||||
"prefs.quality_fastest": "最速",
|
||||
@@ -2138,6 +2161,11 @@
|
||||
"sketch_panel.author": "作成時の配置: {path}",
|
||||
"sketch_panel.dimension_hint": "値または式を入力し、OK を押してください。",
|
||||
"sketch_panel.move_hint": "距離と角度を入力し、OK を押してください。",
|
||||
"sketch_panel.plane_angle": "{plane}、{angle} 回転",
|
||||
"sketch_panel.plane_fixed": "固定平面",
|
||||
"sketch_panel.plane_flipped": "{plane}(裏側から)",
|
||||
"sketch_panel.plane_offset": "{plane}、{distance} オフセット",
|
||||
"sketch_panel.plane_origin": "{plane} 平面",
|
||||
"sketch_panel.redefine_title": "{command}:{name}",
|
||||
"sketch_panel.sheet_attachment": "板金ボディの平面に接続されています。板金が変更されると、そのパネルに追従します。",
|
||||
"sketch_panel.text_hint": "テキストと配置を編集し、OK を押してください。",
|
||||
@@ -2312,6 +2340,7 @@
|
||||
"ui.agent_chat_changes": "{n} 件の変更(元に戻すは1回)",
|
||||
"ui.agent_chat_changes_n": "{n} 件の変更",
|
||||
"ui.agent_chat_changes_of": "変更 {n}/{limit}",
|
||||
"ui.agent_chat_choose_model": "モデルを選択",
|
||||
"ui.agent_chat_close": "閉じる",
|
||||
"ui.agent_chat_command": "エージェントのコマンド",
|
||||
"ui.agent_chat_connect": "接続",
|
||||
@@ -2362,6 +2391,7 @@
|
||||
"ui.agent_chat_mode_all": "すべて",
|
||||
"ui.agent_chat_mode_ask": "確認",
|
||||
"ui.agent_chat_mode_edits": "編集",
|
||||
"ui.agent_chat_model_no_tools": "{model} は SolidCraft のツールを使えず、チャットのみ可能です。ツール対応のモデルを選んでください。",
|
||||
"ui.agent_chat_model_tip": "エージェントが使うモデル。選択はこのエージェントに対して記憶されます。",
|
||||
"ui.agent_chat_new": "新しいチャット",
|
||||
"ui.agent_chat_new_confirm": "新しいチャットを始めますか? 現在のチャットは消去されます。",
|
||||
@@ -2370,6 +2400,7 @@
|
||||
"ui.agent_chat_no_control": "エージェントチャットのエンドポイントが起動しなかったため、エージェントはデザインにアクセスできません。",
|
||||
"ui.agent_chat_no_images": "このエージェントは画像を受け付けません",
|
||||
"ui.agent_chat_no_picture": "クリップボードに画像がありません",
|
||||
"ui.agent_chat_no_tool_call": "モデルが SolidCraft のツールを使わなかったため、デザインは変更されませんでした。ツール呼び出しに対応したモデルを選んでください。エージェントチャットのガイドの「ローカルモデル」を参照してください。",
|
||||
"ui.agent_chat_none_found": "コーディングエージェントが見つかりません。次のいずれかをインストールしてから「再検索」を押してください:",
|
||||
"ui.agent_chat_none_found_short": "エージェントが見つかりません",
|
||||
"ui.agent_chat_not_installed": "未インストール",
|
||||
@@ -2387,6 +2418,9 @@
|
||||
"ui.agent_chat_previous_picture": "前の画像",
|
||||
"ui.agent_chat_privacy": "あなたのアカウントで実行するエージェント以外には、何も送信されません。",
|
||||
"ui.agent_chat_privacy_note": "SolidCraft はどこにも何も送信しません。あなたが実行するエージェントが、あなた自身のアカウントでそのサービスと通信します。SolidCraft がキーやパスワードを見たり保存したりすることはありません。",
|
||||
"ui.agent_chat_provider_models": "{count} 個のモデル",
|
||||
"ui.agent_chat_provider_other": "その他",
|
||||
"ui.agent_chat_provider_tip": "隣の一覧にモデルを表示するプロバイダー。",
|
||||
"ui.agent_chat_queue": "待機に追加",
|
||||
"ui.agent_chat_queue_full": "待機中のメッセージが多すぎます。削除するか、エージェントの完了をお待ちください。",
|
||||
"ui.agent_chat_queued": "待機中",
|
||||
@@ -2594,6 +2628,8 @@
|
||||
"ui.copy": "コピー",
|
||||
"ui.corner": "コーナー",
|
||||
"ui.corners": "コーナー",
|
||||
"ui.cosmetic_thread_markings": "ねじの簡略表示",
|
||||
"ui.cosmetic_thread_markings_help": "ねじ付き円筒面に簡略化したマークを表示します。表示のみを変更し、設計やエクスポートには影響しません。",
|
||||
"ui.counterbore": "座ぐり",
|
||||
"ui.countersink": "皿穴",
|
||||
"ui.create": "作成",
|
||||
@@ -2670,6 +2706,8 @@
|
||||
"ui.filter_commands_or_keys": "コマンドまたはキーを検索",
|
||||
"ui.findInTimeline": "タイムラインで検索",
|
||||
"ui.findInWindow": "ウィンドウで検索",
|
||||
"ui.fine": "細かい",
|
||||
"ui.finest": "最も細かい",
|
||||
"ui.finish_sketch": "スケッチを終了",
|
||||
"ui.fit": "フィット",
|
||||
"ui.fix_unfix": "固定/固定解除",
|
||||
@@ -2863,6 +2901,7 @@
|
||||
"ui.one_side": "片側",
|
||||
"ui.open": "開く",
|
||||
"ui.open_ends_tip": "どこにも接していない",
|
||||
"ui.open_linked_design": "リンクされたデザインを開く",
|
||||
"ui.open_preferences": "環境設定を開く",
|
||||
"ui.open_recent": "最近使った項目を開く",
|
||||
"ui.operation": "操作",
|
||||
@@ -2882,6 +2921,11 @@
|
||||
"ui.paste": "貼り付け",
|
||||
"ui.path": "パス",
|
||||
"ui.pattern_on_path": "パス上のパターン",
|
||||
"ui.perforate_margin_default": "直径と同じ",
|
||||
"ui.perforate_pitch": "ピッチ",
|
||||
"ui.perforate_square": "正方配列",
|
||||
"ui.perforate_staggered": "千鳥配列(60°)",
|
||||
"ui.perforate_title": "パーフォレーション",
|
||||
"ui.perpendicular": "直交",
|
||||
"ui.perspective_view": "パースペクティブ表示",
|
||||
"ui.pinToShortcuts": "ショートカットに固定",
|
||||
@@ -2893,7 +2937,9 @@
|
||||
"ui.plugins": "プラグイン",
|
||||
"ui.plugins_desktop": "プラグインはデスクトップ版で使えます。",
|
||||
"ui.plugins_empty": "プラグインは入っていません。",
|
||||
"ui.plugins_none": "検索に一致するプラグインはありません。",
|
||||
"ui.plugins_note": "プラグインは {path} の中のフォルダで、plugin.json を置きます。SolidCraft はそのファイルを読むだけで、フォルダのコードは実行しません。オフにしてもインストールは残ります。",
|
||||
"ui.plugins_search": "プラグインを検索",
|
||||
"ui.plugins_skipped": "{count} 個のフォルダを読めませんでした。",
|
||||
"ui.plugins_version": "{version}",
|
||||
"ui.point": "点",
|
||||
@@ -2909,6 +2955,7 @@
|
||||
"ui.project_face_edges_sketch": "新規スケッチに面のエッジを自動投影",
|
||||
"ui.properties": "プロパティ",
|
||||
"ui.pull_direction": "抜き方向",
|
||||
"ui.quality": "品質",
|
||||
"ui.quantity": "数量",
|
||||
"ui.quantity_2": "数量 2",
|
||||
"ui.quit": "終了",
|
||||
@@ -3015,6 +3062,7 @@
|
||||
"ui.spline": "スプライン",
|
||||
"ui.split_body": "ボディを分割",
|
||||
"ui.stand_up_tip": "Z軸上向きで開いたSTEPまたはIGESファイルに対し、X軸周りに90度回転させるか確認します",
|
||||
"ui.standard": "標準",
|
||||
"ui.start": "開始",
|
||||
"ui.start_over": "最初からやり直す",
|
||||
"ui.start_page": "スタートページ",
|
||||
@@ -3054,6 +3102,7 @@
|
||||
"ui.total_angle": "合計角度",
|
||||
"ui.trackpad_pan_tip": "2本指スクロールでパンします。FusionではShift + 2本指スクロールで回転します。オフの場合はスクロールでズームします。マウスホイールとピンチ操作はズーム、サイドホイールは横方向のパンになります。",
|
||||
"ui.trim": "トリム",
|
||||
"ui.turn_up_axis": "上方向の軸を回転",
|
||||
"ui.twist": "ねじれ",
|
||||
"ui.two_finger_scroll_pans": "2本指スクロールでパン",
|
||||
"ui.two_sides": "両側",
|
||||
@@ -3071,6 +3120,7 @@
|
||||
"ui.updateToCurrentView": "現在のビューに更新",
|
||||
"ui.vertical_constraint": "垂直拘束",
|
||||
"ui.view_centre": "ビュー中心",
|
||||
"ui.viewport_theme_follow": "テーマに従う",
|
||||
"ui.visual_shaded_hidden_edges": "隠線付きシェーディング",
|
||||
"ui.visual_shaded_with_edges": "エッジ付きシェーディング",
|
||||
"ui.visual_style": "表示スタイル",
|
||||
@@ -3124,6 +3174,7 @@
|
||||
"update.prefs_flatpak": "このコピー ({version}) は Flatpak が更新します: {command} を実行するか、ソフトウェアセンターを使ってください。SolidCraft 自身は確認しません。",
|
||||
"update.prefs_label": "アップデート",
|
||||
"update.prefs_note": "これは SolidCraft {version} ({kind}) です。確認では GitHub に最新リリースを問い合わせるだけで、ほかには何も送信しません。",
|
||||
"update.prefs_web": "ページを再読み込みすると、最新のウェブアプリを取得します。ネットワークが利用できない場合や、更新のダウンロードが時間内に完了しない場合は、保存済みのバージョンを開きます。進行中のダウンロードは次回の再読み込みに向けて続行されます。",
|
||||
"update.release_page": "リリースページを開く",
|
||||
"update.restart": "今すぐ再起動",
|
||||
"update.restart_later": "後で",
|
||||
@@ -3134,6 +3185,11 @@
|
||||
"update.up_to_date": "SolidCraft は最新です。",
|
||||
"update.update_now": "今すぐ更新",
|
||||
"update.you_have": "現在のバージョンは {version} です。",
|
||||
"web.files.insert_drawings_hint": "CADファイル、メッシュ、DXF、SVGを開いているデザインに挿入",
|
||||
"web.files.insert_stored_drawings_hint": "開いているデザインに挿入(CADファイル、メッシュ、DXF、SVG)",
|
||||
"web.open_full": "SolidCraft で開く",
|
||||
"web.open_link": "リンク先のデザインを開きますか?",
|
||||
"web.open_link_confirm": "保存していない変更があります。リンク先のデザインを新しいタブで開きますか?",
|
||||
"↑ ↓ choose · Enter / Tab complete · Esc dismiss": "↑ ↓ 選択 · Enter / Tab 補完 · Esc 閉じる",
|
||||
"↑ ↓ choose · Enter applies what you typed · Esc dismiss": "↑ ↓ 選択 · Enter 入力どおりに適用 · Esc 閉じる"
|
||||
}
|
||||
|
||||
@@ -2013,6 +2013,8 @@
|
||||
"ui.filter_commands_or_keys": "명령 또는 키 필터",
|
||||
"ui.findInTimeline": "타임라인에서 찾기",
|
||||
"ui.findInWindow": "창에서 찾기",
|
||||
"ui.fine": "세밀",
|
||||
"ui.finest": "가장 세밀",
|
||||
"ui.finish_sketch": "스케치 종료",
|
||||
"ui.fit": "맞춤",
|
||||
"ui.fix_unfix": "고정/고정 해제",
|
||||
@@ -2198,6 +2200,7 @@
|
||||
"ui.one_side": "한 방향",
|
||||
"ui.open": "열기",
|
||||
"ui.open_ends_tip": "아무것과도 닿지 않음",
|
||||
"ui.open_linked_design": "연결된 디자인 열기",
|
||||
"ui.open_preferences": "환경 설정 열기",
|
||||
"ui.open_recent": "최근 항목 열기",
|
||||
"ui.operation": "작업",
|
||||
@@ -2244,6 +2247,7 @@
|
||||
"ui.project_face_edges_sketch": "면 모서리를 새 스케치로 투영",
|
||||
"ui.properties": "속성",
|
||||
"ui.pull_direction": "빼기 방향",
|
||||
"ui.quality": "품질",
|
||||
"ui.quantity": "수량",
|
||||
"ui.quantity_2": "수량 2",
|
||||
"ui.quit": "종료",
|
||||
@@ -2344,6 +2348,7 @@
|
||||
"ui.spline": "스플라인",
|
||||
"ui.split_body": "바디 분할",
|
||||
"ui.stand_up_tip": "STEP 또는 IGES 파일이 Z 위쪽으로 열린 후 X축 기준 90도 회전을 제안",
|
||||
"ui.standard": "표준",
|
||||
"ui.start": "시작",
|
||||
"ui.start_over": "처음부터 다시",
|
||||
"ui.start_page": "시작 페이지",
|
||||
@@ -2397,6 +2402,7 @@
|
||||
"ui.up_axis_note": "뷰(축 뷰, 홈, 보기)에서 위쪽을 가리키는 축입니다. 디자인은 변경되지 않습니다.",
|
||||
"ui.updateToCurrentView": "현재 보기로 업데이트",
|
||||
"ui.view_centre": "뷰 중심",
|
||||
"ui.viewport_theme_follow": "테마 따르기",
|
||||
"ui.visual_shaded_hidden_edges": "음영 처리 및 숨겨진 모서리",
|
||||
"ui.visual_shaded_with_edges": "음영 처리 및 모서리",
|
||||
"ui.visual_style": "시각 스타일",
|
||||
@@ -2446,6 +2452,7 @@
|
||||
"update.prefs_flatpak": "이 사본({version})은 Flatpak이 업데이트합니다: {command}를 실행하거나 소프트웨어 센터를 사용하세요. SolidCraft는 직접 확인하지 않습니다.",
|
||||
"update.prefs_label": "업데이트",
|
||||
"update.prefs_note": "SolidCraft {version} ({kind})입니다. 확인 시 GitHub에 최신 릴리스만 요청하며 다른 정보는 보내지 않습니다.",
|
||||
"update.prefs_web": "페이지를 새로고침하면 최신 웹 앱을 가져옵니다. 네트워크를 사용할 수 없거나 업데이트 다운로드가 제한 시간 안에 완료되지 않으면 저장된 버전이 열립니다. 진행 중인 다운로드는 다음 새로고침을 위해 계속됩니다.",
|
||||
"update.release_page": "릴리스 페이지 열기",
|
||||
"update.restart": "지금 다시 시작",
|
||||
"update.restart_later": "나중에",
|
||||
|
||||
@@ -1592,6 +1592,8 @@
|
||||
"ui.filter_commands_or_keys": "Tapis arahan atau kekunci",
|
||||
"ui.findInTimeline": "Cari dalam Garis Masa",
|
||||
"ui.findInWindow": "Cari dalam Tetingkap",
|
||||
"ui.fine": "Halus",
|
||||
"ui.finest": "Paling halus",
|
||||
"ui.finish_sketch": "Tamatkan Lakaran",
|
||||
"ui.fit": "Muatkan",
|
||||
"ui.fix_unfix": "Tetap/Lepas",
|
||||
@@ -1816,6 +1818,7 @@
|
||||
"ui.project_face_edges_sketch": "Unjur tepi muka ke dalam lakaran baharu",
|
||||
"ui.properties": "Sifat",
|
||||
"ui.pull_direction": "Arah tarikan",
|
||||
"ui.quality": "Kualiti",
|
||||
"ui.quantity": "Kuantiti",
|
||||
"ui.quantity_2": "Kuantiti 2",
|
||||
"ui.quit": "Keluar",
|
||||
@@ -1910,6 +1913,7 @@
|
||||
"ui.spline": "Splin",
|
||||
"ui.split_body": "Belah Jasad",
|
||||
"ui.stand_up_tip": "Selepas buka STEP atau IGES dengan Z ke atas, cadangkan suku putaran pada X",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Mula",
|
||||
"ui.start_over": "Mula semula",
|
||||
"ui.start_page": "Halaman mula",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1534,6 +1534,8 @@
|
||||
"ui.filter_commands_or_keys": "Opdrachten of toetsen filteren",
|
||||
"ui.findInTimeline": "Zoeken in tijdlijn",
|
||||
"ui.findInWindow": "Zoeken in venster",
|
||||
"ui.fine": "Fijn",
|
||||
"ui.finest": "Zeer fijn",
|
||||
"ui.finish_sketch": "Schets voltooien",
|
||||
"ui.fit": "Passend",
|
||||
"ui.fix_unfix": "Vastzetten/losmaken",
|
||||
@@ -1758,6 +1760,7 @@
|
||||
"ui.project_face_edges_sketch": "Vlakranden projecteren in nieuwe schetsen",
|
||||
"ui.properties": "Eigenschappen",
|
||||
"ui.pull_direction": "Trekrichting",
|
||||
"ui.quality": "Kwaliteit",
|
||||
"ui.quantity": "Aantal",
|
||||
"ui.quantity_2": "Aantal 2",
|
||||
"ui.quit": "Afsluiten",
|
||||
@@ -1852,6 +1855,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Lichaam splitsen",
|
||||
"ui.stand_up_tip": "Zet na het openen van een STEP- of IGES-bestand met Z omhoog een kwartslag om X aan",
|
||||
"ui.standard": "Standaard",
|
||||
"ui.start": "Start",
|
||||
"ui.start_over": "Opnieuw beginnen",
|
||||
"ui.start_page": "Startpagina",
|
||||
|
||||
@@ -1778,6 +1778,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtruj polecenia lub klawisze",
|
||||
"ui.findInTimeline": "Znajdź na osi czasu",
|
||||
"ui.findInWindow": "Znajdź w oknie",
|
||||
"ui.fine": "Dokładna",
|
||||
"ui.finest": "Najdokładniejsza",
|
||||
"ui.finish_sketch": "Zakończ szkic",
|
||||
"ui.fit": "Dopasuj",
|
||||
"ui.fix_unfix": "Ustal/zwolnij",
|
||||
@@ -2009,6 +2011,7 @@
|
||||
"ui.project_face_edges_sketch": "Rzutuj krawędzie ściany do nowych szkiców",
|
||||
"ui.properties": "Właściwości",
|
||||
"ui.pull_direction": "Kierunek wyjmowania",
|
||||
"ui.quality": "Jakość",
|
||||
"ui.quantity": "Liczba",
|
||||
"ui.quantity_2": "Liczba 2",
|
||||
"ui.quit": "Zakończ",
|
||||
@@ -2103,6 +2106,7 @@
|
||||
"ui.spline": "Splajn",
|
||||
"ui.split_body": "Podziel bryłę",
|
||||
"ui.stand_up_tip": "Gdy plik STEP lub IGES otworzy się z osią Z w górę, proponuj obrót o ćwierć obrotu wokół osi X",
|
||||
"ui.standard": "Standardowa",
|
||||
"ui.start": "Start",
|
||||
"ui.start_over": "Zacznij od nowa",
|
||||
"ui.start_page": "Strona startowa",
|
||||
|
||||
@@ -14,11 +14,15 @@
|
||||
"Active": "Ativo",
|
||||
"Active rule": "Regra ativa",
|
||||
"Add": "Adicionar",
|
||||
"Add Column": "Adicionar coluna",
|
||||
"Add Key": "Adicionar chave",
|
||||
"Add Mid Radius": "Adicionar raio intermediário",
|
||||
"Add Row": "Adicionar linha",
|
||||
"Add a tool": "Adicionar ferramenta",
|
||||
"Add condition": "Adicionar condição",
|
||||
"Add or edit rule": "Adicionar ou editar regra",
|
||||
"Add to New Folder": "Adicionar à nova pasta",
|
||||
"Advanced": "Avançado",
|
||||
"Against": "Contra",
|
||||
"Alignment": "Alinhamento",
|
||||
"All Sketch Points": "Todos os pontos do esboço",
|
||||
@@ -28,9 +32,11 @@
|
||||
"Also deletes": "Também exclui",
|
||||
"Angle 2": "Ângulo 2",
|
||||
"Animate": "Animar",
|
||||
"App/system information and command settings are included. Review private details before sharing.": "Informações do aplicativo/sistema e configurações estão incluídas. Revise detalhes privados antes de compartilhar.",
|
||||
"Appearance name": "Nome da aparência",
|
||||
"Applied Radius": "Raio aplicado",
|
||||
"Apply To": "Aplicar a",
|
||||
"Apply library appearance": "Aplicar aparência da biblioteca",
|
||||
"Apply to selection": "Aplicar à seleção",
|
||||
"Apply your appearance first. Exports assigned appearances and materials created in this design.": "Aplique a aparência primeiro. Exporta as aparências atribuídas e os materiais criados neste projeto.",
|
||||
"Arc length": "Comprimento do arco",
|
||||
@@ -41,13 +47,18 @@
|
||||
"BLEND SURFACE": "SUPERFÍCIE DE TRANSIÇÃO",
|
||||
"BOUNDARY SURFACE": "SUPERFÍCIE DE CONTORNO",
|
||||
"BROWSER": "NAVEGADOR",
|
||||
"Bend Edges": "Arestas de dobra",
|
||||
"Bend Line Position": "Posição da linha de dobra",
|
||||
"Bend Position": "Posição da dobra",
|
||||
"Bend Radius": "Raio de dobra",
|
||||
"Bend Table": "Tabela de dobras",
|
||||
"Bends": "Dobras",
|
||||
"Bodies": "Corpos",
|
||||
"Bodies (optional)": "Corpos (opcional)",
|
||||
"Body": "Corpo",
|
||||
"Body (last if none)": "Corpo (o último, se nenhum)",
|
||||
"Body to split": "Corpo a dividir",
|
||||
"Body, or faces to take out": "Corpo, ou faces a remover",
|
||||
"Boundary": "Contorno",
|
||||
"Bounding box": "Caixa delimitadora",
|
||||
"CHECK": "VERIFICAR",
|
||||
@@ -59,7 +70,9 @@
|
||||
"CSV or JSON: updates existing parameters, adds new ones": "CSV ou JSON: atualiza parâmetros existentes e adiciona novos",
|
||||
"Capture All Positions": "Capturar todas as posições",
|
||||
"Capture Pos.": "Capturar pos.",
|
||||
"Catch Depth": "Profundidade do encaixe",
|
||||
"Catch Direction": "Direção do encaixe",
|
||||
"Catch Length": "Comprimento do encaixe",
|
||||
"Cells": "Células",
|
||||
"Center X": "Centro X",
|
||||
"Center Y": "Centro Y",
|
||||
@@ -68,23 +81,31 @@
|
||||
"Chamfer Type": "Tipo de chanfro",
|
||||
"Check collisions": "Verificar colisões",
|
||||
"Checked": "Marcado",
|
||||
"Choose Variable radius or Spline in Type.": "Escolha Raio variável ou Spline em Tipo.",
|
||||
"Choose a new plane. Sketch geometry and dimensions stay unchanged in its two-dimensional coordinates.": "Escolha um novo plano. A geometria e as cotas do esboço permanecem inalteradas em suas coordenadas bidimensionais.",
|
||||
"Choose…": "Escolher…",
|
||||
"Circular": "Circular",
|
||||
"Circumference": "Circunferência",
|
||||
"Clockwise": "Horário",
|
||||
"Close draft": "Fechar rascunho",
|
||||
"Collapse": "Recolher",
|
||||
"Collisions": "Colisões",
|
||||
"Colour": "Cor",
|
||||
"Command": "Comando",
|
||||
"Comment": "Comentário",
|
||||
"Component 1": "Componente 1",
|
||||
"Component 2": "Componente 2",
|
||||
"Component1": "Componente1",
|
||||
"Components": "Componentes",
|
||||
"Config Table": "Tabela de config.",
|
||||
"Configuration": "Configuração",
|
||||
"Configuration rules": "Regras de configuração",
|
||||
"Contact": "Contato",
|
||||
"Contact Sets": "Conjuntos de contato",
|
||||
"Contact sets": "Conjuntos de contato",
|
||||
"Continue on GitHub": "Continuar no GitHub",
|
||||
"Continuity": "Continuidade",
|
||||
"Control Radius": "Raio de controle",
|
||||
"Copy Error Message": "Copiar mensagem de erro",
|
||||
"Copy Warning Message": "Copiar mensagem de aviso",
|
||||
"Copy all licences": "Copiar todas as licenças",
|
||||
@@ -94,8 +115,11 @@
|
||||
"Corner Relief": "Alívio de canto",
|
||||
"Corner Relief Shape": "Forma do alívio de canto",
|
||||
"Counterbore depth": "Profundidade do rebaixo",
|
||||
"Counterbore Ø": "Ø do rebaixo",
|
||||
"Countersink angle": "Ângulo do escareado",
|
||||
"Countersink Ø": "Ø do escareado",
|
||||
"Create Issue — review draft": "Criar issue — revisar rascunho",
|
||||
"Create Issue…": "Criar issue…",
|
||||
"Cross curves": "Curvas transversais",
|
||||
"Cube": "Cubo",
|
||||
"Current orthographic view (1:1 mm)": "Vista ortográfica atual (1:1 mm)",
|
||||
@@ -103,18 +127,28 @@
|
||||
"Curv. Comb": "Pente de curv.",
|
||||
"Curvature (G2)": "Curvatura (G2)",
|
||||
"Curvature change (G3)": "Variação de curvatura (G3)",
|
||||
"Custom": "Personalizado",
|
||||
"Customize Toolbar": "Personalizar barra de ferramentas",
|
||||
"Customize…": "Personalizar…",
|
||||
"Cylindrical face": "Face cilíndrica",
|
||||
"Delete": "Excluir",
|
||||
"Delete Selected Features…": "Excluir recursos selecionados…",
|
||||
"Delete Selected Folders": "Excluir pastas selecionadas",
|
||||
"Delete all": "Excluir tudo",
|
||||
"Delete rule": "Excluir regra",
|
||||
"Delete the row": "Excluir a linha",
|
||||
"Delete the set": "Excluir o conjunto",
|
||||
"Density": "Densidade",
|
||||
"Dependents": "Dependentes",
|
||||
"Describe the problem you saw": "Descreva o problema que você viu",
|
||||
"Describe what happened before continuing.": "Descreva o que aconteceu antes de continuar.",
|
||||
"Designs you open or save appear here.": "Os projetos que você abrir ou salvar aparecem aqui.",
|
||||
"Determined by To Object. Choose Angle to edit the angular extent.": "Determinado por Até o objeto. Escolha Ângulo para editar a extensão angular.",
|
||||
"Diameter": "Diâmetro",
|
||||
"Direction": "Direção",
|
||||
"Discard": "Descartar",
|
||||
"Distance": "Distância",
|
||||
"Distance 1": "Distância 1",
|
||||
"Do not export hidden edges": "Não exportar arestas ocultas",
|
||||
"Don't ask again": "Não perguntar novamente",
|
||||
"Double-click to rename": "Clique duas vezes para renomear",
|
||||
@@ -126,49 +160,65 @@
|
||||
"Edit Profile Sketch": "Editar esboço do perfil",
|
||||
"Enable rule": "Ativar regra",
|
||||
"Enabled": "Ativado",
|
||||
"End Radius": "Raio final",
|
||||
"End bulge": "Abaulamento final",
|
||||
"End continuity": "Continuidade final",
|
||||
"Expand": "Expandir",
|
||||
"Expected result (optional)": "Resultado esperado (opcional)",
|
||||
"Explode": "Explodir",
|
||||
"Explode Text": "Decompor texto",
|
||||
"Export Animation…": "Exportar animação…",
|
||||
"Export Bend Table…": "Exportar tabela de dobras…",
|
||||
"Export CSV…": "Exportar CSV…",
|
||||
"Export Current View as DXF": "Exportar vista atual como DXF",
|
||||
"Export Current View as DXF…": "Exportar vista atual como DXF…",
|
||||
"Export DXF": "Exportar DXF",
|
||||
"Export DXF…": "Exportar DXF…",
|
||||
"Export JSON…": "Exportar JSON…",
|
||||
"Export design library...": "Exportar biblioteca do projeto...",
|
||||
"Export hidden edges as dashed lines": "Exportar arestas ocultas como linhas tracejadas",
|
||||
"Exported by SolidWorks, which usually saves Y up": "Exportado pelo SolidWorks, que normalmente salva com Y para cima",
|
||||
"Expression": "Expressão",
|
||||
"Extend to meet": "Estender até encontrar",
|
||||
"Extents": "Extensões",
|
||||
"FILES": "ARQUIVOS",
|
||||
"FLAT": "PLANIFICAÇÃO",
|
||||
"Face": "Face",
|
||||
"Face Appearance": "Aparência da face",
|
||||
"Face attachment lost": "Fixação à face perdida",
|
||||
"Faces": "Faces",
|
||||
"Faces / edges / vertices": "Faces / arestas / vértices",
|
||||
"Faces to split": "Faces a dividir",
|
||||
"Fastener": "Fixador",
|
||||
"Favorites": "Favoritos",
|
||||
"Favourite": "Favorito",
|
||||
"Feature": "Recurso",
|
||||
"Files from many CAD programs have Y up, so they open lying on their back here (Z up).": "Arquivos de muitos programas CAD usam Y para cima, então abrem deitados aqui (Z para cima).",
|
||||
"Filter": "Filtro",
|
||||
"Filter…": "Filtrar…",
|
||||
"Find in Browser": "Localizar no navegador",
|
||||
"Finish": "Acabamento",
|
||||
"First plane": "Primeiro plano",
|
||||
"Fit and G2 corners require Constant radius.": "Ajuste e cantos G2 exigem Raio constante.",
|
||||
"Fixed Face": "Face fixa",
|
||||
"Flat Pattern": "Planificação",
|
||||
"Flat size": "Tamanho planificado",
|
||||
"Follow camera (Look At sketches)": "Seguir a câmera (Olhar para os esboços)",
|
||||
"Follow the camera (Look At sketches)": "Seguir a câmera (Olhar para os esboços)",
|
||||
"Font": "Fonte",
|
||||
"From": "De",
|
||||
"From Bodies": "A partir de corpos",
|
||||
"From edges": "Arestas de origem",
|
||||
"Full Length": "Comprimento total",
|
||||
"G2 corners require a constant radius and Exact fit. G2 corner construction is not supported yet.": "Cantos G2 exigem raio constante e Ajuste exato. A construção de cantos G2 ainda não é suportada.",
|
||||
"Gap": "Folga",
|
||||
"Grid": "Grade",
|
||||
"HISTORY": "HISTÓRICO",
|
||||
"Height": "Altura",
|
||||
"Hidden edges": "Arestas ocultas",
|
||||
"History layout": "Layout do histórico",
|
||||
"History names": "Nomes no histórico",
|
||||
"Hole (optional)": "Furo (opcional)",
|
||||
"Holes": "Furos",
|
||||
"Holes (edges on them)": "Furos (arestas neles)",
|
||||
"Home view": "Vista inicial",
|
||||
@@ -179,14 +229,20 @@
|
||||
"In place (surfaces)": "No lugar (superfícies)",
|
||||
"In plane": "No plano",
|
||||
"Inside": "Dentro",
|
||||
"Instant": "Instantâneo",
|
||||
"Interface font": "Fonte da interface",
|
||||
"Interferes": "Interfere",
|
||||
"Invert": "Inverter",
|
||||
"Isocurve": "Isocurva",
|
||||
"Issue title": "Título da issue",
|
||||
"Items": "Itens",
|
||||
"JOINTS": "JUNTAS",
|
||||
"Joint Origin1": "Origem da junta1",
|
||||
"Keep (points on it)": "Manter (pontos sobre ela)",
|
||||
"Keep Tools": "Manter ferramentas",
|
||||
"Keep of the other surface": "Manter da outra superfície",
|
||||
"Key a joint's value at this step": "Criar um quadro-chave com o valor de uma junta neste passo",
|
||||
"Keys": "Quadros-chave",
|
||||
"LIBRARY": "BIBLIOTECA",
|
||||
"LINKS": "VÍNCULOS",
|
||||
"Later": "Depois",
|
||||
@@ -197,9 +253,14 @@
|
||||
"Letter Spacing": "Espaçamento entre letras",
|
||||
"Library": "Biblioteca",
|
||||
"Library file": "Arquivo de biblioteca",
|
||||
"Limits": "Limites",
|
||||
"Line Spacing": "Espaçamento entre linhas",
|
||||
"Line Type": "Tipo de linha",
|
||||
"Listing the installed fonts…": "Listando as fontes instaladas…",
|
||||
"Load library": "Carregar biblioteca",
|
||||
"Local library": "Biblioteca local",
|
||||
"Loop": "Laço",
|
||||
"M5 or M5x0.5": "M5 ou M5x0.5",
|
||||
"MANAGE": "GERENCIAR",
|
||||
"MATERIALS": "MATERIAIS",
|
||||
"MODEL": "MODELO",
|
||||
@@ -210,14 +271,20 @@
|
||||
"Matched restrictions check the final values.": "As restrições cujas condições são atendidas verificam os valores finais.",
|
||||
"Material": "Material",
|
||||
"Max": "Máx.",
|
||||
"Maximum": "Máximo",
|
||||
"Mesh body": "Corpo de malha",
|
||||
"Mid Radius": "Raio intermediário",
|
||||
"Middle double-click": "Clique duplo do meio",
|
||||
"Min": "Mín.",
|
||||
"Minimum": "Mínimo",
|
||||
"Mirror Plane": "Plano de espelho",
|
||||
"Mitre": "Meia-esquadria",
|
||||
"Model Parameters": "Parâmetros do modelo",
|
||||
"Modeled": "Modelado",
|
||||
"More toolbar panels": "Mais painéis da barra de ferramentas",
|
||||
"Motion": "Movimento",
|
||||
"Mouse gestures": "Gestos do mouse",
|
||||
"Mouse gestures only work with the SolidWorks mouse mode (the wheel orbits, Ctrl + wheel pans).": "Os gestos do mouse só funcionam no modo de mouse SolidWorks (a roda orbita, Ctrl + roda desloca).",
|
||||
"Move / Copy": "Mover / Copiar",
|
||||
"Move Type": "Tipo de movimento",
|
||||
"Move down": "Mover para baixo",
|
||||
@@ -235,15 +302,22 @@
|
||||
"No matching appearance presets.": "Nenhuma predefinição de aparência correspondente.",
|
||||
"No matching appearances": "Nenhuma aparência correspondente",
|
||||
"No visible bodies or sketches to export.": "Nenhum corpo ou esboço visível para exportar.",
|
||||
"Nominal diameter": "Diâmetro nominal",
|
||||
"None": "Nenhum",
|
||||
"Not available yet": "Ainda não disponível",
|
||||
"Notch": "Entalhe",
|
||||
"OUTPUT": "SAÍDA",
|
||||
"Of": "De",
|
||||
"On your computer": "No seu computador",
|
||||
"Opacity": "Opacidade",
|
||||
"Open GitHub draft": "Abrir rascunho no GitHub",
|
||||
"Open library...": "Abrir biblioteca...",
|
||||
"Open local libraries in the desktop app. You can export this design's library here.": "Abra bibliotecas locais no aplicativo para desktop. Você pode exportar a biblioteca deste projeto aqui.",
|
||||
"Open-source parametric 3D CAD in Rust. Licensed MIT OR Apache-2.0.": "CAD 3D paramétrico de código aberto em Rust. Licenciado sob MIT OU Apache-2.0.",
|
||||
"Opens your browser and copies the report text for you to paste into GitHub.": "Abre o navegador e copia o texto do relatório para você colar no GitHub.",
|
||||
"Opens your browser. Review and submit your report on GitHub.": "Abre o navegador. Revise e envie seu relatório no GitHub.",
|
||||
"Operator": "Operador",
|
||||
"Orbit (right drag)": "Orbitar (arrastar com o botão direito)",
|
||||
"Other side": "Outro lado",
|
||||
"Other surface (mutual trim)": "Outra superfície (aparo mútuo)",
|
||||
"Outside": "Fora",
|
||||
@@ -258,8 +332,11 @@
|
||||
"Pick the tool bodies": "Selecione os corpos de ferramenta",
|
||||
"Picked": "Selecionado",
|
||||
"Picked point": "Ponto selecionado",
|
||||
"Pitch": "Passo",
|
||||
"Pivot": "Pivô",
|
||||
"Place at the origin instead": "Colocar na origem",
|
||||
"Plastic Rules": "Regras de plástico",
|
||||
"Play the joint's motion in the view": "Reproduzir o movimento da junta na vista",
|
||||
"Playback": "Reprodução",
|
||||
"Plot": "Gráfico",
|
||||
"Position": "Posição",
|
||||
@@ -267,14 +344,18 @@
|
||||
"Position (G0)": "Posição (G0)",
|
||||
"Position along the edge, 0 at the start end, 1 at the other": "Posição ao longo da aresta: 0 na extremidade inicial, 1 na outra",
|
||||
"Preferences › Design turns the offer back on": "Preferências › Projeto reativa a oferta",
|
||||
"Preview": "Visualização",
|
||||
"Preview Row": "Visualizar linha",
|
||||
"Preview leaves the current design unchanged.": "A visualização não altera o projeto atual.",
|
||||
"Profile / Edges": "Perfil / Arestas",
|
||||
"Profiles or curves": "Perfis ou curvas",
|
||||
"Profiles/Curves": "Perfis/Curvas",
|
||||
"Quantity": "Quantidade",
|
||||
"RECENT": "RECENTES",
|
||||
"REFERENCE": "REFERÊNCIA",
|
||||
"RULED SURFACE": "SUPERFÍCIE REGRADA",
|
||||
"RULES": "REGRAS",
|
||||
"Radius": "Raio",
|
||||
"Radius Fit": "Ajuste de raio",
|
||||
"Ratio": "Razão",
|
||||
"Reattach selected face": "Fixar novamente na face selecionada",
|
||||
@@ -283,6 +364,8 @@
|
||||
"Rectangular": "Retangular",
|
||||
"Reference face": "Face de referência",
|
||||
"Remove Tools": "Remover ferramentas",
|
||||
"Remove condition": "Remover condição",
|
||||
"Remove from Folder": "Remover da pasta",
|
||||
"Remove from list": "Remover da lista",
|
||||
"Remove override": "Remover substituição",
|
||||
"Remove private design details or paths before sharing.": "Remova detalhes privados do projeto ou caminhos antes de compartilhar.",
|
||||
@@ -290,12 +373,18 @@
|
||||
"Remove the column": "Remover a coluna",
|
||||
"Remove the track": "Remover a trilha",
|
||||
"Remove this point": "Remover este ponto",
|
||||
"Rename Feature": "Renomear recurso",
|
||||
"Rename Folder": "Renomear pasta",
|
||||
"Replace existing library file": "Substituir o arquivo de biblioteca existente",
|
||||
"Report a bug — review a screenshot and open a GitHub draft": "Relatar um bug — revise uma captura de tela e abra um rascunho no GitHub",
|
||||
"Report text copied. Paste it into GitHub and submit your report there.": "Texto do relatório copiado. Cole-o no GitHub e envie seu relatório por lá.",
|
||||
"Reports are public. A GitHub account is required.": "Os relatórios são públicos. É necessária uma conta no GitHub.",
|
||||
"Reset Toolbar": "Redefinir barra de ferramentas",
|
||||
"Resize Part": "Redimensionar peça",
|
||||
"Restore View": "Restaurar vista",
|
||||
"Restore outer boundary": "Restaurar contorno externo",
|
||||
"Restore the inherited component or physical material appearance": "Restaurar a aparência herdada do componente ou do material físico",
|
||||
"Restore this studio's tools": "Restaurar as ferramentas deste ambiente",
|
||||
"Result": "Resultado",
|
||||
"Retake screenshot": "Refazer captura de tela",
|
||||
"Reverse": "Inverter",
|
||||
@@ -305,7 +394,14 @@
|
||||
"Revert Pos.": "Reverter pos.",
|
||||
"Revert Position": "Reverter posição",
|
||||
"Review the report and screenshot before opening GitHub.": "Revise o relatório e a captura de tela antes de abrir o GitHub.",
|
||||
"Review your report on GitHub and click Submit new issue to publish it.": "Revise seu relatório no GitHub e clique em Submit new issue para publicá-lo.",
|
||||
"Rib Length": "Comprimento da nervura",
|
||||
"Rib Offset": "Deslocamento da nervura",
|
||||
"Rib Thickness": "Espessura da nervura",
|
||||
"Ribs": "Nervuras",
|
||||
"Rim Edge": "Aresta da borda",
|
||||
"Ring of tools on the right button": "Anel de ferramentas no botão direito",
|
||||
"Roll Back Here": "Retroceder até aqui",
|
||||
"Roll History Marker Here": "Mover o marcador do histórico para cá",
|
||||
"Round": "Arredondado",
|
||||
"Rule": "Regra",
|
||||
@@ -315,21 +411,28 @@
|
||||
"SURFACE QUALITY": "QUALIDADE DA SUPERFÍCIE",
|
||||
"Save Rule": "Salvar regra",
|
||||
"Save View": "Salvar vista",
|
||||
"Save screenshot…": "Salvar captura de tela…",
|
||||
"Save the study as an animated GIF, seen as the viewport shows it": "Salvar o estudo como GIF animado, como a janela de visualização o mostra",
|
||||
"Saved preview. Geometry is being checked before editing.": "Visualização salva. A geometria está sendo verificada antes da edição.",
|
||||
"Scale factor": "Fator de escala",
|
||||
"Scene": "Cena",
|
||||
"Screenshot (optional)": "Captura de tela (opcional)",
|
||||
"Search": "Pesquisar",
|
||||
"Search commands": "Pesquisar comandos",
|
||||
"Search this library": "Pesquisar nesta biblioteca",
|
||||
"Second plane": "Segundo plano",
|
||||
"Section": "Seção",
|
||||
"Section position": "Posição da seção",
|
||||
"Sections (one sketch each)": "Seções (um esboço cada)",
|
||||
"Select Other": "Selecionar outro",
|
||||
"Select Other: hold the left button still on the model (or right-click › Select Other…) to list everything under the cursor; click again on the same spot to select the next thing there. Double-click the middle button to go Home (Preferences › Navigation).": "Selecionar outro: mantenha o botão esquerdo parado sobre o modelo (ou clique com o botão direito › Selecionar outro…) para listar tudo sob o cursor; clique de novo no mesmo ponto para selecionar o próximo item ali. Clique duas vezes com o botão do meio para ir ao Início (Preferências › Navegação).",
|
||||
"Select bodies (a face picks its body)": "Selecione corpos (uma face seleciona seu corpo)",
|
||||
"Select bodies or faces instead": "Selecionar corpos ou faces em vez disso",
|
||||
"Select edges": "Selecione arestas",
|
||||
"Selection filter": "Filtro de seleção",
|
||||
"Semantic faces share their appearance across instances.": "Faces semânticas compartilham a aparência entre instâncias.",
|
||||
"Send your report on GitHub": "Envie seu relatório no GitHub",
|
||||
"Shaded": "Sombreado",
|
||||
"Shape": "Forma",
|
||||
"Sheet Rules": "Regras de chapa",
|
||||
"Show Agent Cursor": "Mostrar cursor do agente",
|
||||
@@ -348,6 +451,7 @@
|
||||
"SolidCraft closed before these designs were saved. Their last autosave can be opened.": "O SolidCraft fechou antes de estes projetos serem salvos. O último salvamento automático deles pode ser aberto.",
|
||||
"Specialise": "Especializar",
|
||||
"Speed": "Velocidade",
|
||||
"Splitting tool": "Ferramenta de divisão",
|
||||
"Square": "Quadrado",
|
||||
"Stand it up": "Colocar em pé",
|
||||
"Stand it up: a quarter turn about X, as one Move feature you can undo.": "Colocar em pé: um quarto de volta em torno de X, como um recurso Mover que pode ser desfeito.",
|
||||
@@ -357,17 +461,27 @@
|
||||
"Start continuity": "Continuidade inicial",
|
||||
"Step": "Passo",
|
||||
"Steps": "Passos",
|
||||
"Steps to reproduce (optional)": "Passos para reproduzir (opcional)",
|
||||
"Stitch the kept pieces": "Costurar as partes mantidas",
|
||||
"Stitch to both bodies": "Costurar aos dois corpos",
|
||||
"Studio": "Ambiente",
|
||||
"Study": "Estudo",
|
||||
"Style": "Estilo",
|
||||
"Summary": "Resumo",
|
||||
"Suppress": "Suprimir",
|
||||
"Suppressed": "Suprimido",
|
||||
"Surface": "Superfície",
|
||||
"Surface, or faces to turn over": "Superfície, ou faces a inverter",
|
||||
"Swap Ends": "Trocar extremidades",
|
||||
"TRIM": "APARAR",
|
||||
"Tangent (G1)": "Tangente (G1)",
|
||||
"Tangent Chain": "Cadeia tangente",
|
||||
"Tangent chain": "Cadeia tangente",
|
||||
"Tap drill diameter": "Diâmetro da broca para macho",
|
||||
"Target": "Alvo",
|
||||
"Target Body": "Corpo-alvo",
|
||||
"Tear": "Rasgo",
|
||||
"Technical details": "Detalhes técnicos",
|
||||
"The dashed sketch is a saved plane guide. Select a new face to repair the attachment.": "O esboço tracejado é uma guia de plano salva. Selecione uma nova face para reparar a fixação.",
|
||||
"The saved author occurrence is missing. Select a valid author placement before rebinding.": "A ocorrência de autoria salva não existe mais. Selecione um posicionamento de autoria válido antes de vincular novamente.",
|
||||
"Then": "Então",
|
||||
@@ -379,24 +493,32 @@
|
||||
"This child is shared. Deleting it removes it from every copy of its parent.": "Este filho é compartilhado. Excluí-lo o remove de todas as cópias do pai.",
|
||||
"This child is shared. Position changes apply to every copy of its parent.": "Este filho é compartilhado. Mudanças de posição se aplicam a todas as cópias do pai.",
|
||||
"This face cannot provide a durable attachment. Choose another face or explicitly use a fixed plane.": "Esta face não pode fornecer uma fixação duradoura. Escolha outra face ou use explicitamente um plano fixo.",
|
||||
"This image is not attached to GitHub yet. Copy or save it, then attach it on GitHub.": "Esta imagem ainda não está anexada no GitHub. Copie ou salve-a e depois anexe-a no GitHub.",
|
||||
"To": "Para",
|
||||
"To Offset": "Deslocamento final",
|
||||
"To edges": "Arestas de destino",
|
||||
"Tolerance": "Tolerância",
|
||||
"Too close": "Muito próximo",
|
||||
"Tool Bodies": "Corpos-ferramenta",
|
||||
"Tools": "Ferramentas",
|
||||
"Tools, clockwise from the top": "Ferramentas, em sentido horário a partir do topo",
|
||||
"Trimming tool (plane, face or curves)": "Ferramenta de aparo (plano, face ou curvas)",
|
||||
"Turn off section analysis before exporting the view.": "Desative a análise de seção antes de exportar a vista.",
|
||||
"Type": "Tipo",
|
||||
"UNTRIM": "DESAPARAR",
|
||||
"Unit": "Unidade",
|
||||
"Unsuppress": "Reativar",
|
||||
"Updating the preview": "Atualizando a visualização",
|
||||
"Use active author placement": "Usar o posicionamento de autoria ativo",
|
||||
"Use fixed plane": "Usar plano fixo",
|
||||
"Use saved fixed plane": "Usar o plano fixo salvo",
|
||||
"Use selected face as fixed plane": "Usar a face selecionada como plano fixo",
|
||||
"Use the SolidWorks mouse mode": "Usar o modo de mouse SolidWorks",
|
||||
"User Parameters": "Parâmetros do usuário",
|
||||
"VIEW": "VISTA",
|
||||
"VIEWS": "VISTAS",
|
||||
"Value": "Valor",
|
||||
"Variable Radius": "Raio variável",
|
||||
"Velocity": "Velocidade",
|
||||
"Vertices": "Vértices",
|
||||
"View navigator": "Navegador de vistas",
|
||||
@@ -404,16 +526,50 @@
|
||||
"Wall": "Parede",
|
||||
"Wall Location": "Posição da parede",
|
||||
"Wall Thickness": "Espessura da parede",
|
||||
"What did you do just before the problem? A short list is enough": "O que você fez logo antes do problema? Uma lista curta basta",
|
||||
"What did you expect to see?": "O que você esperava ver?",
|
||||
"What happened?": "O que aconteceu?",
|
||||
"When": "Quando",
|
||||
"Width": "Largura",
|
||||
"Will fail": "Vai falhar",
|
||||
"With gestures on, the right button no longer orbits the view: hold it and move to open the ring, then touch a tool's zone. A plain right-click still opens the menu.": "Com os gestos ativados, o botão direito não orbita mais a vista: segure-o e mova para abrir o anel, depois toque na zona de uma ferramenta. Um clique direito simples ainda abre o menu.",
|
||||
"X": "X",
|
||||
"X Angle": "Ângulo X",
|
||||
"X angle": "Ângulo X",
|
||||
"X distance": "Distância X",
|
||||
"Y": "Y",
|
||||
"Y Angle": "Ângulo Y",
|
||||
"Y angle": "Ângulo Y",
|
||||
"Y distance": "Distância Y",
|
||||
"Z": "Z",
|
||||
"Z Angle": "Ângulo Z",
|
||||
"Z Distance": "Distância Z",
|
||||
"Z angle": "Ângulo Z",
|
||||
"Z distance": "Distância Z",
|
||||
"Zebra": "Zebra",
|
||||
"ai.prefs.availability": "Controles do Assistente",
|
||||
"ai.prefs.background_commands": "Executar comandos do agente em segundo plano",
|
||||
"ai.prefs.follow_camera": "Virar a câmera para os esboços",
|
||||
"ai.prefs.follow_camera_off": "O acompanhamento automático da câmera está desativado.",
|
||||
"ai.prefs.follow_camera_on": "A câmera se vira para os esboços que o agente cria.",
|
||||
"ai.prefs.intro": "Agentes, permissões e como o trabalho deles aparece.",
|
||||
"ai.prefs.make_default": "Usar como padrão",
|
||||
"ai.prefs.no_agents": "Nenhum agente ainda. Adicione um agente ou atualize para encontrar agentes instalados.",
|
||||
"ai.prefs.no_saved_approvals": "Nenhuma aprovação salva.",
|
||||
"ai.prefs.override_all_warning": "Este agente pode salvar, sobrescrever, exportar ou substituir o projeto sem perguntar.",
|
||||
"ai.prefs.permission_all": "Permitir tudo",
|
||||
"ai.prefs.permission_all_summary": "As ferramentas disponíveis do SolidCraft são executadas sem perguntar.",
|
||||
"ai.prefs.permission_ask": "Perguntar antes de alterar",
|
||||
"ai.prefs.permission_ask_summary": "Aprovar cada alteração no projeto e cada ação de arquivo.",
|
||||
"ai.prefs.permission_edits": "Permitir edições no modelo",
|
||||
"ai.prefs.permission_edits_summary": "Edições no modelo são executadas; ações de arquivo e destrutivas ainda perguntam.",
|
||||
"ai.prefs.permission_scope": "Só para ferramentas do SolidCraft. O shell e as edições de arquivos do agente usam as permissões dele.",
|
||||
"ai.prefs.pointer_preview_hidden": "Ponteiro oculto",
|
||||
"ai.prefs.pointer_preview_speed": "Ponteiro do agente · {speed}",
|
||||
"ai.prefs.pointer_speed": "Velocidade do movimento",
|
||||
"ai.prefs.privacy_note": "Só o agente ou endpoint que você escolher recebe a conversa. As chaves de endpoint ficam guardadas no chaveiro do sistema.",
|
||||
"ai.prefs.show_pointer": "Mostrar ponteiro do agente",
|
||||
"ai.prefs.turn_limit_hint": "Número máximo de chamadas de ferramenta que alteram o projeto que o Assistente pode fazer por mensagem.",
|
||||
"angle, height": "ângulo, altura",
|
||||
"appearance.dielectric_ior": "IOR dielétrico",
|
||||
"appearance.metallic": "Metálico",
|
||||
@@ -460,8 +616,10 @@
|
||||
"cmd.component_activate": "Ativar componente",
|
||||
"cmd.component_break_link": "Quebrar vínculo",
|
||||
"cmd.component_capture_position": "Capturar posição",
|
||||
"cmd.component_copies": "Encontrar cópias idênticas",
|
||||
"cmd.component_create": "Novo componente",
|
||||
"cmd.component_delete": "Excluir componente",
|
||||
"cmd.component_extract": "Extrair para arquivo",
|
||||
"cmd.component_from_bodies": "Criar componentes a partir de corpos",
|
||||
"cmd.component_insert_design": "Inserir projeto",
|
||||
"cmd.component_links": "Listar vínculos",
|
||||
@@ -474,6 +632,7 @@
|
||||
"cmd.component_properties": "Propriedades físicas do componente",
|
||||
"cmd.component_relink": "Revincular origem",
|
||||
"cmd.component_rename": "Renomear componente",
|
||||
"cmd.component_replace_with_link": "Substituir por vínculo",
|
||||
"cmd.component_revert_position": "Reverter posição",
|
||||
"cmd.component_unlock": "Desbloquear conteúdo",
|
||||
"cmd.component_update_links": "Atualizar vínculos",
|
||||
@@ -596,6 +755,7 @@
|
||||
"cmd.motion_plot": "Plotar estudo de movimento",
|
||||
"cmd.motion_study": "Estudo de movimento",
|
||||
"cmd.motion_trace": "Traçado de movimento",
|
||||
"cmd.motion_trace_edit": "Editar traçado de movimento",
|
||||
"cmd.motion_trace_keep": "Manter traçado de movimento",
|
||||
"cmd.occurrence_copy": "Colar (instância)",
|
||||
"cmd.occurrence_ground": "Fixar no solo",
|
||||
@@ -775,6 +935,7 @@
|
||||
"cmd.view_left": "Vista esquerda",
|
||||
"cmd.view_list": "Listar vistas nomeadas",
|
||||
"cmd.view_navigate": "Navegar na vista",
|
||||
"cmd.view_normal_to": "Normal à seleção",
|
||||
"cmd.view_rename": "Renomear vista nomeada",
|
||||
"cmd.view_right": "Vista direita",
|
||||
"cmd.view_save": "Nova vista nomeada",
|
||||
@@ -874,6 +1035,12 @@
|
||||
"help.licences": "Licenças",
|
||||
"help.mit": "Licença MIT",
|
||||
"help.notice": "NOTICE",
|
||||
"help.solid.chamfer": "Corta as arestas selecionadas com um bisel plano na distância que você definir. Use para quebrar arestas vivas ou facilitar a entrada de um pino ou parafuso.",
|
||||
"help.solid.extrude": "Empurra um perfil de esboço para o 3D ao longo de uma distância, adicionando ou removendo material. Use para transformar um contorno plano em um bloco, um ressalto ou um rebaixo.",
|
||||
"help.solid.fillet": "Arredonda as arestas selecionadas com uma concordância circular suave do raio que você definir. Use para suavizar arestas vivas, por resistência, conforto ou aparência.",
|
||||
"help.solid.hole": "Faz um furo redondo do diâmetro que você definir em um ponto escolhido de uma face. Use para folgas de parafuso, pinos e outras aberturas redondas simples.",
|
||||
"help.solid.revolve": "Gira um perfil de esboço em torno de um eixo para criar um sólido redondo. Use para eixos, botões, tigelas e qualquer peça redonda em torno de uma linha central.",
|
||||
"help.solid.shell": "Esvazia um sólido, deixando paredes da espessura que você definir, e pode abrir as faces que você escolher. Use para caixas, tampas e outras peças de parede fina.",
|
||||
"help.third_party": "Licenças de terceiros",
|
||||
"home.back": "Voltar para {name}",
|
||||
"home.crashes": "Relatórios de falhas",
|
||||
@@ -983,6 +1150,15 @@
|
||||
"motion.to_end": "Para o fim",
|
||||
"motion.to_start": "Para o início",
|
||||
"motion.track_name": "Trilha {number}",
|
||||
"nav.alias.help": "Shift+Alt+arrastar com o esquerdo orbita, Shift+Alt+meio desloca, Shift+Alt+direito aplica zoom; arrastar com o meio também desloca e arrastar com o direito orbita",
|
||||
"nav.blender.help": "Arrastar com o meio orbita, Shift+meio desloca, Ctrl+meio aplica zoom; arrastar com o direito não mexe na câmera",
|
||||
"nav.free_orbit.help": "O mouse e o mouse 3D giram passando pelos dois polos e preservam o giro lateral (roll). O encaixe em eixo com Shift fica desativado.",
|
||||
"nav.free_orbit.label": "Órbita livre",
|
||||
"nav.fusion.help": "Arrastar com o meio desloca, Shift+meio orbita, arrastar com o direito orbita",
|
||||
"nav.inventor.help": "Arrastar com o meio desloca, Shift+meio orbita, Ctrl+meio aplica zoom, arrastar com o direito orbita",
|
||||
"nav.openscad.help": "Arrastar com o esquerdo no espaço vazio orbita, Shift+arrastar com o esquerdo seleciona por caixa, arrastar a geometria do esboço a edita; arrastar com o direito ou o meio desloca, Shift+arrastar com o direito ou o meio aplica zoom",
|
||||
"nav.solidworks.help": "Arrastar com o meio orbita, Ctrl+meio desloca, Shift+meio aplica zoom, arrastar com o direito orbita",
|
||||
"nav.tinkercad.help": "Arrastar com o direito orbita, arrastar com o meio ou Shift+direito desloca",
|
||||
"nav.touchpad.help": "Segure Shift e mova o ponteiro para deslocar; segure Alt/Option e mova para orbitar. Não é preciso botão do mouse. A rolagem vertical aplica zoom.",
|
||||
"nav.touchpad.label": "Touchpad",
|
||||
"nav.touchpad.orbit": "Orbitar (segure Alt/Option e mova; sem botão do mouse)",
|
||||
@@ -1005,8 +1181,130 @@
|
||||
"pattern.flip_direction": "Inverter direção",
|
||||
"pick a hole to seat it, or OK places it at the origin": "selecione um furo para assentá-la, ou OK a coloca na origem",
|
||||
"pick one or two vertices, edges or faces": "selecione um ou dois vértices, arestas ou faces",
|
||||
"prefs.add_item": "Adicionar o item",
|
||||
"prefs.alt_frees_manipulators": "Alt / Option também libera as setas do manipulador",
|
||||
"prefs.anti_aliasing_note": "Suaviza bordas serrilhadas.",
|
||||
"prefs.applies_on_restart": "Aplica-se ao reiniciar",
|
||||
"prefs.assistant": "Assistente",
|
||||
"prefs.axes": "Eixos",
|
||||
"prefs.axis": "Eixo",
|
||||
"prefs.bottom": "Embaixo",
|
||||
"prefs.browser": "Navegador",
|
||||
"prefs.built_in": "Integrado",
|
||||
"prefs.button_left": "Arrastar com o esquerdo",
|
||||
"prefs.button_middle": "Arrastar com o meio",
|
||||
"prefs.button_right": "Arrastar com o direito",
|
||||
"prefs.choose_font": "Escolher arquivo de fonte…",
|
||||
"prefs.click": "Clique",
|
||||
"prefs.contact_shading": "Sombreamento suave de contato",
|
||||
"prefs.contact_shading_note": "Sombreamento suave onde as peças se aproximam.",
|
||||
"prefs.context_menu": "Menu de contexto",
|
||||
"prefs.context_menu_ring": "Menu de contexto · segure para o menu radial",
|
||||
"prefs.cpu": "CPU (software)",
|
||||
"prefs.crash_reports": "Abrir relatórios de falhas…",
|
||||
"prefs.crash_reports_note": "Os relatórios ficam guardados neste computador, com o projeto e os comandos que reproduzem o problema.",
|
||||
"prefs.ctrl_cmd": "Ctrl / Cmd",
|
||||
"prefs.curved_surfaces": "Superfícies curvas",
|
||||
"prefs.curves": "Superfícies curvas",
|
||||
"prefs.dead_zone_note": "A faixa hachurada é a zona morta: o movimento dentro dela é ignorado.",
|
||||
"prefs.default": "padrão",
|
||||
"prefs.design": "Padrões do projeto",
|
||||
"prefs.design_note": "Com o que os novos projetos começam. Projetos abertos mantêm as próprias configurações.",
|
||||
"prefs.devices": "Mouse 3D",
|
||||
"prefs.display": "Exibição",
|
||||
"prefs.edges": "Arestas e sombreamento",
|
||||
"prefs.extend": "Extensões",
|
||||
"prefs.extra_navigation": "Ctrl+arrastar com o esquerdo no espaço vazio orbita; segure Espaço para deslocar.",
|
||||
"prefs.follows_os": "Segue o sistema",
|
||||
"prefs.font": "Fonte",
|
||||
"prefs.font_fallback": "Os glifos que faltam na fonte escolhida usam a fonte integrada, então nenhum rótulo mostra uma caixa vazia.",
|
||||
"prefs.font_sample": "Vovô viu o ímã, a maçã e o pinguim · Ø12.50 mm · 45.0° · 0123456789",
|
||||
"prefs.font_unreadable": "Não foi possível ler a fonte selecionada.",
|
||||
"prefs.general": "Geral",
|
||||
"prefs.general_note": "Idioma, salvamento e atualizações.",
|
||||
"prefs.gesture_orbit": "Orbitar",
|
||||
"prefs.gesture_pan": "Deslocar",
|
||||
"prefs.gesture_zoom": "Zoom",
|
||||
"prefs.graphics": "Gráficos",
|
||||
"prefs.graphics_note": "Troque velocidade por suavidade. Cada opção mostra seu efeito em uma amostra.",
|
||||
"prefs.graphics_presets_note": "As predefinições ajustam as opções abaixo em conjunto.",
|
||||
"prefs.history": "Histórico",
|
||||
"prefs.hold_stop_snapping": "Segure para desativar o encaixe",
|
||||
"prefs.icons_only": "Só ícones",
|
||||
"prefs.imported_file": "Arquivo importado",
|
||||
"prefs.input": "Entrada",
|
||||
"prefs.interface": "Interface",
|
||||
"prefs.interface_language": "Idioma da interface",
|
||||
"prefs.interface_note": "A aparência do SolidCraft e onde ficam suas partes.",
|
||||
"prefs.interval_minutes": "{n} min",
|
||||
"prefs.labels": "Rótulos",
|
||||
"prefs.layout": "Layout",
|
||||
"prefs.layout_note": "Compacto encaixa os painéis nas bordas da janela. A translucidez do navegador está disponível em Flutuante. Mude o lado do Assistente na página Assistente.",
|
||||
"prefs.left": "Esquerda",
|
||||
"prefs.left_click": "Clique esquerdo",
|
||||
"prefs.live_input": "Entrada ao vivo",
|
||||
"prefs.live_preview": "Visualização ao vivo",
|
||||
"prefs.minutes": "minutos",
|
||||
"prefs.minutes_suffix": " min",
|
||||
"prefs.mouse": "Mouse e trackpad",
|
||||
"prefs.mouse_heading": "Mouse",
|
||||
"prefs.mouse_mapping": "Mapeamento do mouse",
|
||||
"prefs.navigation": "Navegação",
|
||||
"prefs.navigation_note": "Como o mouse, o trackpad e o mouse 3D movem a vista.",
|
||||
"prefs.not_on_gpu": "indisponível nesta GPU",
|
||||
"prefs.on": "Ativado",
|
||||
"prefs.opaque": "Opaco",
|
||||
"prefs.orbit_snap": "Segure Shift ao orbitar para encaixar em um eixo.",
|
||||
"prefs.orientation": "Orientação",
|
||||
"prefs.overall_speed": "Velocidade geral",
|
||||
"prefs.preview_choices": "Prévia das suas escolhas",
|
||||
"prefs.quality_default": "padrão",
|
||||
"prefs.quality_fastest": "mais rápido",
|
||||
"prefs.quality_slowest": "mais lento",
|
||||
"prefs.quality_smoother": "mais suave",
|
||||
"prefs.reports_saved": "{n} salvos",
|
||||
"prefs.right_click": "Clique direito",
|
||||
"prefs.saving": "Salvamento automático e recuperação",
|
||||
"prefs.scale_note": "Também Ctrl + / Ctrl − na janela. Os botões têm 28 px em 100%.",
|
||||
"prefs.scale_text": "Escala e texto",
|
||||
"prefs.select": "Selecionar",
|
||||
"prefs.select_one_item": "Selecionar um item",
|
||||
"prefs.selecting": "Seleção",
|
||||
"prefs.shift": "Shift",
|
||||
"prefs.shift_add_ctrl_toggle": "Shift só adiciona; Ctrl / Cmd alterna",
|
||||
"prefs.shift_add_note": "Ativado: Shift adiciona, Ctrl / Cmd alterna. Desativado (padrão): ambos alternam.",
|
||||
"prefs.shortcuts": "Atalhos",
|
||||
"prefs.sketch_selection": "Esboço e seleção",
|
||||
"prefs.sketch_selection_heading": "Esboço e seleção",
|
||||
"prefs.sketch_selection_note": "Como os esboços encaixam e como os cliques selecionam.",
|
||||
"prefs.sketching": "Criação de esboços",
|
||||
"prefs.snap_drawing_note": "Ao desenhar ou arrastar um ponto do esboço.",
|
||||
"prefs.source": "Origem",
|
||||
"prefs.speed": "Velocidade",
|
||||
"prefs.stand_up_note": "Depois que um arquivo STEP ou IGES abrir com Z para cima, oferecer um quarto de volta em torno de X.",
|
||||
"prefs.status_done": "Concluído",
|
||||
"prefs.status_error": "Erro",
|
||||
"prefs.status_selected": "Selecionado",
|
||||
"prefs.status_warning": "Aviso",
|
||||
"prefs.supersampling_brief": "Desenha a vista maior e a reduz com filtragem: muito nítida, e mais pesada.",
|
||||
"prefs.tab_accent_note": "A cor de destaque acompanha a aba ativa",
|
||||
"prefs.theme_file": "arquivo de tema",
|
||||
"prefs.timeline_half_hour": "−30 min",
|
||||
"prefs.timeline_now": "agora",
|
||||
"prefs.timeline_quarter_hour": "−15",
|
||||
"prefs.toggle_item": "Adicionar o item, ou retirá-lo de novo",
|
||||
"prefs.toolbar": "Barra de ferramentas",
|
||||
"prefs.translucent": "Translúcido",
|
||||
"prefs.under_browser": "Abaixo do navegador",
|
||||
"prefs.under_cursor": "Sob o cursor",
|
||||
"prefs.units_precision": "Unidades e precisão",
|
||||
"prefs.updates": "Atualizações",
|
||||
"prefs.view": "Comportamento da vista",
|
||||
"prefs.viewport": "Janela de visualização",
|
||||
"prefs.wheel": "Roda",
|
||||
"prefs.wheel_trackpad": "Roda e trackpad",
|
||||
"prefs.workspace": "Espaço de trabalho",
|
||||
"prefs.zoom_toward_cursor": "Zoom em direção ao cursor",
|
||||
"properties.title": "Propriedades: {name}",
|
||||
"recovery.days_ago": "há {count} dias",
|
||||
"recovery.detail": "{file} · {features} recursos · salvo automaticamente {when}",
|
||||
@@ -1084,9 +1382,12 @@
|
||||
"settings.msaa_applies_on_restart": "O antisserrilhamento vale na próxima vez que o SolidCraft iniciar",
|
||||
"settings.msaa_reset": "{setting}: {requested}× não é suportado por este dispositivo gráfico; agora é {reset}× (suportados: {supported}).",
|
||||
"settings.msaa_unsupported": "Não suportado por este dispositivo gráfico",
|
||||
"settings.reference_geometry_through_bodies": "Mostrar geometria de referência através dos corpos",
|
||||
"settings.reference_geometry_through_bodies_help": "Desenhar contornos de esboços inativos e planos de referência sobre os corpos sombreados",
|
||||
"settings.reset_intro": "Estas configurações não funcionam neste computador e impediriam o SolidCraft de iniciar, por isso foram alteradas:",
|
||||
"settings.reset_title": "As configurações foram alteradas",
|
||||
"settings.supersampling_note": "Desenha a vista em resolução maior e a filtra para baixo: arestas, linhas e grade mais suaves em telas abaixo de 4K. Custa tempo de GPU: cerca de 2,25× os pixels em 1,5× e 4× em 2×.",
|
||||
"sheet.no_body": "não há corpo de chapa metálica: comece um com Flange > Base, ou transforme uma placa em chapa metálica com Converter em chapa metálica (selecione a face plana grande dela)",
|
||||
"shortcut.json_error": "os parâmetros devem estar no formato JSON: {error}",
|
||||
"shortcut.no_command": "o comando `{id}` não existe; o texto antes do JSON deve ser um ID de comando",
|
||||
"shortcut.pin": "Fixar no topo da caixa S",
|
||||
@@ -1123,6 +1424,9 @@
|
||||
"thread.designation": "Designação",
|
||||
"thread.iso_metric": "Métrica ISO",
|
||||
"thread.select_size": "Selecionar tamanho",
|
||||
"timeline.delete_after_marker_one": "Excluir 1 recurso após o marcador do histórico",
|
||||
"timeline.delete_after_marker_other": "Excluir {count} recursos após o marcador do histórico",
|
||||
"timeline.delete_many": "Excluir {count} recursos selecionados",
|
||||
"timeline.group": "Nova pasta de recursos",
|
||||
"timeline.move_many": "Mover itens da linha do tempo",
|
||||
"timeline.move_to_group": "Mover recursos para a pasta",
|
||||
@@ -1368,11 +1672,15 @@
|
||||
"ui.agent_chat_waiting": "Aguardando sua resposta",
|
||||
"ui.agent_cursor": "Cursor do agente",
|
||||
"ui.agent_cursor_speed": "Velocidade do cursor do agente",
|
||||
"ui.agent_off_thread": "Manter a janela respondendo enquanto os agentes executam comandos",
|
||||
"ui.agent_off_thread_note": "Os comandos lentos de um agente (do painel de IA ou de um cliente MCP) são calculados ao lado da janela: você pode continuar girando e inspecionando a vista, e parar um deles pelo indicador na vista. Desativado: cada um roda na thread da janela, e a janela espera ele terminar.",
|
||||
"ui.ai_add": "Adicionar",
|
||||
"ui.ai_add_agent": "Adicionar agente…",
|
||||
"ui.ai_add_agent_title": "Adicionar agente",
|
||||
"ui.ai_add_anthropic": "API compatível com Anthropic",
|
||||
"ui.ai_add_api": "API compatível com OpenAI",
|
||||
"ui.ai_add_custom": "Comando personalizado",
|
||||
"ui.ai_add_endpoint": "Endpoint de API",
|
||||
"ui.ai_add_installed": "Agente instalado",
|
||||
"ui.ai_add_installed_note": "Uma entrada própria para um agente instalado, por exemplo com outros argumentos. Os agentes instalados são listados por si mesmos.",
|
||||
"ui.ai_added": "adicionado",
|
||||
@@ -1401,6 +1709,7 @@
|
||||
"ui.ai_key_needs_https": "Uma chave só é enviada por HTTPS ou para este computador.",
|
||||
"ui.ai_key_note": "Guardada no chaveiro do sistema, nunca nas configurações do SolidCraft. Deixe em branco para um servidor local.",
|
||||
"ui.ai_keychain_error": "O chaveiro do sistema recusou: {error}",
|
||||
"ui.ai_kind": "Tipo",
|
||||
"ui.ai_mode_all": "Permitir tudo",
|
||||
"ui.ai_mode_all_note": "Nada pergunta antes. Os relatórios de falha continuam fora de alcance e os limites de pasta ainda valem.",
|
||||
"ui.ai_mode_all_warning": "O agente pode salvar, sobrescrever, exportar e substituir seu projeto sem perguntar. Use isto só com um agente em que você confie e em projetos que você já salvou.",
|
||||
@@ -1422,6 +1731,7 @@
|
||||
"ui.ai_panel": "Painel",
|
||||
"ui.ai_permissions": "Permissões",
|
||||
"ui.ai_preset": "Predefinição",
|
||||
"ui.ai_protocol": "Protocolo",
|
||||
"ui.ai_remove": "Remover",
|
||||
"ui.ai_reset": "Redefinir",
|
||||
"ui.ai_settings": "Configurações de IA…",
|
||||
@@ -1431,6 +1741,8 @@
|
||||
"ui.ai_test": "Testar",
|
||||
"ui.ai_test_acp_ok": "Responde: {agent}",
|
||||
"ui.ai_test_acp_tip": "Inicia o agente por um instante e pede uma sessão; depois o encerra",
|
||||
"ui.ai_test_answered": "Acessado: {model} respondeu",
|
||||
"ui.ai_test_anthropic_tip": "Envia uma mensagem curta ao endpoint",
|
||||
"ui.ai_test_api_tip": "Pede ao endpoint a lista de modelos",
|
||||
"ui.ai_test_no_model": "Acessado: {count} modelos, mas não {model}",
|
||||
"ui.ai_test_ok": "Acessado: {count} modelos",
|
||||
@@ -1589,6 +1901,9 @@
|
||||
"ui.export_keymap_tip": "Teclas, favoritos da caixa S e a barra de ferramentas, como um arquivo",
|
||||
"ui.extend": "Estender",
|
||||
"ui.extent_type": "Tipo de extensão",
|
||||
"ui.extract_component": "Extrair para arquivo…",
|
||||
"ui.extract_design_changed": "O projeto mudou enquanto um arquivo era escolhido. Inicie Extrair para arquivo de novo.",
|
||||
"ui.extract_done": "O componente agora é um projeto próprio, vinculado aqui.",
|
||||
"ui.extrude": "Extrudar",
|
||||
"ui.factor": "Fator",
|
||||
"ui.feature_history": "Histórico de recursos",
|
||||
@@ -1599,6 +1914,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrar comandos ou teclas",
|
||||
"ui.findInTimeline": "Localizar na linha do tempo",
|
||||
"ui.findInWindow": "Localizar na janela",
|
||||
"ui.fine": "Fina",
|
||||
"ui.finest": "Muito fina",
|
||||
"ui.finish_sketch": "Concluir esboço",
|
||||
"ui.fit": "Ajustar",
|
||||
"ui.fix_unfix": "Fixar/Liberar",
|
||||
@@ -1696,10 +2013,17 @@
|
||||
"ui.hideProfile": "Ocultar perfil",
|
||||
"ui.history_back": "Voltar uma etapa",
|
||||
"ui.history_below_browser": "Abaixo do navegador",
|
||||
"ui.history_edge_hint": "clique duas vezes na borda",
|
||||
"ui.history_first": "Ir para o início",
|
||||
"ui.history_forward": "Avançar uma etapa",
|
||||
"ui.history_hide_names": "Ocultar nomes",
|
||||
"ui.history_last": "Ir para o fim",
|
||||
"ui.history_marker_tip": "Marcador do histórico: arraste para retroceder o modelo; novos recursos entram aqui",
|
||||
"ui.history_names": "Nomes",
|
||||
"ui.history_play": "Reproduzir até o fim",
|
||||
"ui.history_show_names": "Mostrar nomes",
|
||||
"ui.history_title": "Histórico",
|
||||
"ui.history_toggle_names": "Mostrar ou ocultar os nomes dos recursos",
|
||||
"ui.hole": "Furo",
|
||||
"ui.hole_tap_type": "Tipo de rosca do furo",
|
||||
"ui.hole_type": "Tipo de furo",
|
||||
@@ -1721,6 +2045,10 @@
|
||||
"ui.length_decimals": "Casas decimais de comprimento",
|
||||
"ui.light": "Claro",
|
||||
"ui.line": "Linha",
|
||||
"ui.link_copies": "Vincular cópias idênticas",
|
||||
"ui.link_copies_keep": "Manter",
|
||||
"ui.link_copies_link": "Vincular",
|
||||
"ui.link_copies_text": "Estes componentes constroem os mesmos corpos que {name}. Torná-los posicionamentos do vínculo dele?",
|
||||
"ui.lock": "Bloquear",
|
||||
"ui.loft": "Loft",
|
||||
"ui.look_at": "Olhar para",
|
||||
@@ -1823,6 +2151,7 @@
|
||||
"ui.project_face_edges_sketch": "Projetar arestas da face em novos esboços",
|
||||
"ui.properties": "Propriedades",
|
||||
"ui.pull_direction": "Direção de extração",
|
||||
"ui.quality": "Qualidade",
|
||||
"ui.quantity": "Quantidade",
|
||||
"ui.quantity_2": "Quantidade 2",
|
||||
"ui.quit": "Sair",
|
||||
@@ -1844,6 +2173,7 @@
|
||||
"ui.render": "Renderizar",
|
||||
"ui.renderer": "Renderizador",
|
||||
"ui.repeat": "Repetir",
|
||||
"ui.replace_with_link_done": "As cópias agora são posicionamentos do projeto vinculado.",
|
||||
"ui.report_a_bug": "Relatar um bug",
|
||||
"ui.reset": "Redefinir",
|
||||
"ui.reset_all": "Redefinir tudo",
|
||||
@@ -1917,6 +2247,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Dividir corpo",
|
||||
"ui.stand_up_tip": "Depois que um arquivo STEP ou IGES abrir com Z para cima, oferecer um quarto de volta em torno de X",
|
||||
"ui.standard": "Padrão",
|
||||
"ui.start": "Início",
|
||||
"ui.start_over": "Recomeçar",
|
||||
"ui.start_page": "Página inicial",
|
||||
|
||||
@@ -1534,6 +1534,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrează comenzi sau taste",
|
||||
"ui.findInTimeline": "Găsește în cronologie",
|
||||
"ui.findInWindow": "Găsește în fereastră",
|
||||
"ui.fine": "Fină",
|
||||
"ui.finest": "Foarte fină",
|
||||
"ui.finish_sketch": "Finalizează schița",
|
||||
"ui.fit": "Potrivire",
|
||||
"ui.fix_unfix": "Fixează/Defixează",
|
||||
@@ -1758,6 +1760,7 @@
|
||||
"ui.project_face_edges_sketch": "Proiectează muchiile feței în schițe noi",
|
||||
"ui.properties": "Proprietăți",
|
||||
"ui.pull_direction": "Direcția de extragere",
|
||||
"ui.quality": "Calitate",
|
||||
"ui.quantity": "Cantitate",
|
||||
"ui.quantity_2": "Cantitatea 2",
|
||||
"ui.quit": "Ieșire",
|
||||
@@ -1852,6 +1855,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Împarte corpul",
|
||||
"ui.stand_up_tip": "După ce un fișier STEP sau IGES se deschide cu Z în sus, oferă un sfert de rotație în jurul lui X",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Început",
|
||||
"ui.start_over": "Reîncepe",
|
||||
"ui.start_page": "Pagina de start",
|
||||
|
||||
@@ -1591,6 +1591,8 @@
|
||||
"ui.filter_commands_or_keys": "Фильтр команд или клавиш",
|
||||
"ui.findInTimeline": "Найти на шкале",
|
||||
"ui.findInWindow": "Найти в окне",
|
||||
"ui.fine": "Высокое",
|
||||
"ui.finest": "Максимальное",
|
||||
"ui.finish_sketch": "Завершить эскиз",
|
||||
"ui.fit": "Вписать",
|
||||
"ui.fix_unfix": "Зафиксировать/Освободить",
|
||||
@@ -1815,6 +1817,7 @@
|
||||
"ui.project_face_edges_sketch": "Проецировать рёбра граней в новые эскизы",
|
||||
"ui.properties": "Свойства",
|
||||
"ui.pull_direction": "Направление вытягивания",
|
||||
"ui.quality": "Качество",
|
||||
"ui.quantity": "Количество",
|
||||
"ui.quantity_2": "Количество 2",
|
||||
"ui.quit": "Выход",
|
||||
@@ -1909,6 +1912,7 @@
|
||||
"ui.spline": "Сплайн",
|
||||
"ui.split_body": "Разделить тело",
|
||||
"ui.stand_up_tip": "Если файл STEP или IGES открывается с Z вверх, предложить поворот на четверть оборота вокруг X",
|
||||
"ui.standard": "Стандартное",
|
||||
"ui.start": "Старт",
|
||||
"ui.start_over": "Начать заново",
|
||||
"ui.start_page": "Начальная страница",
|
||||
|
||||
@@ -1534,6 +1534,8 @@
|
||||
"ui.filter_commands_or_keys": "Filtrera kommandon eller tangenter",
|
||||
"ui.findInTimeline": "Sök i tidslinjen",
|
||||
"ui.findInWindow": "Sök i fönstret",
|
||||
"ui.fine": "Fin",
|
||||
"ui.finest": "Finast",
|
||||
"ui.finish_sketch": "Avsluta skiss",
|
||||
"ui.fit": "Anpassa",
|
||||
"ui.fix_unfix": "Fäst/Lös",
|
||||
@@ -1758,6 +1760,7 @@
|
||||
"ui.project_face_edges_sketch": "Projicera ytkanter i nya skisser",
|
||||
"ui.properties": "Egenskaper",
|
||||
"ui.pull_direction": "Dragriktning",
|
||||
"ui.quality": "Kvalitet",
|
||||
"ui.quantity": "Antal",
|
||||
"ui.quantity_2": "Antal 2",
|
||||
"ui.quit": "Avsluta",
|
||||
@@ -1852,6 +1855,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Dela kropp",
|
||||
"ui.stand_up_tip": "När en STEP- eller IGES-fil öppnas med Z uppåt, erbjud ett kvartsvarv runt X",
|
||||
"ui.standard": "Standard",
|
||||
"ui.start": "Start",
|
||||
"ui.start_over": "Börja om",
|
||||
"ui.start_page": "Startsida",
|
||||
|
||||
@@ -1591,6 +1591,8 @@
|
||||
"ui.filter_commands_or_keys": "Komutları veya tuşları filtrele",
|
||||
"ui.findInTimeline": "Zaman çizelgesinde bul",
|
||||
"ui.findInWindow": "Pencerede bul",
|
||||
"ui.fine": "İnce",
|
||||
"ui.finest": "En ince",
|
||||
"ui.finish_sketch": "Eskizi bitir",
|
||||
"ui.fit": "Sığdır",
|
||||
"ui.fix_unfix": "Sabitle/Çöz",
|
||||
@@ -1815,6 +1817,7 @@
|
||||
"ui.project_face_edges_sketch": "Yüz kenarlarını yeni eskizlere yansıt",
|
||||
"ui.properties": "Özellikler",
|
||||
"ui.pull_direction": "Kalıptan çıkarma yönü",
|
||||
"ui.quality": "Kalite",
|
||||
"ui.quantity": "Adet",
|
||||
"ui.quantity_2": "Adet 2",
|
||||
"ui.quit": "Çıkış",
|
||||
@@ -1909,6 +1912,7 @@
|
||||
"ui.spline": "Spline",
|
||||
"ui.split_body": "Gövdeyi böl",
|
||||
"ui.stand_up_tip": "Bir STEP veya IGES dosyası Z yukarı olarak açıldığında X etrafında çeyrek tur döndürmeyi öner",
|
||||
"ui.standard": "Standart",
|
||||
"ui.start": "Başlangıç",
|
||||
"ui.start_over": "Baştan başla",
|
||||
"ui.start_page": "Başlangıç sayfası",
|
||||
|
||||
+307
-1
@@ -14,11 +14,15 @@
|
||||
"Active": "Активна",
|
||||
"Active rule": "Активне правило",
|
||||
"Add": "Додати",
|
||||
"Add Key": "Додати клавішу",
|
||||
"Add Column": "Додати стовпець",
|
||||
"Add Key": "Додати ключовий кадр",
|
||||
"Add Mid Radius": "Додати середній радіус",
|
||||
"Add Row": "Додати рядок",
|
||||
"Add a tool": "Додати інструмент",
|
||||
"Add condition": "Додати умову",
|
||||
"Add or edit rule": "Додати або змінити правило",
|
||||
"Add to New Folder": "Додати до нової теки",
|
||||
"Advanced": "Додатково",
|
||||
"Against": "Проти",
|
||||
"Alignment": "Вирівнювання",
|
||||
"All Sketch Points": "Усі точки ескізу",
|
||||
@@ -28,9 +32,11 @@
|
||||
"Also deletes": "Також видаляє",
|
||||
"Angle 2": "Кут 2",
|
||||
"Animate": "Анімувати",
|
||||
"App/system information and command settings are included. Review private details before sharing.": "Додано відомості про програму й систему та налаштування команд. Перегляньте приватні дані перед поширенням.",
|
||||
"Appearance name": "Назва вигляду",
|
||||
"Applied Radius": "Застосований радіус",
|
||||
"Apply To": "Застосувати до",
|
||||
"Apply library appearance": "Застосувати вигляд із бібліотеки",
|
||||
"Apply to selection": "Застосувати до виділення",
|
||||
"Apply your appearance first. Exports assigned appearances and materials created in this design.": "Спочатку застосуйте вигляд. Експортує призначені вигляди та матеріали, створені в цьому проєкті.",
|
||||
"Arc length": "Довжина дуги",
|
||||
@@ -41,13 +47,18 @@
|
||||
"BLEND SURFACE": "ПОВЕРХНЯ ПЕРЕХОДУ",
|
||||
"BOUNDARY SURFACE": "ПОВЕРХНЯ ЗА МЕЖАМИ",
|
||||
"BROWSER": "БРАУЗЕР",
|
||||
"Bend Edges": "Ребра згину",
|
||||
"Bend Line Position": "Положення лінії згину",
|
||||
"Bend Position": "Положення згину",
|
||||
"Bend Radius": "Радіус згину",
|
||||
"Bend Table": "Таблиця згинів",
|
||||
"Bends": "Згини",
|
||||
"Bodies": "Тіла",
|
||||
"Bodies (optional)": "Тіла (необов'язково)",
|
||||
"Body": "Тіло",
|
||||
"Body (last if none)": "Тіло (останнє, якщо не вибрано)",
|
||||
"Body to split": "Тіло для розділення",
|
||||
"Body, or faces to take out": "Тіло або грані для вилучення",
|
||||
"Boundary": "Межа",
|
||||
"Bounding box": "Обмежувальна рамка",
|
||||
"CHECK": "ПЕРЕВІРКА",
|
||||
@@ -59,7 +70,9 @@
|
||||
"CSV or JSON: updates existing parameters, adds new ones": "CSV або JSON: оновлює наявні параметри, додає нові",
|
||||
"Capture All Positions": "Зафіксувати всі положення",
|
||||
"Capture Pos.": "Зафікс. полож.",
|
||||
"Catch Depth": "Глибина зачеплення",
|
||||
"Catch Direction": "Напрямок зачеплення",
|
||||
"Catch Length": "Довжина зачеплення",
|
||||
"Cells": "Комірки",
|
||||
"Center X": "Центр X",
|
||||
"Center Y": "Центр Y",
|
||||
@@ -68,23 +81,31 @@
|
||||
"Chamfer Type": "Тип фаски",
|
||||
"Check collisions": "Перевіряти зіткнення",
|
||||
"Checked": "Перевірено",
|
||||
"Choose Variable radius or Spline in Type.": "Виберіть у полі «Тип» значення «Variable radius» або «Spline».",
|
||||
"Choose a new plane. Sketch geometry and dimensions stay unchanged in its two-dimensional coordinates.": "Виберіть нову площину. Геометрія та розміри ескізу залишаються незмінними у своїх двовимірних координатах.",
|
||||
"Choose…": "Вибрати…",
|
||||
"Circular": "Круговий",
|
||||
"Circumference": "Довжина кола",
|
||||
"Clockwise": "За годинниковою стрілкою",
|
||||
"Close draft": "Закрити чернетку",
|
||||
"Collapse": "Згорнути",
|
||||
"Collisions": "Зіткнення",
|
||||
"Colour": "Колір",
|
||||
"Command": "Команда",
|
||||
"Comment": "Коментар",
|
||||
"Component 1": "Компонент 1",
|
||||
"Component 2": "Компонент 2",
|
||||
"Component1": "Компонент1",
|
||||
"Components": "Компоненти",
|
||||
"Config Table": "Табл. конфігурацій",
|
||||
"Configuration": "Конфігурація",
|
||||
"Configuration rules": "Правила конфігурації",
|
||||
"Contact": "Контакт",
|
||||
"Contact Sets": "Набори контактів",
|
||||
"Contact sets": "Набори контактів",
|
||||
"Continue on GitHub": "Продовжити на GitHub",
|
||||
"Continuity": "Неперервність",
|
||||
"Control Radius": "Керівний радіус",
|
||||
"Copy Error Message": "Копіювати повідомлення про помилку",
|
||||
"Copy Warning Message": "Копіювати попереджувальне повідомлення",
|
||||
"Copy all licences": "Копіювати всі ліцензії",
|
||||
@@ -94,8 +115,11 @@
|
||||
"Corner Relief": "Полегшення кута",
|
||||
"Corner Relief Shape": "Форма полегшення кута",
|
||||
"Counterbore depth": "Глибина циліндричного розширення",
|
||||
"Counterbore Ø": "Ø циліндричного розширення",
|
||||
"Countersink angle": "Кут зенкування",
|
||||
"Countersink Ø": "Ø зенкування",
|
||||
"Create Issue — review draft": "Створити повідомлення про проблему — перегляд чернетки",
|
||||
"Create Issue…": "Створити повідомлення про проблему…",
|
||||
"Cross curves": "Поперечні криві",
|
||||
"Cube": "Куб",
|
||||
"Current orthographic view (1:1 mm)": "Поточний ортографічний вид (1:1 mm)",
|
||||
@@ -103,18 +127,28 @@
|
||||
"Curv. Comb": "Гребінь кривини",
|
||||
"Curvature (G2)": "Кривина (G2)",
|
||||
"Curvature change (G3)": "Зміна кривини (G3)",
|
||||
"Custom": "Власний",
|
||||
"Customize Toolbar": "Налаштувати панель інструментів",
|
||||
"Customize…": "Налаштувати…",
|
||||
"Cylindrical face": "Циліндрична грань",
|
||||
"Delete": "Видалити",
|
||||
"Delete Selected Features…": "Видалити вибрані операції…",
|
||||
"Delete Selected Folders": "Видалити вибрані теки",
|
||||
"Delete all": "Видалити все",
|
||||
"Delete rule": "Видалити правило",
|
||||
"Delete the row": "Видалити рядок",
|
||||
"Delete the set": "Видалити набір",
|
||||
"Density": "Густина",
|
||||
"Dependents": "Залежні",
|
||||
"Describe the problem you saw": "Опишіть проблему, яку ви побачили",
|
||||
"Describe what happened before continuing.": "Опишіть, що сталося, перш ніж продовжити.",
|
||||
"Designs you open or save appear here.": "Проєкти, які ви відкриваєте чи зберігаєте, з'являються тут.",
|
||||
"Determined by To Object. Choose Angle to edit the angular extent.": "Визначається об'єктом призначення. Виберіть «Кут», щоб редагувати кутову протяжність.",
|
||||
"Diameter": "Діаметр",
|
||||
"Direction": "Напрямок",
|
||||
"Discard": "Відхилити",
|
||||
"Distance": "Відстань",
|
||||
"Distance 1": "Відстань 1",
|
||||
"Do not export hidden edges": "Не експортувати приховані ребра",
|
||||
"Don't ask again": "Більше не питати",
|
||||
"Double-click to rename": "Двічі клацніть, щоб перейменувати",
|
||||
@@ -126,17 +160,22 @@
|
||||
"Edit Profile Sketch": "Редагувати ескіз профілю",
|
||||
"Enable rule": "Увімкнути правило",
|
||||
"Enabled": "Увімкнено",
|
||||
"End Radius": "Кінцевий радіус",
|
||||
"End bulge": "Роздуття кінця",
|
||||
"End continuity": "Неперервність кінця",
|
||||
"Expand": "Розгорнути",
|
||||
"Expected result (optional)": "Очікуваний результат (необов'язково)",
|
||||
"Explode": "Рознести",
|
||||
"Explode Text": "Розібрати текст",
|
||||
"Export Animation…": "Експортувати анімацію…",
|
||||
"Export Bend Table…": "Експортувати таблицю згинів…",
|
||||
"Export CSV…": "Експорт CSV…",
|
||||
"Export Current View as DXF": "Експортувати поточний вид як DXF",
|
||||
"Export Current View as DXF…": "Експортувати поточний вид як DXF…",
|
||||
"Export DXF": "Експорт DXF",
|
||||
"Export DXF…": "Експорт DXF…",
|
||||
"Export JSON…": "Експорт JSON…",
|
||||
"Export design library...": "Експортувати бібліотеку проєкту...",
|
||||
"Export hidden edges as dashed lines": "Експортувати приховані ребра як штрихові лінії",
|
||||
"Expression": "Вираз",
|
||||
"Extend to meet": "Подовжити до перетину",
|
||||
@@ -144,31 +183,41 @@
|
||||
"FILES": "ФАЙЛИ",
|
||||
"FLAT": "РОЗГОРТКА",
|
||||
"Face": "Грань",
|
||||
"Face Appearance": "Вигляд грані",
|
||||
"Face attachment lost": "Втрачено прив'язку до грані",
|
||||
"Faces": "Грані",
|
||||
"Faces / edges / vertices": "Грані / ребра / вершини",
|
||||
"Faces to split": "Грані для розділення",
|
||||
"Fastener": "Кріплення",
|
||||
"Favorites": "Обране",
|
||||
"Favourite": "Обране",
|
||||
"Feature": "Операція",
|
||||
"Files from many CAD programs have Y up, so they open lying on their back here (Z up).": "Файли з багатьох CAD-програм мають напрямок Y вгору, тому тут вони відкриваються лежачи на спині (Z вгору).",
|
||||
"Filter": "Фільтр",
|
||||
"Filter…": "Фільтр…",
|
||||
"Find in Browser": "Знайти в браузері",
|
||||
"Finish": "Оздоблення",
|
||||
"First plane": "Перша площина",
|
||||
"Fit and G2 corners require Constant radius.": "Для підгонки та кутів G2 потрібен тип «Constant radius».",
|
||||
"Fixed Face": "Фіксована грань",
|
||||
"Flat Pattern": "Розгортка",
|
||||
"Flat size": "Розмір розгортки",
|
||||
"Follow camera (Look At sketches)": "Стежити за камерою (ескізи наведення)",
|
||||
"Follow the camera (Look At sketches)": "Стежити за камерою (ескізи наведення)",
|
||||
"Font": "Шрифт",
|
||||
"From": "Від",
|
||||
"From Bodies": "З тіл",
|
||||
"From edges": "Початкові ребра",
|
||||
"Full Length": "Повна довжина",
|
||||
"G2 corners require a constant radius and Exact fit. G2 corner construction is not supported yet.": "Кути G2 потребують постійного радіуса та підгонки «Exact». Побудова кутів G2 ще не підтримується.",
|
||||
"Gap": "Зазор",
|
||||
"Grid": "Сітка",
|
||||
"HISTORY": "ІСТОРІЯ",
|
||||
"Height": "Висота",
|
||||
"Hidden edges": "Приховані ребра",
|
||||
"History layout": "Розташування історії",
|
||||
"History names": "Назви в історії",
|
||||
"Hole (optional)": "Отвір (необов'язково)",
|
||||
"Holes": "Отвори",
|
||||
"Holes (edges on them)": "Отвори (ребра на них)",
|
||||
"Home view": "Головний вид",
|
||||
@@ -179,14 +228,20 @@
|
||||
"In place (surfaces)": "На місці (поверхні)",
|
||||
"In plane": "У площині",
|
||||
"Inside": "Усередину",
|
||||
"Instant": "Миттєво",
|
||||
"Interface font": "Шрифт інтерфейсу",
|
||||
"Interferes": "Перетинається",
|
||||
"Invert": "Інвертувати",
|
||||
"Isocurve": "Ізокрива",
|
||||
"Issue title": "Заголовок повідомлення",
|
||||
"Items": "Елементи",
|
||||
"JOINTS": "З’ЄДНАННЯ",
|
||||
"Joint Origin1": "Початок з'єднання1",
|
||||
"Keep (points on it)": "Залишити (точки на ньому)",
|
||||
"Keep Tools": "Зберегти інструменти",
|
||||
"Keep of the other surface": "Залишити від іншої поверхні",
|
||||
"Key a joint's value at this step": "Вставити ключовий кадр зі значенням з'єднання на цьому кроці",
|
||||
"Keys": "Ключові кадри",
|
||||
"LIBRARY": "БІБЛІОТЕКА",
|
||||
"LINKS": "ПОСИЛАННЯ",
|
||||
"Later": "Пізніше",
|
||||
@@ -197,9 +252,14 @@
|
||||
"Letter Spacing": "Міжлітерний інтервал",
|
||||
"Library": "Бібліотека",
|
||||
"Library file": "Файл бібліотеки",
|
||||
"Limits": "Межі",
|
||||
"Line Spacing": "Міжрядковий інтервал",
|
||||
"Line Type": "Тип лінії",
|
||||
"Listing the installed fonts…": "Пошук встановлених шрифтів…",
|
||||
"Load library": "Завантажити бібліотеку",
|
||||
"Local library": "Локальна бібліотека",
|
||||
"Loop": "Контур",
|
||||
"M5 or M5x0.5": "M5 або M5x0.5",
|
||||
"MANAGE": "КЕРУВАННЯ",
|
||||
"MATERIALS": "МАТЕРІАЛИ",
|
||||
"MODEL": "МОДЕЛЬ",
|
||||
@@ -210,14 +270,20 @@
|
||||
"Matched restrictions check the final values.": "Обмеження, умови яких виконано, перевіряють кінцеві значення.",
|
||||
"Material": "Матеріал",
|
||||
"Max": "Макс.",
|
||||
"Maximum": "Максимум",
|
||||
"Mesh body": "Тіло сітки",
|
||||
"Mid Radius": "Середній радіус",
|
||||
"Middle double-click": "Подвійне клацання середньою кнопкою",
|
||||
"Min": "Мін.",
|
||||
"Minimum": "Мінімум",
|
||||
"Mirror Plane": "Площина дзеркала",
|
||||
"Mitre": "Скіс",
|
||||
"Model Parameters": "Параметри моделі",
|
||||
"Modeled": "Змодельовано",
|
||||
"More toolbar panels": "Більше панелей інструментів",
|
||||
"Motion": "Рух",
|
||||
"Mouse gestures": "Жести мишею",
|
||||
"Mouse gestures only work with the SolidWorks mouse mode (the wheel orbits, Ctrl + wheel pans).": "Жести мишею працюють лише в режимі миші SolidWorks (колесо обертає, Ctrl + колесо панорамує).",
|
||||
"Move / Copy": "Перемістити / копіювати",
|
||||
"Move Type": "Тип переміщення",
|
||||
"Move down": "Перемістити вниз",
|
||||
@@ -235,15 +301,22 @@
|
||||
"No matching appearance presets.": "Немає відповідних наборів вигляду.",
|
||||
"No matching appearances": "Немає відповідних виглядів",
|
||||
"No visible bodies or sketches to export.": "Немає видимих тіл або ескізів для експорту.",
|
||||
"Nominal diameter": "Номінальний діаметр",
|
||||
"None": "Немає",
|
||||
"Not available yet": "Ще недоступно",
|
||||
"Notch": "Виріз",
|
||||
"OUTPUT": "ВИВЕДЕННЯ",
|
||||
"Of": "Ступінь вільності",
|
||||
"On your computer": "На цьому комп'ютері",
|
||||
"Opacity": "Непрозорість",
|
||||
"Open GitHub draft": "Відкрити чернетку GitHub",
|
||||
"Open library...": "Відкрити бібліотеку...",
|
||||
"Open local libraries in the desktop app. You can export this design's library here.": "Відкривайте локальні бібліотеки в настільному застосунку. Тут можна експортувати бібліотеку цього проєкту.",
|
||||
"Open-source parametric 3D CAD in Rust. Licensed MIT OR Apache-2.0.": "Параметричний 3D-CAD з відкритим вихідним кодом на Rust. Ліцензовано за MIT OR Apache-2.0.",
|
||||
"Opens your browser and copies the report text for you to paste into GitHub.": "Відкриває браузер і копіює текст звіту, щоб ви вставили його на GitHub.",
|
||||
"Opens your browser. Review and submit your report on GitHub.": "Відкриває браузер. Перегляньте й надішліть звіт на GitHub.",
|
||||
"Operator": "Оператор",
|
||||
"Orbit (right drag)": "Обертання (перетягування правою кнопкою)",
|
||||
"Other side": "Інший бік",
|
||||
"Other surface (mutual trim)": "Інша поверхня (взаємне обрізання)",
|
||||
"Outside": "Назовні",
|
||||
@@ -258,8 +331,11 @@
|
||||
"Pick the tool bodies": "Виберіть тіла інструмента",
|
||||
"Picked": "Вибрано",
|
||||
"Picked point": "Вибрана точка",
|
||||
"Pitch": "Крок",
|
||||
"Pivot": "Точка обертання",
|
||||
"Place at the origin instead": "Натомість розмістити в початку координат",
|
||||
"Plastic Rules": "Правила пластику",
|
||||
"Play the joint's motion in the view": "Відтворити рух з'єднання у виді",
|
||||
"Playback": "Відтворення",
|
||||
"Plot": "Графік",
|
||||
"Position": "Положення",
|
||||
@@ -267,14 +343,18 @@
|
||||
"Position (G0)": "Положення (G0)",
|
||||
"Position along the edge, 0 at the start end, 1 at the other": "Положення вздовж ребра: 0 на початку, 1 на іншому кінці",
|
||||
"Preferences › Design turns the offer back on": "Налаштування › Дизайн повертає пропозицію",
|
||||
"Preview": "Попередній перегляд",
|
||||
"Preview Row": "Рядок перегляду",
|
||||
"Preview leaves the current design unchanged.": "Попередній перегляд не змінює поточний проєкт.",
|
||||
"Profile / Edges": "Профіль / ребра",
|
||||
"Profiles or curves": "Профілі або криві",
|
||||
"Profiles/Curves": "Профілі/криві",
|
||||
"Quantity": "Величина",
|
||||
"RECENT": "НЕДАВНІ",
|
||||
"REFERENCE": "ДОПОМІЖНА ГЕОМЕТРІЯ",
|
||||
"RULED SURFACE": "ЛІНІЙЧАСТА ПОВЕРХНЯ",
|
||||
"RULES": "ПРАВИЛА",
|
||||
"Radius": "Радіус",
|
||||
"Radius Fit": "Підгонка за радіусом",
|
||||
"Ratio": "Співвідношення",
|
||||
"Reattach selected face": "Повторно приєднати вибрану грань",
|
||||
@@ -283,6 +363,8 @@
|
||||
"Rectangular": "Прямокутний",
|
||||
"Reference face": "Опорна грань",
|
||||
"Remove Tools": "Прибрати інструменти",
|
||||
"Remove condition": "Прибрати умову",
|
||||
"Remove from Folder": "Прибрати з теки",
|
||||
"Remove from list": "Прибрати зі списку",
|
||||
"Remove override": "Прибрати перевизначення",
|
||||
"Remove private design details or paths before sharing.": "Перед публікацією приберіть приватні дані проєкту або шляхи.",
|
||||
@@ -290,12 +372,18 @@
|
||||
"Remove the column": "Прибрати стовпець",
|
||||
"Remove the track": "Прибрати доріжку",
|
||||
"Remove this point": "Прибрати цю точку",
|
||||
"Rename Feature": "Перейменувати операцію",
|
||||
"Rename Folder": "Перейменувати теку",
|
||||
"Replace existing library file": "Замінити наявний файл бібліотеки",
|
||||
"Report a bug — review a screenshot and open a GitHub draft": "Повідомити про помилку — переглянути знімок екрана й відкрити чернетку GitHub",
|
||||
"Report text copied. Paste it into GitHub and submit your report there.": "Текст звіту скопійовано. Вставте його на GitHub і надішліть звіт там.",
|
||||
"Reports are public. A GitHub account is required.": "Звіти загальнодоступні. Потрібен обліковий запис GitHub.",
|
||||
"Reset Toolbar": "Скинути панель інструментів",
|
||||
"Resize Part": "Змінити розмір деталі",
|
||||
"Restore View": "Відновити вид",
|
||||
"Restore outer boundary": "Відновити зовнішню межу",
|
||||
"Restore the inherited component or physical material appearance": "Відновити успадкований вигляд компонента або фізичного матеріалу",
|
||||
"Restore this studio's tools": "Відновити інструменти цієї студії",
|
||||
"Result": "Результат",
|
||||
"Retake screenshot": "Повторити знімок екрана",
|
||||
"Reverse": "Обернути",
|
||||
@@ -305,7 +393,14 @@
|
||||
"Revert Pos.": "Скасув. полож.",
|
||||
"Revert Position": "Повернути положення",
|
||||
"Review the report and screenshot before opening GitHub.": "Перегляньте звіт і знімок екрана перед відкриттям GitHub.",
|
||||
"Review your report on GitHub and click Submit new issue to publish it.": "Перегляньте звіт на GitHub і натисніть Submit new issue, щоб опублікувати його.",
|
||||
"Rib Length": "Довжина ребра",
|
||||
"Rib Offset": "Зсув ребра",
|
||||
"Rib Thickness": "Товщина ребра",
|
||||
"Ribs": "Ребра",
|
||||
"Rim Edge": "Крайове ребро",
|
||||
"Ring of tools on the right button": "Кільце інструментів на правій кнопці",
|
||||
"Roll Back Here": "Відкотити сюди",
|
||||
"Roll History Marker Here": "Перемістити маркер історії сюди",
|
||||
"Round": "Круглий",
|
||||
"Rule": "Правило",
|
||||
@@ -315,21 +410,28 @@
|
||||
"SURFACE QUALITY": "ЯКІСТЬ ПОВЕРХНІ",
|
||||
"Save Rule": "Зберегти правило",
|
||||
"Save View": "Зберегти вид",
|
||||
"Save screenshot…": "Зберегти знімок екрана…",
|
||||
"Save the study as an animated GIF, seen as the viewport shows it": "Зберегти дослідження як анімований GIF, як його показує вікно перегляду",
|
||||
"Saved preview. Geometry is being checked before editing.": "Збережений перегляд. Геометрію перевіряють перед редагуванням.",
|
||||
"Scale factor": "Коефіцієнт масштабу",
|
||||
"Scene": "Сцена",
|
||||
"Screenshot (optional)": "Знімок екрана (необов'язково)",
|
||||
"Search": "Пошук",
|
||||
"Search commands": "Пошук команд",
|
||||
"Search this library": "Пошук у цій бібліотеці",
|
||||
"Second plane": "Друга площина",
|
||||
"Section": "Переріз",
|
||||
"Section position": "Положення перерізу",
|
||||
"Sections (one sketch each)": "Перерізи (по одному ескізу)",
|
||||
"Select Other": "Вибрати інше",
|
||||
"Select Other: hold the left button still on the model (or right-click › Select Other…) to list everything under the cursor; click again on the same spot to select the next thing there. Double-click the middle button to go Home (Preferences › Navigation).": "Вибір іншого: утримуйте ліву кнопку нерухомо на моделі (або клацніть правою › Вибрати інше…), щоб побачити список усього під курсором; клацніть ще раз у тому ж місці, щоб вибрати наступний об'єкт там. Двічі клацніть середньою кнопкою, щоб перейти до головного виду (Налаштування › Навігація).",
|
||||
"Select bodies (a face picks its body)": "Виділяти тіла (грань виділяє своє тіло)",
|
||||
"Select bodies or faces instead": "Натомість виділіть тіла або грані",
|
||||
"Select edges": "Виберіть ребра",
|
||||
"Selection filter": "Фільтр виділення",
|
||||
"Semantic faces share their appearance across instances.": "Семантичні грані спільно використовують свій вигляд між екземплярами.",
|
||||
"Send your report on GitHub": "Надіслати звіт на GitHub",
|
||||
"Shaded": "Затінений",
|
||||
"Shape": "Форма",
|
||||
"Sheet Rules": "Правила листа",
|
||||
"Show Agent Cursor": "Показати курсор агента",
|
||||
@@ -348,6 +450,7 @@
|
||||
"SolidCraft closed before these designs were saved. Their last autosave can be opened.": "SolidCraft закрився до того, як ці проєкти було збережено. Можна відкрити їхнє останнє автозбереження.",
|
||||
"Specialise": "Спеціалізувати",
|
||||
"Speed": "Швидкість",
|
||||
"Splitting tool": "Інструмент розділення",
|
||||
"Square": "Квадрат",
|
||||
"Stand it up": "Вирівняти",
|
||||
"Stand it up: a quarter turn about X, as one Move feature you can undo.": "Вирівняти: поворот на чверть оберту навколо X як одна операція переміщення, яку можна скасувати.",
|
||||
@@ -357,17 +460,27 @@
|
||||
"Start continuity": "Неперервність початку",
|
||||
"Step": "Крок",
|
||||
"Steps": "Кроки",
|
||||
"Steps to reproduce (optional)": "Кроки відтворення (необов'язково)",
|
||||
"Stitch the kept pieces": "Зшити залишені частини",
|
||||
"Stitch to both bodies": "Зшити з обома тілами",
|
||||
"Studio": "Студія",
|
||||
"Study": "Дослідження",
|
||||
"Style": "Стиль",
|
||||
"Summary": "Короткий опис",
|
||||
"Suppress": "Придушити",
|
||||
"Suppressed": "Придушено",
|
||||
"Surface": "Поверхня",
|
||||
"Surface, or faces to turn over": "Поверхня або грані, щоб обернути нормаль",
|
||||
"Swap Ends": "Поміняти кінці місцями",
|
||||
"TRIM": "ОБРІЗАННЯ",
|
||||
"Tangent (G1)": "Дотик (G1)",
|
||||
"Tangent Chain": "Дотичний ланцюг",
|
||||
"Tangent chain": "Дотичний ланцюг",
|
||||
"Tap drill diameter": "Діаметр свердла під різьбу",
|
||||
"Target": "Цільова грань або площина",
|
||||
"Target Body": "Цільове тіло",
|
||||
"Tear": "Розрив",
|
||||
"Technical details": "Технічні подробиці",
|
||||
"The dashed sketch is a saved plane guide. Select a new face to repair the attachment.": "Штриховий ескіз — це збережений орієнтир площини. Виберіть нову грань, щоб відновити прив'язку.",
|
||||
"The saved author occurrence is missing. Select a valid author placement before rebinding.": "Збережений вихідний екземпляр відсутній. Перед повторною прив'язкою виберіть дійсне вихідне розміщення.",
|
||||
"Then": "Потім",
|
||||
@@ -379,24 +492,32 @@
|
||||
"This child is shared. Deleting it removes it from every copy of its parent.": "Цей дочірній об'єкт спільний. Його видалення прибирає його з кожної копії батьківського.",
|
||||
"This child is shared. Position changes apply to every copy of its parent.": "Цей дочірній об'єкт спільний. Зміни положення застосовуються до кожної копії батьківського.",
|
||||
"This face cannot provide a durable attachment. Choose another face or explicitly use a fixed plane.": "Ця грань не може забезпечити надійну прив'язку. Виберіть іншу грань або явно використайте фіксовану площину.",
|
||||
"This image is not attached to GitHub yet. Copy or save it, then attach it on GitHub.": "Це зображення ще не додано до GitHub. Скопіюйте або збережіть його, а потім додайте на GitHub.",
|
||||
"To": "До",
|
||||
"To Offset": "До зсуву",
|
||||
"To edges": "Кінцеві ребра",
|
||||
"Tolerance": "Допуск",
|
||||
"Too close": "Занадто близько",
|
||||
"Tool Bodies": "Тіла інструмента",
|
||||
"Tools": "Інструменти",
|
||||
"Tools, clockwise from the top": "Інструменти за годинниковою стрілкою згори",
|
||||
"Trimming tool (plane, face or curves)": "Інструмент обрізання (площина, грань або криві)",
|
||||
"Turn off section analysis before exporting the view.": "Вимкніть аналіз перерізу перед експортом виду.",
|
||||
"Type": "Тип",
|
||||
"UNTRIM": "ЗНЯТИ ОБРІЗАННЯ",
|
||||
"Unit": "Одиниця",
|
||||
"Unsuppress": "Скасувати придушення",
|
||||
"Updating the preview": "Оновлення попереднього перегляду",
|
||||
"Use active author placement": "Використати активне вихідне розміщення",
|
||||
"Use fixed plane": "Використати фіксовану площину",
|
||||
"Use saved fixed plane": "Використати збережену фіксовану площину",
|
||||
"Use selected face as fixed plane": "Використати вибрану грань як фіксовану площину",
|
||||
"Use the SolidWorks mouse mode": "Використовувати режим миші SolidWorks",
|
||||
"User Parameters": "Параметри користувача",
|
||||
"VIEW": "ВИД",
|
||||
"VIEWS": "ВИГЛЯДИ",
|
||||
"Value": "Значення",
|
||||
"Variable Radius": "Змінний радіус",
|
||||
"Velocity": "Швидкість",
|
||||
"Vertices": "Вершини",
|
||||
"View navigator": "Навігатор виду",
|
||||
@@ -404,16 +525,50 @@
|
||||
"Wall": "Стінка",
|
||||
"Wall Location": "Розташування стінки",
|
||||
"Wall Thickness": "Товщина стінки",
|
||||
"What did you do just before the problem? A short list is enough": "Що ви робили безпосередньо перед проблемою? Короткого переліку достатньо",
|
||||
"What did you expect to see?": "Що ви очікували побачити?",
|
||||
"What happened?": "Що сталося?",
|
||||
"When": "Коли",
|
||||
"Width": "Ширина",
|
||||
"Will fail": "Зазнає невдачі",
|
||||
"With gestures on, the right button no longer orbits the view: hold it and move to open the ring, then touch a tool's zone. A plain right-click still opens the menu.": "Коли жести ввімкнено, права кнопка більше не обертає вид: утримуйте її та рухайте, щоб відкрити кільце, а потім наведіть на зону інструмента. Звичайне клацання правою кнопкою так само відкриває меню.",
|
||||
"X": "X",
|
||||
"X Angle": "Кут X",
|
||||
"X angle": "Кут X",
|
||||
"X distance": "Відстань X",
|
||||
"Y": "Y",
|
||||
"Y Angle": "Кут Y",
|
||||
"Y angle": "Кут Y",
|
||||
"Y distance": "Відстань Y",
|
||||
"Z": "Z",
|
||||
"Z Angle": "Кут Z",
|
||||
"Z Distance": "Відстань Z",
|
||||
"Z angle": "Кут Z",
|
||||
"Z distance": "Відстань Z",
|
||||
"Zebra": "Зебра",
|
||||
"ai.prefs.availability": "Керування асистентом",
|
||||
"ai.prefs.background_commands": "Виконувати команди агента у фоновому режимі",
|
||||
"ai.prefs.follow_camera": "Повертати камеру до ескізів",
|
||||
"ai.prefs.follow_camera_off": "Автоматичне стеження камери вимкнено.",
|
||||
"ai.prefs.follow_camera_on": "Камера повертається до ескізів, які створює агент.",
|
||||
"ai.prefs.intro": "Агенти, дозволи та те, як показується їхня робота.",
|
||||
"ai.prefs.make_default": "Використовувати за замовчуванням",
|
||||
"ai.prefs.no_agents": "Агентів ще немає. Додайте агента або оновіть список, щоб знайти встановлених.",
|
||||
"ai.prefs.no_saved_approvals": "Немає збережених дозволів.",
|
||||
"ai.prefs.override_all_warning": "Цей агент може зберігати, перезаписувати, експортувати або замінювати проєкт без запиту.",
|
||||
"ai.prefs.permission_all": "Дозволяти все",
|
||||
"ai.prefs.permission_all_summary": "Доступні інструменти SolidCraft працюють без запиту.",
|
||||
"ai.prefs.permission_ask": "Запитувати перед змінами",
|
||||
"ai.prefs.permission_ask_summary": "Підтверджувати кожну зміну проєкту та дію з файлами.",
|
||||
"ai.prefs.permission_edits": "Дозволяти редагування моделі",
|
||||
"ai.prefs.permission_edits_summary": "Редагування моделі виконується; для дій з файлами й руйнівних дій усе ще запитують дозвіл.",
|
||||
"ai.prefs.permission_scope": "Лише для інструментів SolidCraft. Оболонка агента та редагування файлів підкоряються його власним дозволам.",
|
||||
"ai.prefs.pointer_preview_hidden": "Вказівник приховано",
|
||||
"ai.prefs.pointer_preview_speed": "Вказівник агента · {speed}",
|
||||
"ai.prefs.pointer_speed": "Швидкість руху",
|
||||
"ai.prefs.privacy_note": "Розмову отримує лише вибраний вами агент або кінцева точка. Ключі кінцевих точок зберігаються в системному сховищі ключів.",
|
||||
"ai.prefs.show_pointer": "Показати вказівник агента",
|
||||
"ai.prefs.turn_limit_hint": "Максимальна кількість викликів інструментів, що змінюють проєкт, які Асистент може зробити за одне повідомлення.",
|
||||
"angle, height": "кут, висота",
|
||||
"appearance.dielectric_ior": "Діелектричний IOR",
|
||||
"appearance.metallic": "Металевість",
|
||||
@@ -770,6 +925,7 @@
|
||||
"cmd.view_graphics_preset": "Набір графіки",
|
||||
"cmd.view_list": "Список іменованих видів",
|
||||
"cmd.view_navigate": "Навігація видом",
|
||||
"cmd.view_normal_to": "Перпендикулярно до виділення",
|
||||
"cmd.view_rename": "Перейменувати іменований вид",
|
||||
"cmd.view_save": "Новий іменований вид",
|
||||
"color.copy": "Клацніть, щоб скопіювати значення кольору",
|
||||
@@ -867,6 +1023,12 @@
|
||||
"help.licences": "Ліцензії",
|
||||
"help.mit": "Ліцензія MIT",
|
||||
"help.notice": "NOTICE",
|
||||
"help.solid.chamfer": "Зрізає вибрані ребра плоским скосом на заданій відстані. Використовуйте, щоб притупити гострі ребра або полегшити вставляння штифта чи гвинта.",
|
||||
"help.solid.extrude": "Витягує профіль ескізу в 3D на задану відстань, додаючи або видаляючи матеріал. Використовуйте, щоб перетворити плоский контур на брусок, бобишку або кишеню.",
|
||||
"help.solid.fillet": "Закруглює вибрані ребра плавним круговим переходом заданого радіуса. Використовуйте, щоб пом'якшити гострі ребра для міцності, зручності чи вигляду.",
|
||||
"help.solid.hole": "Просвердлює круглий отвір заданого діаметра в обраній точці на грані. Використовуйте для отворів під гвинти, штифтів та інших простих круглих отворів.",
|
||||
"help.solid.revolve": "Обертає профіль ескізу навколо осі, утворюючи кругле тіло. Використовуйте для валів, ручок, чаш та будь-яких деталей, круглих навколо осьової лінії.",
|
||||
"help.solid.shell": "Робить тіло порожнистим, залишаючи стінки заданої товщини, і може відкривати вибрані грані. Використовуйте для коробок, кришок та інших тонкостінних деталей.",
|
||||
"help.third_party": "Ліцензії сторонніх компонентів",
|
||||
"home.back": "Назад до {name}",
|
||||
"home.crashes": "Звіти про збої",
|
||||
@@ -976,6 +1138,15 @@
|
||||
"motion.to_end": "У кінець",
|
||||
"motion.to_start": "На початок",
|
||||
"motion.track_name": "Доріжка {number}",
|
||||
"nav.alias.help": "Shift+Alt+ліва обертає, Shift+Alt+середня панорамує, Shift+Alt+права масштабує; середня також панорамує, права обертає",
|
||||
"nav.blender.help": "Середня обертає, Shift+середня панорамує, Ctrl+середня масштабує; права не рухає камеру",
|
||||
"nav.free_orbit.help": "Миша та 3D-миша обертають через обидва полюси й зберігають крен. Прив'язування до осей через Shift вимкнено.",
|
||||
"nav.free_orbit.label": "Вільне обертання",
|
||||
"nav.fusion.help": "Середня панорамує, Shift+середня обертає, права обертає",
|
||||
"nav.inventor.help": "Середня панорамує, Shift+середня обертає, Ctrl+середня масштабує, права обертає",
|
||||
"nav.openscad.help": "Ліва обертає по порожньому місцю, Shift+ліва виділяє рамкою, геометрію ескізу перетягують для редагування; права або середня панорамує, Shift+права або Shift+середня масштабує",
|
||||
"nav.solidworks.help": "Середня обертає, Ctrl+середня панорамує, Shift+середня масштабує, права обертає",
|
||||
"nav.tinkercad.help": "Права обертає, середня або Shift+права панорамує",
|
||||
"nav.touchpad.help": "Утримуйте Shift і рухайте вказівник, щоб панорамувати; утримуйте Alt/Option і рухайте, щоб обертати. Кнопка миші не потрібна. Вертикальна прокрутка масштабує.",
|
||||
"nav.touchpad.label": "Трекпад",
|
||||
"nav.touchpad.orbit": "Обертання (утримуйте Alt/Option і рухайте; без кнопки миші)",
|
||||
@@ -998,8 +1169,130 @@
|
||||
"pattern.flip_direction": "Змінити напрямок",
|
||||
"pick a hole to seat it, or OK places it at the origin": "виберіть отвір для посадки, або OK розмістить його в початку координат",
|
||||
"pick one or two vertices, edges or faces": "виберіть одну-дві вершини, ребра або грані",
|
||||
"prefs.add_item": "Додати елемент",
|
||||
"prefs.alt_frees_manipulators": "Alt / Option також дає вільне перетягування стрілок маніпулятора",
|
||||
"prefs.anti_aliasing_note": "Згладжує нерівні краї.",
|
||||
"prefs.applies_on_restart": "Застосовується після перезапуску",
|
||||
"prefs.assistant": "Асистент",
|
||||
"prefs.axes": "Осі",
|
||||
"prefs.axis": "Вісь",
|
||||
"prefs.bottom": "Низ",
|
||||
"prefs.browser": "Браузер",
|
||||
"prefs.built_in": "Вбудована",
|
||||
"prefs.button_left": "Перетягування лівою кнопкою",
|
||||
"prefs.button_middle": "Перетягування середньою кнопкою",
|
||||
"prefs.button_right": "Перетягування правою кнопкою",
|
||||
"prefs.choose_font": "Вибрати файл шрифту…",
|
||||
"prefs.click": "Клацання",
|
||||
"prefs.contact_shading": "М'яке контактне затінення",
|
||||
"prefs.contact_shading_note": "М'яке затінення там, де деталі зближуються.",
|
||||
"prefs.context_menu": "Контекстне меню",
|
||||
"prefs.context_menu_ring": "Контекстне меню · утримуйте для кругового меню",
|
||||
"prefs.cpu": "ЦП (програмний)",
|
||||
"prefs.crash_reports": "Відкрити звіти про збої…",
|
||||
"prefs.crash_reports_note": "Звіти зберігаються на цьому комп'ютері разом із проєктом і командами, що відтворюють проблему.",
|
||||
"prefs.ctrl_cmd": "Ctrl / Cmd",
|
||||
"prefs.curved_surfaces": "Криві поверхні",
|
||||
"prefs.curves": "Криві поверхні",
|
||||
"prefs.dead_zone_note": "Заштрихована смуга — це мертва зона: рух у її межах ігнорується.",
|
||||
"prefs.default": "типово",
|
||||
"prefs.design": "Типові параметри проєкту",
|
||||
"prefs.design_note": "З чого починаються нові проєкти. Відкриті проєкти зберігають власні параметри.",
|
||||
"prefs.devices": "3D-миша",
|
||||
"prefs.display": "Відображення",
|
||||
"prefs.edges": "Ребра та затінення",
|
||||
"prefs.extend": "Розширення",
|
||||
"prefs.extra_navigation": "Ctrl+перетягування лівою на порожньому місці обертає; утримуйте Space, щоб панорамувати.",
|
||||
"prefs.follows_os": "Як у системі",
|
||||
"prefs.font": "Шрифт",
|
||||
"prefs.font_fallback": "Символи, яких немає у вибраному шрифті, беруться з вбудованого, тож жоден напис не показує порожній квадрат.",
|
||||
"prefs.font_sample": "Ґедзь, що їв фінік, з'їв і юшку · Ø12.50 mm · 45.0° · 0123456789",
|
||||
"prefs.font_unreadable": "Не вдалося прочитати вибраний шрифт.",
|
||||
"prefs.general": "Загальні",
|
||||
"prefs.general_note": "Мова, збереження та оновлення.",
|
||||
"prefs.gesture_orbit": "Обертання",
|
||||
"prefs.gesture_pan": "Панорамування",
|
||||
"prefs.gesture_zoom": "Масштаб",
|
||||
"prefs.graphics": "Графіка",
|
||||
"prefs.graphics_note": "Обміняйте швидкість на плавність. Кожен варіант показує свій ефект на зразку.",
|
||||
"prefs.graphics_presets_note": "Набори задають наведені нижче параметри разом.",
|
||||
"prefs.history": "Історія",
|
||||
"prefs.hold_stop_snapping": "Утримуйте, щоб вимкнути прив'язування",
|
||||
"prefs.icons_only": "Лише піктограми",
|
||||
"prefs.imported_file": "Імпортований файл",
|
||||
"prefs.input": "Введення",
|
||||
"prefs.interface": "Інтерфейс",
|
||||
"prefs.interface_language": "Мова інтерфейсу",
|
||||
"prefs.interface_note": "Як виглядає SolidCraft і де розташовані його частини.",
|
||||
"prefs.interval_minutes": "{n} хв",
|
||||
"prefs.labels": "Підписи",
|
||||
"prefs.layout": "Компонування",
|
||||
"prefs.layout_note": "«Компактне» прикріплює панелі до країв вікна. Прозорість браузера доступна в режимі «Плаваюче». Сторону Асистента можна змінити на сторінці «Асистент».",
|
||||
"prefs.left": "Ліворуч",
|
||||
"prefs.left_click": "Клацання лівою",
|
||||
"prefs.live_input": "Поточне введення",
|
||||
"prefs.live_preview": "Попередній перегляд у реальному часі",
|
||||
"prefs.minutes": "хв",
|
||||
"prefs.minutes_suffix": " min",
|
||||
"prefs.mouse": "Миша й трекпад",
|
||||
"prefs.mouse_heading": "Миша",
|
||||
"prefs.mouse_mapping": "Призначення кнопок миші",
|
||||
"prefs.navigation": "Навігація",
|
||||
"prefs.navigation_note": "Як миша, трекпад і 3D-миша рухають вид.",
|
||||
"prefs.not_on_gpu": "не на цьому GPU",
|
||||
"prefs.on": "Увімкнено",
|
||||
"prefs.opaque": "Непрозорий",
|
||||
"prefs.orbit_snap": "Утримуйте Shift під час обертання, щоб прив'язатися до осі.",
|
||||
"prefs.orientation": "Орієнтація",
|
||||
"prefs.overall_speed": "Загальна швидкість",
|
||||
"prefs.preview_choices": "Перегляд ваших виборів",
|
||||
"prefs.quality_default": "типово",
|
||||
"prefs.quality_fastest": "найшвидше",
|
||||
"prefs.quality_slowest": "найповільніше",
|
||||
"prefs.quality_smoother": "плавніше",
|
||||
"prefs.reports_saved": "Збережено: {n}",
|
||||
"prefs.right_click": "Клацання правою",
|
||||
"prefs.saving": "Автозбереження й відновлення",
|
||||
"prefs.scale_note": "Також Ctrl + / Ctrl − у вікні. Кнопки мають 28 px за 100%.",
|
||||
"prefs.scale_text": "Масштаб і текст",
|
||||
"prefs.select": "Вибрати",
|
||||
"prefs.select_one_item": "Вибрати один елемент",
|
||||
"prefs.selecting": "Вибір",
|
||||
"prefs.shift": "Shift",
|
||||
"prefs.shift_add_ctrl_toggle": "Shift лише додає; Ctrl / Cmd перемикає",
|
||||
"prefs.shift_add_note": "Увімкнено: Shift додає, Ctrl / Cmd перемикає. Вимкнено (типово): обидва перемикають.",
|
||||
"prefs.shortcuts": "Комбінації клавіш",
|
||||
"prefs.sketch_selection": "Ескіз і вибір",
|
||||
"prefs.sketch_selection_heading": "Ескіз і вибір",
|
||||
"prefs.sketch_selection_note": "Як ескізи прив'язуються й як клацання вибирають.",
|
||||
"prefs.sketching": "Ескізування",
|
||||
"prefs.snap_drawing_note": "Під час малювання або перетягування точки ескізу.",
|
||||
"prefs.source": "Джерело",
|
||||
"prefs.speed": "Швидкість",
|
||||
"prefs.stand_up_note": "Коли файл STEP або IGES відкрито з віссю Z угору, пропонувати поворот на чверть оберту навколо X.",
|
||||
"prefs.status_done": "Готово",
|
||||
"prefs.status_error": "Помилка",
|
||||
"prefs.status_selected": "Вибрано",
|
||||
"prefs.status_warning": "Попередження",
|
||||
"prefs.supersampling_brief": "Малює вид у більшому розмірі й зменшує його: дуже чітко, але потребує більше ресурсів.",
|
||||
"prefs.tab_accent_note": "Акцентний колір відповідає активній вкладці",
|
||||
"prefs.theme_file": "файл теми",
|
||||
"prefs.timeline_half_hour": "−30 хв",
|
||||
"prefs.timeline_now": "зараз",
|
||||
"prefs.timeline_quarter_hour": "−15",
|
||||
"prefs.toggle_item": "Додати або прибрати елемент",
|
||||
"prefs.toolbar": "Панель інструментів",
|
||||
"prefs.translucent": "Напівпрозорий",
|
||||
"prefs.under_browser": "Під браузером",
|
||||
"prefs.under_cursor": "Під курсором",
|
||||
"prefs.units_precision": "Одиниці й точність",
|
||||
"prefs.updates": "Оновлення",
|
||||
"prefs.view": "Поведінка виду",
|
||||
"prefs.viewport": "Вікно перегляду",
|
||||
"prefs.wheel": "Колесо",
|
||||
"prefs.wheel_trackpad": "Колесо й трекпад",
|
||||
"prefs.workspace": "Робоча область",
|
||||
"prefs.zoom_toward_cursor": "Масштаб до курсора",
|
||||
"properties.title": "Властивості: {name}",
|
||||
"recovery.days_ago": "{count} дн. тому",
|
||||
"recovery.detail": "{file} · елементів: {features} · автозбережено {when}",
|
||||
@@ -1361,6 +1654,8 @@
|
||||
"ui.agent_chat_waiting": "Очікує на вашу відповідь",
|
||||
"ui.agent_cursor": "Курсор агента",
|
||||
"ui.agent_cursor_speed": "Швидкість курсора агента",
|
||||
"ui.agent_off_thread": "Підтримувати чуйність вікна, поки агенти виконують команди",
|
||||
"ui.agent_off_thread_note": "Повільні команди агента (з панелі ШІ або клієнта MCP) обчислюються паралельно з вікном: ви можете далі обертати й оглядати вид і зупинити команду з індикатора у виді. Вимкнено: кожна виконується в потоці вікна, і вікно чекає на неї.",
|
||||
"ui.ai_add": "Додати",
|
||||
"ui.ai_add_agent": "Додати агента…",
|
||||
"ui.ai_add_agent_title": "Додати агента",
|
||||
@@ -1592,6 +1887,8 @@
|
||||
"ui.filter_commands_or_keys": "Фільтрувати команди або клавіші",
|
||||
"ui.findInTimeline": "Знайти в часовому ланцюжку",
|
||||
"ui.findInWindow": "Знайти у вікні",
|
||||
"ui.fine": "Висока",
|
||||
"ui.finest": "Максимальна",
|
||||
"ui.finish_sketch": "Завершити ескіз",
|
||||
"ui.fit": "Вписати",
|
||||
"ui.fix_unfix": "Закріпити/розкріпити",
|
||||
@@ -1689,10 +1986,17 @@
|
||||
"ui.hideProfile": "Приховати профіль",
|
||||
"ui.history_back": "На один крок назад",
|
||||
"ui.history_below_browser": "Під браузером",
|
||||
"ui.history_edge_hint": "двічі клацніть край",
|
||||
"ui.history_first": "Перейти на початок",
|
||||
"ui.history_forward": "На один крок уперед",
|
||||
"ui.history_hide_names": "Приховати назви",
|
||||
"ui.history_last": "Перейти в кінець",
|
||||
"ui.history_marker_tip": "Маркер історії: перетягніть, щоб відкотити модель назад; нові елементи додаються тут",
|
||||
"ui.history_names": "Назви",
|
||||
"ui.history_play": "Відтворити до кінця",
|
||||
"ui.history_show_names": "Показати назви",
|
||||
"ui.history_title": "Історія",
|
||||
"ui.history_toggle_names": "Показувати або приховувати назви елементів",
|
||||
"ui.hole": "Отвір",
|
||||
"ui.hole_tap_type": "Тип різьби отвору",
|
||||
"ui.hole_type": "Тип отвору",
|
||||
@@ -1816,6 +2120,7 @@
|
||||
"ui.project_face_edges_sketch": "Проєктувати ребра граней у нові ескізи",
|
||||
"ui.properties": "Властивості",
|
||||
"ui.pull_direction": "Напрямок витягування",
|
||||
"ui.quality": "Якість",
|
||||
"ui.quantity": "Кількість",
|
||||
"ui.quantity_2": "Кількість 2",
|
||||
"ui.quit": "Вихід",
|
||||
@@ -1910,6 +2215,7 @@
|
||||
"ui.spline": "Сплайн",
|
||||
"ui.split_body": "Розділити тіло",
|
||||
"ui.stand_up_tip": "Після відкриття файлу STEP або IGES з напрямком Z вгору пропонувати поворот на чверть оберту навколо X",
|
||||
"ui.standard": "Стандартна",
|
||||
"ui.start": "Початок",
|
||||
"ui.start_over": "Почати спочатку",
|
||||
"ui.start_page": "Початкова сторінка",
|
||||
|
||||
@@ -1592,6 +1592,8 @@
|
||||
"ui.filter_commands_or_keys": "Lọc lệnh hoặc phím tắt",
|
||||
"ui.findInTimeline": "Tìm trong lịch sử thiết kế",
|
||||
"ui.findInWindow": "Tìm trong cửa sổ",
|
||||
"ui.fine": "Mịn",
|
||||
"ui.finest": "Mịn nhất",
|
||||
"ui.finish_sketch": "Hoàn tất phác thảo",
|
||||
"ui.fit": "Vừa vặn (Fit)",
|
||||
"ui.fix_unfix": "Cố định/Uncố định",
|
||||
@@ -1816,6 +1818,7 @@
|
||||
"ui.project_face_edges_sketch": "Chiếu các cạnh bề mặt vào phác thảo mới",
|
||||
"ui.properties": "Thuộc tính cơ lý",
|
||||
"ui.pull_direction": "Hướng kéo",
|
||||
"ui.quality": "Chất lượng",
|
||||
"ui.quantity": "Số lượng",
|
||||
"ui.quantity_2": "Số lượng 2",
|
||||
"ui.quit": "Thoát ứng dụng",
|
||||
@@ -1910,6 +1913,7 @@
|
||||
"ui.spline": "Đường cong Spline",
|
||||
"ui.split_body": "Chia tách khối",
|
||||
"ui.stand_up_tip": "Sau khi mở tệp STEP hoặc IGES với trục Z hướng lên, đề xuất xoay 90° quanh trục X",
|
||||
"ui.standard": "Tiêu chuẩn",
|
||||
"ui.start": "Bắt đầu",
|
||||
"ui.start_over": "Bắt đầu lại",
|
||||
"ui.start_page": "Trang bắt đầu",
|
||||
|
||||
@@ -1534,6 +1534,8 @@
|
||||
"ui.filter_commands_or_keys": "篩選命令或按鍵",
|
||||
"ui.findInTimeline": "在時間軸中查詢",
|
||||
"ui.findInWindow": "在視窗中查詢",
|
||||
"ui.fine": "精細",
|
||||
"ui.finest": "最精細",
|
||||
"ui.finish_sketch": "完成草圖",
|
||||
"ui.fit": "適合",
|
||||
"ui.fix_unfix": "固定/取消固定",
|
||||
@@ -1758,6 +1760,7 @@
|
||||
"ui.project_face_edges_sketch": "將面的邊投影到新草圖",
|
||||
"ui.properties": "屬性",
|
||||
"ui.pull_direction": "拔模方向",
|
||||
"ui.quality": "品質",
|
||||
"ui.quantity": "數量",
|
||||
"ui.quantity_2": "數量 2",
|
||||
"ui.quit": "結束",
|
||||
@@ -1852,6 +1855,7 @@
|
||||
"ui.spline": "雲形線",
|
||||
"ui.split_body": "分割實體",
|
||||
"ui.stand_up_tip": "當 Z 朝上的 STEP 或 IGES 檔案開啟後,提示繞 X 軸旋轉四分之一週",
|
||||
"ui.standard": "標準",
|
||||
"ui.start": "開始",
|
||||
"ui.start_over": "重新開始",
|
||||
"ui.start_page": "起始頁面",
|
||||
|
||||
+58
-2
@@ -143,6 +143,7 @@
|
||||
"Cube": "立方体",
|
||||
"Current orthographic view (1:1 mm)": "当前正交视图(1:1毫米)",
|
||||
"Current perspective view": "当前透视视图",
|
||||
"Current plane": "当前平面",
|
||||
"Curv. Comb": "曲率梳",
|
||||
"Curvature (G2)": "曲率 (G2)",
|
||||
"Curvature change (G3)": "曲率变化 (G3)",
|
||||
@@ -239,7 +240,9 @@
|
||||
"Gap": "间隙",
|
||||
"Grid": "网格",
|
||||
"HISTORY": "历史",
|
||||
"Halo under sketch curves": "在草图曲线下方显示光晕",
|
||||
"Height": "高度",
|
||||
"Height From": "高度基准",
|
||||
"Hidden edges": "隐藏线",
|
||||
"History layout": "历史布局",
|
||||
"History names": "历史名称",
|
||||
@@ -256,6 +259,7 @@
|
||||
"In place (surfaces)": "原位(曲面)",
|
||||
"In plane": "在平面内",
|
||||
"Included": "夹角",
|
||||
"Inner Sharp": "内侧虚拟尖点",
|
||||
"Inside": "内侧",
|
||||
"Instant": "即时",
|
||||
"Interface font": "界面字体",
|
||||
@@ -302,6 +306,7 @@
|
||||
"Mass Center": "质心",
|
||||
"Matched restrictions check the final values.": "满足条件的限制规则检查最终值。",
|
||||
"Material": "材质",
|
||||
"Material Outside": "材料在外",
|
||||
"Material copied. Existing body assignments are unchanged.": "材质已复制。现有实体指定保持不变。",
|
||||
"Max": "最大",
|
||||
"Maximum": "最大",
|
||||
@@ -314,7 +319,6 @@
|
||||
"Mitre": "斜接",
|
||||
"Model Parameters": "模型参数",
|
||||
"Modeled": "已建模",
|
||||
"More themes": "更多主题",
|
||||
"More toolbar panels": "更多工具栏面板",
|
||||
"Motion": "运动",
|
||||
"Mouse gestures": "鼠标手势",
|
||||
@@ -349,8 +353,10 @@
|
||||
"On your computer": "在此计算机上",
|
||||
"Opacity": "不透明度",
|
||||
"Open GitHub draft": "打开 GitHub 草稿",
|
||||
"Open bodies (no volume)": "未闭合实体(无体积)",
|
||||
"Open library...": "打开库...",
|
||||
"Open local libraries in the desktop app. You can export this design's library here.": "请在桌面应用中打开本地库。您可以在此导出当前设计的库。",
|
||||
"Open surface — no volume": "未闭合曲面 — 无体积",
|
||||
"Open-source parametric 3D CAD in Rust. Licensed MIT OR Apache-2.0.": "使用 Rust 编写的开源参数化 3D CAD。基于 MIT OR Apache-2.0 许可。",
|
||||
"Opens your browser and copies the report text for you to paste into GitHub.": "打开浏览器,并复制报告文本以便粘贴到GitHub。",
|
||||
"Opens your browser. Review and submit your report on GitHub.": "打开浏览器。请在GitHub中检查并提交报告。",
|
||||
@@ -359,6 +365,7 @@
|
||||
"Other side": "另一侧",
|
||||
"Other surface (mutual trim)": "另一曲面(相互修剪)",
|
||||
"Other way": "反方向",
|
||||
"Outer Sharp": "外侧虚拟尖点",
|
||||
"Outer radius": "外圆角半径",
|
||||
"Outside": "外侧",
|
||||
"Overall length": "总长",
|
||||
@@ -388,7 +395,6 @@
|
||||
"Preview": "预览",
|
||||
"Preview Row": "预览行",
|
||||
"Preview leaves the current design unchanged.": "预览不会更改当前设计。",
|
||||
"Previous themes": "上一组主题",
|
||||
"Profile / Edges": "轮廓 / 边",
|
||||
"Profiles or curves": "轮廓或曲线",
|
||||
"Profiles/Curves": "轮廓/曲线",
|
||||
@@ -526,9 +532,11 @@
|
||||
"Surface, or faces to turn over": "曲面,或要翻转的面",
|
||||
"Swap Ends": "交换端点",
|
||||
"TRIM": "修剪",
|
||||
"Tangent": "相切",
|
||||
"Tangent (G1)": "相切 (G1)",
|
||||
"Tangent Chain": "相切链",
|
||||
"Tangent chain": "相切链",
|
||||
"Tangent to Edge": "与边相切",
|
||||
"Tap drill diameter": "攻丝底孔直径",
|
||||
"Target": "目标",
|
||||
"Target Body": "目标实体",
|
||||
@@ -684,6 +692,7 @@
|
||||
"cmd.component_capture_position": "捕获位置",
|
||||
"cmd.component_copies": "查找相同副本",
|
||||
"cmd.component_create": "新建组件",
|
||||
"cmd.component_cycle_color": "循环切换组件颜色",
|
||||
"cmd.component_delete": "删除组件",
|
||||
"cmd.component_extract": "提取到文件",
|
||||
"cmd.component_from_bodies": "由实体创建组件",
|
||||
@@ -768,6 +777,8 @@
|
||||
"cmd.inspect_accessibility": "可达性分析",
|
||||
"cmd.inspect_center_of_mass": "质心",
|
||||
"cmd.inspect_clearance": "间隙",
|
||||
"cmd.inspect_colored_components": "启用组件颜色",
|
||||
"cmd.inspect_colored_components_disable": "禁用组件颜色",
|
||||
"cmd.inspect_compare": "比较实体",
|
||||
"cmd.inspect_continuity": "连续性分析",
|
||||
"cmd.inspect_curvature_comb": "曲率梳分析",
|
||||
@@ -1081,6 +1092,7 @@
|
||||
"crash.report": "报告…",
|
||||
"crash.unclean_explanation": "在后续启动时检测到;未记录确切的退出时间。系统关机或强制停止也可能导致会话未正常结束。",
|
||||
"delete.and_more": "…以及另外 {count} 项",
|
||||
"diagnostic.empty_boolean_component": "组件 '{component}' 中没有可供切除或求交的实体;工具可能与组件 '{other}' 中的 '{body}' 重叠 — 请激活该组件或选择该实体作为目标",
|
||||
"dialog.bodies_count": "{count} 个实体",
|
||||
"dialog.clearance_invalid": "间隙必须是 0 或更大的长度",
|
||||
"dialog.compute": "计算",
|
||||
@@ -1124,9 +1136,11 @@
|
||||
"dxf.progress.write": "正在写入 DXF (5/5)",
|
||||
"dxf.tolerance": "曲线公差",
|
||||
"dxf.tolerance_help": "仅导出可见实体和显示的草图。曲线使用直线段近似。公差越小,曲线越精细,但需要更多时间和内存。",
|
||||
"file.open.drawing_filter": "设计、CAD 文件、网格和图纸",
|
||||
"file_load.built": "已构建:{built}/{total} 个特征。",
|
||||
"file_load.converting": "正在转换实体 {done}/{total}",
|
||||
"file_load.inserting": "正在插入几何体",
|
||||
"file_load.link_item": "{name} ({done}/{total})",
|
||||
"file_load.opening": "正在打开设计",
|
||||
"file_load.preparing_thumbnail": "正在准备缩略图...",
|
||||
"file_load.preparing_view": "正在准备视图...",
|
||||
@@ -1136,6 +1150,7 @@
|
||||
"file_load.rebuilding": "正在重建特征 {done}/{total}",
|
||||
"file_load.recovering": "正在恢复设计",
|
||||
"file_load.stopping": "正在等待上一次操作停止...",
|
||||
"file_load.updating_links": "正在更新链接",
|
||||
"file_load.waiting": "正在等待文件操作",
|
||||
"fits the face, e.g. M8": "适配该面,例如 M8",
|
||||
"from the profile": "取自型材",
|
||||
@@ -1238,6 +1253,8 @@
|
||||
"joint.from_bodies_hint": "每个所选实体移入各自的新组件,位置保持不变。",
|
||||
"joint.one_body": "两次选择都在 {body} 上。请在另一个零件上选择第二个。",
|
||||
"joint.one_component": "这些零件是同一组件的实体:{bodies}。接头使一个组件相对另一个组件运动,因此每个零件都需要自己的组件。",
|
||||
"joint.rigid_group_one_component": "这 {count} 个实体都位于同一组件中(或直接位于设计中):请先使用“{command}”。",
|
||||
"joint.rigid_group_select_components": "请选择两个或更多组件。",
|
||||
"keymap.command_id": "命令 ID",
|
||||
"keymap.empty": "没有匹配的命令",
|
||||
"keymap.use_anyway": "仍在此处使用 {key}",
|
||||
@@ -1358,6 +1375,7 @@
|
||||
"pick the path": "选择路径",
|
||||
"prefs.add_item": "添加项目",
|
||||
"prefs.alt_frees_manipulators": "Alt / Option 也可自由拖动操纵器箭头",
|
||||
"prefs.anti_aliasing_amd_dx12": "由于启动检查在启用多重采样时未绘制任何内容,而在1×时通过了检查,抗锯齿已设为1×。您可以在上方选择其他设置;重启后若检查通过,该设置将生效。",
|
||||
"prefs.anti_aliasing_note": "平滑锯齿边缘。",
|
||||
"prefs.applies_on_restart": "重启后生效",
|
||||
"prefs.assistant": "助手",
|
||||
@@ -1401,6 +1419,10 @@
|
||||
"prefs.gesture_pan": "平移",
|
||||
"prefs.gesture_zoom": "缩放",
|
||||
"prefs.graphics": "图形",
|
||||
"prefs.graphics_card": "显卡",
|
||||
"prefs.graphics_card_auto": "自动",
|
||||
"prefs.graphics_card_missing": "已保存的显卡不可用;将使用自动选择。",
|
||||
"prefs.graphics_card_restart": "重启 SolidCraft 后生效。WGPU_ADAPTER_NAME 优先于此选择。",
|
||||
"prefs.graphics_note": "在速度与平滑度之间取舍。每个选项均以示例展示效果。",
|
||||
"prefs.graphics_presets_note": "预设会同时设置以下选项。",
|
||||
"prefs.history": "历史",
|
||||
@@ -1432,6 +1454,7 @@
|
||||
"prefs.orbit_snap": "旋转时按住Shift可捕捉到坐标轴。",
|
||||
"prefs.orientation": "方向",
|
||||
"prefs.overall_speed": "整体速度",
|
||||
"prefs.prefer_free_sketch_points": "草图点重合时优先选择可移动的点",
|
||||
"prefs.preview_choices": "所选设置预览",
|
||||
"prefs.quality_default": "默认",
|
||||
"prefs.quality_fastest": "最快",
|
||||
@@ -2138,6 +2161,11 @@
|
||||
"sketch_panel.author": "创建时的放置:{path}",
|
||||
"sketch_panel.dimension_hint": "输入数值或表达式,然后按“确定”。",
|
||||
"sketch_panel.move_hint": "输入距离和角度,然后按“确定”。",
|
||||
"sketch_panel.plane_angle": "{plane},旋转 {angle}",
|
||||
"sketch_panel.plane_fixed": "固定平面",
|
||||
"sketch_panel.plane_flipped": "{plane}(从另一侧)",
|
||||
"sketch_panel.plane_offset": "{plane},偏移 {distance}",
|
||||
"sketch_panel.plane_origin": "{plane} 平面",
|
||||
"sketch_panel.redefine_title": "{command}:{name}",
|
||||
"sketch_panel.sheet_attachment": "附着到钣金实体的平面上;钣金变化时会跟随该面板。",
|
||||
"sketch_panel.text_hint": "编辑文字及其位置,然后按“确定”。",
|
||||
@@ -2312,6 +2340,7 @@
|
||||
"ui.agent_chat_changes": "{n} 项更改,一步撤销",
|
||||
"ui.agent_chat_changes_n": "{n} 项更改",
|
||||
"ui.agent_chat_changes_of": "更改 {n}/{limit}",
|
||||
"ui.agent_chat_choose_model": "选择模型",
|
||||
"ui.agent_chat_close": "关闭",
|
||||
"ui.agent_chat_command": "智能体命令",
|
||||
"ui.agent_chat_connect": "连接",
|
||||
@@ -2362,6 +2391,7 @@
|
||||
"ui.agent_chat_mode_all": "全部",
|
||||
"ui.agent_chat_mode_ask": "询问",
|
||||
"ui.agent_chat_mode_edits": "编辑",
|
||||
"ui.agent_chat_model_no_tools": "{model} 无法使用 SolidCraft 的工具,只能聊天。请选择支持工具的模型。",
|
||||
"ui.agent_chat_model_tip": "智能体使用的模型。你的选择会为此智能体记住。",
|
||||
"ui.agent_chat_new": "新对话",
|
||||
"ui.agent_chat_new_confirm": "开始新对话?当前对话将被清除。",
|
||||
@@ -2370,6 +2400,7 @@
|
||||
"ui.agent_chat_no_control": "智能体聊天的端点未能启动,因此智能体无法访问设计。",
|
||||
"ui.agent_chat_no_images": "该智能体不接收图片",
|
||||
"ui.agent_chat_no_picture": "剪贴板上没有图片",
|
||||
"ui.agent_chat_no_tool_call": "模型没有使用 SolidCraft 的工具,因此设计没有更改。请选择支持工具调用的模型;参见智能体聊天指南中的“本地模型”。",
|
||||
"ui.agent_chat_none_found": "未找到编程智能体。请安装以下之一,然后点击刷新:",
|
||||
"ui.agent_chat_none_found_short": "未找到智能体",
|
||||
"ui.agent_chat_not_installed": "未安装",
|
||||
@@ -2387,6 +2418,9 @@
|
||||
"ui.agent_chat_previous_picture": "上一张图片",
|
||||
"ui.agent_chat_privacy": "除了你以自己的账户运行的智能体之外,不会向任何地方发送任何内容。",
|
||||
"ui.agent_chat_privacy_note": "SolidCraft 不向任何地方发送任何内容:你运行的智能体以你自己的账户与它自己的服务通信。SolidCraft 从不查看或保存任何密钥或密码。",
|
||||
"ui.agent_chat_provider_models": "{count} 个模型",
|
||||
"ui.agent_chat_provider_other": "其他",
|
||||
"ui.agent_chat_provider_tip": "旁边的列表显示此提供商的模型。",
|
||||
"ui.agent_chat_queue": "加入队列",
|
||||
"ui.agent_chat_queue_full": "等待中的消息太多:请删除一条,或等待智能体完成。",
|
||||
"ui.agent_chat_queued": "已排队",
|
||||
@@ -2594,6 +2628,8 @@
|
||||
"ui.copy": "复制",
|
||||
"ui.corner": "角",
|
||||
"ui.corners": "角点",
|
||||
"ui.cosmetic_thread_markings": "装饰螺纹标记",
|
||||
"ui.cosmetic_thread_markings_help": "在带螺纹的圆柱面上显示示意标记。仅改变显示,不影响设计或导出。",
|
||||
"ui.counterbore": "沉头孔",
|
||||
"ui.countersink": "锥形沉孔",
|
||||
"ui.create": "创建",
|
||||
@@ -2670,6 +2706,8 @@
|
||||
"ui.filter_commands_or_keys": "筛选命令或按键",
|
||||
"ui.findInTimeline": "在时间线中查找",
|
||||
"ui.findInWindow": "在窗口中查找",
|
||||
"ui.fine": "精细",
|
||||
"ui.finest": "最精细",
|
||||
"ui.finish_sketch": "完成草图",
|
||||
"ui.fit": "适合",
|
||||
"ui.fix_unfix": "固定/取消固定",
|
||||
@@ -2863,6 +2901,7 @@
|
||||
"ui.one_side": "单侧",
|
||||
"ui.open": "打开",
|
||||
"ui.open_ends_tip": "未接触任何曲线",
|
||||
"ui.open_linked_design": "打开链接设计",
|
||||
"ui.open_preferences": "打开首选项",
|
||||
"ui.open_recent": "打开最近",
|
||||
"ui.operation": "操作",
|
||||
@@ -2882,6 +2921,11 @@
|
||||
"ui.paste": "粘贴",
|
||||
"ui.path": "路径",
|
||||
"ui.pattern_on_path": "路径阵列",
|
||||
"ui.perforate_margin_default": "与直径相同",
|
||||
"ui.perforate_pitch": "孔距",
|
||||
"ui.perforate_square": "正方形排列",
|
||||
"ui.perforate_staggered": "交错排列(60°)",
|
||||
"ui.perforate_title": "穿孔",
|
||||
"ui.perpendicular": "垂直",
|
||||
"ui.perspective_view": "透视图",
|
||||
"ui.pinToShortcuts": "固定到快捷方式",
|
||||
@@ -2893,7 +2937,9 @@
|
||||
"ui.plugins": "插件",
|
||||
"ui.plugins_desktop": "插件仅在桌面版中可用。",
|
||||
"ui.plugins_empty": "尚未安装插件。",
|
||||
"ui.plugins_none": "没有符合搜索的插件。",
|
||||
"ui.plugins_note": "每个插件是 {path} 里的一个文件夹,其中有 plugin.json。SolidCraft 只读取该文件,不运行文件夹里的代码。关闭插件仍会保留安装。",
|
||||
"ui.plugins_search": "搜索插件",
|
||||
"ui.plugins_skipped": "有 {count} 个文件夹无法读取。",
|
||||
"ui.plugins_version": "{version}",
|
||||
"ui.point": "点",
|
||||
@@ -2909,6 +2955,7 @@
|
||||
"ui.project_face_edges_sketch": "将面的边投影到新草图",
|
||||
"ui.properties": "属性",
|
||||
"ui.pull_direction": "拔模方向",
|
||||
"ui.quality": "质量",
|
||||
"ui.quantity": "数量",
|
||||
"ui.quantity_2": "数量 2",
|
||||
"ui.quit": "退出",
|
||||
@@ -3015,6 +3062,7 @@
|
||||
"ui.spline": "样条曲线",
|
||||
"ui.split_body": "分割实体",
|
||||
"ui.stand_up_tip": "当 Z 朝上的 STEP 或 IGES 文件打开后,提示绕 X 轴旋转四分之一周",
|
||||
"ui.standard": "标准",
|
||||
"ui.start": "开始",
|
||||
"ui.start_over": "重新开始",
|
||||
"ui.start_page": "起始页",
|
||||
@@ -3054,6 +3102,7 @@
|
||||
"ui.total_angle": "总角度",
|
||||
"ui.trackpad_pan_tip": "双指滚动平移;Fusion 预设下,Shift + 双指滚动旋转视图。关闭时滚动缩放。鼠标滚轮和双指捏合缩放,拇指滚轮横向平移。",
|
||||
"ui.trim": "修剪",
|
||||
"ui.turn_up_axis": "旋转向上轴",
|
||||
"ui.twist": "扭转",
|
||||
"ui.two_finger_scroll_pans": "双指滚动平移",
|
||||
"ui.two_sides": "双侧",
|
||||
@@ -3071,6 +3120,7 @@
|
||||
"ui.updateToCurrentView": "更新为当前视图",
|
||||
"ui.vertical_constraint": "垂直约束",
|
||||
"ui.view_centre": "视图中心",
|
||||
"ui.viewport_theme_follow": "跟随主题",
|
||||
"ui.visual_shaded_hidden_edges": "带隐藏边的着色",
|
||||
"ui.visual_shaded_with_edges": "带边着色",
|
||||
"ui.visual_style": "视觉样式",
|
||||
@@ -3124,6 +3174,7 @@
|
||||
"update.prefs_flatpak": "此副本({version})由 Flatpak 更新:运行 {command} 或使用软件中心。SolidCraft 不会自行检查。",
|
||||
"update.prefs_label": "更新",
|
||||
"update.prefs_note": "当前为 SolidCraft {version}({kind})。检查时只向 GitHub 查询最新版本,不发送其他任何数据。",
|
||||
"update.prefs_web": "重新加载页面以获取最新的网页应用。如果网络不可用或更新无法及时下载完成,则打开已保存的版本;正在进行的下载会继续,供下次重新加载时使用。",
|
||||
"update.release_page": "打开发布页面",
|
||||
"update.restart": "立即重启",
|
||||
"update.restart_later": "稍后",
|
||||
@@ -3134,6 +3185,11 @@
|
||||
"update.up_to_date": "SolidCraft 已是最新版本。",
|
||||
"update.update_now": "立即更新",
|
||||
"update.you_have": "当前版本为 {version}。",
|
||||
"web.files.insert_drawings_hint": "将 CAD 文件、网格、DXF 或 SVG 插入当前设计",
|
||||
"web.files.insert_stored_drawings_hint": "插入当前设计(CAD 文件、网格、DXF、SVG)",
|
||||
"web.open_full": "在 SolidCraft 中打开",
|
||||
"web.open_link": "打开链接的设计?",
|
||||
"web.open_link_confirm": "有未保存的更改。要在新标签页中打开链接的设计吗?",
|
||||
"↑ ↓ choose · Enter / Tab complete · Esc dismiss": "↑ ↓ 选择 · Enter / Tab 补全 · Esc 关闭",
|
||||
"↑ ↓ choose · Enter applies what you typed · Esc dismiss": "↑ ↓ 选择 · Enter 按原样应用 · Esc 关闭"
|
||||
}
|
||||
|
||||
@@ -296,9 +296,10 @@ fn opaque_depth(i: TOut, front: bool) -> AoDepth {
|
||||
return AoDepth(depth, bitcast<u32>(depth));
|
||||
}
|
||||
|
||||
// Deterministic cosine-weighted hemisphere samples. Projecting the sample and a point one
|
||||
// radius toward the eye supplies a depth range in both orthographic and perspective views;
|
||||
// distant foreground geometry cannot cast a dark halo onto a background surface.
|
||||
// Cosine-weighted hemisphere samples, the pattern turned by a different angle at each pixel.
|
||||
// Projecting the sample and a point one radius toward the eye supplies a depth range in both
|
||||
// orthographic and perspective views; distant foreground geometry cannot cast a dark halo onto
|
||||
// a background surface.
|
||||
fn occlusion(i: TOut) -> f32 {
|
||||
let radius = u.ao.x;
|
||||
if (radius <= 0.0 || length(i.n) < 0.5) { return 1.0; }
|
||||
@@ -311,6 +312,14 @@ fn occlusion(i: TOut) -> f32 {
|
||||
// The map is a 1 × 1 stand-in until a frame draws into it (the product preview draws no
|
||||
// prepass): sampling it tells nothing, so leave the surface unoccluded.
|
||||
if (size.x < 2 || size.y < 2) { return 1.0; }
|
||||
// The same offsets at every pixel made each sample darken its own shifted copy of a nearby
|
||||
// part's outline: faint ghosts of the part where the radius is large on screen (#4167),
|
||||
// stepped bands along contacts where it is small (#3407). Turned by interleaved gradient
|
||||
// noise (Jimenez 2014), neighbouring pixels sample different points and the copies break up
|
||||
// into an even grain.
|
||||
let turn = fract(52.9829189 * fract(dot(i.pos.xy, vec2<f32>(0.06711056, 0.00583715))));
|
||||
let t = tangent * cos(turn * 6.28318531) + bitangent * sin(turn * 6.28318531);
|
||||
let b = cross(n, t);
|
||||
// One comparison for both depth directions: depths read as 0 near / 1 far (mirrored when
|
||||
// the buffer runs reversed). The map is cleared to its far plane either way, so a texel
|
||||
// with nothing in it reads as 1 and the `d < 1.0` test below skips it.
|
||||
@@ -319,7 +328,7 @@ fn occlusion(i: TOut) -> f32 {
|
||||
for (var j = 0u; j < 32u; j = j + 1u) {
|
||||
let f = (f32(j) + 0.5) / 32.0;
|
||||
let angle = f32(j) * 2.39996323;
|
||||
let direction = tangent * (cos(angle) * sqrt(f)) + bitangent * (sin(angle) * sqrt(f)) + n * sqrt(1.0 - f);
|
||||
let direction = t * (cos(angle) * sqrt(f)) + b * (sin(angle) * sqrt(f)) + n * sqrt(1.0 - f);
|
||||
let reach = radius * (0.2 + 0.8 * fract(f32(j) * 0.61803399 + 0.5));
|
||||
let sample = i.wp + n * (radius * 0.025) + direction * reach;
|
||||
let q = u.vp * vec4<f32>(sample, 1.0);
|
||||
|
||||
@@ -155,9 +155,11 @@ impl Tokens {
|
||||
origin_plane_edge: Color32::from_rgba_unmultiplied_const(214, 140, 84, 200),
|
||||
origin_plane_hover: Color32::from_rgba_unmultiplied_const(120, 130, 230, 150),
|
||||
origin_point: Color32::from_rgb(214, 215, 218),
|
||||
axis_x: Color32::from_rgb(255, 0, 0),
|
||||
axis_y: Color32::from_rgb(0, 255, 0),
|
||||
axis_z: Color32::from_rgb(2, 2, 248),
|
||||
// The one set of X, Y and Z colours (#976), equal to the engine's `view::colors::AXIS_*`
|
||||
// so a headless picture draws its origin axes as the window does.
|
||||
axis_x: Color32::from_rgb(220, 60, 60),
|
||||
axis_y: Color32::from_rgb(60, 170, 60),
|
||||
axis_z: Color32::from_rgb(60, 100, 230),
|
||||
construction_plane: Color32::from_rgba_unmultiplied_const(249, 184, 134, 70),
|
||||
construction_geom: icon_primary(crate::icon_svg::CONSTRUCTION_PRIMARY[0]),
|
||||
body: Color32::from_rgb(176, 186, 198),
|
||||
@@ -178,6 +180,7 @@ impl Tokens {
|
||||
body_selected: Color32::from_rgb(110, 170, 235),
|
||||
sketch: Color32::from_rgb(30, 90, 200),
|
||||
sketch_fixed: Color32::from_rgb(20, 20, 20),
|
||||
sketch_halo: Color32::from_rgb(240, 243, 247),
|
||||
sketch_point: Color32::BLACK,
|
||||
sketch_locked: Color32::from_rgb(0, 140, 60),
|
||||
dimension: Color32::from_rgb(36, 40, 48),
|
||||
@@ -219,8 +222,6 @@ impl Tokens {
|
||||
sketch_lost: Color32::from_rgb(200, 60, 90),
|
||||
sketch_construction: Color32::from_rgb(230, 130, 40),
|
||||
sketch_centerline: Color32::from_rgb(200, 110, 60),
|
||||
triad: [Color32::from_rgb(220, 60, 60), Color32::from_rgb(60, 170, 60), Color32::from_rgb(60, 100, 230)],
|
||||
gizmo: [Color32::from_rgb(225, 70, 60), Color32::from_rgb(80, 190, 80), Color32::from_rgb(70, 130, 240)],
|
||||
bend_up: Color32::from_rgb(30, 140, 50),
|
||||
bend_down: Color32::from_rgb(200, 90, 20),
|
||||
interference: Color32::from_rgb(235, 45, 40),
|
||||
@@ -336,6 +337,7 @@ impl Tokens {
|
||||
t.body_edge = Color32::from_rgb(16, 16, 18);
|
||||
t.sketch = Color32::from_rgb(92, 150, 255);
|
||||
t.sketch_fixed = Color32::from_rgb(232, 234, 238);
|
||||
t.sketch_halo = Color32::from_rgb(28, 32, 40);
|
||||
t.sketch_point = Color32::from_rgb(232, 234, 238);
|
||||
t.sketch_locked = Color32::from_rgb(96, 204, 116);
|
||||
t.dimension = Color32::from_rgb(224, 228, 234);
|
||||
@@ -375,9 +377,8 @@ impl Tokens {
|
||||
let mut t = self;
|
||||
let positive = [0.20, 0.45, 0.90];
|
||||
let negative = [0.85, 0.40, 0.05];
|
||||
t.triad[0] = Color32::from_rgb(200, 40, 40);
|
||||
t.triad[1] = Color32::from_rgb(120, 210, 80);
|
||||
t.gizmo[1] = Color32::from_rgb(140, 220, 90);
|
||||
t.axis_x = Color32::from_rgb(200, 40, 40);
|
||||
t.axis_y = Color32::from_rgb(120, 210, 80);
|
||||
t.preview_sketch = Color32::from_rgb(80, 185, 145);
|
||||
t.analysis.draft = [positive, [0.95, 0.90, 0.60], negative];
|
||||
t.analysis.access = [positive, negative];
|
||||
|
||||
@@ -0,0 +1,245 @@
|
||||
{
|
||||
"base": "light",
|
||||
"colors": {
|
||||
"accent": "#c63a00",
|
||||
"accent_soft": "#e8d0c3",
|
||||
"agent_busy": "#015ba6",
|
||||
"agent_ok": "#257231",
|
||||
"app_bar": "#e1ddd8",
|
||||
"app_bar_hover": "#13110e14",
|
||||
"app_bar_hover_button": "#13110e18",
|
||||
"app_bar_hover_strong": "#13110e22",
|
||||
"app_bar_hover_subtle": "#13110e0c",
|
||||
"app_bar_icon": [
|
||||
"#403d38",
|
||||
"#b5b0a9",
|
||||
"#c63a00"
|
||||
],
|
||||
"app_bar_separator": "#b5b0a9",
|
||||
"app_bar_tab_active": "#f9f6f2",
|
||||
"app_bar_text": "#403d38",
|
||||
"axis_x": "#c71529",
|
||||
"axis_y": "#257231",
|
||||
"axis_z": "#015ba6",
|
||||
"bend_down": "#705e91",
|
||||
"bend_up": "#257231",
|
||||
"body": "#c2beb8",
|
||||
"body_edge": "#403d38",
|
||||
"body_selected": "#de8d6b",
|
||||
"border": "#d9d5d0",
|
||||
"box_crossing": "#257231",
|
||||
"box_window": "#015ba6",
|
||||
"chip": "#c63a00",
|
||||
"construction_geom": "#7d6535",
|
||||
"construction_plane": "#7d653540",
|
||||
"continuity": [
|
||||
"#257231",
|
||||
"#015ba6",
|
||||
"#c08a1a",
|
||||
"#b14578"
|
||||
],
|
||||
"control_border": "#d4d0ca",
|
||||
"control_fill": "#fffdfa",
|
||||
"cube_border": "#b5b0a9",
|
||||
"cube_face": "#fffdfa",
|
||||
"cube_hover": "#d4d0ca",
|
||||
"cube_text": "#13110e",
|
||||
"dialog_bg": "#f9f6f2",
|
||||
"dialog_body": "#f9f6f2",
|
||||
"dialog_border": "#d4d0ca",
|
||||
"dialog_footer": "#efece8",
|
||||
"dialog_label": "#403d38",
|
||||
"dialog_rule": "#d9d5d0",
|
||||
"dimension": "#403d38",
|
||||
"dimension_driven": "#6c6863",
|
||||
"error": "#c71529",
|
||||
"field": "#fffdfa",
|
||||
"form_accent": "#5844bc",
|
||||
"form_dim": "#6c6863",
|
||||
"form_error": "#c71529",
|
||||
"form_error_fill": "#f4e0de",
|
||||
"form_fill": "#5844bc",
|
||||
"form_ink": "#13110e",
|
||||
"form_primary": "#c63a00",
|
||||
"form_soft": "#e4e0e5",
|
||||
"form_success": "#257231",
|
||||
"form_success_fill": "#e4e9df",
|
||||
"form_tab_ink": "#5844bc",
|
||||
"gizmo": [
|
||||
"#b00018",
|
||||
"#096125",
|
||||
"#004c9b"
|
||||
],
|
||||
"glyph_bg": "#fffdfa",
|
||||
"glyph_edge": "#d4d0ca",
|
||||
"glyph_text": "#604b83",
|
||||
"grid": "#edeae5",
|
||||
"grid_major": "#e1ddd8",
|
||||
"heading_bg": "#ebe7e2",
|
||||
"hover": "#e1ddd7",
|
||||
"hover_edge": "#13110e",
|
||||
"hover_edge_halo": "#fffdfa",
|
||||
"hover_profile": "#13110e22",
|
||||
"hover_profile_edge": "#403d38",
|
||||
"icon": "#403d38",
|
||||
"icon_fill": "#d4d0ca",
|
||||
"icons.access": [
|
||||
"#257231",
|
||||
"#c71529"
|
||||
],
|
||||
"icons.agent": "#5844bc",
|
||||
"icons.axes": [
|
||||
"#c71529",
|
||||
"#257231",
|
||||
"#015ba6"
|
||||
],
|
||||
"icons.curvature": [
|
||||
"#015ba6",
|
||||
"#257231",
|
||||
"#c71529"
|
||||
],
|
||||
"icons.draft": [
|
||||
"#257231",
|
||||
"#e6af2b"
|
||||
],
|
||||
"icons.floor": "#6c6863",
|
||||
"icons.fold": "#8d8982",
|
||||
"icons.folder": "#c9a96a",
|
||||
"icons.glint": "#ffffffa0",
|
||||
"icons.highlight": "#fffdfa",
|
||||
"icons.interference": "#c71529",
|
||||
"icons.marker_halo": "#13110e96",
|
||||
"icons.paint": [
|
||||
"#c71529",
|
||||
"#015ba6",
|
||||
"#e6af2b"
|
||||
],
|
||||
"icons.plane": "#e3cf9f",
|
||||
"icons.sheet": "#b9cde2",
|
||||
"icons.sheet_2": "#a5bfd9",
|
||||
"icons.sheet_light": "#dbe6f0",
|
||||
"icons.sheet_line": "#015ba6",
|
||||
"icons.sky": "#b9cde2",
|
||||
"icons.stripe": "#13110e",
|
||||
"icons.warning": "#e6af2b",
|
||||
"interference": "#c71529",
|
||||
"logo": [
|
||||
"#bb461e",
|
||||
"#c63a00",
|
||||
"#902e04"
|
||||
],
|
||||
"manipulator": "#004c9b",
|
||||
"mesh_accent": "#7e6900",
|
||||
"mesh_fill": "#7e6900",
|
||||
"mesh_ink": "#6b5903",
|
||||
"mesh_soft": "#e7e3d8",
|
||||
"on_accent": "#fffbed",
|
||||
"origin_plane": "#6c686338",
|
||||
"origin_plane_edge": "#6c6863c8",
|
||||
"origin_plane_hover": "#015ba670",
|
||||
"origin_point": "#403d38",
|
||||
"overlay": "#fffdfaeb",
|
||||
"panel": "#efece8",
|
||||
"panel_header": "#ebe7e2",
|
||||
"preview_add": "#4f8fd6",
|
||||
"preview_cut": "#c715296e",
|
||||
"preview_new": "#e6af2b",
|
||||
"preview_sketch": "#2d713b",
|
||||
"profile_fill": "#015ba614",
|
||||
"render_accent": "#ac1f6a",
|
||||
"render_fill": "#ac1f6a",
|
||||
"render_ink": "#ac1f6a",
|
||||
"render_soft": "#eadedf",
|
||||
"rubber_band": "#004c9b",
|
||||
"section_cap": "#7d6535",
|
||||
"sel_edge": "#c63a00",
|
||||
"sel_edge_rim": "#e29c80",
|
||||
"sel_face": "#d67147",
|
||||
"sel_profile": "#c63a00a0",
|
||||
"sel_profile_edge": "#c63a00",
|
||||
"sel_vertex": "#c63a00",
|
||||
"selected_bg": "#f1d8cb",
|
||||
"selected_ink": "#13110e",
|
||||
"sheet_fill": "#015ba6",
|
||||
"sheet_ink": "#015ba6",
|
||||
"sheet_soft": "#dee2e3",
|
||||
"sketch": "#015ba6",
|
||||
"sketch_accent": "#2d713b",
|
||||
"sketch_centerline": "#403d38",
|
||||
"sketch_construction": "#7d6535",
|
||||
"sketch_fixed": "#13110e",
|
||||
"sketch_ink": "#2d713b",
|
||||
"sketch_locked": "#257231",
|
||||
"sketch_lost": "#c71529",
|
||||
"sketch_point": "#13110e",
|
||||
"sketch_point_free": "#015ba6",
|
||||
"sketch_projected": "#705e91",
|
||||
"sketch_soft": "#e1e3dc",
|
||||
"subheading_bg": "#efece8",
|
||||
"surface_accent": "#7d6535",
|
||||
"surface_fill": "#7d6535",
|
||||
"surface_ink": "#6a562e",
|
||||
"surface_soft": "#e7e3db",
|
||||
"tab_on_fill_dark": "#13110e",
|
||||
"text": "#13110e",
|
||||
"text_dim": "#6c6863",
|
||||
"timeline": "#efece8",
|
||||
"timeline_item": "#fffdfa",
|
||||
"timeline_item_error": "#f2c5c8",
|
||||
"timeline_marker": "#c63a00",
|
||||
"toolbar": "#efece8",
|
||||
"triad": [
|
||||
"#c71529",
|
||||
"#257231",
|
||||
"#015ba6"
|
||||
],
|
||||
"viewport_bottom": "#f1ede8",
|
||||
"viewport_top": "#f9f6f2",
|
||||
"warning": "#956000"
|
||||
},
|
||||
"format": "solidcraft-theme/1",
|
||||
"name": "Akari",
|
||||
"icon_palette": {
|
||||
"ink": "#13110e",
|
||||
"line": "#505054",
|
||||
"passive-1": "#dee5ee",
|
||||
"passive-2": "#aeb5bd",
|
||||
"passive-3": "#81878f",
|
||||
"guide": "#6e6e73",
|
||||
"solid": [
|
||||
"#dbe9fe",
|
||||
"#81b3fa",
|
||||
"#1875eb"
|
||||
],
|
||||
"surface": [
|
||||
"#fde3c4",
|
||||
"#daa662",
|
||||
"#a06f28"
|
||||
],
|
||||
"mesh": [
|
||||
"#fee7a2",
|
||||
"#d1ad37",
|
||||
"#937717"
|
||||
],
|
||||
"form": [
|
||||
"#ede2ff",
|
||||
"#c39afc",
|
||||
"#8b62bf"
|
||||
],
|
||||
"sketch": [
|
||||
"#b1fdc5",
|
||||
"#72c78b",
|
||||
"#388e56"
|
||||
],
|
||||
"constraint": [
|
||||
"#fee0dd",
|
||||
"#f98e87",
|
||||
"#d73339"
|
||||
],
|
||||
"construction": [
|
||||
"#fde3c4",
|
||||
"#daa662",
|
||||
"#a06f28"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#d4902f",
|
||||
"form_success_fill": "#3b280d",
|
||||
"form_tab_ink": "#cf8d31",
|
||||
"gizmo": [
|
||||
"#f3a535",
|
||||
"#ffad38",
|
||||
"#9b6922"
|
||||
],
|
||||
"glyph_bg": "#201607",
|
||||
"glyph_edge": "#e0d1ac",
|
||||
"glyph_text": "#e0d1ac",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#ba7e29",
|
||||
"sketch_construction": "#ad7626",
|
||||
"sketch_fixed": "#c68b2f",
|
||||
"sketch_halo": "#170d03",
|
||||
"sketch_ink": "#f7ce88",
|
||||
"sketch_locked": "#d4902f",
|
||||
"sketch_lost": "#fff0ca",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#46300f",
|
||||
"timeline_marker": "#9b6922",
|
||||
"toolbar": "#100b04",
|
||||
"triad": [
|
||||
"#f3a535",
|
||||
"#ffad38",
|
||||
"#9b6922"
|
||||
],
|
||||
"viewport_bottom": "#090603",
|
||||
"viewport_top": "#090603",
|
||||
"warning": "#ffd274"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#6ee0bb",
|
||||
"form_success_fill": "#153e47",
|
||||
"form_tab_ink": "#b6a9e4",
|
||||
"gizmo": [
|
||||
"#ec9e99",
|
||||
"#9ddab7",
|
||||
"#91c8ff"
|
||||
],
|
||||
"glyph_bg": "#0a233e",
|
||||
"glyph_edge": "#ff968d",
|
||||
"glyph_text": "#ff968d",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#e7b374",
|
||||
"sketch_construction": "#78b8dc",
|
||||
"sketch_fixed": "#e3f0fa",
|
||||
"sketch_halo": "#092c50",
|
||||
"sketch_ink": "#9ddab7",
|
||||
"sketch_locked": "#6ee0bb",
|
||||
"sketch_lost": "#ff968d",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#422d40",
|
||||
"timeline_marker": "#94b2cb",
|
||||
"toolbar": "#0c223c",
|
||||
"triad": [
|
||||
"#ec9e99",
|
||||
"#9ddab7",
|
||||
"#91c8ff"
|
||||
],
|
||||
"viewport_bottom": "#143b67",
|
||||
"viewport_top": "#143b67",
|
||||
"warning": "#f0d18c"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#a6e3a1",
|
||||
"form_success_fill": "#353f42",
|
||||
"form_tab_ink": "#b4befe",
|
||||
"gizmo": [
|
||||
"#f38ba8",
|
||||
"#a6e3a1",
|
||||
"#477dc8"
|
||||
],
|
||||
"glyph_bg": "#313244",
|
||||
"glyph_edge": "#fc93b0",
|
||||
"glyph_text": "#fc93b0",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#f9e2af",
|
||||
"sketch_construction": "#f9e2af",
|
||||
"sketch_fixed": "#cdd6f4",
|
||||
"sketch_halo": "#11111b",
|
||||
"sketch_ink": "#a6e3a1",
|
||||
"sketch_locked": "#a6e3a1",
|
||||
"sketch_lost": "#f38ba8",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#51384b",
|
||||
"timeline_marker": "#a6adc8",
|
||||
"toolbar": "#1e1e2e",
|
||||
"triad": [
|
||||
"#f38ba8",
|
||||
"#a6e3a1",
|
||||
"#477dc8"
|
||||
],
|
||||
"viewport_bottom": "#11111b",
|
||||
"viewport_top": "#11111b",
|
||||
"warning": "#f9e2af"
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
"app_bar_separator": "#b4b4b8",
|
||||
"app_bar_tab_active": "#f4f4f4",
|
||||
"app_bar_text": "#242426",
|
||||
"axis_x": "#ff0000",
|
||||
"axis_y": "#00ff00",
|
||||
"axis_z": "#0202f8",
|
||||
"axis_x": "#e95049",
|
||||
"axis_y": "#35a754",
|
||||
"axis_z": "#297fdb",
|
||||
"bend_down": "#bd843f",
|
||||
"bend_up": "#36934d",
|
||||
"body": "#b6bbc3",
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#237b38",
|
||||
"form_success_fill": "#e6f3e8",
|
||||
"form_tab_ink": "#75559f",
|
||||
"gizmo": [
|
||||
"#ed514b",
|
||||
"#36ad59",
|
||||
"#2184e9"
|
||||
],
|
||||
"glyph_bg": "#ffffff",
|
||||
"glyph_edge": "#d73339",
|
||||
"glyph_text": "#d73339",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#b77c47",
|
||||
"sketch_construction": "#cb8b37",
|
||||
"sketch_fixed": "#262628",
|
||||
"sketch_halo": "#ffffff",
|
||||
"sketch_ink": "#236f40",
|
||||
"sketch_locked": "#318348",
|
||||
"sketch_lost": "#c94f68",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#f8dedb",
|
||||
"timeline_marker": "#63636b",
|
||||
"toolbar": "#ececec",
|
||||
"triad": [
|
||||
"#e95049",
|
||||
"#35a754",
|
||||
"#297fdb"
|
||||
],
|
||||
"viewport_bottom": "#d9dce2",
|
||||
"viewport_top": "#f5f5f7",
|
||||
"warning": "#ad7400"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#83c69b",
|
||||
"form_success_fill": "#35423e",
|
||||
"form_tab_ink": "#a796cb",
|
||||
"gizmo": [
|
||||
"#ed7777",
|
||||
"#83c69b",
|
||||
"#2878a9"
|
||||
],
|
||||
"glyph_bg": "#303338",
|
||||
"glyph_edge": "#e57071",
|
||||
"glyph_text": "#e57071",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#dbb879",
|
||||
"sketch_construction": "#dbb879",
|
||||
"sketch_fixed": "#e0e2e5",
|
||||
"sketch_halo": "#17191d",
|
||||
"sketch_ink": "#88b298",
|
||||
"sketch_locked": "#83c69b",
|
||||
"sketch_lost": "#ed7777",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#553a3d",
|
||||
"timeline_marker": "#a0a6b0",
|
||||
"toolbar": "#25272b",
|
||||
"triad": [
|
||||
"#ed7777",
|
||||
"#83c69b",
|
||||
"#2878a9"
|
||||
],
|
||||
"viewport_bottom": "#17191d",
|
||||
"viewport_top": "#17191d",
|
||||
"warning": "#dbb879"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#39d45c",
|
||||
"form_success_fill": "#133b20",
|
||||
"form_tab_ink": "#36b95c",
|
||||
"gizmo": [
|
||||
"#c1f3ba",
|
||||
"#4dff79",
|
||||
"#599b70"
|
||||
],
|
||||
"glyph_bg": "#09200e",
|
||||
"glyph_edge": "#afd5b6",
|
||||
"glyph_text": "#afd5b6",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#32ba50",
|
||||
"sketch_construction": "#2fad4a",
|
||||
"sketch_fixed": "#8def9f",
|
||||
"sketch_halo": "#021007",
|
||||
"sketch_ink": "#bbffca",
|
||||
"sketch_locked": "#39d45c",
|
||||
"sketch_lost": "#d8ffdf",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#21462a",
|
||||
"timeline_marker": "#5b9b6a",
|
||||
"toolbar": "#061009",
|
||||
"triad": [
|
||||
"#c1f3ba",
|
||||
"#4dff79",
|
||||
"#599b70"
|
||||
],
|
||||
"viewport_bottom": "#010703",
|
||||
"viewport_top": "#010703",
|
||||
"warning": "#d1ffad"
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
"body_selected": "#83a598",
|
||||
"sketch": "#83a598",
|
||||
"sketch_fixed": "#ebdbb2",
|
||||
"sketch_halo": "#141617",
|
||||
"sketch_locked": "#b8bb26",
|
||||
"dimension": "#ebdbb2",
|
||||
"dimension_driven": "#928374",
|
||||
@@ -83,16 +84,6 @@
|
||||
"bend_up": "#b8bb26",
|
||||
"bend_down": "#fe8019",
|
||||
"interference": "#fb4934",
|
||||
"triad": [
|
||||
"#fb4934",
|
||||
"#b8bb26",
|
||||
"#83a598"
|
||||
],
|
||||
"gizmo": [
|
||||
"#fb4934",
|
||||
"#b8bb26",
|
||||
"#83a598"
|
||||
],
|
||||
"icons.agent": "#d3869b",
|
||||
"surface_fill": "#fe9755",
|
||||
"surface_soft": "#382c20",
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
"text_dim": "#a89984",
|
||||
"accent": "#83a598",
|
||||
"accent_soft": "#4e5954",
|
||||
"selected_ink": "#ebdbb2",
|
||||
"sketch_accent": "#a1a322",
|
||||
"error": "#fb4934",
|
||||
"warning": "#fabd2f",
|
||||
@@ -53,6 +54,7 @@
|
||||
"body_selected": "#83a598",
|
||||
"sketch": "#83a598",
|
||||
"sketch_fixed": "#ebdbb2",
|
||||
"sketch_halo": "#1d2021",
|
||||
"sketch_locked": "#b8bb26",
|
||||
"dimension": "#ebdbb2",
|
||||
"dimension_driven": "#928374",
|
||||
@@ -83,16 +85,6 @@
|
||||
"bend_up": "#b8bb26",
|
||||
"bend_down": "#fe8019",
|
||||
"interference": "#fb4934",
|
||||
"triad": [
|
||||
"#fb4934",
|
||||
"#b8bb26",
|
||||
"#83a598"
|
||||
],
|
||||
"gizmo": [
|
||||
"#fb4934",
|
||||
"#b8bb26",
|
||||
"#83a598"
|
||||
],
|
||||
"icons.agent": "#d3869b",
|
||||
"surface_fill": "#fe9755",
|
||||
"surface_soft": "#4a3a2c",
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
"text_dim": "#a89984",
|
||||
"accent": "#83a598",
|
||||
"accent_soft": "#48544f",
|
||||
"selected_ink": "#ebdbb2",
|
||||
"sketch_accent": "#a1a322",
|
||||
"error": "#fb4934",
|
||||
"warning": "#fabd2f",
|
||||
@@ -53,6 +54,7 @@
|
||||
"body_selected": "#83a598",
|
||||
"sketch": "#83a598",
|
||||
"sketch_fixed": "#ebdbb2",
|
||||
"sketch_halo": "#1d2021",
|
||||
"sketch_locked": "#b8bb26",
|
||||
"dimension": "#ebdbb2",
|
||||
"dimension_driven": "#928374",
|
||||
@@ -83,16 +85,6 @@
|
||||
"bend_up": "#b8bb26",
|
||||
"bend_down": "#fe8019",
|
||||
"interference": "#fb4934",
|
||||
"triad": [
|
||||
"#fb4934",
|
||||
"#b8bb26",
|
||||
"#83a598"
|
||||
],
|
||||
"gizmo": [
|
||||
"#fb4934",
|
||||
"#b8bb26",
|
||||
"#83a598"
|
||||
],
|
||||
"icons.agent": "#d3869b",
|
||||
"surface_fill": "#fe9755",
|
||||
"surface_soft": "#423326",
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
"body_selected": "#83a598",
|
||||
"sketch": "#076678",
|
||||
"sketch_fixed": "#282828",
|
||||
"sketch_halo": "#fbf8e3",
|
||||
"sketch_locked": "#79740e",
|
||||
"dimension": "#3c3836",
|
||||
"dimension_driven": "#7c6f64",
|
||||
@@ -83,16 +84,6 @@
|
||||
"bend_up": "#79740e",
|
||||
"bend_down": "#af3a03",
|
||||
"interference": "#cc241d",
|
||||
"triad": [
|
||||
"#cc241d",
|
||||
"#98971a",
|
||||
"#458588"
|
||||
],
|
||||
"gizmo": [
|
||||
"#cc241d",
|
||||
"#98971a",
|
||||
"#458588"
|
||||
],
|
||||
"icons.agent": "#8f3f71",
|
||||
"surface_fill": "#df663c",
|
||||
"surface_soft": "#f3e6c6",
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
"body_selected": "#83a598",
|
||||
"sketch": "#076678",
|
||||
"sketch_fixed": "#282828",
|
||||
"sketch_halo": "#f6edd0",
|
||||
"sketch_locked": "#79740e",
|
||||
"dimension": "#3c3836",
|
||||
"dimension_driven": "#7c6f64",
|
||||
@@ -83,16 +84,6 @@
|
||||
"bend_up": "#79740e",
|
||||
"bend_down": "#af3a03",
|
||||
"interference": "#cc241d",
|
||||
"triad": [
|
||||
"#cc241d",
|
||||
"#98971a",
|
||||
"#458588"
|
||||
],
|
||||
"gizmo": [
|
||||
"#cc241d",
|
||||
"#98971a",
|
||||
"#458588"
|
||||
],
|
||||
"icons.agent": "#8f3f71",
|
||||
"surface_fill": "#df663c",
|
||||
"surface_soft": "#edd7ad",
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
"body_selected": "#83a598",
|
||||
"sketch": "#076678",
|
||||
"sketch_fixed": "#282828",
|
||||
"sketch_halo": "#fcf5d8",
|
||||
"sketch_locked": "#79740e",
|
||||
"dimension": "#3c3836",
|
||||
"dimension_driven": "#7c6f64",
|
||||
@@ -83,16 +84,6 @@
|
||||
"bend_up": "#79740e",
|
||||
"bend_down": "#af3a03",
|
||||
"interference": "#cc241d",
|
||||
"triad": [
|
||||
"#cc241d",
|
||||
"#98971a",
|
||||
"#458588"
|
||||
],
|
||||
"gizmo": [
|
||||
"#cc241d",
|
||||
"#98971a",
|
||||
"#458588"
|
||||
],
|
||||
"icons.agent": "#8f3f71",
|
||||
"surface_fill": "#df663c",
|
||||
"surface_soft": "#f5e2b7",
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#40e080",
|
||||
"form_success_fill": "#0b2616",
|
||||
"form_tab_ink": "#df8fff",
|
||||
"gizmo": [
|
||||
"#ff6666",
|
||||
"#40e080",
|
||||
"#0070d0"
|
||||
],
|
||||
"glyph_bg": "#151515",
|
||||
"glyph_edge": "#fa8a86",
|
||||
"glyph_text": "#fa8a86",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#ffcc00",
|
||||
"sketch_construction": "#ffcc00",
|
||||
"sketch_fixed": "#ffffff",
|
||||
"sketch_halo": "#000000",
|
||||
"sketch_ink": "#00ff80",
|
||||
"sketch_locked": "#40e080",
|
||||
"sketch_lost": "#ff6666",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#3d1818",
|
||||
"timeline_marker": "#cccccc",
|
||||
"toolbar": "#000000",
|
||||
"triad": [
|
||||
"#ff6666",
|
||||
"#40e080",
|
||||
"#0070d0"
|
||||
],
|
||||
"viewport_bottom": "#000000",
|
||||
"viewport_top": "#000000",
|
||||
"warning": "#ffcc00"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#a3be8c",
|
||||
"form_success_fill": "#424b4d",
|
||||
"form_tab_ink": "#c3a5bd",
|
||||
"gizmo": [
|
||||
"#bf616a",
|
||||
"#a3be8c",
|
||||
"#5e81ac"
|
||||
],
|
||||
"glyph_bg": "#3b4252",
|
||||
"glyph_edge": "#f9959c",
|
||||
"glyph_text": "#f9959c",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#ebcb8b",
|
||||
"sketch_construction": "#ebcb8b",
|
||||
"sketch_fixed": "#eceff4",
|
||||
"sketch_halo": "#242f40",
|
||||
"sketch_ink": "#a3be8c",
|
||||
"sketch_locked": "#a3be8c",
|
||||
"sketch_lost": "#bf616a",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#513f4a",
|
||||
"timeline_marker": "#a4b0c2",
|
||||
"toolbar": "#2e3440",
|
||||
"triad": [
|
||||
"#bf616a",
|
||||
"#a3be8c",
|
||||
"#5e81ac"
|
||||
],
|
||||
"viewport_bottom": "#242f40",
|
||||
"viewport_top": "#242f40",
|
||||
"warning": "#ebcb8b"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#50fa7b",
|
||||
"form_success_fill": "#2f4d42",
|
||||
"form_tab_ink": "#d6acff",
|
||||
"gizmo": [
|
||||
"#ff5555",
|
||||
"#50fa7b",
|
||||
"#8456b8"
|
||||
],
|
||||
"glyph_bg": "#343746",
|
||||
"glyph_edge": "#fc827b",
|
||||
"glyph_text": "#fc827b",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#f1fa8c",
|
||||
"sketch_construction": "#f1fa8c",
|
||||
"sketch_fixed": "#f8f8f2",
|
||||
"sketch_halo": "#1d1e29",
|
||||
"sketch_ink": "#50fa7b",
|
||||
"sketch_locked": "#50fa7b",
|
||||
"sketch_lost": "#ff5555",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#5c343d",
|
||||
"timeline_marker": "#a1a4c4",
|
||||
"toolbar": "#282a36",
|
||||
"triad": [
|
||||
"#ff5555",
|
||||
"#50fa7b",
|
||||
"#8456b8"
|
||||
],
|
||||
"viewport_bottom": "#1d1e29",
|
||||
"viewport_top": "#1d1e29",
|
||||
"warning": "#f1fa8c"
|
||||
|
||||
@@ -0,0 +1,245 @@
|
||||
{
|
||||
"base": "dark",
|
||||
"colors": {
|
||||
"accent": "#ff7c50",
|
||||
"accent_soft": "#3a2723",
|
||||
"agent_busy": "#6daff7",
|
||||
"agent_ok": "#89cf8e",
|
||||
"app_bar": "#0f1113",
|
||||
"app_bar_hover": "#e1e3e514",
|
||||
"app_bar_hover_button": "#e1e3e518",
|
||||
"app_bar_hover_strong": "#e1e3e522",
|
||||
"app_bar_hover_subtle": "#e1e3e50c",
|
||||
"app_bar_icon": [
|
||||
"#bbbec1",
|
||||
"#585b5f",
|
||||
"#ff7c50"
|
||||
],
|
||||
"app_bar_separator": "#474b4f",
|
||||
"app_bar_tab_active": "#1b1e20",
|
||||
"app_bar_text": "#bbbec1",
|
||||
"axis_x": "#f85052",
|
||||
"axis_y": "#89cf8e",
|
||||
"axis_z": "#6daff7",
|
||||
"bend_down": "#ab9acd",
|
||||
"bend_up": "#89cf8e",
|
||||
"body": "#74777b",
|
||||
"body_edge": "#0f1113",
|
||||
"body_selected": "#c56241",
|
||||
"border": "#2f3235",
|
||||
"box_crossing": "#89cf8e",
|
||||
"box_window": "#6daff7",
|
||||
"chip": "#ff7c50",
|
||||
"construction_geom": "#ceb687",
|
||||
"construction_plane": "#ceb68740",
|
||||
"continuity": [
|
||||
"#89cf8e",
|
||||
"#6daff7",
|
||||
"#e6af2b",
|
||||
"#f38bb7"
|
||||
],
|
||||
"control_border": "#474b4f",
|
||||
"control_fill": "#2c2e31",
|
||||
"cube_border": "#585b5f",
|
||||
"cube_face": "#2c2e31",
|
||||
"cube_hover": "#474b4f",
|
||||
"cube_text": "#e1e3e5",
|
||||
"dialog_bg": "#222527",
|
||||
"dialog_body": "#222527",
|
||||
"dialog_border": "#383b3e",
|
||||
"dialog_footer": "#1b1e20",
|
||||
"dialog_label": "#bbbec1",
|
||||
"dialog_rule": "#2f3235",
|
||||
"dimension": "#bbbec1",
|
||||
"dimension_driven": "#8f9296",
|
||||
"error": "#f85052",
|
||||
"field": "#2c2e31",
|
||||
"form_accent": "#a6a2fc",
|
||||
"form_dim": "#8f9296",
|
||||
"form_error": "#ff6060",
|
||||
"form_error_fill": "#37292b",
|
||||
"form_fill": "#a6a2fc",
|
||||
"form_ink": "#e1e3e5",
|
||||
"form_primary": "#ff7c50",
|
||||
"form_soft": "#2f3043",
|
||||
"form_success": "#89cf8e",
|
||||
"form_success_fill": "#2c3631",
|
||||
"form_tab_ink": "#a6a2fc",
|
||||
"gizmo": [
|
||||
"#ff6060",
|
||||
"#98dfa2",
|
||||
"#7abfff"
|
||||
],
|
||||
"glyph_bg": "#222527",
|
||||
"glyph_edge": "#474b4f",
|
||||
"glyph_text": "#ab9acd",
|
||||
"grid": "#27292c",
|
||||
"grid_major": "#2c2e31",
|
||||
"heading_bg": "#15171a",
|
||||
"hover": "#383b3e",
|
||||
"hover_edge": "#0f1113",
|
||||
"hover_edge_halo": "#e1e3e5",
|
||||
"hover_profile": "#e1e3e522",
|
||||
"hover_profile_edge": "#bbbec1",
|
||||
"icon": "#bbbec1",
|
||||
"icon_fill": "#474b4f",
|
||||
"icons.access": [
|
||||
"#89cf8e",
|
||||
"#f85052"
|
||||
],
|
||||
"icons.agent": "#aba3ff",
|
||||
"icons.axes": [
|
||||
"#f85052",
|
||||
"#89cf8e",
|
||||
"#6daff7"
|
||||
],
|
||||
"icons.curvature": [
|
||||
"#6daff7",
|
||||
"#89cf8e",
|
||||
"#f85052"
|
||||
],
|
||||
"icons.draft": [
|
||||
"#89cf8e",
|
||||
"#e6af2b"
|
||||
],
|
||||
"icons.floor": "#383b3e",
|
||||
"icons.fold": "#707376",
|
||||
"icons.folder": "#ceb687",
|
||||
"icons.glint": "#ffffffa0",
|
||||
"icons.highlight": "#e1e3e5",
|
||||
"icons.interference": "#f85052",
|
||||
"icons.marker_halo": "#0f111396",
|
||||
"icons.paint": [
|
||||
"#f85052",
|
||||
"#6daff7",
|
||||
"#e6af2b"
|
||||
],
|
||||
"icons.plane": "#dcc9a0",
|
||||
"icons.sheet": "#a2bedb",
|
||||
"icons.sheet_2": "#8fb0d2",
|
||||
"icons.sheet_light": "#c9d9ea",
|
||||
"icons.sheet_line": "#6daff7",
|
||||
"icons.sky": "#a2bedb",
|
||||
"icons.stripe": "#0f1113",
|
||||
"icons.warning": "#e6af2b",
|
||||
"interference": "#f85052",
|
||||
"logo": [
|
||||
"#ff9c7c",
|
||||
"#ff7c50",
|
||||
"#b75c3e"
|
||||
],
|
||||
"manipulator": "#7abfff",
|
||||
"mesh_accent": "#cfc152",
|
||||
"mesh_fill": "#cfc152",
|
||||
"mesh_ink": "#cfc152",
|
||||
"mesh_soft": "#363624",
|
||||
"on_accent": "#0f1113",
|
||||
"origin_plane": "#8f929638",
|
||||
"origin_plane_edge": "#8f9296c8",
|
||||
"origin_plane_hover": "#6daff770",
|
||||
"origin_point": "#bbbec1",
|
||||
"overlay": "#15171af0",
|
||||
"panel": "#15171a",
|
||||
"panel_header": "#222527",
|
||||
"preview_add": "#4c78a7",
|
||||
"preview_cut": "#f850526e",
|
||||
"preview_new": "#e6af2b",
|
||||
"preview_sketch": "#8eca96",
|
||||
"profile_fill": "#6daff71c",
|
||||
"render_accent": "#f38bb7",
|
||||
"render_fill": "#f38bb7",
|
||||
"render_ink": "#f38bb7",
|
||||
"render_soft": "#3d2c36",
|
||||
"rubber_band": "#7abfff",
|
||||
"section_cap": "#ceb687",
|
||||
"sel_edge": "#ff7c50",
|
||||
"sel_edge_rim": "#ffbea8",
|
||||
"sel_face": "#dd6d47",
|
||||
"sel_profile": "#ff7c50b0",
|
||||
"sel_profile_edge": "#ff7c50",
|
||||
"sel_vertex": "#ff7c50",
|
||||
"selected_bg": "#45332e",
|
||||
"selected_ink": "#e1e3e5",
|
||||
"sheet_fill": "#6daff7",
|
||||
"sheet_ink": "#6daff7",
|
||||
"sheet_soft": "#253242",
|
||||
"sketch": "#6daff7",
|
||||
"sketch_accent": "#8eca96",
|
||||
"sketch_centerline": "#bbbec1",
|
||||
"sketch_construction": "#ceb687",
|
||||
"sketch_fixed": "#e1e3e5",
|
||||
"sketch_ink": "#8eca96",
|
||||
"sketch_locked": "#89cf8e",
|
||||
"sketch_lost": "#f85052",
|
||||
"sketch_point": "#e1e3e5",
|
||||
"sketch_point_free": "#6daff7",
|
||||
"sketch_projected": "#998cb3",
|
||||
"sketch_soft": "#2b3730",
|
||||
"subheading_bg": "#1b1e20",
|
||||
"surface_accent": "#ceb687",
|
||||
"surface_fill": "#ceb687",
|
||||
"surface_ink": "#ceb687",
|
||||
"surface_soft": "#36342e",
|
||||
"tab_on_fill_dark": "#0f1113",
|
||||
"text": "#e1e3e5",
|
||||
"text_dim": "#8f9296",
|
||||
"timeline": "#15171a",
|
||||
"timeline_item": "#222527",
|
||||
"timeline_item_error": "#552f31",
|
||||
"timeline_marker": "#ff7c50",
|
||||
"toolbar": "#15171a",
|
||||
"triad": [
|
||||
"#f85052",
|
||||
"#89cf8e",
|
||||
"#6daff7"
|
||||
],
|
||||
"viewport_bottom": "#1b1e20",
|
||||
"viewport_top": "#222527",
|
||||
"warning": "#e6af2b"
|
||||
},
|
||||
"format": "solidcraft-theme/1",
|
||||
"name": "Okibi",
|
||||
"icon_palette": {
|
||||
"ink": "#15171a",
|
||||
"line": "#e1e3e5",
|
||||
"passive-1": "#bfc1c5",
|
||||
"passive-2": "#939599",
|
||||
"passive-3": "#6a6c6f",
|
||||
"guide": "#a0a6b0",
|
||||
"solid": [
|
||||
"#a0d7fb",
|
||||
"#65bdf3",
|
||||
"#4aa3d8"
|
||||
],
|
||||
"surface": [
|
||||
"#fcc28e",
|
||||
"#dea572",
|
||||
"#c38c59"
|
||||
],
|
||||
"mesh": [
|
||||
"#e8cd7d",
|
||||
"#cab060",
|
||||
"#b19747"
|
||||
],
|
||||
"form": [
|
||||
"#d5c4fd",
|
||||
"#b9a7df",
|
||||
"#a08fc4"
|
||||
],
|
||||
"sketch": [
|
||||
"#b0dbc0",
|
||||
"#94bea4",
|
||||
"#7ba58b"
|
||||
],
|
||||
"constraint": [
|
||||
"#febbb9",
|
||||
"#fb8e8d",
|
||||
"#e57071"
|
||||
],
|
||||
"construction": [
|
||||
"#fcc28e",
|
||||
"#dea572",
|
||||
"#c38c59"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#8fdb9a",
|
||||
"form_success_fill": "#2c4a33",
|
||||
"form_tab_ink": "#c97fdf",
|
||||
"gizmo": [
|
||||
"#e06c75",
|
||||
"#98c379",
|
||||
"#61afef"
|
||||
],
|
||||
"glyph_bg": "#282c34",
|
||||
"glyph_edge": "#f57f87",
|
||||
"glyph_text": "#f57f87",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#d19a66",
|
||||
"sketch_construction": "#d19a66",
|
||||
"sketch_fixed": "#abb2bf",
|
||||
"sketch_halo": "#181a1f",
|
||||
"sketch_ink": "#98c379",
|
||||
"sketch_locked": "#98c379",
|
||||
"sketch_lost": "#e06c75",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#5c343d",
|
||||
"timeline_marker": "#abb2bf",
|
||||
"toolbar": "#21252b",
|
||||
"triad": [
|
||||
"#e06c75",
|
||||
"#98c379",
|
||||
"#61afef"
|
||||
],
|
||||
"viewport_bottom": "#282c34",
|
||||
"viewport_top": "#282c34",
|
||||
"warning": "#e5c07b"
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
"app_bar_separator": "#aaaaaa",
|
||||
"app_bar_tab_active": "#e6e6e6",
|
||||
"app_bar_text": "#222222",
|
||||
"axis_x": "#ff0000",
|
||||
"axis_y": "#00ff00",
|
||||
"axis_z": "#0202f8",
|
||||
"axis_x": "#dc3c3c",
|
||||
"axis_y": "#3caa3c",
|
||||
"axis_z": "#3c64e6",
|
||||
"bend_down": "#c85a14",
|
||||
"bend_up": "#1e8c32",
|
||||
"body": "#adadb6",
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#336633",
|
||||
"form_success_fill": "#e2ecdf",
|
||||
"form_tab_ink": "#6d4e7d",
|
||||
"gizmo": [
|
||||
"#e1463c",
|
||||
"#50be50",
|
||||
"#4682f0"
|
||||
],
|
||||
"glyph_bg": "#ffffff",
|
||||
"glyph_edge": "#ab2125",
|
||||
"glyph_text": "#ab2125",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#c86e3c",
|
||||
"sketch_construction": "#e68228",
|
||||
"sketch_fixed": "#222222",
|
||||
"sketch_halo": "#ffffff",
|
||||
"sketch_ink": "#456045",
|
||||
"sketch_locked": "#447744",
|
||||
"sketch_lost": "#c83c5a",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#f2dddd",
|
||||
"timeline_marker": "#666666",
|
||||
"toolbar": "#dddddd",
|
||||
"triad": [
|
||||
"#dc3c3c",
|
||||
"#3caa3c",
|
||||
"#3c64e6"
|
||||
],
|
||||
"viewport_bottom": "#ffffff",
|
||||
"viewport_top": "#ffffff",
|
||||
"warning": "#997722"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#859900",
|
||||
"form_success_fill": "#dcdbb1",
|
||||
"form_tab_ink": "#565a9d",
|
||||
"gizmo": [
|
||||
"#dc322f",
|
||||
"#859900",
|
||||
"#346e88"
|
||||
],
|
||||
"glyph_bg": "#e3ddc9",
|
||||
"glyph_edge": "#da2f2d",
|
||||
"glyph_text": "#da2f2d",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#b58900",
|
||||
"sketch_construction": "#b58900",
|
||||
"sketch_fixed": "#586e75",
|
||||
"sketch_halo": "#fdf6e3",
|
||||
"sketch_ink": "#5a6800",
|
||||
"sketch_locked": "#859900",
|
||||
"sketch_lost": "#dc322f",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#eabcad",
|
||||
"timeline_marker": "#657b83",
|
||||
"toolbar": "#eee8d5",
|
||||
"triad": [
|
||||
"#dc322f",
|
||||
"#859900",
|
||||
"#346e88"
|
||||
],
|
||||
"viewport_bottom": "#fdf6e3",
|
||||
"viewport_top": "#fdf6e3",
|
||||
"warning": "#b58900"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#008000",
|
||||
"form_success_fill": "#c0dcc0",
|
||||
"form_tab_ink": "#7d007d",
|
||||
"gizmo": [
|
||||
"#ff0000",
|
||||
"#00ff00",
|
||||
"#0000ff"
|
||||
],
|
||||
"glyph_bg": "#ffffff",
|
||||
"glyph_edge": "#800000",
|
||||
"glyph_text": "#800000",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#808000",
|
||||
"sketch_construction": "#808000",
|
||||
"sketch_fixed": "#000000",
|
||||
"sketch_halo": "#ffffff",
|
||||
"sketch_ink": "#005400",
|
||||
"sketch_locked": "#008000",
|
||||
"sketch_lost": "#800080",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#ffffc0",
|
||||
"timeline_marker": "#000000",
|
||||
"toolbar": "#c0c0c0",
|
||||
"triad": [
|
||||
"#ff0000",
|
||||
"#00ff00",
|
||||
"#0000ff"
|
||||
],
|
||||
"viewport_bottom": "#008080",
|
||||
"viewport_top": "#008080",
|
||||
"warning": "#ffff00"
|
||||
|
||||
@@ -65,11 +65,6 @@
|
||||
"form_success": "#9ece6a",
|
||||
"form_success_fill": "#303932",
|
||||
"form_tab_ink": "#bb9af7",
|
||||
"gizmo": [
|
||||
"#f7768e",
|
||||
"#9ece6a",
|
||||
"#4775ce"
|
||||
],
|
||||
"glyph_bg": "#24283b",
|
||||
"glyph_edge": "#f6758d",
|
||||
"glyph_text": "#f6758d",
|
||||
@@ -168,6 +163,7 @@
|
||||
"sketch_centerline": "#e0af68",
|
||||
"sketch_construction": "#e0af68",
|
||||
"sketch_fixed": "#c0caf5",
|
||||
"sketch_halo": "#151722",
|
||||
"sketch_ink": "#9ece6a",
|
||||
"sketch_locked": "#9ece6a",
|
||||
"sketch_lost": "#f7768e",
|
||||
@@ -188,11 +184,6 @@
|
||||
"timeline_item_error": "#4f313f",
|
||||
"timeline_marker": "#9aa5ce",
|
||||
"toolbar": "#1a1b26",
|
||||
"triad": [
|
||||
"#f7768e",
|
||||
"#9ece6a",
|
||||
"#4775ce"
|
||||
],
|
||||
"viewport_bottom": "#151722",
|
||||
"viewport_top": "#151722",
|
||||
"warning": "#e0af68"
|
||||
|
||||
+17
-11
@@ -227,6 +227,22 @@ impl FeatureKind {
|
||||
}
|
||||
}
|
||||
|
||||
/// [`Document::component_transform`] with each component's first occurrence found by `first`
|
||||
/// (an index, where many transforms are wanted at once).
|
||||
pub(crate) fn transform_through<'a>(component: u64, first: impl Fn(u64) -> Option<&'a Occurrence>) -> Mat {
|
||||
let mut m = IDENTITY;
|
||||
let mut c = component;
|
||||
for _ in 0..1000 {
|
||||
if c == 0 {
|
||||
break;
|
||||
}
|
||||
let Some(o) = first(c) else { break };
|
||||
m = mat_mul(&o.transform, &m);
|
||||
c = o.parent;
|
||||
}
|
||||
m
|
||||
}
|
||||
|
||||
impl Document {
|
||||
/// The first occurrence of a component (its placement for authoring).
|
||||
pub fn occurrence_of(&self, component: u64) -> Option<&crate::Occurrence> {
|
||||
@@ -235,17 +251,7 @@ impl Document {
|
||||
|
||||
/// World transform of a component's frame (through its first occurrence and its parents').
|
||||
pub fn component_transform(&self, component: u64) -> Mat {
|
||||
let mut m = IDENTITY;
|
||||
let mut c = component;
|
||||
for _ in 0..1000 {
|
||||
if c == 0 {
|
||||
break;
|
||||
}
|
||||
let Some(o) = self.occurrence_of(c) else { break };
|
||||
m = mat_mul(&o.transform, &m);
|
||||
c = o.parent;
|
||||
}
|
||||
m
|
||||
transform_through(component, |c| self.occurrence_of(c))
|
||||
}
|
||||
|
||||
/// One placement: the component the occurrence `path` from the root leads to (the root for
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
//! Identification colours, independent of materials and appearances.
|
||||
|
||||
use crate::Document;
|
||||
|
||||
/// Automatic colours select this palette in creation order; cycling uses the same order.
|
||||
/// Colors are generated by picking colors on a color wheel, with 0.9 brightness and 0.8 saturation.
|
||||
/// First pass is 3 colors, 120 huedegrees from each other. Second pass starts with 60 degrees from
|
||||
/// the first one. Then third and fourth pass fill 60 and 30 degrees gaps between already generated
|
||||
/// colors of the palette.
|
||||
pub const PALETTE: [[u8; 3]; 24] = [
|
||||
[230, 161, 92],
|
||||
[92, 230, 161],
|
||||
[161, 92, 230],
|
||||
[161, 230, 92],
|
||||
[92, 161, 230],
|
||||
[230, 92, 161],
|
||||
[230, 230, 92],
|
||||
[92, 230, 92],
|
||||
[92, 230, 230],
|
||||
[92, 92, 230],
|
||||
[230, 92, 230],
|
||||
[230, 92, 92],
|
||||
[230, 195, 92],
|
||||
[195, 230, 92],
|
||||
[126, 230, 92],
|
||||
[92, 230, 126],
|
||||
[92, 230, 195],
|
||||
[92, 195, 230],
|
||||
[92, 126, 230],
|
||||
[126, 92, 230],
|
||||
[195, 92, 230],
|
||||
[230, 92, 195],
|
||||
[230, 92, 126],
|
||||
[230, 126, 92],
|
||||
];
|
||||
|
||||
/// Select a colour in creation order, wrapping at the end of the palette.
|
||||
pub fn automatic_color(index: u64) -> [u8; 3] {
|
||||
PALETTE.get((index % PALETTE.len() as u64) as usize).copied().unwrap_or([230, 161, 92])
|
||||
}
|
||||
|
||||
pub fn next_color(color: [u8; 3]) -> [u8; 3] {
|
||||
let index = PALETTE.iter().position(|c| *c == color).map_or(0, |i| (i + 1) % PALETTE.len());
|
||||
PALETTE.get(index).copied().unwrap_or([230, 161, 92])
|
||||
}
|
||||
|
||||
impl Document {
|
||||
pub fn component_identification_color(&self, id: u64) -> [u8; 3] {
|
||||
self.components.iter().enumerate().find(|(_, c)| c.id == id).map_or_else(
|
||||
|| automatic_color(0),
|
||||
|(position, c)| c.identification_color.unwrap_or_else(|| automatic_color(c.identification_color_index.unwrap_or(position as u64))),
|
||||
)
|
||||
}
|
||||
|
||||
/// Fill older records in stored order and repair stale counters without changing saved indices.
|
||||
pub(crate) fn normalise_component_color_indices(&mut self) -> crate::Result<()> {
|
||||
let mut next = self.next_component_color_index;
|
||||
for component in &self.components {
|
||||
if let Some(index) = component.identification_color_index {
|
||||
next = next.max(index.checked_add(1).ok_or_else(|| crate::DocError::Invalid("component colour sequence exhausted".into()))?);
|
||||
}
|
||||
}
|
||||
for component in &mut self.components {
|
||||
if component.identification_color_index.is_none() {
|
||||
let following = next.checked_add(1).ok_or_else(|| crate::DocError::Invalid("component colour sequence exhausted".into()))?;
|
||||
component.identification_color_index = Some(next);
|
||||
next = following;
|
||||
}
|
||||
}
|
||||
self.next_component_color_index = next;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn old_components_default_to_stable_colors_and_overrides_round_trip() {
|
||||
let mut doc = Document::default();
|
||||
let id = doc.add_component(Some("Part"), 0).unwrap();
|
||||
let automatic = doc.component_identification_color(id);
|
||||
let mut legacy: serde_json::Value = serde_json::from_str(&doc.to_json()).unwrap();
|
||||
legacy["components"][0].as_object_mut().unwrap().remove("identification_color");
|
||||
if let Some(pending) = legacy.get_mut("format_pending").and_then(|v| v.as_array_mut()) {
|
||||
pending.retain(|name| name != "component-identification-colors");
|
||||
}
|
||||
let restored = Document::from_json(&legacy.to_string()).unwrap();
|
||||
assert_eq!(restored.component_identification_color(id), automatic);
|
||||
assert_eq!(restored.components[0].identification_color, None);
|
||||
let override_color = next_color(automatic);
|
||||
assert_ne!(override_color, automatic);
|
||||
doc.components[0].identification_color = Some(override_color);
|
||||
doc.components[0].name = "Renamed".into();
|
||||
let saved = Document::from_json(&doc.to_json()).unwrap();
|
||||
assert_eq!(saved.component_identification_color(id), override_color);
|
||||
assert_eq!(saved.components[0].identification_color, Some(override_color));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn creation_order_wraps_and_survives_deletion_reordering_and_reopening() {
|
||||
let mut doc = Document::default();
|
||||
let mut ids = Vec::new();
|
||||
for index in 0..25 {
|
||||
// IDs also belong to occurrences, so their numeric values are not colour indices.
|
||||
let id = doc.add_component(None, 0).unwrap();
|
||||
assert_eq!(doc.component_identification_color(id), PALETTE[index % PALETTE.len()]);
|
||||
ids.push(id);
|
||||
}
|
||||
let retained = ids[1];
|
||||
doc.components.retain(|c| c.id != ids[0]);
|
||||
doc.occurrences.retain(|o| o.component != ids[0]);
|
||||
doc.components.reverse();
|
||||
let mut restored = Document::from_json(&doc.to_json()).unwrap();
|
||||
assert_eq!(restored.component_identification_color(retained), PALETTE[1]);
|
||||
let next = restored.add_component(None, 0).unwrap();
|
||||
assert_eq!(restored.component_identification_color(next), PALETTE[1]);
|
||||
assert_eq!(restored.next_component_color_index, 26);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn legacy_order_and_overrides_are_preserved_and_stale_counters_repaired() {
|
||||
let mut doc = Document::default();
|
||||
let first = doc.add_component(None, 0).unwrap();
|
||||
let second = doc.add_component(None, first).unwrap();
|
||||
doc.components[1].identification_color = Some([1, 2, 3]);
|
||||
let mut json: serde_json::Value = serde_json::from_str(&doc.to_json()).unwrap();
|
||||
json.as_object_mut().unwrap().remove("next_component_color_index");
|
||||
for component in json["components"].as_array_mut().unwrap() {
|
||||
component.as_object_mut().unwrap().remove("identification_color_index");
|
||||
}
|
||||
if let Some(pending) = json.get_mut("format_pending").and_then(|v| v.as_array_mut()) {
|
||||
pending.retain(|name| name != "sequential-component-colors");
|
||||
}
|
||||
let mut restored = Document::from_json(&json.to_string()).unwrap();
|
||||
assert_eq!(restored.components[0].identification_color_index, Some(0));
|
||||
assert_eq!(restored.components[1].identification_color_index, Some(1));
|
||||
assert_eq!(restored.component_identification_color(first), PALETTE[0]);
|
||||
assert_eq!(restored.component_identification_color(second), [1, 2, 3]);
|
||||
let third = restored.add_component(None, 0).unwrap();
|
||||
assert_eq!(restored.component_identification_color(third), PALETTE[2]);
|
||||
restored.next_component_color_index = 0;
|
||||
let mut repaired = Document::from_json(&restored.to_json()).unwrap();
|
||||
let fourth = repaired.add_component(None, 0).unwrap();
|
||||
assert_eq!(repaired.component_identification_color(fourth), PALETTE[3]);
|
||||
let mut hostile: serde_json::Value = serde_json::from_str(&repaired.to_json()).unwrap();
|
||||
hostile["components"][0]["identification_color_index"] = u64::MAX.into();
|
||||
assert!(Document::from_json(&hostile.to_string()).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cycling_visits_every_palette_color_and_wraps() {
|
||||
let original = automatic_color(123);
|
||||
let mut seen = std::collections::BTreeSet::new();
|
||||
let mut color = original;
|
||||
for _ in 0..PALETTE.len() {
|
||||
assert!(seen.insert(color));
|
||||
color = next_color(color);
|
||||
}
|
||||
assert_eq!(color, original);
|
||||
assert_eq!(automatic_color(0), PALETTE[0]);
|
||||
assert_eq!(automatic_color(1), PALETTE[1]);
|
||||
assert_eq!(automatic_color(24), PALETTE[0]);
|
||||
}
|
||||
}
|
||||
@@ -130,6 +130,7 @@ impl Document {
|
||||
/// A column's current value in the design.
|
||||
pub fn config_current(&self, c: &Column) -> Option<String> {
|
||||
match c {
|
||||
Column::Param(n) if self.text_param(n).is_some() => self.text_param(n).map(|p| p.text.clone()),
|
||||
Column::Param(n) => self.all_param_exprs().into_iter().find(|(m, _, _)| m == n).map(|(_, e, kind)| {
|
||||
// Feature literals are stored in base units, unlike newly typed bare
|
||||
// row cells. Capture their unit explicitly before editing in an inch design.
|
||||
@@ -262,6 +263,7 @@ impl Document {
|
||||
}
|
||||
self.configs.columns.iter().zip(&r.cells).all(|(c, v)| match c {
|
||||
Column::Suppress(id) => suppression_cell(v).is_ok_and(|on| self.feature(*id).is_some_and(|f| f.suppressed == on)),
|
||||
Column::Param(name) if self.text_param(name).is_some() => self.text_param(name).is_some_and(|p| p.text == crate::text_params::unquote(v)),
|
||||
Column::Param(name) => {
|
||||
let kind = self
|
||||
.features
|
||||
|
||||
@@ -5,6 +5,10 @@
|
||||
//! These functions format values, not validate them: non-finite inputs retain Rust's `NaN`,
|
||||
//! `inf` and `-inf` text. Callers that require finite measurements must validate them first.
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{DocError, Result, expr};
|
||||
|
||||
/// Units per millimetre and the unit's name. Unknown names use millimetres.
|
||||
pub fn unit_scale(units: &str) -> (f64, &'static str) {
|
||||
match units {
|
||||
@@ -39,6 +43,142 @@ pub fn format_length(mm: f64, units: &str, decimals: u8) -> String {
|
||||
format!("{} {u}", length_number(mm, units, decimals))
|
||||
}
|
||||
|
||||
/// The decimal separator of a number, independent of UI language.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum DecimalMarker {
|
||||
Point,
|
||||
Comma,
|
||||
}
|
||||
|
||||
/// How an exact tie in the prepared decimal digits is rounded.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum Ties {
|
||||
HalfEven,
|
||||
HalfAwayFromZero,
|
||||
}
|
||||
|
||||
/// Number presentation for non-UI consumers. This does not change the legacy length helpers.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(default, deny_unknown_fields)]
|
||||
pub struct NumberFormat {
|
||||
pub marker: DecimalMarker,
|
||||
pub groups: bool,
|
||||
pub leading_zero: bool,
|
||||
pub trailing_zeros: bool,
|
||||
pub ties: Ties,
|
||||
}
|
||||
|
||||
impl Default for NumberFormat {
|
||||
fn default() -> Self {
|
||||
Self { marker: DecimalMarker::Point, groups: false, leading_zero: true, trailing_zeros: true, ties: Ties::HalfEven }
|
||||
}
|
||||
}
|
||||
|
||||
/// Formatted text without a unit suffix, and the rounded number in the display unit.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct Shown {
|
||||
pub text: String,
|
||||
pub value: f64,
|
||||
}
|
||||
|
||||
/// Format an internal value (millimetres or radians) in a strictly validated display unit.
|
||||
pub fn format_value(value: f64, kind: expr::Kind, unit: &str, decimals: u8, f: &NumberFormat) -> Result<Shown> {
|
||||
let (unit_kind, scale) = expr::unit_info(unit).ok_or_else(|| DocError::Invalid("unknown number display unit".into()))?;
|
||||
if unit_kind != kind {
|
||||
return Err(DocError::Invalid("number display unit has a different kind".into()));
|
||||
}
|
||||
format_display(value / scale, scale, decimals, f)
|
||||
}
|
||||
|
||||
/// Format a unit-less number with the same validation and decimal rounding policy.
|
||||
pub fn format_number(x: f64, decimals: u8, f: &NumberFormat) -> Result<Shown> {
|
||||
format_display(x, 1.0, decimals, f)
|
||||
}
|
||||
|
||||
fn format_display(x: f64, scale: f64, decimals: u8, f: &NumberFormat) -> Result<Shown> {
|
||||
// The unit table supplies a positive finite scale. Its decimal step must be at most
|
||||
// 1e-9 internal units; the precision floor can make the effective tie window narrower.
|
||||
let unit_resolution = (scale.log10() + 9.0).ceil().max(0.0) as usize;
|
||||
let resolution = unit_resolution.max(usize::from(decimals) + 3);
|
||||
let (rounded, value) = round_decimal(x, decimals, resolution, f.ties)?;
|
||||
let (integer, fraction) = rounded.split_once('.').unwrap_or((&rounded, ""));
|
||||
let fraction = if f.trailing_zeros { fraction } else { fraction.trim_end_matches('0') };
|
||||
let integer = if !f.leading_zero && integer == "0" && !fraction.is_empty() { "" } else { integer };
|
||||
let mut text = String::new();
|
||||
if value.is_sign_negative() {
|
||||
text.push('−');
|
||||
}
|
||||
grouped_digits(&mut text, integer, true, f.groups);
|
||||
if !fraction.is_empty() {
|
||||
text.push(match f.marker {
|
||||
DecimalMarker::Point => '.',
|
||||
DecimalMarker::Comma => ',',
|
||||
});
|
||||
grouped_digits(&mut text, fraction, false, f.groups);
|
||||
}
|
||||
Ok(Shown { text, value })
|
||||
}
|
||||
|
||||
/// Prepare a bounded magnitude, then round decimal digits, never a binary tie comparison.
|
||||
fn round_decimal(x: f64, decimals: u8, resolution: usize, ties: Ties) -> Result<(String, f64)> {
|
||||
if decimals > 8 {
|
||||
return Err(DocError::Invalid("number precision must be at most 8 decimal places".into()));
|
||||
}
|
||||
if !x.is_finite() || x.abs() > 1e12 {
|
||||
return Err(DocError::Invalid("display value must be finite with magnitude at most 1e12".into()));
|
||||
}
|
||||
let prepared = format!("{:.*}", resolution, x.abs());
|
||||
let (integer, fraction) = prepared.split_once('.').unwrap_or((&prepared, ""));
|
||||
let places = usize::from(decimals);
|
||||
let mut digits: Vec<u8> = integer.bytes().chain(fraction.bytes().take(places)).collect();
|
||||
let discarded = fraction.as_bytes().get(places..).unwrap_or_default();
|
||||
let up = match discarded.first().copied() {
|
||||
Some(b'6'..=b'9') => true,
|
||||
Some(b'5') => {
|
||||
discarded.get(1..).unwrap_or_default().iter().any(|d| *d != b'0')
|
||||
|| match ties {
|
||||
Ties::HalfEven => digits.last().is_some_and(|d| !(d - b'0').is_multiple_of(2)),
|
||||
Ties::HalfAwayFromZero => true,
|
||||
}
|
||||
}
|
||||
_ => false,
|
||||
};
|
||||
if up {
|
||||
let mut carry = true;
|
||||
for d in digits.iter_mut().rev() {
|
||||
if *d == b'9' {
|
||||
*d = b'0';
|
||||
} else {
|
||||
*d += 1;
|
||||
carry = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if carry {
|
||||
digits.insert(0, b'1');
|
||||
}
|
||||
}
|
||||
if places > 0 {
|
||||
let point = digits.len().checked_sub(places).ok_or_else(|| DocError::Invalid("invalid prepared number".into()))?;
|
||||
digits.insert(point, b'.');
|
||||
}
|
||||
let rounded = String::from_utf8(digits).map_err(|_| DocError::Invalid("invalid prepared digits".into()))?;
|
||||
let magnitude = rounded.parse::<f64>().map_err(|_| DocError::Invalid("invalid rounded number".into()))?;
|
||||
let negative = x.is_sign_negative() && magnitude != 0.0;
|
||||
Ok((rounded, if negative { -magnitude } else { magnitude }))
|
||||
}
|
||||
|
||||
fn grouped_digits(text: &mut String, digits: &str, integer: bool, groups: bool) {
|
||||
for (i, digit) in digits.chars().enumerate() {
|
||||
if groups && digits.len() >= 5 && i > 0 && if integer { (digits.len() - i).is_multiple_of(3) } else { i.is_multiple_of(3) } {
|
||||
text.push('\u{202f}');
|
||||
}
|
||||
text.push(digit);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{format_length, length_number, length_precision, unit_scale};
|
||||
@@ -121,3 +261,359 @@ mod tests {
|
||||
assert_eq!(format_length(f64::NEG_INFINITY, "cm", 2), "-inf cm");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod number_tests {
|
||||
use super::*;
|
||||
use expr::Kind::{Angle, Length, Unitless};
|
||||
|
||||
fn pair(x: f64, dp: u8, even: &str, away: &str) {
|
||||
for (ties, expected) in [(Ties::HalfEven, even), (Ties::HalfAwayFromZero, away)] {
|
||||
let shown = format_number(x, dp, &NumberFormat { ties, ..NumberFormat::default() }).unwrap();
|
||||
assert_eq!(shown.text, expected, "x={x:?}, dp={dp}, ties={ties:?}");
|
||||
let parsed: f64 = expected.replace('−', "-").parse().unwrap();
|
||||
assert_eq!(shown.value, parsed);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_exact_binary_ties() {
|
||||
for (x, dp, even, away) in [
|
||||
(0.125, 2, "0.12", "0.13"),
|
||||
(0.375, 2, "0.38", "0.38"),
|
||||
(12.5, 0, "12", "13"),
|
||||
(-12.5, 0, "−12", "−13"),
|
||||
(13.5, 0, "14", "14"),
|
||||
(-13.5, 0, "−14", "−14"),
|
||||
] {
|
||||
pair(x, dp, even, away);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_decimal_ties() {
|
||||
for (x, even, away) in [(2.675, "2.68", "2.68"), (2.665, "2.66", "2.67"), (1.005, "1.00", "1.01"), (0.285, "0.28", "0.29")] {
|
||||
pair(x, 2, even, away);
|
||||
}
|
||||
// The existing UI policy deliberately remains different.
|
||||
assert_eq!(length_number(2.665, "mm", 2), "2.67");
|
||||
assert_eq!(length_number(2.675, "mm", 2), "2.67");
|
||||
assert_eq!(length_number(1.005, "mm", 2), "1.00");
|
||||
assert_eq!(length_number(0.285, "mm", 2), "0.28");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_tie_zone_edges_and_precision_floor() {
|
||||
for (x, expected) in [(61.49999999999999, "62"), (61.4999999996, "62"), (61.4999999994, "61"), (61.4999997, "61"), (61.4996, "61")] {
|
||||
pair(x, 0, expected, expected);
|
||||
}
|
||||
pair(1.0000000049, 8, "1.00000000", "1.00000000");
|
||||
pair(2.4501, 1, "2.5", "2.5");
|
||||
pair(2.5499, 1, "2.5", "2.5");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_carries() {
|
||||
pair(9.995, 2, "10.00", "10.00");
|
||||
pair(-9.995, 2, "−10.00", "−10.00");
|
||||
pair(99.5, 0, "100", "100");
|
||||
pair(0.999999995, 8, "1.00000000", "1.00000000");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_units_and_aliases() {
|
||||
let f = NumberFormat::default();
|
||||
for (x, kind, unit, dp, expected) in [
|
||||
(25.4, Length, "in", 3, "1.000"),
|
||||
(25.4 * (1.0 + 1e-12), Length, "in", 3, "1.000"),
|
||||
(25.4, Length, "in", 0, "1"),
|
||||
(12.5, Length, "cm", 2, "1.25"),
|
||||
(3810.0, Length, "ft", 1, "12.5"),
|
||||
(std::f64::consts::PI / 6.0, Angle, "deg", 1, "30.0"),
|
||||
(1.0, Angle, "deg", 3, "57.296"),
|
||||
(1.0, Angle, "rad", 3, "1.000"),
|
||||
(0.001, Length, "um", 3, "1.000"),
|
||||
(0.001, Length, "µm", 3, "1.000"),
|
||||
(1e-6, Length, "nm", 3, "1.000"),
|
||||
(0.0254, Length, "mil", 3, "1.000"),
|
||||
(914.4, Length, "yd", 3, "1.000"),
|
||||
(1e6, Length, "km", 3, "1.000"),
|
||||
(25.4, Length, " inch ", 3, "1.000"),
|
||||
(std::f64::consts::PI, Angle, "°", 1, "180.0"),
|
||||
(std::f64::consts::PI, Angle, "degrees", 1, "180.0"),
|
||||
(1.25, Unitless, "", 2, "1.25"),
|
||||
(1.25, Unitless, "none", 2, "1.25"),
|
||||
(1.25, Unitless, "unitless", 2, "1.25"),
|
||||
] {
|
||||
let shown = format_value(x, kind, unit, dp, &f).unwrap();
|
||||
assert_eq!(shown.text, expected, "{x:?} {kind:?} in {unit:?}");
|
||||
assert_eq!(shown.value, expected.parse::<f64>().unwrap());
|
||||
}
|
||||
for (kind, unit) in [(Length, "deg"), (Angle, "mm"), (Length, ""), (Length, "parsec"), (Unitless, "mm"), (Length, "IN")] {
|
||||
assert!(matches!(format_value(1.0, kind, unit, 2, &f), Err(DocError::Invalid(_))), "{kind:?} {unit:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_unit_resolution_edges() {
|
||||
let f = NumberFormat { ties: Ties::HalfAwayFromZero, ..NumberFormat::default() };
|
||||
for (kind, unit, resolution) in [
|
||||
(Length, "mm", 9),
|
||||
(Length, "cm", 10),
|
||||
(Length, "in", 11),
|
||||
(Length, "m", 12),
|
||||
(Length, "ft", 12),
|
||||
(Angle, "deg", 8),
|
||||
(Unitless, "", 9),
|
||||
(Length, "nm", 3),
|
||||
(Length, "km", 15),
|
||||
] {
|
||||
let scale = expr::unit_info(unit).unwrap().1;
|
||||
let quantum = 10.0_f64.powi(-resolution);
|
||||
for (distance, expected) in [(0.4, "1"), (0.6, "0")] {
|
||||
let internal = (0.5 - distance * quantum) * scale;
|
||||
assert_eq!(
|
||||
format_value(internal, kind, unit, 0, &f).unwrap().text,
|
||||
expected,
|
||||
"{unit:?}, resolution={resolution}, distance={distance}"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_zero_sign_caps_and_shown_value() {
|
||||
for x in [-0.0, -0.004, f64::from_bits(1)] {
|
||||
let shown = format_number(x, 2, &NumberFormat::default()).unwrap();
|
||||
assert_eq!(shown.text, "0.00");
|
||||
assert_eq!(shown.value.to_bits(), 0.0_f64.to_bits());
|
||||
}
|
||||
pair(-1.5, 1, "−1.5", "−1.5");
|
||||
pair(12.5, 8, "12.50000000", "12.50000000");
|
||||
let f = NumberFormat::default();
|
||||
for dp in [9, 255] {
|
||||
assert!(matches!(format_number(12.5, dp, &f), Err(DocError::Invalid(_))));
|
||||
assert!(matches!(format_value(25.4, Length, "in", dp, &f), Err(DocError::Invalid(_))));
|
||||
}
|
||||
for x in [f64::NAN, f64::INFINITY, f64::NEG_INFINITY, 1e13, -1e13, 1e12_f64.next_up(), -1e12_f64.next_up()] {
|
||||
assert!(matches!(format_number(x, 2, &f), Err(DocError::Invalid(_))), "{x:?}");
|
||||
assert!(matches!(format_value(x, Length, "mm", 2, &f), Err(DocError::Invalid(_))), "{x:?}");
|
||||
}
|
||||
for x in [-1e12, 1e12] {
|
||||
assert_eq!(format_number(x, 8, &f).unwrap().value, x);
|
||||
}
|
||||
assert_eq!(format_value(1e15, Length, "m", 8, &f).unwrap().value, 1e12, "cap is in display units");
|
||||
assert_eq!(format_number(2.665, 2, &f).unwrap().value, 2.66);
|
||||
assert_eq!(format_value(25.4, Length, "in", 3, &f).unwrap().value, 1.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_format_options_and_group_boundaries() {
|
||||
let base = NumberFormat::default();
|
||||
let comma = NumberFormat { marker: DecimalMarker::Comma, ..base };
|
||||
assert_eq!(format_number(2.665, 2, &comma).unwrap().text, "2,66");
|
||||
let no_leading = NumberFormat { leading_zero: false, ..base };
|
||||
assert_eq!(format_number(0.5, 3, &no_leading).unwrap().text, ".500");
|
||||
let trim = NumberFormat { trailing_zeros: false, ..base };
|
||||
assert_eq!(format_number(25.0, 2, &trim).unwrap().text, "25");
|
||||
assert_eq!(format_number(25.5, 2, &trim).unwrap().text, "25.5");
|
||||
assert_eq!(format_number(0.5, 3, &NumberFormat { leading_zero: false, ..trim }).unwrap().text, ".5");
|
||||
let groups = NumberFormat { groups: true, ..base };
|
||||
for (x, dp, expected) in [
|
||||
(12345.6789, 4, "12\u{202f}345.6789"),
|
||||
(1.23456, 5, "1.234\u{202f}56"),
|
||||
(1234.5678, 4, "1234.5678"),
|
||||
(123456.0, 0, "123\u{202f}456"),
|
||||
(1234.0, 0, "1234"),
|
||||
(12345.0, 0, "12\u{202f}345"),
|
||||
(1.23456789, 8, "1.234\u{202f}567\u{202f}89"),
|
||||
(-12345.6789, 4, "−12\u{202f}345.6789"),
|
||||
(9999.9, 0, "10\u{202f}000"),
|
||||
] {
|
||||
assert_eq!(format_number(x, dp, &groups).unwrap().text, expected, "{x:?}, dp={dp}");
|
||||
}
|
||||
assert_eq!(format_number(12345.6789, 4, &NumberFormat { groups: true, ..comma }).unwrap().text, "12\u{202f}345,6789");
|
||||
assert_eq!(format_number(1.23450, 5, &NumberFormat { groups: true, ..trim }).unwrap().text, "1.2345", "group printed digits after trimming");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_provisional_leading_zero_for_rounded_zero() {
|
||||
// Provisional #5290 assumption: a fractional zero also omits the integer zero.
|
||||
let f = NumberFormat { leading_zero: false, ..NumberFormat::default() };
|
||||
for x in [0.0, -0.0, -0.004] {
|
||||
assert_eq!(format_number(x, 2, &f).unwrap().text, ".00");
|
||||
assert_eq!(format_number(x, 0, &f).unwrap().text, "0");
|
||||
assert_eq!(format_number(x, 2, &NumberFormat { trailing_zeros: false, ..f }).unwrap().text, "0");
|
||||
}
|
||||
assert_eq!(format_number(-0.5, 2, &f).unwrap().text, "−.50");
|
||||
assert_eq!(format_number(0.0, 2, &NumberFormat { marker: DecimalMarker::Comma, ..f }).unwrap().text, ",00");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_provisional_serde_convention_and_strict_fields() {
|
||||
// Provisional #5290 assumption, matching expr::Kind and other doc enums.
|
||||
let f: NumberFormat = serde_json::from_str("{}").unwrap();
|
||||
assert_eq!(f, NumberFormat::default());
|
||||
assert_eq!(
|
||||
serde_json::to_value(f).unwrap(),
|
||||
serde_json::json!({
|
||||
"marker": "point", "groups": false, "leading_zero": true,
|
||||
"trailing_zeros": true, "ties": "half_even"
|
||||
})
|
||||
);
|
||||
let f: NumberFormat = serde_json::from_value(serde_json::json!({"marker":"comma", "ties":"half_away_from_zero"})).unwrap();
|
||||
assert_eq!(f.marker, DecimalMarker::Comma);
|
||||
assert_eq!(f.ties, Ties::HalfAwayFromZero);
|
||||
assert!(f.leading_zero && f.trailing_zeros && !f.groups);
|
||||
assert_eq!(serde_json::from_value::<NumberFormat>(serde_json::to_value(f).unwrap()).unwrap(), f);
|
||||
for bad in [serde_json::json!({"locale":"en"}), serde_json::json!({"marker":"Point"}), serde_json::json!({"ties":"unknown"})] {
|
||||
assert!(serde_json::from_value::<NumberFormat>(bad).is_err());
|
||||
}
|
||||
}
|
||||
|
||||
fn random(state: &mut u64) -> u64 {
|
||||
*state ^= *state << 13;
|
||||
*state ^= *state >> 7;
|
||||
*state ^= *state << 17;
|
||||
*state
|
||||
}
|
||||
|
||||
/// Compare the printed decimal exactly with the input's binary fraction. A second f64
|
||||
/// subtraction can exceed the bound solely because parsing the correct text rounds again.
|
||||
fn decimal_within_bound(x: f64, text: &str, dp: u8, resolution: usize) -> bool {
|
||||
let unsigned = text.trim_start_matches('-');
|
||||
let (whole, fraction) = unsigned.split_once('.').unwrap_or((unsigned, ""));
|
||||
let coefficient: u128 = format!("{whole}{fraction}").parse().unwrap();
|
||||
let coefficient = coefficient * 10_u128.pow(u32::from(dp) - fraction.len() as u32);
|
||||
let extra = 10_u128.pow((resolution - usize::from(dp)) as u32);
|
||||
// Multiply |text - input| <= (10^-dp + 10^-resolution)/2 by 2*10^resolution.
|
||||
let center = 2 * coefficient * extra;
|
||||
let radius = extra + 1;
|
||||
let bits = x.abs().to_bits();
|
||||
let exponent = ((bits >> 52) & 0x7ff) as u32;
|
||||
let mantissa = u128::from(bits & ((1_u64 << 52) - 1));
|
||||
let (mantissa, shift) = if exponent == 0 { (mantissa, 1074) } else { (mantissa | (1_u128 << 52), 1075 - exponent) };
|
||||
let input = 2 * mantissa * 10_u128.pow(resolution as u32);
|
||||
// Input is below 2^104 at the supported resolutions. A shifted bound above u128's
|
||||
// range is therefore certainly above input; saturation preserves the comparison.
|
||||
let shifted = |n: u128| {
|
||||
if n == 0 {
|
||||
0
|
||||
} else if shift >= 128 || n > (u128::MAX >> shift) {
|
||||
u128::MAX
|
||||
} else {
|
||||
n << shift
|
||||
}
|
||||
};
|
||||
shifted(center.saturating_sub(radius)) <= input && input <= shifted(center + radius)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_large_magnitude_decimal_error_bound() {
|
||||
let x = 34947628153.461784;
|
||||
let shown = format_number(x, 5, &NumberFormat::default()).unwrap();
|
||||
assert_eq!(shown.text, "34947628153.46178");
|
||||
assert!(decimal_within_bound(x, &shown.text, 5, 9));
|
||||
assert!(!decimal_within_bound(x, "34947628153.46177", 5, 9));
|
||||
// Another exact binary tie whose rounded decimal has an inexact f64 representation.
|
||||
let x = 100000000000.25;
|
||||
let shown = format_number(x, 1, &NumberFormat::default()).unwrap();
|
||||
assert_eq!(shown.text, "100000000000.2");
|
||||
assert!(decimal_within_bound(x, &shown.text, 1, 9));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_seeded_100k_properties() {
|
||||
// Reference resolutions derived by hand from the unit table, not from the formatter.
|
||||
let units = [
|
||||
("mm", 9),
|
||||
("cm", 10),
|
||||
("m", 12),
|
||||
("in", 11),
|
||||
("ft", 12),
|
||||
("yd", 12),
|
||||
("km", 15),
|
||||
("um", 6),
|
||||
("µm", 6),
|
||||
("nm", 3),
|
||||
("mil", 8),
|
||||
("inch", 11),
|
||||
("deg", 8),
|
||||
("rad", 9),
|
||||
("°", 8),
|
||||
("degree", 8),
|
||||
("degrees", 8),
|
||||
("", 9),
|
||||
("none", 9),
|
||||
("unitless", 9),
|
||||
(" in ", 11),
|
||||
("parsec", 9),
|
||||
("IN", 9),
|
||||
("\0", 9),
|
||||
("../../mm", 9),
|
||||
("🦀", 9),
|
||||
];
|
||||
let mut seed = 0x5290_a735_19d2_8bc1;
|
||||
let (mut accepted, mut rejected, mut ordered) = (0, 0, 0);
|
||||
for case in 0..100_000 {
|
||||
let x = f64::from_bits(random(&mut seed));
|
||||
let dp = (random(&mut seed) % 13) as u8;
|
||||
let bits = random(&mut seed);
|
||||
let f = NumberFormat {
|
||||
marker: if bits & 1 == 0 { DecimalMarker::Point } else { DecimalMarker::Comma },
|
||||
groups: bits & 2 != 0,
|
||||
leading_zero: bits & 4 != 0,
|
||||
trailing_zeros: bits & 8 != 0,
|
||||
ties: if bits & 16 == 0 { Ties::HalfEven } else { Ties::HalfAwayFromZero },
|
||||
};
|
||||
let kind = match random(&mut seed) % 3 {
|
||||
0 => Length,
|
||||
1 => Angle,
|
||||
_ => Unitless,
|
||||
};
|
||||
let (unit, base_resolution) = units[(random(&mut seed) % units.len() as u64) as usize];
|
||||
let bare = case % 2 == 0;
|
||||
let info = if bare { Some((Unitless, 1.0)) } else { expr::unit_info(unit).filter(|(k, _)| *k == kind) };
|
||||
let call = |v| if bare { format_number(v, dp, &f) } else { format_value(v, kind, unit, dp, &f) };
|
||||
let result = call(x);
|
||||
let display = info.map(|(_, scale)| x / scale);
|
||||
let valid = dp <= 8 && display.is_some_and(|v| v.is_finite() && v.abs() <= 1e12);
|
||||
if !valid {
|
||||
rejected += 1;
|
||||
assert!(matches!(result, Err(DocError::Invalid(_))), "case {case}: {x:?}, dp={dp}, {kind:?}, {unit:?}: {result:?}");
|
||||
continue;
|
||||
}
|
||||
accepted += 1;
|
||||
let shown = result.unwrap();
|
||||
let canonical = shown.text.replace(',', ".").replace('\u{202f}', "").replace('−', "-");
|
||||
let parsed: f64 = canonical.parse().unwrap();
|
||||
assert_eq!(shown.value.to_bits(), parsed.to_bits(), "case {case}: {shown:?}");
|
||||
assert!(!shown.text.contains('-'));
|
||||
if parsed == 0.0 {
|
||||
assert!(!shown.value.is_sign_negative() && !shown.text.starts_with('−'));
|
||||
}
|
||||
let step = 10.0_f64.powi(-i32::from(dp));
|
||||
let resolution = if bare { 9 } else { base_resolution }.max(usize::from(dp) + 3);
|
||||
assert!(
|
||||
decimal_within_bound(display.unwrap(), &canonical, dp, resolution),
|
||||
"case {case}: input={x:?}, dp={dp}, unit={unit:?}, {shown:?}"
|
||||
);
|
||||
if parsed != 0.0 {
|
||||
assert_eq!(parsed.is_sign_negative(), x.is_sign_negative());
|
||||
}
|
||||
// Shown.value already has display units; converting it again would be wrong.
|
||||
assert_eq!(format_number(shown.value, dp, &f).unwrap().text, shown.text, "idempotence case {case}");
|
||||
// Fixed settings/units; move by >=2 display steps and several input ULPs.
|
||||
// Unlike next_up alone, this requires actual output increases, not just equal zeros.
|
||||
let scale = info.unwrap().1;
|
||||
let delta = (2.0 * step * scale).max(x.abs() * f64::EPSILON * 4.0);
|
||||
let y = x + delta;
|
||||
if let Ok(next) = call(y) {
|
||||
ordered += 1;
|
||||
assert!(y > x && next.value > shown.value, "monotonicity case {case}: {x:?}->{y:?}, dp={dp}, unit={unit:?}: {shown:?}->{next:?}");
|
||||
}
|
||||
}
|
||||
assert!(accepted > 10_000 && rejected > 10_000 && ordered > 10_000, "coverage: accepted={accepted}, rejected={rejected}, ordered={ordered}");
|
||||
eprintln!("seed=0x5290a73519d28bc1 cases=100000 accepted={accepted} rejected={rejected} strictly_ordered={ordered}");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1086,7 +1086,7 @@ pub enum FeatureKind {
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
#[walk(length = "Bend radius")]
|
||||
radius: Option<Expr>,
|
||||
/// inside | outside | middle.
|
||||
/// inside | outside | middle | material_outside | tangent (`sheet::SheetBody::add_flanges_each`).
|
||||
#[serde(default = "inside_str")]
|
||||
position: String,
|
||||
#[serde(default, skip_serializing_if = "std::ops::Not::not")]
|
||||
@@ -1102,6 +1102,11 @@ pub enum FeatureKind {
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
#[walk(length = "Corner relief")]
|
||||
corner_relief: Option<Expr>,
|
||||
/// Where the heights are measured from: `inner` (the inner virtual sharp) or `tangent`
|
||||
/// (past 90° the line square to the flange touching the bend's outside); none is the outer
|
||||
/// virtual sharp (`sheet::HeightFrom`).
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
height_from: Option<String>,
|
||||
},
|
||||
/// Flat hems on sheet edges.
|
||||
SheetHem {
|
||||
@@ -1952,6 +1957,12 @@ pub struct SketchPoints {
|
||||
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct Component {
|
||||
pub id: u64,
|
||||
/// Optional identification colour, separate from normal appearances.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub identification_color: Option<[u8; 3]>,
|
||||
/// Creation sequence used to select an automatic identification colour.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub identification_color_index: Option<u64>,
|
||||
pub name: String,
|
||||
/// Parent component (0 = the root).
|
||||
#[serde(default)]
|
||||
@@ -2513,6 +2524,9 @@ pub struct Document {
|
||||
#[serde(default, skip_serializing_if = "crate::Metadata::is_empty")]
|
||||
pub metadata: crate::Metadata,
|
||||
pub params: Vec<Param>,
|
||||
/// Named texts the words of sketch texts can be built from ([`crate::text_params`]).
|
||||
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
||||
pub text_params: Vec<crate::text_params::TextParam>,
|
||||
pub features: Vec<Feature>,
|
||||
/// Timeline marker: features at or after this index are rolled back (not evaluated).
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
@@ -2528,6 +2542,9 @@ pub struct Document {
|
||||
/// Components below the root, as a tree (by parent).
|
||||
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
||||
pub components: Vec<Component>,
|
||||
/// Next automatic colour sequence number; deletions never rewind it.
|
||||
#[serde(default)]
|
||||
pub next_component_color_index: u64,
|
||||
/// Placements of components in their parents (each non-root component has at least one).
|
||||
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
||||
pub occurrences: Vec<crate::Occurrence>,
|
||||
@@ -2786,11 +2803,13 @@ impl Document {
|
||||
units: default_units(),
|
||||
metadata: Default::default(),
|
||||
params: Vec::new(),
|
||||
text_params: Vec::new(),
|
||||
features: Vec::new(),
|
||||
marker: None,
|
||||
next_id: 1,
|
||||
reserved_body_names: Default::default(),
|
||||
components: Vec::new(),
|
||||
next_component_color_index: 0,
|
||||
occurrences: Vec::new(),
|
||||
assembly: Default::default(),
|
||||
sheet: Default::default(),
|
||||
@@ -3105,6 +3124,9 @@ impl Document {
|
||||
if self.components.len() >= 10_000 {
|
||||
return Err(DocError::Invalid("too many components".into()));
|
||||
}
|
||||
self.normalise_component_color_indices()?;
|
||||
let color_index = self.next_component_color_index;
|
||||
let next_color_index = color_index.checked_add(1).ok_or_else(|| DocError::Invalid("component colour sequence exhausted".into()))?;
|
||||
let id = self.next_id.max(1);
|
||||
self.next_id = id.checked_add(1).ok_or_else(|| DocError::Invalid("too many items in the design".into()))?;
|
||||
let name = match name.map(str::trim) {
|
||||
@@ -3117,7 +3139,8 @@ impl Document {
|
||||
format!("Component{k}")
|
||||
}
|
||||
};
|
||||
self.components.push(Component { id, name, parent, ..Default::default() });
|
||||
self.components.push(Component { id, name, parent, identification_color_index: Some(color_index), ..Default::default() });
|
||||
self.next_component_color_index = next_color_index;
|
||||
let occurrence = self.add_occurrence(id, parent, crate::IDENTITY)?;
|
||||
// The design's first part is grounded, so joints and drags have something fixed to work
|
||||
// from (#2804); later parts and copies start free. Only creation decides this: opening a
|
||||
@@ -3469,6 +3492,12 @@ impl Document {
|
||||
/// Add or change a parameter. Fails if the result would not evaluate. A new parameter
|
||||
/// without a unit takes the unit of its value (mm, deg or none).
|
||||
pub fn set_param(&mut self, name: &str, expr_s: &str, unit: Option<&str>, comment: Option<&str>) -> Result<()> {
|
||||
// A text parameter: one with the text unit, or an existing one when no unit is given.
|
||||
match (unit.map(crate::text_params::is_text_unit), self.text_param(name).is_some()) {
|
||||
(Some(true), _) | (None, true) => return self.set_text_param(name, expr_s, comment),
|
||||
(Some(false), true) => return Err(DocError::Invalid(format!("`{name}` is a text parameter"))),
|
||||
_ => {}
|
||||
}
|
||||
if let Some(p) = Self::param_name_problem(name) {
|
||||
return Err(DocError::Invalid(p));
|
||||
}
|
||||
@@ -3637,6 +3666,7 @@ impl Document {
|
||||
/// parameters (in place).
|
||||
pub fn apply_dimension_values(&self, vals: &std::collections::BTreeMap<String, expr::Value>, sk: &mut Sketch) -> Result<()> {
|
||||
self.apply_point_values(vals, sk)?;
|
||||
self.apply_pattern_values(vals, sk)?;
|
||||
for c in &mut sk.constraints {
|
||||
if let Some(p) = &c.param {
|
||||
let kind = if c.kind.is_angle() { Kind::Angle } else { Kind::Length };
|
||||
@@ -3668,6 +3698,43 @@ impl Document {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Evaluate the retained pattern inputs before solving its associative relations.
|
||||
pub fn apply_pattern_values(&self, vals: &std::collections::BTreeMap<String, expr::Value>, sk: &mut Sketch) -> Result<()> {
|
||||
use solidcraft_sketch::SketchPatternKind;
|
||||
self.apply_pattern_quantities(vals, sk)?;
|
||||
for index in 0..sk.patterns.len() {
|
||||
let Some(pattern) = sk.patterns.get(index) else { continue };
|
||||
let mut kind = pattern.kind.clone();
|
||||
for (key, expression) in &pattern.expressions {
|
||||
let unit = match key.as_str() {
|
||||
"count" | "count2" => Kind::Unitless,
|
||||
"spacing" | "spacing2" => Kind::Length,
|
||||
"angle" => Kind::Angle,
|
||||
_ => return Err(DocError::Invalid(format!("unknown sketch pattern input `{key}`"))),
|
||||
};
|
||||
let value = crate::eval::val(vals, expression, unit).map_err(|e| DocError::Expr(format!("pattern {} `{key}`: {e}", pattern.id)))?;
|
||||
let count = || -> Result<usize> {
|
||||
if !(1.0..=500.0).contains(&value) || value.fract() != 0.0 {
|
||||
return Err(DocError::Invalid(format!("pattern `{key}` must be a positive integer from 1 to 500")));
|
||||
}
|
||||
Ok(value as usize)
|
||||
};
|
||||
match (&mut kind, key.as_str()) {
|
||||
(SketchPatternKind::Circular { count: n, .. } | SketchPatternKind::Rectangular { count: n, .. }, "count") => *n = count()?,
|
||||
(SketchPatternKind::Rectangular { count2, .. }, "count2") => *count2 = count()?,
|
||||
(SketchPatternKind::Rectangular { spacing, .. }, "spacing") => *spacing = value,
|
||||
(SketchPatternKind::Rectangular { spacing2, .. }, "spacing2") => *spacing2 = value,
|
||||
(SketchPatternKind::Circular { angle, .. }, "angle") => *angle = value.to_degrees(),
|
||||
_ => return Err(DocError::Invalid(format!("invalid sketch pattern input `{key}`"))),
|
||||
}
|
||||
}
|
||||
if kind != pattern.kind {
|
||||
sk.update_pattern(index, kind)?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Move the points placed by parameters to where their expressions come to (in place). Such
|
||||
/// a point is fixed, so the solve keeps it there.
|
||||
pub fn apply_point_values(&self, vals: &std::collections::BTreeMap<String, expr::Value>, sk: &mut Sketch) -> Result<()> {
|
||||
@@ -3689,14 +3756,14 @@ impl Document {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Give the texts of a sketch the numbers their expressions come to (in place): a text's
|
||||
/// height, place and angle that were typed as expressions. A text's outlines are rebuilt from
|
||||
/// its numbers when the sketch's links are refreshed, so this comes before that. A number
|
||||
/// typed as a number is left as it is.
|
||||
/// Give the texts of a sketch the numbers and words their expressions come to (in place): a
|
||||
/// text's height, place and angle that were typed as expressions, and its words built from
|
||||
/// text parameters. A text's outlines are rebuilt from them when the sketch's links are
|
||||
/// refreshed, so this comes before that. What was typed as such is left as it is.
|
||||
pub fn apply_text_values(&self, vals: &std::collections::BTreeMap<String, expr::Value>, sk: &mut Sketch) -> Result<()> {
|
||||
use crate::eval::val;
|
||||
for link in &mut sk.links {
|
||||
let solidcraft_sketch::LinkSource::Text { at, height, angle, exprs, .. } = &mut link.source else { continue };
|
||||
let solidcraft_sketch::LinkSource::Text { text, at, height, angle, exprs, .. } = &mut link.source else { continue };
|
||||
let number = |e: &Option<String>, kind: Kind, what: &str| -> Result<Option<f64>> {
|
||||
match e {
|
||||
None => Ok(None),
|
||||
@@ -3718,6 +3785,13 @@ impl Document {
|
||||
if exprs.height.is_some() && !(*height > 1e-6 && *height < 1e5) {
|
||||
return Err(DocError::Invalid("a text's height must be positive".into()));
|
||||
}
|
||||
if let Some(e) = &exprs.text {
|
||||
let words = self.eval_words(e).map_err(|error| DocError::Expr(format!("text: {error}")))?;
|
||||
if words.trim().is_empty() || words.chars().count() > solidcraft_sketch::MAX_TEXT_CHARS {
|
||||
return Err(DocError::Invalid(format!("text: `{e}` gives no words, or too many")));
|
||||
}
|
||||
*text = words;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -3756,7 +3830,6 @@ impl Document {
|
||||
moved_from: Option<&Sketch>,
|
||||
analysis: solidcraft_sketch::Analysis,
|
||||
) -> Result<solidcraft_sketch::SolveReport> {
|
||||
self.apply_pattern_quantities(vals, sk)?;
|
||||
self.apply_dimension_values(vals, sk)?;
|
||||
let was = |sk: &Sketch| moved_from.and_then(|from| sk.positions_in(from));
|
||||
let offsets = !sk.offsets.is_empty() || !sk.freeform_offsets.is_empty();
|
||||
|
||||
+141
-42
@@ -68,6 +68,9 @@ pub struct ModelBody {
|
||||
/// [`kernel::measure`] of `body` (with the body it was measured on), worked out once and
|
||||
/// shared by clones: inspecting a design again measures only the bodies that changed.
|
||||
measured: Arc<OnceLock<(Body, kernel::Result<kernel::BodyMeasure>)>>,
|
||||
/// [`Body::is_surface`] of `body` (with the body it was measured on), worked out once and
|
||||
/// shared by clones.
|
||||
surface: Arc<OnceLock<(Body, bool)>>,
|
||||
}
|
||||
|
||||
impl ModelBody {
|
||||
@@ -93,6 +96,16 @@ impl ModelBody {
|
||||
source_key: 0,
|
||||
outline: Arc::new(OnceLock::new()),
|
||||
measured: Arc::new(OnceLock::new()),
|
||||
surface: Arc::new(OnceLock::new()),
|
||||
}
|
||||
}
|
||||
|
||||
/// A surface body: some shell does not close ([`Body::is_surface`]), worked out once.
|
||||
pub fn is_surface(&self) -> bool {
|
||||
match self.surface.get_or_init(|| (self.body.clone(), self.body.is_surface())) {
|
||||
(measured, s) if measured.same(&self.body) => *s,
|
||||
// The body was replaced in this cell's holder since: look again.
|
||||
_ => self.body.is_surface(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -331,6 +344,8 @@ pub struct ThreadInfo {
|
||||
pub body: String,
|
||||
pub designation: String,
|
||||
pub major_diameter: f64,
|
||||
/// Radius of the actual cylindrical face when the cosmetic thread is evaluated.
|
||||
pub radius: f64,
|
||||
pub pitch: f64,
|
||||
pub internal: bool,
|
||||
pub axis_point: Vec3,
|
||||
@@ -483,6 +498,7 @@ fn thread_on_impl(
|
||||
body,
|
||||
designation: name,
|
||||
major_diameter: major,
|
||||
radius: cyl.radius,
|
||||
pitch,
|
||||
internal: cyl.internal,
|
||||
axis_point: cyl.axis_point,
|
||||
@@ -1175,19 +1191,21 @@ pub struct Model {
|
||||
}
|
||||
|
||||
/// Parameters a feature uses directly (inputs, sketch dimensions and the expressions of a
|
||||
/// sketch's texts), sorted.
|
||||
/// sketch's texts, the text parameters of their words included), sorted.
|
||||
fn param_names(f: &Feature) -> Vec<String> {
|
||||
let mut names: Vec<String> = f.kind.expressions().iter().flat_map(|e| expr::references(e)).collect();
|
||||
if let FeatureKind::Sketch { sketch, .. } = &f.kind {
|
||||
names.extend(sketch.constraints.iter().filter_map(|c| c.param.clone()));
|
||||
names.extend(sketch.patterns.iter().flat_map(|p| p.expressions.values()).flat_map(|e| expr::references(e)));
|
||||
names.extend(sketch.text_exprs().into_iter().flat_map(|(_, e)| expr::references(e)));
|
||||
names.extend(sketch.text_word_exprs().into_iter().flat_map(|e| crate::text_params::references(e)));
|
||||
}
|
||||
names.sort();
|
||||
names.dedup();
|
||||
names
|
||||
}
|
||||
|
||||
fn fingerprint(prev: u64, f: &Feature, vals: &BTreeMap<String, Value>, rolled_back: bool, steps: &StepDigests) -> u64 {
|
||||
fn fingerprint(doc: &Document, prev: u64, f: &Feature, vals: &BTreeMap<String, Value>, rolled_back: bool, steps: &StepDigests) -> u64 {
|
||||
let mut h = std::collections::hash_map::DefaultHasher::new();
|
||||
prev.hash(&mut h);
|
||||
rolled_back.hash(&mut h);
|
||||
@@ -1195,13 +1213,14 @@ fn fingerprint(prev: u64, f: &Feature, vals: &BTreeMap<String, Value>, rolled_ba
|
||||
hash_feature_json(f, steps, &mut h);
|
||||
for n in param_names(f) {
|
||||
n.hash(&mut h);
|
||||
match vals.get(&n) {
|
||||
Some(v) => {
|
||||
match (vals.get(&n), doc.text_param(&n)) {
|
||||
(Some(v), _) => {
|
||||
v.v.to_bits().hash(&mut h);
|
||||
v.len.hash(&mut h);
|
||||
v.ang.hash(&mut h);
|
||||
}
|
||||
None => 0u8.hash(&mut h),
|
||||
(None, Some(p)) => p.text.hash(&mut h),
|
||||
(None, None) => 0u8.hash(&mut h),
|
||||
}
|
||||
}
|
||||
h.finish()
|
||||
@@ -1325,13 +1344,28 @@ fn feature_json(f: &Feature, steps: &StepDigests) -> String {
|
||||
/// constraints' values. Nothing else: what evaluation derives for its own copy (an offset's
|
||||
/// upgraded topology, refreshed links) stays out of the stored sketch. A `solved` that does not
|
||||
/// match `stored` entity for entity is not adopted.
|
||||
fn adopt_solution(stored: &mut solidcraft_sketch::Sketch, solved: &solidcraft_sketch::Sketch) {
|
||||
fn adopt_solution(stored: &mut solidcraft_sketch::Sketch, solved: &solidcraft_sketch::Sketch) -> bool {
|
||||
if stored.patterns != solved.patterns {
|
||||
// Rebuild authored copies without storing topology derived from links or offsets.
|
||||
let mut updated = stored.clone();
|
||||
for pattern in &solved.patterns {
|
||||
let Some(index) = updated.patterns.iter().position(|p| p.id == pattern.id) else { return false };
|
||||
if updated.update_pattern(index, pattern.kind.clone()).is_err() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if updated.patterns != solved.patterns || !adopt_solution(&mut updated, solved) {
|
||||
return false;
|
||||
}
|
||||
*stored = updated;
|
||||
return true;
|
||||
}
|
||||
if stored.points.len() != solved.points.len()
|
||||
|| stored.curves.len() != solved.curves.len()
|
||||
|| stored.constraints.len() != solved.constraints.len()
|
||||
|| stored.constraints.iter().zip(&solved.constraints).any(|(a, b)| a.id != b.id)
|
||||
{
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
for (p, q) in stored.points.iter_mut().zip(&solved.points) {
|
||||
p.pos = q.pos;
|
||||
@@ -1353,6 +1387,7 @@ fn adopt_solution(stored: &mut solidcraft_sketch::Sketch, solved: &solidcraft_sk
|
||||
c.kind.set_value(v);
|
||||
}
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
/// The values features are evaluated with: the parameters, and the design's length unit.
|
||||
@@ -1378,7 +1413,7 @@ fn chain_fingerprint(
|
||||
steps: &StepDigests,
|
||||
st: Option<&ModelState>,
|
||||
) -> u64 {
|
||||
let mut fp = fingerprint(prev, f, vals, rolled_back, steps) ^ placement_digest(doc, f, st);
|
||||
let mut fp = fingerprint(doc, prev, f, vals, rolled_back, steps) ^ placement_digest(doc, f, st);
|
||||
// Sheet metal features also depend on the rules (and the parameters they use).
|
||||
if f.kind.is_sheet() {
|
||||
let mut h = std::collections::hash_map::DefaultHasher::new();
|
||||
@@ -1417,7 +1452,7 @@ fn context_digest(doc: &Document, vals: &BTreeMap<String, Value>) -> u64 {
|
||||
for f in doc.features.iter().filter(|f| {
|
||||
matches!(f.kind, FeatureKind::ConstructionPlane { .. } | FeatureKind::ConstructionAxis { .. } | FeatureKind::ConstructionPoint { .. })
|
||||
}) {
|
||||
fingerprint(0, f, vals, false, &StepDigests::default()).hash(&mut h);
|
||||
fingerprint(doc, 0, f, vals, false, &StepDigests::default()).hash(&mut h);
|
||||
}
|
||||
doc.units.hash(&mut h);
|
||||
serde_json::to_string(&doc.sheet).unwrap_or_default().hash(&mut h);
|
||||
@@ -1859,6 +1894,7 @@ impl Model {
|
||||
s.report.keeps_orientation()
|
||||
&& doc.sketch(s.feature).is_ok_and(|stored| {
|
||||
stored.driving_values() != s.sketch.driving_values()
|
||||
|| stored.patterns != s.sketch.patterns
|
||||
|| s.sketch.points.iter().zip(&stored.points).any(|(p, q)| p.link.is_some() && p.id == q.id && p.pos != q.pos)
|
||||
})
|
||||
})
|
||||
@@ -1986,7 +2022,8 @@ impl Model {
|
||||
Arc::make_mut(&mut state).reserved_body_names.clone_from(&reserved);
|
||||
}
|
||||
// The same feature on the same inputs: its earlier result.
|
||||
let key = cache_key(f, fp, fingerprint(0, f, &vals, false, &self.step_digests) ^ placement_digest(doc, f, Some(&state)), ctx, &state);
|
||||
let key =
|
||||
cache_key(f, fp, fingerprint(doc, 0, f, &vals, false, &self.step_digests) ^ placement_digest(doc, f, Some(&state)), ctx, &state);
|
||||
let kept = self.kept.0.as_ref().filter(|_| !self.no_cache);
|
||||
if !self.no_cache
|
||||
&& let Some(c) = self.cache.lock().ok().and_then(|mut m| m.get(key)).or_else(|| kept.and_then(|k| k.get(key)))
|
||||
@@ -2598,7 +2635,15 @@ fn intersection_tool_union(tools: Vec<Traced>) -> Result<Vec<Traced>> {
|
||||
}
|
||||
|
||||
/// After a cut handled some sheet bodies as flat machining, apply it to the other targets.
|
||||
fn apply_beside_sheet_cut(st: &mut ModelState, f: &Feature, tools: Vec<Traced>, op: Operation, targets: &[String], handled: &[String]) -> Result<()> {
|
||||
fn apply_beside_sheet_cut(
|
||||
doc: &Document,
|
||||
st: &mut ModelState,
|
||||
f: &Feature,
|
||||
tools: Vec<Traced>,
|
||||
op: Operation,
|
||||
targets: &[String],
|
||||
handled: &[String],
|
||||
) -> Result<()> {
|
||||
let effective = if targets.is_empty() { &f.participants } else { targets };
|
||||
let all = effective.len() == 1 && effective.first().is_some_and(|t| t == "*");
|
||||
let rest: Vec<String> = st
|
||||
@@ -2613,7 +2658,7 @@ fn apply_beside_sheet_cut(st: &mut ModelState, f: &Feature, tools: Vec<Traced>,
|
||||
if rest.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
apply_traced(st, f, tools, op, &rest)
|
||||
apply_traced(doc, st, f, tools, op, &rest)
|
||||
}
|
||||
|
||||
/// Only one target meets every separated tool. A tool with no contact must retain
|
||||
@@ -2639,8 +2684,8 @@ fn common_join_target(state: &ModelState, indices: &[usize], tools: &[Traced]) -
|
||||
Ok(common.filter(|index| contacts.iter().all(|contact| *contact == Some(*index))))
|
||||
}
|
||||
|
||||
fn apply_op(state: &mut ModelState, f: &Feature, tools: Vec<Body>, op: Operation, targets: &[String]) -> Result<()> {
|
||||
apply_traced(state, f, tools.into_iter().map(Traced::unnamed).collect(), op, targets)
|
||||
fn apply_op(doc: &Document, state: &mut ModelState, f: &Feature, tools: Vec<Body>, op: Operation, targets: &[String]) -> Result<()> {
|
||||
apply_traced(doc, state, f, tools.into_iter().map(Traced::unnamed).collect(), op, targets)
|
||||
}
|
||||
|
||||
/// Many cut tools clear of each other (a pattern's copies, the circles of a vent field in one
|
||||
@@ -2685,8 +2730,60 @@ pub(crate) fn boolean_scope(state: &ModelState, f: &Feature, targets: &[String])
|
||||
(!all && !effective.is_empty(), names)
|
||||
}
|
||||
|
||||
/// Suggest one nearby body without changing the default component scope or running a boolean.
|
||||
fn empty_boolean_targets(doc: &Document, state: &ModelState, f: &Feature, tools: &[Traced], default_targets: bool) -> DocError {
|
||||
let plain = "there is no body to cut or intersect";
|
||||
if !default_targets {
|
||||
return DocError::Invalid(plain.into());
|
||||
}
|
||||
let component_name = |id| {
|
||||
if id == 0 {
|
||||
doc.name.clone()
|
||||
} else {
|
||||
doc.components.iter().take(10_000).find(|c| c.id == id).map(|c| c.name.clone()).unwrap_or_else(|| format!("Component{id}"))
|
||||
}
|
||||
};
|
||||
let tool_bounds: Vec<_> = tools.iter().take(64).map(|t| t.body.outline_bounds()).collect();
|
||||
let frame = doc.component_transform(f.component);
|
||||
let Some(inverse) = crate::mat_inverse(&frame) else { return DocError::Invalid(plain.into()) };
|
||||
// Named by the component the Browser shows the body in; one shown in the feature's own
|
||||
// component has no other component to point at.
|
||||
let others = state
|
||||
.bodies
|
||||
.iter()
|
||||
.take(256)
|
||||
.map(|b| (b, doc.model_body_component(b)))
|
||||
.filter(|(b, owner)| b.component != f.component && *owner != f.component);
|
||||
for (body, owner) in others {
|
||||
// Compare in the feature's frame, including component placements and body offsets.
|
||||
let world = body_world(doc, body);
|
||||
let relative = crate::mat_mul(&inverse, &world);
|
||||
let bounds = body.outline_bounds();
|
||||
if bounds.is_empty() || !bounds.min.is_finite() || !bounds.max.is_finite() {
|
||||
continue;
|
||||
}
|
||||
let mut placed = solidcraft_geom::Aabb3::EMPTY;
|
||||
for x in [bounds.min.x, bounds.max.x] {
|
||||
for y in [bounds.min.y, bounds.max.y] {
|
||||
for z in [bounds.min.z, bounds.max.z] {
|
||||
placed.add(crate::apply_point(&relative, Vec3::new(x, y, z)));
|
||||
}
|
||||
}
|
||||
}
|
||||
if tool_bounds.iter().any(|b| !b.is_empty() && b.min.is_finite() && b.max.is_finite() && b.meets(&placed)) {
|
||||
let own = component_name(f.component);
|
||||
let other = component_name(owner);
|
||||
let name = &body.name;
|
||||
return DocError::Invalid(format!(
|
||||
"{plain} in component '{own}'; the tool may overlap '{name}' in component '{other}' — activate that component or pick the body as a target"
|
||||
));
|
||||
}
|
||||
}
|
||||
DocError::Invalid(plain.into())
|
||||
}
|
||||
|
||||
/// [`apply_op`] with tools whose lineage is known: the bodies it makes or changes keep theirs.
|
||||
fn apply_traced(state: &mut ModelState, f: &Feature, tools: Vec<Traced>, op: Operation, targets: &[String]) -> Result<()> {
|
||||
fn apply_traced(doc: &Document, state: &mut ModelState, f: &Feature, tools: Vec<Traced>, op: Operation, targets: &[String]) -> Result<()> {
|
||||
let tools = if op == Operation::Intersect { intersection_tool_union(tools)? } else { tools };
|
||||
// Participants: the feature's own targets, else its explicit participants, else the bodies
|
||||
// of its component (and what it made itself): other components are left alone.
|
||||
@@ -2706,7 +2803,7 @@ fn apply_traced(state: &mut ModelState, f: &Feature, tools: Vec<Traced>, op: Ope
|
||||
};
|
||||
if op == Operation::NewBody || target_idx.is_empty() {
|
||||
if op == Operation::Cut || op == Operation::Intersect {
|
||||
return Err(DocError::Invalid("there is no body to cut or intersect".into()));
|
||||
return Err(empty_boolean_targets(doc, state, f, &tools, targets.is_empty()));
|
||||
}
|
||||
for (k, t) in tools.into_iter().enumerate() {
|
||||
let name = new_name(state, f, k);
|
||||
@@ -2752,7 +2849,7 @@ fn apply_traced(state: &mut ModelState, f: &Feature, tools: Vec<Traced>, op: Ope
|
||||
let mut batched = state.clone();
|
||||
// Preserve the original participants. For Join, the compound's larger
|
||||
// size must not expand the contact tolerance and absorb a nearby body.
|
||||
if apply_traced(&mut batched, f, vec![Traced::step(compound, &tools.iter().collect::<Vec<_>>())], op, &names).is_ok() {
|
||||
if apply_traced(doc, &mut batched, f, vec![Traced::step(compound, &tools.iter().collect::<Vec<_>>())], op, &names).is_ok() {
|
||||
*state = batched;
|
||||
return Ok(());
|
||||
}
|
||||
@@ -6298,12 +6395,12 @@ fn replay(
|
||||
}
|
||||
// New bodies from a pattern join their source when they touch it (as one feature would).
|
||||
if f.body_names.is_empty() {
|
||||
apply_traced(st, f, copies, op, &targets)?;
|
||||
apply_traced(doc, st, f, copies, op, &targets)?;
|
||||
} else {
|
||||
let start = st.bodies.iter().filter(|b| b.feature == f.id).count();
|
||||
let mut named = f.clone();
|
||||
named.body_names = f.body_names.iter().skip(start).cloned().collect();
|
||||
apply_traced(st, &named, copies, op, &targets)?;
|
||||
apply_traced(doc, st, &named, copies, op, &targets)?;
|
||||
}
|
||||
}
|
||||
if missed > 0 {
|
||||
@@ -6784,10 +6881,10 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
|
||||
let bodies: Vec<Body> = tools.iter().map(|t| t.body.clone()).collect();
|
||||
let handled = more::sheet_cut(f, st, &bodies, &crate::plain(targets), constructor.as_ref(), warning)?;
|
||||
if !handled.is_empty() {
|
||||
return apply_beside_sheet_cut(st, f, tools, *operation, &crate::plain(targets), &handled);
|
||||
return apply_beside_sheet_cut(doc, st, f, tools, *operation, &crate::plain(targets), &handled);
|
||||
}
|
||||
}
|
||||
apply_traced(st, f, tools, *operation, &crate::plain(targets))
|
||||
apply_traced(doc, st, f, tools, *operation, &crate::plain(targets))
|
||||
}
|
||||
FeatureKind::Hole { thread, thread_depth, diameter, .. } => {
|
||||
let thread_depth = thread_depth.as_ref().map(|d| val(vals, d, Kind::Length)).transpose()?;
|
||||
@@ -6802,9 +6899,9 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
|
||||
let handled = sheet_hole_cut(st, f, &tools, warning)?;
|
||||
let tools: Vec<Traced> = tools.into_iter().map(|(tool, _)| tool).collect();
|
||||
if handled.is_empty() {
|
||||
apply_traced(st, f, tools, Operation::Cut, &[])?;
|
||||
apply_traced(doc, st, f, tools, Operation::Cut, &[])?;
|
||||
} else {
|
||||
apply_beside_sheet_cut(st, f, tools, Operation::Cut, &[], &handled)?;
|
||||
apply_beside_sheet_cut(doc, st, f, tools, Operation::Cut, &[], &handled)?;
|
||||
}
|
||||
if let Some(d) = thread {
|
||||
// Find the bore beyond any entry recess, including shallow and through holes.
|
||||
@@ -7011,7 +7108,7 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
|
||||
if *remove_tools {
|
||||
st.bodies.retain(|b| !tools.iter().any(|t| *t == b.name));
|
||||
}
|
||||
apply_traced(st, f, made, *operation, &[])
|
||||
apply_traced(doc, st, f, made, *operation, &[])
|
||||
}
|
||||
FeatureKind::SplitFace { faces, body, plane, tool, sketch } => {
|
||||
let i = body_at(st, body, &crate::plain(faces))?;
|
||||
@@ -7244,9 +7341,9 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
|
||||
let handled = more::sheet_primitive_cut(f, st, &b, more::PrimitivePrism::Box { lo: corner, hi: corner + s }, *operation, false, warning)?;
|
||||
let tools = vec![crate::lineage::box_tool(b)];
|
||||
if !handled.is_empty() {
|
||||
return apply_beside_sheet_cut(st, f, tools, *operation, &[], &handled);
|
||||
return apply_beside_sheet_cut(doc, st, f, tools, *operation, &[], &handled);
|
||||
}
|
||||
apply_traced(st, f, tools, *operation, &[])
|
||||
apply_traced(doc, st, f, tools, *operation, &[])
|
||||
}
|
||||
FeatureKind::Cylinder { base, axis, radius, height, operation } => {
|
||||
let (base, radius, height) = (point(vals, base)?, val(vals, radius, Kind::Length)?, val(vals, height, Kind::Length)?);
|
||||
@@ -7256,17 +7353,17 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
|
||||
let handled = more::sheet_primitive_cut(f, st, &b, prism, *operation, false, warning)?;
|
||||
let tools = vec![crate::lineage::cylinder_tool(b)];
|
||||
if !handled.is_empty() {
|
||||
return apply_beside_sheet_cut(st, f, tools, *operation, &[], &handled);
|
||||
return apply_beside_sheet_cut(doc, st, f, tools, *operation, &[], &handled);
|
||||
}
|
||||
apply_traced(st, f, tools, *operation, &[])
|
||||
apply_traced(doc, st, f, tools, *operation, &[])
|
||||
}
|
||||
FeatureKind::Sphere { center, radius, operation } => {
|
||||
let b = kernel::sphere(point(vals, center)?, val(vals, radius, Kind::Length)?)?;
|
||||
apply_op(st, f, vec![b], *operation, &[])
|
||||
apply_op(doc, st, f, vec![b], *operation, &[])
|
||||
}
|
||||
FeatureKind::Torus { center, major, minor, operation } => {
|
||||
let b = kernel::torus(point(vals, center)?, val(vals, major, Kind::Length)?, val(vals, minor, Kind::Length)?)?;
|
||||
apply_op(st, f, vec![b], *operation, &[])
|
||||
apply_op(doc, st, f, vec![b], *operation, &[])
|
||||
}
|
||||
FeatureKind::Combine { target, tools, operation, keep_tools } => {
|
||||
if tools.iter().any(|t| t == target) {
|
||||
@@ -7314,7 +7411,7 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
|
||||
return Ok(()); // the pieces were all joined back into the body they are part of
|
||||
}
|
||||
let op = if *operation == Operation::NewBody { Operation::Join } else { *operation };
|
||||
apply_traced(st, f, tb, op, std::slice::from_ref(&target.0))?;
|
||||
apply_traced(doc, st, f, tb, op, std::slice::from_ref(&target.0))?;
|
||||
if !keep_tools {
|
||||
st.bodies.retain(|b| !tools.iter().any(|t| *t == b.name));
|
||||
}
|
||||
@@ -8033,17 +8130,19 @@ pub fn world_state_reusing(doc: &Document, st: &ModelState, placed_before: &mut
|
||||
let geom = if ident { c.geom.clone() } else { c.geom.placed(&m) };
|
||||
out.construct.push(crate::construct::Construct { geom, ..c.clone() });
|
||||
}
|
||||
for t in st
|
||||
.threads
|
||||
.iter()
|
||||
.filter(|t| st.body(&t.body).map(|body| doc.model_body_component(body)).unwrap_or_else(|| comp_of_feature(t.feature)) == comp)
|
||||
{
|
||||
let mut t2 = t.clone();
|
||||
let frame = st.body(&t.body).and_then(|body| doc.model_body_offset(body)).map(|offset| crate::mat_mul(&m, offset)).unwrap_or(m);
|
||||
t2.axis_point = crate::apply_point(&frame, t.axis_point);
|
||||
t2.axis = crate::apply_vector(&frame, *t.axis).unit().unwrap_or(t.axis);
|
||||
out.threads.push(t2);
|
||||
}
|
||||
}
|
||||
// Unlike editable sketch guides, cosmetic surfaces belong to every occurrence.
|
||||
for t in st
|
||||
.threads
|
||||
.iter()
|
||||
.filter(|t| st.body(&t.body).map(|body| doc.model_body_component(body)).unwrap_or_else(|| comp_of_feature(t.feature)) == comp)
|
||||
{
|
||||
let mut t2 = t.clone();
|
||||
t2.body = doc.world_body_name(st, &t.body, comp, &path);
|
||||
let frame = st.body(&t.body).and_then(|body| doc.model_body_offset(body)).map(|offset| crate::mat_mul(&m, offset)).unwrap_or(m);
|
||||
t2.axis_point = crate::apply_point(&frame, t.axis_point);
|
||||
t2.axis = crate::apply_vector(&frame, *t.axis).unit().unwrap_or(t.axis);
|
||||
out.threads.push(t2);
|
||||
}
|
||||
}
|
||||
*placed_before = placed_now;
|
||||
|
||||
+15
-10
@@ -67,11 +67,11 @@ pub(super) fn eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature,
|
||||
if st.bodies.is_empty() {
|
||||
return Err(DocError::Invalid("there is no body to emboss".into()));
|
||||
}
|
||||
apply_op(st, f, tools, if *deboss { Operation::Cut } else { Operation::Join }, &crate::plain(targets))
|
||||
apply_op(doc, st, f, tools, if *deboss { Operation::Cut } else { Operation::Join }, &crate::plain(targets))
|
||||
}
|
||||
FeatureKind::Rib { .. } => {
|
||||
let tools = rib_tools(vals, st, f, None)?;
|
||||
apply_op(st, f, tools, Operation::Join, &[])
|
||||
apply_op(doc, st, f, tools, Operation::Join, &[])
|
||||
}
|
||||
FeatureKind::ReplaceFace { faces, target, body } => {
|
||||
let tp = doc.resolve_plane_in(vals, target, 0, Some(st))?;
|
||||
@@ -561,7 +561,7 @@ pub(super) fn sheet_eval(
|
||||
st.sheets.push(sh);
|
||||
Ok(())
|
||||
}
|
||||
FeatureKind::SheetFlange { edges, height, angle, radius, position, flip, body, corner_relief_shape, corner_relief } => {
|
||||
FeatureKind::SheetFlange { edges, height, angle, radius, position, flip, body, corner_relief_shape, corner_relief, height_from } => {
|
||||
let i = sheet_for(st, body, edges.first().map(|e| e.point.0))?;
|
||||
let (h, a) = (val(vals, height, Kind::Length)?, val(vals, angle, Kind::Angle)?);
|
||||
// Each edge's own height and angle, else the feature's.
|
||||
@@ -598,6 +598,11 @@ pub(super) fn sheet_eval(
|
||||
None => None,
|
||||
},
|
||||
};
|
||||
let from = match height_from {
|
||||
Some(name) => sheet::HeightFrom::parse(name)
|
||||
.ok_or_else(|| DocError::Invalid(format!("unknown flange height datum `{name}` (outer, inner or tangent)")))?,
|
||||
None => sheet::HeightFrom::Outer,
|
||||
};
|
||||
let sh = st.sheets.get_mut(i).ok_or_else(|| DocError::Invalid("sheet".into()))?;
|
||||
if sh.flat {
|
||||
return Err(DocError::Invalid("refold the sheet before adding flanges".into()));
|
||||
@@ -606,7 +611,7 @@ pub(super) fn sheet_eval(
|
||||
let each: Vec<sheet::EdgeFlange> = sheet_picks(sh, f, &points, warning)
|
||||
.into_iter()
|
||||
.zip(own)
|
||||
.map(|(pick, (height, angle))| sheet::EdgeFlange { pick, height, angle })
|
||||
.map(|(pick, (height, angle))| sheet::EdgeFlange { pick, height, angle, from })
|
||||
.collect();
|
||||
let n0 = sh.flanges.len();
|
||||
let (_, notes) = sh.add_flanges_each(&each, rr, position, *flip, relief)?;
|
||||
@@ -1884,7 +1889,7 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
|
||||
tools.extend(kernel::extrude(&rp, &[rect], -delta, hr)?.into_iter().map(|b| crate::lineage::part_tool(b, &format!("rib{k}"))));
|
||||
}
|
||||
}
|
||||
apply_traced(st, f, tools, Operation::Join, std::slice::from_ref(&target))?;
|
||||
apply_traced(doc, st, f, tools, Operation::Join, std::slice::from_ref(&target))?;
|
||||
// The root fillet: rounds the circle where the post meets the face.
|
||||
if rf > 1e-9 {
|
||||
let i = st.bodies.iter().position(|b| b.name == target).ok_or_else(|| DocError::Invalid("boss body".into()))?;
|
||||
@@ -1908,7 +1913,7 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
|
||||
let hp = Plane::new(position.0, x, z.cross(x)).ok_or_else(|| DocError::Invalid("hole frame".into()))?;
|
||||
let tool = kernel::extrude(&hp, &[Region2 { outer: Loop2::circle(Vec2::ZERO, rh), holes: Vec::new() }], h - depth, h + delta)?;
|
||||
let tool = tool.into_iter().map(|b| crate::lineage::part_tool(b, "hole")).collect();
|
||||
apply_traced(st, f, tool, Operation::Cut, std::slice::from_ref(&target))?;
|
||||
apply_traced(doc, st, f, tool, Operation::Cut, std::slice::from_ref(&target))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -1994,10 +1999,10 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
|
||||
let delta = (h * 0.05).clamp(1e-3, 0.5);
|
||||
if *groove {
|
||||
let tool = kernel::extrude(&plane, &[band], -(h + g), delta)?.into_iter().map(|b| crate::lineage::part_tool(b, "groove")).collect();
|
||||
apply_traced(st, f, tool, Operation::Cut, std::slice::from_ref(&target))
|
||||
apply_traced(doc, st, f, tool, Operation::Cut, std::slice::from_ref(&target))
|
||||
} else {
|
||||
let tool = kernel::extrude(&plane, &[band], -delta, h)?.into_iter().map(|b| crate::lineage::part_tool(b, "lip")).collect();
|
||||
apply_traced(st, f, tool, Operation::Join, std::slice::from_ref(&target))
|
||||
apply_traced(doc, st, f, tool, Operation::Join, std::slice::from_ref(&target))
|
||||
}
|
||||
}
|
||||
FeatureKind::SnapFit { position, direction, hook, length, thickness, width, catch_depth, catch_length, body } => {
|
||||
@@ -2023,7 +2028,7 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
|
||||
let (lo, hi) = if sgn > 0.0 { (0.0, w) } else { (-w, 0.0) };
|
||||
let tool = kernel::extrude(&pl, &[Region2 { outer: lp, holes: Vec::new() }], lo, hi)?;
|
||||
let tool = tool.into_iter().map(|b| crate::lineage::part_tool(b, "arm")).collect();
|
||||
apply_traced(st, f, tool, Operation::Join, std::slice::from_ref(&target))
|
||||
apply_traced(doc, st, f, tool, Operation::Join, std::slice::from_ref(&target))
|
||||
}
|
||||
FeatureKind::Rest { position, direction, along, width, length, height, draft, thickness, body } => {
|
||||
let target = body_under(st, body, position.0)?;
|
||||
@@ -2074,7 +2079,7 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
|
||||
kernel::extrude(&base, &[region], 0.0, h + delta)?
|
||||
};
|
||||
let tool = tool.into_iter().map(|b| crate::lineage::part_tool(b, "rest")).collect();
|
||||
apply_traced(st, f, tool, Operation::Join, std::slice::from_ref(&target))
|
||||
apply_traced(doc, st, f, tool, Operation::Join, std::slice::from_ref(&target))
|
||||
}
|
||||
_ => Err(DocError::Invalid(format!("{} is not a plastic feature", f.name))),
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ pub(super) fn eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature,
|
||||
if tools.is_empty() {
|
||||
return Err(DocError::Invalid("pick the surfaces to thicken".into()));
|
||||
}
|
||||
apply_op(st, f, tools, *operation, &crate::plain(targets))
|
||||
apply_op(doc, st, f, tools, *operation, &crate::plain(targets))
|
||||
}
|
||||
FeatureKind::SurfaceTrim { body, plane, tool, keep, keep_more, curves, with, keep_with, stitch, extend } => {
|
||||
let i = st.bodies.iter().position(|b| &b.name == body).ok_or_else(|| DocError::Unknown(format!("body `{body}`")))?;
|
||||
|
||||
@@ -1144,6 +1144,7 @@ fn rigid(m: &crate::Mat) -> bool {
|
||||
|
||||
/// Feature input names and component occurrences, which format 1 files may predate.
|
||||
fn normalise(d: &mut Document) -> Result<()> {
|
||||
d.normalise_component_color_indices()?;
|
||||
d.name_all_feature_inputs();
|
||||
let missing: Vec<(u64, u64)> =
|
||||
d.components.iter().filter(|c| !d.occurrences.iter().any(|o| o.component == c.id)).map(|c| (c.id, c.parent)).collect();
|
||||
@@ -1419,6 +1420,7 @@ mod tests {
|
||||
body: None,
|
||||
corner_relief_shape: shape.map(Into::into),
|
||||
corner_relief: size.map(Into::into),
|
||||
height_from: None,
|
||||
};
|
||||
let saved = |document: &Document| -> Value { serde_json::from_str(&document.to_json()).unwrap() };
|
||||
// A flange that follows the rule saves neither key, and a design of format 23 opens as it was.
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
//! An edge flange feature's `position` can also be `material_outside` (the inner virtual sharp on
|
||||
//! the picked edge, so at 90° the flange's inner face is flush with the edge's face) or `tangent`
|
||||
//! (the bend's outer face tangent to the edge's face; below 90° the bend's end on that face),
|
||||
//! #5941. Older designs need no step: their
|
||||
//! positions (inside, outside, middle) are saved and built as before. The last release refuses a
|
||||
//! design that has them (it refuses the newer format number).
|
||||
@@ -0,0 +1,6 @@
|
||||
//! An edge flange feature can say where its heights are measured from (#5938): `height_from` is
|
||||
//! `inner` (the inner virtual sharp) or `tangent` (past 90° the line square to the flange
|
||||
//! touching the outside of the bend, up to 90° the outer virtual sharp). A feature measured from the outer
|
||||
//! virtual sharp, as every flange was before, saves no `height_from`, so older designs need no
|
||||
//! step and open and save as they were. The last release refuses a design that has it (it
|
||||
//! refuses the newer format number).
|
||||
@@ -0,0 +1,5 @@
|
||||
//! Text parameters (`text_params`: name, text, comment) and the expression behind a sketch
|
||||
//! text's words (`exprs.text` of a text link, e.g. `Label + '-L'`), whose words are what it gave
|
||||
//! last. Older designs need no transformation: they have neither. The last release refuses the
|
||||
//! newer format number instead of opening a design whose texts would lose their link to the
|
||||
//! parameters.
|
||||
@@ -0,0 +1,4 @@
|
||||
//! Components save an optional `identification_color_index` and the document saves
|
||||
//! `next_component_color_index`. Automatic colours follow creation order and wrap through the
|
||||
//! palette; deletions do not rewind the sequence. Older records receive indices in stored order
|
||||
//! during normalization (not the order they were originally created), preserving explicit RGB overrides.
|
||||
@@ -0,0 +1,5 @@
|
||||
//! An edge joint origin (`Snap::Edge`) saves an optional `axis`: `{"along": [x, y, z]}` (z runs
|
||||
//! along the edge, the way the vector points) or `{"fixed": [x, y, z]}` (z is that direction), for
|
||||
//! an edge or a corner picked in the Joint dialog, which used to be saved as a point. Older
|
||||
//! designs have no `axis` and resolve as before (z out of the face). The last release refuses a
|
||||
//! design with this change by its newer format number.
|
||||
@@ -0,0 +1,2 @@
|
||||
//! Sketch patterns retain count, spacing and angle expressions alongside evaluated settings.
|
||||
//! Missing expressions preserve the numeric settings of older designs without rewriting them.
|
||||
@@ -13,6 +13,10 @@
|
||||
//! around them tells apart are numbered (`#1`, `#2`): in the order of what they came from when
|
||||
//! that differs (exact), else in the kernel's order (unverified). A face made of several (a
|
||||
//! coplanar join) takes one name and answers to the others (aliases).
|
||||
//!
|
||||
//! A piece that is split again keeps the face's stem and the bounds that told the piece it
|
||||
//! came from apart: its name lists the faces around it, not the qualifiers of the pieces
|
||||
//! before it, so a name does not grow with every split.
|
||||
|
||||
use std::collections::{BTreeMap, BTreeSet};
|
||||
use std::sync::{Arc, OnceLock};
|
||||
@@ -244,7 +248,7 @@ fn merged(names: Vec<Named>) -> Option<Named> {
|
||||
}
|
||||
common = crate::naming::parent_piece(c);
|
||||
}
|
||||
let name = common.map(str::to_string).unwrap_or(first);
|
||||
let name = common_piece(&names).or_else(|| common.map(str::to_string)).unwrap_or(first);
|
||||
let mut aliases: Vec<String> = Vec::new();
|
||||
for n in names {
|
||||
for alias in std::iter::once(n.name).chain(n.aliases) {
|
||||
@@ -256,6 +260,38 @@ fn merged(names: Vec<Named>) -> Option<Named> {
|
||||
Some(Named { name, aliases, verified, origins: None })
|
||||
}
|
||||
|
||||
/// The name the faces have in common: their stem, the faces their qualifiers share and the
|
||||
/// number that told their pieces apart, when all of them have it. A face made of pieces that
|
||||
/// were split again keeps the name of the piece they came from (#5860).
|
||||
fn common_piece(names: &[Named]) -> Option<String> {
|
||||
let first = names.first()?.name.as_str();
|
||||
let (stem, around, tie) = split_piece(first);
|
||||
let mut shared: BTreeSet<String> = around.into_iter().collect();
|
||||
let mut same_tie = tie;
|
||||
for n in names.iter().skip(1) {
|
||||
let (other_stem, around, other_tie) = split_piece(&n.name);
|
||||
if other_stem != stem {
|
||||
return None;
|
||||
}
|
||||
let around: BTreeSet<String> = around.into_iter().collect();
|
||||
shared = shared.intersection(&around).cloned().collect();
|
||||
if same_tie != other_tie {
|
||||
same_tie = None;
|
||||
}
|
||||
}
|
||||
let mut name = stem;
|
||||
if !shared.is_empty() {
|
||||
name.push_str("#[");
|
||||
name.push_str(&shared.into_iter().collect::<Vec<_>>().join(","));
|
||||
name.push(']');
|
||||
}
|
||||
if let Some(tie) = same_tie {
|
||||
name.push('#');
|
||||
name.push_str(&tie);
|
||||
}
|
||||
Some(name)
|
||||
}
|
||||
|
||||
/// Whether `name` is `stem` or a piece of it (at any depth).
|
||||
pub(crate) fn descends(name: &str, stem: &str) -> bool {
|
||||
let mut current = Some(name);
|
||||
@@ -330,11 +366,26 @@ fn qualify_at(named: Vec<Named>, adjacent: &[(usize, usize)], centres: Option<&d
|
||||
})
|
||||
.unwrap_or_default();
|
||||
let own = |i: usize| -> Vec<&String> { bounds.get(i).unwrap_or(&empty).iter().filter(|x| !common.contains(x)).collect() };
|
||||
// The face's stem, the faces the parent's qualifier lists (the bounds that told the
|
||||
// parent apart from its siblings) and the number that told apart the pieces nothing
|
||||
// else told apart.
|
||||
let (stem, inherited, tie) = split_piece(base);
|
||||
let mut by_key: BTreeMap<String, Vec<usize>> = BTreeMap::new();
|
||||
for &i in members {
|
||||
let key: Vec<&str> = own(i).into_iter().map(String::as_str).collect();
|
||||
// Nothing around it of its own: the piece is only numbered (below).
|
||||
let name = if key.is_empty() { base.to_string() } else { format!("{base}#[{}]", key.join(",")) };
|
||||
let own = own(i);
|
||||
// Nothing around it of its own: the piece keeps the name it had.
|
||||
let name = if own.is_empty() {
|
||||
base.to_string()
|
||||
} else {
|
||||
// The bounds that told the parent apart and the bounds that tell this piece
|
||||
// apart: the name says which piece of the face it is without repeating the
|
||||
// qualifiers of the pieces before it (the name grew with every split
|
||||
// otherwise, #5860).
|
||||
let mut key: BTreeSet<&str> = inherited.iter().map(String::as_str).collect();
|
||||
key.extend(own.iter().map(|s| s.as_str()));
|
||||
let key: Vec<&str> = key.into_iter().collect();
|
||||
piece_name(&stem, &key, tie.as_deref())
|
||||
};
|
||||
by_key.entry(name).or_default().push(i);
|
||||
}
|
||||
for (key, tied) in by_key {
|
||||
@@ -394,6 +445,56 @@ fn qualify_at(named: Vec<Named>, adjacent: &[(usize, usize)], centres: Option<&d
|
||||
Names { faces: Arc::new(names), info }
|
||||
}
|
||||
|
||||
/// The most bytes a face name may take: a command takes a face name of at most this many
|
||||
/// bytes, so a longer name could not be used to find the face again.
|
||||
const MAX_NAME_BYTES: usize = 512;
|
||||
|
||||
/// A piece's name: the face's stem, the faces around the piece that tell it apart, as many
|
||||
/// of them as the name can hold (`MAX_NAME_BYTES`), and the number that told the pieces of
|
||||
/// the same face apart.
|
||||
fn piece_name(stem: &str, faces: &[&str], tie: Option<&str>) -> String {
|
||||
let mut kept: Vec<&str> = Vec::with_capacity(faces.len());
|
||||
// The stem, the `#[` and the `]` the qualifier is written in.
|
||||
let mut len = stem.len() + 3;
|
||||
for face in faces {
|
||||
let more = face.len() + if kept.is_empty() { 0 } else { 1 };
|
||||
if len + more > MAX_NAME_BYTES {
|
||||
break;
|
||||
}
|
||||
len += more;
|
||||
kept.push(face);
|
||||
}
|
||||
let mut name = if kept.is_empty() { stem.to_string() } else { format!("{stem}#[{}]", kept.join(",")) };
|
||||
if let Some(tie) = tie {
|
||||
name.push('#');
|
||||
name.push_str(tie);
|
||||
}
|
||||
name
|
||||
}
|
||||
|
||||
/// A piece name's parts: the face's stem, the faces its qualifier lists and the number that
|
||||
/// tells apart the pieces of the same face that nothing else tells apart
|
||||
/// (`F2:top#[F3:side]#2`). A name that cannot be read is taken as it is: a hostile name never
|
||||
/// panics.
|
||||
fn split_piece(name: &str) -> (String, Vec<String>, Option<String>) {
|
||||
let (stem, around) = match crate::piece_names::piece_parts(name) {
|
||||
Some((stem, around)) => (stem.to_string(), around.iter().map(|face| face.to_string()).collect()),
|
||||
None => (name.to_string(), Vec::new()),
|
||||
};
|
||||
(stem, around, tie_number(name))
|
||||
}
|
||||
|
||||
/// The number at the end of a piece name (`#2` of `F2:top#[F3:side]#2`), when it has one: it
|
||||
/// tells apart the pieces of a face that nothing else tells apart.
|
||||
fn tie_number(name: &str) -> Option<String> {
|
||||
let i = name.rfind('#')?;
|
||||
let digits = name.get(i + 1..)?;
|
||||
if digits.is_empty() || !digits.bytes().all(|b| b.is_ascii_digit()) {
|
||||
return None;
|
||||
}
|
||||
Some(digits.to_string())
|
||||
}
|
||||
|
||||
/// `origin` with the face or edge it names left out (its kind and operand kept).
|
||||
fn without_index(origin: FaceOrigin) -> FaceOrigin {
|
||||
match origin {
|
||||
|
||||
@@ -79,6 +79,38 @@ fn pieces_nothing_tells_apart_are_numbered_and_unverified() {
|
||||
assert!(!names.verified(0) && !names.verified(1));
|
||||
}
|
||||
|
||||
/// #5860: a piece of a split face that is split again must not stack another qualifier on
|
||||
/// its name: the name grew with every split (728 characters after eleven splits).
|
||||
#[test]
|
||||
fn a_piece_split_again_does_not_grow_its_name() {
|
||||
// A face split in two: the pieces are told apart by the walls only they touch.
|
||||
let first = qualify(named(&["top", "top", "wall:a", "wall:b"]), &[(0, 2), (1, 3)]);
|
||||
assert_eq!(first.faces[0], "top#[wall:a]");
|
||||
assert_eq!(first.faces[1], "top#[wall:b]");
|
||||
// The piece that touches wall:a is split again, and again: its name lists the walls
|
||||
// around it, not the qualifiers of the pieces it came from.
|
||||
let mut piece = first.faces[0].clone();
|
||||
for _ in 0..10 {
|
||||
let names = qualify(named(&[piece.as_str(), piece.as_str(), "wall:a", "wall:b"]), &[(0, 2), (1, 3)]);
|
||||
piece = names.faces[0].clone();
|
||||
}
|
||||
assert_eq!(piece, "top#[wall:a]");
|
||||
}
|
||||
|
||||
/// A name has to stay within the length a command accepts for a face name (512 bytes), or
|
||||
/// the face could not be named again.
|
||||
#[test]
|
||||
fn a_piece_with_many_faces_around_it_keeps_a_name_that_can_be_used() {
|
||||
let around: Vec<String> = (0..80).map(|i| format!("F{i}:blend:face:{i}")).collect();
|
||||
let mut faces: Vec<&str> = vec!["top", "top"];
|
||||
faces.extend(around.iter().map(String::as_str));
|
||||
// Each piece touches forty faces of its own: none of them tells the pieces apart.
|
||||
let adjacent: Vec<(usize, usize)> = (2..42).map(|i| (0, i)).chain((42..82).map(|i| (1, i))).collect();
|
||||
let names = qualify(named(&faces), &adjacent);
|
||||
assert!(names.faces.iter().all(|n| n.len() <= 512), "{:?}", names.faces);
|
||||
assert_ne!(names.faces[0], names.faces[1], "the pieces are still told apart");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_merged_face_takes_the_shared_stem_or_the_first_name_and_answers_to_the_others() {
|
||||
let m = merged(named(&["top#[a]", "top#[b]"])).unwrap();
|
||||
|
||||
@@ -75,6 +75,10 @@ pub enum Snap {
|
||||
face: Option<String>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
corner: Option<String>,
|
||||
/// The frame's z when it isn't the face's normal (an edge or a corner picked as it is,
|
||||
/// not on a face): the point still follows the edge, found by name.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
axis: Option<EdgeAxis>,
|
||||
},
|
||||
/// A point, z along `z` (default +Z) and x toward `x` laid square to z (default: one chosen
|
||||
/// from z alone).
|
||||
@@ -87,6 +91,25 @@ pub enum Snap {
|
||||
},
|
||||
}
|
||||
|
||||
/// The z of an edge origin that isn't its face's normal (component coordinates); its x follows
|
||||
/// from z alone, as a point origin's does.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum EdgeAxis {
|
||||
/// Along a straight edge, the way this points: a hinge on the edge turns about it as it moves.
|
||||
Along(Vec3),
|
||||
/// This direction.
|
||||
Fixed(Vec3),
|
||||
}
|
||||
|
||||
impl EdgeAxis {
|
||||
pub fn dir(self) -> Vec3 {
|
||||
match self {
|
||||
EdgeAxis::Along(d) | EdgeAxis::Fixed(d) => d,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// What sets a joint origin's x axis (its turn about z): a direction, or a face found by its
|
||||
/// persistent name, so a round origin keeps its turn when the design changes.
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
@@ -179,7 +202,7 @@ impl Snap {
|
||||
Snap::Frame { origin, z, x } => origin.is_finite() && z.is_finite() && x.is_none_or(|x| x.is_finite()),
|
||||
Snap::FaceCenter { pick, x, .. } | Snap::CircleCenter { pick, x, .. } => pick.is_finite() && x_ok(x),
|
||||
Snap::Point { point, z, x } => point.is_finite() && z.is_none_or(|z| z.is_finite()) && x.is_none_or(|x| x.is_finite()),
|
||||
Snap::Edge { pick, .. } => pick.is_finite(),
|
||||
Snap::Edge { pick, axis, .. } => pick.is_finite() && axis.is_none_or(|a| a.dir().is_finite()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2015,19 +2038,37 @@ impl Document {
|
||||
/// Apply a solution: occurrence transforms (in their parents) for the occurrences it places,
|
||||
/// and the values of the joints that moved to close loops. Returns true when something moved.
|
||||
pub fn apply_joint_solution(&mut self, sol: &Solution) -> bool {
|
||||
// Joints and occurrences are indexed once (the first of each id, as a search finds):
|
||||
// searching them for each of a large design's thousands of values and occurrences took
|
||||
// 20 ms on every change to the design.
|
||||
let mut joint_at = std::collections::HashMap::new();
|
||||
for (i, j) in self.assembly.joints.iter().enumerate() {
|
||||
joint_at.entry(j.id).or_insert(i);
|
||||
}
|
||||
let mut changed = false;
|
||||
for (id, q) in &sol.values {
|
||||
if let Some(j) = self.assembly.joints.iter_mut().find(|j| j.id == *id) {
|
||||
if let Some(j) = joint_at.get(id).and_then(|&i| self.assembly.joints.get_mut(i)) {
|
||||
j.values.clone_from(q);
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
let parents: BTreeMap<u64, u64> = self.occurrences.iter().map(|o| (o.id, o.parent)).collect();
|
||||
let (mut occurrence_at, mut first_of) = (std::collections::HashMap::new(), std::collections::HashMap::new());
|
||||
for (i, o) in self.occurrences.iter().enumerate() {
|
||||
occurrence_at.entry(o.id).or_insert(i);
|
||||
first_of.entry(o.component).or_insert(i);
|
||||
}
|
||||
for (occ, world) in &sol.world {
|
||||
let parent = parents.get(occ).copied().unwrap_or(0);
|
||||
let pw = if parent == 0 { IDENTITY } else { self.component_transform(parent) };
|
||||
// Through the transforms as this loop has left them, as `component_transform` reads.
|
||||
let occurrences = &self.occurrences;
|
||||
let pw = if parent == 0 {
|
||||
IDENTITY
|
||||
} else {
|
||||
crate::assembly::transform_through(parent, |c| first_of.get(&c).and_then(|&i| occurrences.get(i)))
|
||||
};
|
||||
let Some(local) = mat_inverse(&pw).map(|inv| mat_mul(&inv, world)) else { continue };
|
||||
if let Some(o) = self.occurrences.iter_mut().find(|o| o.id == *occ) {
|
||||
if let Some(o) = occurrence_at.get(occ).and_then(|&i| self.occurrences.get_mut(i)) {
|
||||
let (dt, da) = mismatch(&o.transform, &local);
|
||||
if dt > 1e-9 || da > 1e-10 {
|
||||
o.transform = local;
|
||||
@@ -2061,7 +2102,7 @@ pub mod cam;
|
||||
|
||||
#[path = "joints_edge.rs"]
|
||||
mod edge;
|
||||
pub use edge::edge_snap;
|
||||
pub use edge::{edge_axis, edge_snap};
|
||||
|
||||
#[path = "joints_reach.rs"]
|
||||
mod reach;
|
||||
@@ -2393,4 +2434,33 @@ mod tests {
|
||||
let (_, a) = mismatch(&rot_z(3.0), &IDENTITY);
|
||||
assert!((a - 3.0).abs() < 1e-12, "{a}");
|
||||
}
|
||||
|
||||
/// Applying a solution stores each occurrence in its parent's frame as the loop has left it:
|
||||
/// a component the same solution moves is read moved, through its first occurrence. Joint
|
||||
/// values land on their joints; a value for a missing joint is skipped.
|
||||
#[test]
|
||||
fn a_solution_places_occurrences_in_their_moved_parents() {
|
||||
let occurrence =
|
||||
|id, component, parent| crate::Occurrence { id, component, parent, name: format!("O{id}"), transform: IDENTITY, grounded: false };
|
||||
// Component 1 sits at the root twice (its first occurrence is the frame its children sit
|
||||
// in), component 2 inside 1 and component 3 inside 2.
|
||||
let mut doc = Document {
|
||||
assembly: chain(2, 0.0),
|
||||
occurrences: vec![occurrence(10, 1, 0), occurrence(11, 1, 0), occurrence(20, 2, 1), occurrence(30, 3, 2)],
|
||||
..Document::default()
|
||||
};
|
||||
let w10 = mat_mul(&shift(3.0, 4.0, 5.0), &rot_y(0.3));
|
||||
let w20 = mat_mul(&shift(-1.0, 2.0, 0.5), &rot_x(-0.2));
|
||||
let w30 = mat_mul(&shift(0.0, 7.0, 1.0), &rot_y(1.1));
|
||||
let world = BTreeMap::from([(10, w10), (20, w20), (30, w30)]);
|
||||
let sol = Solution { world: world.clone(), values: BTreeMap::from([(2, vec![0.75]), (99, vec![1.0])]), ..Solution::default() };
|
||||
assert!(doc.apply_joint_solution(&sol));
|
||||
for (component, w) in [(1, w10), (2, w20), (3, w30)] {
|
||||
assert!(close(&doc.component_transform(component), &w), "component {component}");
|
||||
}
|
||||
assert!(close(&doc.occurrences[1].transform, &IDENTITY), "only the occurrence the solution names moves");
|
||||
let values: Vec<_> = doc.assembly.joints.iter().map(|j| j.values.clone()).collect();
|
||||
assert_eq!(values, vec![vec![0.0], vec![0.75]]);
|
||||
assert!(!doc.apply_joint_solution(&Solution { world, ..Solution::default() }), "applied twice, nothing moves");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
use solidcraft_geom::Vec3;
|
||||
|
||||
use super::{Snap, component_bodies, frame};
|
||||
use super::{EdgeAxis, Snap, component_bodies, frame};
|
||||
use crate::{DocError, Document, IDENTITY, Mat, ModelBody, ModelState, Result, apply_point, mat_inverse, mat_mul};
|
||||
|
||||
/// A body's placement in its component and its inverse: a body moved in from another component
|
||||
@@ -108,7 +108,7 @@ fn meeting(e: &[Vec3], f: &[Vec3], tol: f64) -> Option<Vec3> {
|
||||
|
||||
/// The frame of an edge snap in its component's coordinates.
|
||||
pub(super) fn edge_frame(doc: &Document, st: &ModelState, comp: u64, snap: &Snap) -> Result<Mat> {
|
||||
let Snap::Edge { pick, edge, face, corner } = snap else { return Err(DocError::Invalid("not an edge origin".into())) };
|
||||
let Snap::Edge { pick, edge, face, corner, axis } = snap else { return Err(DocError::Invalid("not an edge origin".into())) };
|
||||
let bad = || DocError::Invalid("joint origin: degenerate frame".into());
|
||||
let gone = |what: &str| DocError::Invalid(format!("joint origin: {what} no longer exists (edit the joint to pick again)"));
|
||||
let found = component_bodies(doc, st, comp).into_iter().find_map(|b| {
|
||||
@@ -143,6 +143,27 @@ pub(super) fn edge_frame(doc: &Document, st: &ModelState, comp: u64, snap: &Snap
|
||||
frame(at, z, Some(x)).ok_or_else(bad)
|
||||
}
|
||||
}?;
|
||||
// A z of its own: x from z alone, at the point the edge gives.
|
||||
let local = match axis {
|
||||
None => local,
|
||||
Some(a) => {
|
||||
let at = Vec3::new(local[3][0], local[3][1], local[3][2]);
|
||||
let (_, inv) = placement(doc, b);
|
||||
let want = crate::apply_vector(&inv, a.dir());
|
||||
let z = match a {
|
||||
EdgeAxis::Fixed(_) => want,
|
||||
// The edge's run, the way `want` points.
|
||||
EdgeAxis::Along(_) => {
|
||||
let run = match (e.first(), e.last()) {
|
||||
(Some(p), Some(q)) => (*q - *p).normalized().ok_or_else(bad)?,
|
||||
_ => return Err(bad()),
|
||||
};
|
||||
if run.dot(want) < 0.0 { -run } else { run }
|
||||
}
|
||||
};
|
||||
frame(at, z, None).ok_or_else(bad)?
|
||||
}
|
||||
};
|
||||
Ok(mat_mul(&placed, &local))
|
||||
}
|
||||
|
||||
@@ -207,5 +228,16 @@ pub fn edge_snap(doc: &Document, st: &ModelState, comp: u64, pick: Vec3, on: Opt
|
||||
)
|
||||
}
|
||||
};
|
||||
Ok(Snap::Edge { pick, edge: names.get(i).cloned().filter(|n| !n.is_empty()), face, corner })
|
||||
Ok(Snap::Edge { pick, edge: names.get(i).cloned().filter(|n| !n.is_empty()), face, corner, axis: None })
|
||||
}
|
||||
|
||||
/// Edge snap `snap` of component `comp` given z `z` (component coordinates) of its own: along the
|
||||
/// edge when the edge runs that way (so a hinge on it keeps turning about it), else fixed.
|
||||
pub fn edge_axis(doc: &Document, st: &ModelState, comp: u64, snap: Snap, z: Vec3) -> Snap {
|
||||
let Snap::Edge { pick, edge, face, corner, .. } = snap else { return snap };
|
||||
let with = |axis| Snap::Edge { pick, edge: edge.clone(), face: face.clone(), corner: corner.clone(), axis: Some(axis) };
|
||||
let along = with(EdgeAxis::Along(z));
|
||||
let runs =
|
||||
edge_frame(doc, st, comp, &along).is_ok_and(|m| z.normalized().is_some_and(|z| Vec3::new(m[2][0], m[2][1], m[2][2]).dot(z) > 1.0 - 1e-9));
|
||||
if runs { along } else { with(EdgeAxis::Fixed(z)) }
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ pub use body_transfer::{valid_transfer_matrix, validate_body_transfer};
|
||||
pub mod canvas;
|
||||
mod clipboard;
|
||||
pub use clipboard::{clone_expression, remap_topology};
|
||||
pub mod component_color;
|
||||
mod component_removal;
|
||||
pub use component_removal::RemovedTree;
|
||||
pub mod config;
|
||||
@@ -65,6 +66,7 @@ pub mod render_settings;
|
||||
pub mod render_surface;
|
||||
pub use project3d::iso_grid;
|
||||
pub mod sheet;
|
||||
pub mod text_params;
|
||||
|
||||
pub use assembly::{
|
||||
IDENTITY, MAX_PLACEMENT_DEPTH, MAX_PLACEMENTS, Mat, Occurrence, apply_point, apply_vector, is_identity, map_point_expr, mat_inverse, mat_mul,
|
||||
|
||||
@@ -636,7 +636,7 @@ impl Model {
|
||||
let mut before = Arc::new(ModelState::default());
|
||||
if let Ok(mut cache) = model.cache.lock() {
|
||||
for (f, r) in doc.features.iter().zip(&model.results).filter(|(_, r)| !r.skipped && r.error.is_none()) {
|
||||
let local = fingerprint(0, f, &vals, false, &model.step_digests) ^ placement_digest(doc, f, Some(&before));
|
||||
let local = fingerprint(doc, 0, f, &vals, false, &model.step_digests) ^ placement_digest(doc, f, Some(&before));
|
||||
cache.put(
|
||||
cache_key(f, r.fingerprint, local, ctx, &before),
|
||||
CachedEval {
|
||||
|
||||
@@ -78,6 +78,7 @@ impl FeatureKind {
|
||||
inputs.extend(placement);
|
||||
if let FeatureKind::Sketch { sketch, .. } = self {
|
||||
inputs.extend(sketch.patterns.iter().filter_map(|p| p.count_expression.as_deref()));
|
||||
inputs.extend(sketch.patterns.iter().flat_map(|p| p.expressions.values().map(String::as_str)));
|
||||
}
|
||||
inputs
|
||||
}
|
||||
@@ -103,6 +104,9 @@ pub struct ParamRow {
|
||||
/// Names this one's expression uses, and names whose expressions use this one.
|
||||
pub uses: Vec<String>,
|
||||
pub used_by: Vec<String>,
|
||||
/// A text parameter's text (its unit is `text`, its value none).
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub text: Option<String>,
|
||||
}
|
||||
|
||||
fn unit_of(k: Kind) -> &'static str {
|
||||
@@ -129,7 +133,7 @@ impl Document {
|
||||
}
|
||||
|
||||
pub(crate) fn name_taken(&self, n: &str) -> bool {
|
||||
self.param(n).is_some() || self.features.iter().any(|f| f.param_names.iter().any(|x| x == n))
|
||||
self.param(n).is_some() || self.text_param(n).is_some() || self.features.iter().any(|f| f.param_names.iter().any(|x| x == n))
|
||||
}
|
||||
|
||||
/// The next free `dN` name.
|
||||
@@ -289,6 +293,14 @@ impl Document {
|
||||
if expression.len() > 4096 || expression.trim().is_empty() {
|
||||
return Err(DocError::Expr("expression is empty or too long".into()));
|
||||
}
|
||||
if let Some(p) = next.text_params.iter_mut().find(|p| p.name == *name) {
|
||||
let text = crate::text_params::unquote(expression);
|
||||
if p.text != text {
|
||||
changed.insert(name.clone());
|
||||
}
|
||||
p.text = text;
|
||||
continue;
|
||||
}
|
||||
if let Some(p) = next.params.iter_mut().find(|p| p.name == *name) {
|
||||
if p.expr != expression.trim() {
|
||||
changed.insert(name.clone());
|
||||
@@ -349,6 +361,7 @@ impl Document {
|
||||
favorite: self.favorites.contains(&p.name),
|
||||
uses: refs.get(&p.name).cloned().unwrap_or_default(),
|
||||
used_by: used_by(&p.name),
|
||||
text: None,
|
||||
});
|
||||
}
|
||||
for f in &self.features {
|
||||
@@ -369,9 +382,28 @@ impl Document {
|
||||
favorite: self.favorites.contains(name),
|
||||
uses: refs.get(name).cloned().unwrap_or_default(),
|
||||
used_by: used_by(name),
|
||||
text: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
for p in &self.text_params {
|
||||
let readers = self.features_reading_texts(&BTreeSet::from([p.name.clone()]));
|
||||
rows.push(ParamRow {
|
||||
name: p.name.clone(),
|
||||
expression: p.text.clone(),
|
||||
unit: crate::text_params::TEXT_UNIT.into(),
|
||||
value: None,
|
||||
error: None,
|
||||
comment: p.comment.clone(),
|
||||
source: "user",
|
||||
feature: None,
|
||||
input: None,
|
||||
favorite: self.favorites.contains(&p.name),
|
||||
uses: Vec::new(),
|
||||
used_by: readers.iter().filter_map(|id| self.feature(*id)).map(|f| format!("Feature:{}", f.name)).collect(),
|
||||
text: Some(p.text.clone()),
|
||||
});
|
||||
}
|
||||
rows
|
||||
}
|
||||
|
||||
@@ -498,6 +530,9 @@ impl Document {
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
if unit.map_or(self.text_param(name).is_some(), crate::text_params::is_text_unit) {
|
||||
return self.set_text_param(name, expr_s, comment);
|
||||
}
|
||||
if let Some(p) = Self::param_name_problem(name) {
|
||||
return Err(DocError::Invalid(p));
|
||||
}
|
||||
@@ -704,11 +739,16 @@ impl Document {
|
||||
out.push(ParamUser::Feature { feature: f.id, name: f.name.clone(), input: format!("{} Quantity", pattern.id) });
|
||||
}
|
||||
}
|
||||
for (what, e) in sketch.text_exprs() {
|
||||
for (what, e) in
|
||||
sketch.text_exprs().into_iter().chain(sketch.patterns.iter().flat_map(|p| p.expressions.iter().map(|(k, e)| (k.as_str(), e))))
|
||||
{
|
||||
if expr::references(e).iter().any(|r| r == name) {
|
||||
out.push(ParamUser::Feature { feature: f.id, name: f.name.clone(), input: what.to_string() });
|
||||
}
|
||||
}
|
||||
if sketch.text_word_exprs().iter().any(|e| crate::text_params::references(e).iter().any(|r| r == name)) {
|
||||
out.push(ParamUser::Feature { feature: f.id, name: f.name.clone(), input: "Text".into() });
|
||||
}
|
||||
}
|
||||
}
|
||||
for (joint, input, e) in self.assembly.exprs() {
|
||||
@@ -740,6 +780,9 @@ impl Document {
|
||||
|
||||
/// Remove a stored parameter; refused while something uses it (the error lists the users).
|
||||
pub fn remove_param(&mut self, name: &str) -> Result<()> {
|
||||
if self.text_param(name).is_some() {
|
||||
return self.remove_text_param(name);
|
||||
}
|
||||
if self.param(name).is_none() {
|
||||
if self.features.iter().any(|f| f.param_names.iter().any(|n| n == name)) {
|
||||
return Err(DocError::Invalid(format!("`{name}` is a feature's input: delete or edit the feature instead")));
|
||||
@@ -774,6 +817,12 @@ impl Document {
|
||||
return Err(DocError::Invalid(format!("there is already a parameter `{new}`")));
|
||||
}
|
||||
let mut n = 0;
|
||||
let text = self.text_param(old).is_some();
|
||||
for p in &mut self.text_params {
|
||||
if p.name == old {
|
||||
p.name = new.to_string();
|
||||
}
|
||||
}
|
||||
for p in &mut self.params {
|
||||
if p.name == old {
|
||||
p.name = new.to_string();
|
||||
@@ -811,7 +860,7 @@ impl Document {
|
||||
n += 1;
|
||||
}
|
||||
}
|
||||
for e in sketch.patterns.iter_mut().filter_map(|p| p.count_expression.as_mut()) {
|
||||
for e in sketch.patterns.iter_mut().flat_map(|p| p.count_expression.iter_mut().chain(p.expressions.values_mut())) {
|
||||
let r = expr::rename_reference(e, old, new);
|
||||
if r != *e {
|
||||
*e = r;
|
||||
@@ -825,6 +874,13 @@ impl Document {
|
||||
n += 1;
|
||||
}
|
||||
}
|
||||
for e in sketch.text_word_exprs_mut() {
|
||||
let r = crate::text_params::rename_reference(e, old, new);
|
||||
if r != *e {
|
||||
*e = r;
|
||||
n += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if self.favorites.remove(old) {
|
||||
@@ -839,9 +895,11 @@ impl Document {
|
||||
for rule in &mut self.configs.rules {
|
||||
rule.rename_parameter(old, new);
|
||||
}
|
||||
// A text parameter's cells are texts, not expressions.
|
||||
let texts: BTreeSet<String> = self.text_params.iter().map(|p| p.name.clone()).collect();
|
||||
for r in &mut self.configs.rows {
|
||||
for (column, cell) in self.configs.columns.iter().zip(&mut r.cells) {
|
||||
if matches!(column, crate::config::Column::Param(_)) {
|
||||
if !text && matches!(column, crate::config::Column::Param(c) if !texts.contains(c)) {
|
||||
*cell = expr::rename_reference(cell, old, new);
|
||||
}
|
||||
}
|
||||
@@ -886,6 +944,10 @@ impl Document {
|
||||
p.comment = comment.to_string();
|
||||
return Ok(());
|
||||
}
|
||||
if let Some(p) = self.text_params.iter_mut().find(|p| p.name == name) {
|
||||
p.comment = comment.to_string();
|
||||
return Ok(());
|
||||
}
|
||||
if !self.name_taken(name) {
|
||||
return Err(DocError::Unknown(format!("parameter `{name}`")));
|
||||
}
|
||||
@@ -905,8 +967,10 @@ impl Document {
|
||||
let mut names: BTreeSet<String> = f.param_names.iter().filter(|n| !n.is_empty()).cloned().collect();
|
||||
if let FeatureKind::Sketch { sketch, .. } = &f.kind {
|
||||
names.extend(sketch.constraints.iter().filter_map(|c| c.param.clone()));
|
||||
names.extend(sketch.patterns.iter().flat_map(|p| p.expressions.values()).flat_map(|e| expr::references(e)));
|
||||
names.extend(sketch.text_exprs().into_iter().flat_map(|(_, e)| expr::references(e)));
|
||||
names.extend(sketch.patterns.iter().filter_map(|p| p.count_expression.as_deref()).flat_map(expr::references));
|
||||
names.extend(sketch.text_word_exprs().into_iter().flat_map(|e| crate::text_params::references(e)));
|
||||
}
|
||||
// Sheet metal and plastic features rebuild when their rules' parameters change (#4420).
|
||||
if f.kind.is_sheet() {
|
||||
@@ -947,7 +1011,9 @@ impl Document {
|
||||
hit |= f.kind.expressions().iter().any(|e| expr::references(e).iter().any(|r| affected.contains(r)));
|
||||
if let FeatureKind::Sketch { sketch, .. } = &f.kind {
|
||||
hit |= sketch.constraints.iter().any(|c| c.param.as_ref().is_some_and(|p| affected.contains(p)));
|
||||
hit |= sketch.patterns.iter().flat_map(|p| p.expressions.values()).any(|e| expr::references(e).iter().any(|r| affected.contains(r)));
|
||||
hit |= sketch.text_exprs().iter().any(|(_, e)| expr::references(e).iter().any(|r| affected.contains(r)));
|
||||
hit |= sketch.text_word_exprs().iter().any(|e| crate::text_params::references(e).iter().any(|r| affected.contains(r)));
|
||||
}
|
||||
if hit {
|
||||
out.push(f.id);
|
||||
|
||||
@@ -21,6 +21,9 @@ pub struct Progress {
|
||||
work_stage: std::sync::Mutex<&'static str>,
|
||||
work_done: AtomicUsize,
|
||||
work_total: AtomicUsize,
|
||||
/// The item a command works through one at a time (the linked design Update Links reads
|
||||
/// again): its name, its place and how many there are ([`item`]).
|
||||
item: std::sync::Mutex<Option<(String, usize, usize)>>,
|
||||
/// A window wants the model as far as it is built, to show while the rest is ([`Progress::want_partial`]).
|
||||
partial_wanted: AtomicBool,
|
||||
/// The latest such model and when it was offered.
|
||||
@@ -48,6 +51,7 @@ impl Default for Progress {
|
||||
work_stage: std::sync::Mutex::new(""),
|
||||
work_done: AtomicUsize::new(0),
|
||||
work_total: AtomicUsize::new(0),
|
||||
item: std::sync::Mutex::new(None),
|
||||
partial_wanted: AtomicBool::new(false),
|
||||
partial: std::sync::Mutex::new((None, None)),
|
||||
}
|
||||
@@ -86,6 +90,23 @@ impl Progress {
|
||||
let stage = self.work_stage.lock().map(|s| *s).unwrap_or("");
|
||||
(total > 0 && !stage.is_empty()).then(|| (stage, self.work_done.load(Ordering::Relaxed).min(total), total))
|
||||
}
|
||||
/// The item being worked on, as [`item`] reported it: (name, index from 0, count).
|
||||
pub fn item(&self) -> Option<(String, usize, usize)> {
|
||||
self.item.lock().ok().and_then(|i| i.clone())
|
||||
}
|
||||
}
|
||||
|
||||
/// Tell a watcher which item a command is on (`name`, `index` from 0 of `count`), such as the
|
||||
/// linked design Update Links reads again; `None` once it is past them. Nothing happens unless
|
||||
/// the work is watched ([`watch`]).
|
||||
pub fn item(current: Option<(&str, usize, usize)>) {
|
||||
CURRENT.with(|c| {
|
||||
if let Some(cur) = c.borrow().as_ref()
|
||||
&& let Ok(mut i) = cur.progress.item.lock()
|
||||
{
|
||||
*i = current.map(|(name, index, count)| (name.to_string(), index.min(count), count));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// The kernel's long work (STEP import) reports to the same progress and stops on Cancel.
|
||||
@@ -242,6 +263,22 @@ mod tests {
|
||||
assert!(!begin(1).step(0), "the watch ends with its scope");
|
||||
}
|
||||
|
||||
/// The item a command is on reaches its watcher, and only a watcher.
|
||||
#[test]
|
||||
fn items_go_to_the_watcher() {
|
||||
item(Some(("unwatched", 0, 1)));
|
||||
let p = Arc::new(Progress::default());
|
||||
assert_eq!(p.item(), None);
|
||||
watch(p.clone(), || {
|
||||
item(Some(("plate", 1, 3)));
|
||||
assert_eq!(p.item(), Some(("plate".to_string(), 1, 3)));
|
||||
item(None);
|
||||
});
|
||||
assert_eq!(p.item(), None, "cleared once past the items");
|
||||
item(Some(("after", 0, 1)));
|
||||
assert_eq!(p.item(), None, "the watch ends with its scope");
|
||||
}
|
||||
|
||||
/// A watcher that asks for partial models gets the model built so far, placed, now and then;
|
||||
/// one that doesn't ask, or an unwatched evaluation, never pays for it.
|
||||
#[test]
|
||||
|
||||
@@ -688,7 +688,11 @@ fn refresh_links_in(
|
||||
}
|
||||
sk.set_link_source(&l.id, r.source);
|
||||
let _ = sk.set_link_wires(&l.id, &r.wires);
|
||||
// Words built from text parameters change shape when the parameters do: that
|
||||
// rebuild is the text following them, not a reference that changed under it.
|
||||
let words_follow = matches!(&l.source, LinkSource::Text { exprs, .. } if exprs.text.is_some());
|
||||
match sk.update_link(&l.id, &r.geom) {
|
||||
Ok(true) if words_follow => {}
|
||||
Ok(true) => warn.push(format!("projected {} changed shape and was rebuilt", l.source.describe())),
|
||||
Ok(false) if r.moved => warn.push(format!("projected {} was re-found on the nearest geometry", l.source.describe())),
|
||||
Ok(false) => {}
|
||||
|
||||
+126
-25
@@ -549,13 +549,75 @@ pub struct SheetFlange {
|
||||
pub tag: String,
|
||||
}
|
||||
|
||||
/// One edge flange to make: a pick on the sheet's edge, and that flange's height (to the outer
|
||||
/// face, from the virtual sharp) and angle (radians).
|
||||
/// One edge flange to make: a pick on the sheet's edge, that flange's height (measured as `from`
|
||||
/// says) and angle (radians).
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub struct EdgeFlange {
|
||||
pub pick: Vec3,
|
||||
pub height: f64,
|
||||
pub angle: f64,
|
||||
pub from: HeightFrom,
|
||||
}
|
||||
|
||||
/// Where an edge flange's height is measured from (#5938). Every one measures along the flange,
|
||||
/// up to its far edge; they differ in where the measure starts, so in how much of the height is
|
||||
/// the bend rather than the leg (the flat panel past the bend). With bend angle θ, inner radius
|
||||
/// R and thickness T, the leg is the height less [`HeightFrom::before_leg`].
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||
pub enum HeightFrom {
|
||||
/// From the outer virtual sharp, where the lines of the base's and the flange's outer faces
|
||||
/// meet, along the outer face: (R + T)·tan(θ/2) of the height is before the leg.
|
||||
#[default]
|
||||
Outer,
|
||||
/// From the inner virtual sharp, where the lines of the two inner faces meet, along the inner
|
||||
/// face: R·tan(θ/2) of the height is before the leg.
|
||||
Inner,
|
||||
/// For bends past 90°: from the line square to the flange that touches the outside of the
|
||||
/// bend (at the point a quarter turn before the bend's end), R + T before the leg. Up to 90°
|
||||
/// it is the outer virtual sharp, (R + T)·tan(θ/2); at 90° the two are the same line (the
|
||||
/// base's outer face), so the height does not jump as the angle passes 90°.
|
||||
Tangent,
|
||||
}
|
||||
|
||||
impl HeightFrom {
|
||||
pub const NAMES: [&'static str; 3] = ["outer", "inner", "tangent"];
|
||||
|
||||
pub fn parse(name: &str) -> Option<Self> {
|
||||
match name.trim().to_ascii_lowercase().as_str() {
|
||||
"outer" => Some(Self::Outer),
|
||||
"inner" => Some(Self::Inner),
|
||||
"tangent" => Some(Self::Tangent),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn name(self) -> &'static str {
|
||||
match self {
|
||||
Self::Outer => "outer",
|
||||
Self::Inner => "inner",
|
||||
Self::Tangent => "tangent",
|
||||
}
|
||||
}
|
||||
|
||||
/// How much of the height lies before the leg starts, for a bend of `angle` (radians), inner
|
||||
/// `radius` and `thickness`: the smallest height that fits (a flange with no leg).
|
||||
pub fn before_leg(self, angle: f64, radius: f64, thickness: f64) -> f64 {
|
||||
match self {
|
||||
Self::Outer => (radius + thickness) * (angle / 2.0).tan(),
|
||||
Self::Inner => radius * (angle / 2.0).tan(),
|
||||
Self::Tangent if angle <= std::f64::consts::FRAC_PI_2 => (radius + thickness) * (angle / 2.0).tan(),
|
||||
Self::Tangent => radius + thickness,
|
||||
}
|
||||
}
|
||||
|
||||
/// What the measure starts at, for messages.
|
||||
fn datum(self) -> &'static str {
|
||||
match self {
|
||||
Self::Outer => "the outer sharp",
|
||||
Self::Inner => "the inner sharp",
|
||||
Self::Tangent => "the bend's tangent",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The most lines a path flange's path may have (each one flange and its bend).
|
||||
@@ -2360,8 +2422,9 @@ impl SheetBody {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Add an edge flange on the panel edge nearest `pick` (world): `height` to the outer face
|
||||
/// from the virtual sharp, `angle` (0…180°), inside / outside / middle bend position.
|
||||
/// Add an edge flange on the panel edge nearest `pick` (world): `height` measured from the
|
||||
/// outer virtual sharp ([`HeightFrom::Outer`]), `angle` (0…180°), inside / outside / middle /
|
||||
/// material_outside / tangent bend position (see `add_flanges_each`).
|
||||
pub fn add_flange(&mut self, pick: Vec3, height: f64, angle: f64, radius: f64, position: &str, flip: bool) -> Result<usize> {
|
||||
self.add_flanges(&[pick], height, angle, radius, position, flip)?.into_iter().next().ok_or_else(|| DocError::Invalid("flange".into()))
|
||||
}
|
||||
@@ -2384,7 +2447,7 @@ impl SheetBody {
|
||||
position: &str,
|
||||
flip: bool,
|
||||
) -> Result<(Vec<usize>, Vec<String>)> {
|
||||
let each: Vec<EdgeFlange> = picks.iter().map(|&pick| EdgeFlange { pick, height, angle }).collect();
|
||||
let each: Vec<EdgeFlange> = picks.iter().map(|&pick| EdgeFlange { pick, height, angle, from: HeightFrom::Outer }).collect();
|
||||
self.add_flanges_each(&each, radius, position, flip, ReliefOverride::default())
|
||||
}
|
||||
|
||||
@@ -2475,7 +2538,7 @@ impl SheetBody {
|
||||
None => (pick, top == (turn < 0.0)),
|
||||
Some(&i) => (self.far_edge_pick(i).ok_or_else(|| DocError::Invalid("the flange has no far edge to bend again".into()))?, turn < 0.0),
|
||||
};
|
||||
let each = [EdgeFlange { pick: at, height, angle: turn.abs() }];
|
||||
let each = [EdgeFlange { pick: at, height, angle: turn.abs(), from: HeightFrom::Outer }];
|
||||
let own = if k == 0 { relief } else { ReliefOverride::default() };
|
||||
let (new, more) = self.add_flanges_each(&each, radius, "inside", flip, own).map_err(line)?;
|
||||
made.extend(new);
|
||||
@@ -2516,15 +2579,39 @@ impl SheetBody {
|
||||
return Err(DocError::Invalid(format!("{}the flange angle must be between 0 and 180°", on(k))));
|
||||
}
|
||||
let sharp = (radius + self.t) * (e.angle / 2.0).tan();
|
||||
// How far inside the picked edge the bend starts (the base is cut back that far), with
|
||||
// bend angle θ, inner radius R and thickness T:
|
||||
// - inside: (R + T)·tan(θ/2), the outer virtual sharp on the edge (at 90° the flange's
|
||||
// outer face is flush with the edge's face);
|
||||
// - outside: 0, the bend starts at the edge and lies wholly outside it (`sheet.flange`
|
||||
// also takes `bend_outside` and saves it as `outside`);
|
||||
// - middle: half of inside;
|
||||
// - material_outside: R·tan(θ/2), the inner virtual sharp on the edge (at 90° the
|
||||
// flange's inner face is flush with the edge's face, its material outside);
|
||||
// - tangent: from 90° on R + T, the bend's outer face tangent to the edge's face (it
|
||||
// touches that face a quarter turn into the bend and nothing of the bend passes it);
|
||||
// below 90° the outer face never turns parallel to the edge's face, so the bend
|
||||
// reaches furthest out at its end: (R + T)·sin θ puts that end on the edge's face
|
||||
// (the leg leans on out past it). Both are R + T at 90°.
|
||||
let setback = match position {
|
||||
"inside" | "" => sharp,
|
||||
"outside" => 0.0,
|
||||
"middle" | "mid" => sharp / 2.0,
|
||||
other => return Err(DocError::Invalid(format!("unknown bend position `{other}` (inside, outside or middle)"))),
|
||||
"material_outside" => radius * (e.angle / 2.0).tan(),
|
||||
"tangent" if e.angle < std::f64::consts::FRAC_PI_2 => (radius + self.t) * e.angle.sin(),
|
||||
"tangent" => radius + self.t,
|
||||
other => {
|
||||
return Err(DocError::Invalid(format!("unknown bend position `{other}` (inside, outside, middle, material_outside or tangent)")));
|
||||
}
|
||||
};
|
||||
let leg = e.height - sharp;
|
||||
let least = e.from.before_leg(e.angle, radius, self.t);
|
||||
let leg = e.height - least;
|
||||
if !(leg >= -1e-9) {
|
||||
return Err(DocError::Invalid(format!("{}the flange height must be at least {sharp:.3} mm for this bend", on(k))));
|
||||
let from = match e.from {
|
||||
HeightFrom::Outer => String::new(),
|
||||
other => format!(" from {}", other.datum()),
|
||||
};
|
||||
return Err(DocError::Invalid(format!("{}the flange height{from} must be at least {least:.3} mm for this bend", on(k))));
|
||||
}
|
||||
sizes.push((setback, leg));
|
||||
}
|
||||
@@ -5986,7 +6073,8 @@ mod tests {
|
||||
Vec3::new(60.0 + u.x * 90.0, u.y * 90.0, 2.0),
|
||||
Vec3::new(u.x * 45.0, u.y * 45.0, 2.0),
|
||||
];
|
||||
let each: Vec<EdgeFlange> = (0..4).map(|i| EdgeFlange { pick: picks[i], height: heights[i], angle: angles[i].to_radians() }).collect();
|
||||
let each: Vec<EdgeFlange> =
|
||||
(0..4).map(|i| EdgeFlange { pick: picks[i], height: heights[i], angle: angles[i].to_radians(), from: HeightFrom::Outer }).collect();
|
||||
flanges_each(rhombus(), rv, &each)
|
||||
}
|
||||
|
||||
@@ -6016,7 +6104,7 @@ mod tests {
|
||||
Vec3::new(l * 0.75, -l * u.y / 2.0, 2.0),
|
||||
Vec3::new(l / 4.0, -l * u.y / 2.0, 2.0),
|
||||
];
|
||||
let flange = |i: usize| EdgeFlange { pick: picks[i], height: 38.6, angle: 90f64.to_radians() };
|
||||
let flange = |i: usize| EdgeFlange { pick: picks[i], height: 38.6, angle: 90f64.to_radians(), from: HeightFrom::Outer };
|
||||
// The round relief reaches r from its corner and the two are 12 mm apart: it fits at both.
|
||||
for shape in [ReliefShape::Round, ReliefShape::Rectangular] {
|
||||
let what = format!("{shape:?} at two corners opposite each other");
|
||||
@@ -6167,7 +6255,7 @@ mod tests {
|
||||
let pts = [Vec2::new(0.0, 0.0), Vec2::new(9.0, 0.0), Vec2::new(9.0, 40.0), Vec2::new(-20.0, 20.0 * 3.0f64.sqrt())];
|
||||
let base = || Region2 { outer: Loop2::polygon(&pts).ccw(), holes: vec![] };
|
||||
let picks = [Vec3::new(-10.0, 17.32, 2.0), Vec3::new(4.5, 0.0, 2.0), Vec3::new(9.0, 20.0, 2.0)];
|
||||
let flange = |i: usize| EdgeFlange { pick: picks[i], height: 38.6, angle: 90f64.to_radians() };
|
||||
let flange = |i: usize| EdgeFlange { pick: picks[i], height: 38.6, angle: 90f64.to_radians(), from: HeightFrom::Outer };
|
||||
for shape in [ReliefShape::Round, ReliefShape::Rectangular] {
|
||||
let what = format!("{shape:?} at both ends of a short edge");
|
||||
let rv = RuleValues { corner_relief_shape: shape, corner_relief: 4.0, ..alu() };
|
||||
@@ -6260,6 +6348,16 @@ mod tests {
|
||||
holds_the_flat_material(&s, "a flange on a folded panel's side");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_bend_position_only_the_command_takes_as_another_name_is_refused_when_built() {
|
||||
// `sheet.flange` saves `bend_outside` as `outside`; a design that names it itself is
|
||||
// refused rather than built (or edited) as some other position.
|
||||
let mut s = plate(200.0, 100.0);
|
||||
let e = s.add_flange(Vec3::new(100.0, 0.0, 2.5), 40.0, std::f64::consts::FRAC_PI_2, 2.5, "bend_outside", false).unwrap_err().to_string();
|
||||
assert!(e.contains("unknown bend position `bend_outside`"), "{e}");
|
||||
assert!(s.flanges.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn edge_flanges_across_an_existing_bend_close_their_corner() {
|
||||
for position in ["inside", "outside", "middle"] {
|
||||
@@ -6341,7 +6439,7 @@ mod tests {
|
||||
let parent = s.flanges.get(wall).unwrap();
|
||||
let point = parent.p + parent.d * parent.len + parent.n * (s.allowance(parent) + parent.leg * 0.5);
|
||||
let side = apply_point(&s.world(Some(wall)), Vec3::new(point.x, point.y, s.t));
|
||||
let edges = [Vec3::new(120.0, 45.0, 2.0), side].map(|pick| EdgeFlange { pick, height: 20.0, angle });
|
||||
let edges = [Vec3::new(120.0, 45.0, 2.0), side].map(|pick| EdgeFlange { pick, height: 20.0, angle, from: HeightFrom::Outer });
|
||||
let (_, notes) = s.add_flanges_each(&edges, 1.0, "inside", false, ReliefOverride { shape: Some(shape), size: Some(4.0) }).unwrap();
|
||||
assert!(notes.is_empty(), "{shape:?}: {notes:?}");
|
||||
assert_eq!(s.holes.len(), 1);
|
||||
@@ -7059,7 +7157,8 @@ mod tests {
|
||||
let base = rect(Vec2::new(0.0, 0.0), Vec2::new(120.0, 0.0), Vec2::new(120.0, 90.0), Vec2::new(0.0, 90.0));
|
||||
let t = rv.thickness;
|
||||
let picks = [Vec3::new(60.0, 0.0, t), Vec3::new(120.0, 45.0, t), Vec3::new(60.0, 90.0, t), Vec3::new(0.0, 45.0, t)];
|
||||
let each: Vec<EdgeFlange> = (0..4).map(|i| EdgeFlange { pick: picks[i], height: heights[i], angle: angles[i].to_radians() }).collect();
|
||||
let each: Vec<EdgeFlange> =
|
||||
(0..4).map(|i| EdgeFlange { pick: picks[i], height: heights[i], angle: angles[i].to_radians(), from: HeightFrom::Outer }).collect();
|
||||
flanges_each(base, rv, &each)
|
||||
}
|
||||
|
||||
@@ -7259,7 +7358,8 @@ mod tests {
|
||||
let pts = [Vec2::new(0.0, 0.0), Vec2::new(120.0, 0.0), Vec2::new(100.0, 90.0), Vec2::new(20.0, 90.0)];
|
||||
let picks = [Vec3::new(60.0, 0.0, 2.0), Vec3::new(110.0, 45.0, 2.0), Vec3::new(60.0, 90.0, 2.0), Vec3::new(10.0, 45.0, 2.0)];
|
||||
let (angles, heights) = ([60.0f64, 105.0, 75.0, 120.0], [38.6, 30.0, 45.0, 25.0]);
|
||||
let each: Vec<EdgeFlange> = (0..4).map(|i| EdgeFlange { pick: picks[i], height: heights[i], angle: angles[i].to_radians() }).collect();
|
||||
let each: Vec<EdgeFlange> =
|
||||
(0..4).map(|i| EdgeFlange { pick: picks[i], height: heights[i], angle: angles[i].to_radians(), from: HeightFrom::Outer }).collect();
|
||||
let (s, notes) = flanges_each(Region2 { outer: Loop2::polygon(&pts).ccw(), holes: vec![] }, &alu(), &each);
|
||||
assert!(notes.is_empty(), "{notes:?}");
|
||||
for i in 0..4 {
|
||||
@@ -7283,7 +7383,7 @@ mod tests {
|
||||
.iter()
|
||||
.map(|&k| {
|
||||
let m = (pts[k] + pts[(k + 1) % n]) * 0.5;
|
||||
EdgeFlange { pick: Vec3::new(m.x, m.y, rv.thickness), height, angle: deg.to_radians() }
|
||||
EdgeFlange { pick: Vec3::new(m.x, m.y, rv.thickness), height, angle: deg.to_radians(), from: HeightFrom::Outer }
|
||||
})
|
||||
.collect();
|
||||
let (s, notes) = flanges_each(Region2 { outer: Loop2::polygon(pts).ccw(), holes: vec![] }, rv, &each);
|
||||
@@ -7602,8 +7702,9 @@ mod tests {
|
||||
let rv = alu();
|
||||
let (t, g) = (rv.thickness, rv.gap);
|
||||
let (mut s, _) = tray(&rv, 90.0, 20.0);
|
||||
let each: Vec<EdgeFlange> =
|
||||
(0..4).map(|i| EdgeFlange { pick: far_edge_pick(&s, i, true), height: 12.0, angle: [90f64, 70.0][i % 2].to_radians() }).collect();
|
||||
let each: Vec<EdgeFlange> = (0..4)
|
||||
.map(|i| EdgeFlange { pick: far_edge_pick(&s, i, true), height: 12.0, angle: [90f64, 70.0][i % 2].to_radians(), from: HeightFrom::Outer })
|
||||
.collect();
|
||||
let (made, notes) = s.add_flanges_each(&each, 1.0, "inside", false, ReliefOverride::default()).unwrap();
|
||||
assert!(notes.is_empty() && made == [4, 5, 6, 7], "{made:?} {notes:?}");
|
||||
for (a, a_end, b, b_end) in TRAY_RETURNS {
|
||||
@@ -7774,7 +7875,7 @@ mod tests {
|
||||
let each: Vec<EdgeFlange> = (0..4)
|
||||
.map(|i| {
|
||||
let deg: f64 = if square { 90.0 } else { 180.0 - angles[i] };
|
||||
EdgeFlange { pick: far_edge_pick(&s, i, true), height: 12.0, angle: deg.to_radians() }
|
||||
EdgeFlange { pick: far_edge_pick(&s, i, true), height: 12.0, angle: deg.to_radians(), from: HeightFrom::Outer }
|
||||
})
|
||||
.collect();
|
||||
let (_, notes) = s.add_flanges_each(&each, 1.0, "inside", false, ReliefOverride::default()).unwrap();
|
||||
@@ -7914,8 +8015,8 @@ mod tests {
|
||||
for b in SWEEP {
|
||||
let what = format!("corner {alpha}°, flanges {a}° and {b}°");
|
||||
let each = [
|
||||
EdgeFlange { pick: Vec3::new(60.0, 0.0, 2.0), height: 38.6, angle: a.to_radians() },
|
||||
EdgeFlange { pick: Vec3::new(u.x * 45.0, u.y * 45.0, 2.0), height: 38.6, angle: b.to_radians() },
|
||||
EdgeFlange { pick: Vec3::new(60.0, 0.0, 2.0), height: 38.6, angle: a.to_radians(), from: HeightFrom::Outer },
|
||||
EdgeFlange { pick: Vec3::new(u.x * 45.0, u.y * 45.0, 2.0), height: 38.6, angle: b.to_radians(), from: HeightFrom::Outer },
|
||||
];
|
||||
let (s, notes) = flanges_each(Region2 { outer: Loop2::polygon(&pts).ccw(), holes: vec![] }, &rv, &each);
|
||||
assert!(notes.is_empty(), "{what}: {notes:?}");
|
||||
@@ -8314,8 +8415,8 @@ mod tests {
|
||||
for b in SWEEP {
|
||||
let what = format!("corner {alpha}°, flanges {a}° and {b}°");
|
||||
let each = [
|
||||
EdgeFlange { pick: Vec3::new(60.0, 0.0, 2.0), height: 38.6, angle: a.to_radians() },
|
||||
EdgeFlange { pick: Vec3::new(u.x * 45.0, u.y * 45.0, 2.0), height: 38.6, angle: b.to_radians() },
|
||||
EdgeFlange { pick: Vec3::new(60.0, 0.0, 2.0), height: 38.6, angle: a.to_radians(), from: HeightFrom::Outer },
|
||||
EdgeFlange { pick: Vec3::new(u.x * 45.0, u.y * 45.0, 2.0), height: 38.6, angle: b.to_radians(), from: HeightFrom::Outer },
|
||||
];
|
||||
let base = || Region2 { outer: Loop2::polygon(&pts).ccw(), holes: vec![] };
|
||||
let (notch, _) = flanges_each(base(), &alu(), &each);
|
||||
@@ -8482,8 +8583,8 @@ mod tests {
|
||||
let u = Vec2::new(alpha.cos(), alpha.sin());
|
||||
let pts = [Vec2::new(0.0, 0.0), Vec2::new(120.0, 0.0), Vec2::new(120.0, 0.0) + u * 90.0, u * 90.0];
|
||||
let each = [
|
||||
EdgeFlange { pick: Vec3::new(60.0, 0.0, 2.0), height: 38.6, angle: a.to_radians() },
|
||||
EdgeFlange { pick: Vec3::new(u.x * 45.0, u.y * 45.0, 2.0), height: 38.6, angle: b.to_radians() },
|
||||
EdgeFlange { pick: Vec3::new(60.0, 0.0, 2.0), height: 38.6, angle: a.to_radians(), from: HeightFrom::Outer },
|
||||
EdgeFlange { pick: Vec3::new(u.x * 45.0, u.y * 45.0, 2.0), height: 38.6, angle: b.to_radians(), from: HeightFrom::Outer },
|
||||
];
|
||||
let base = || Region2 { outer: Loop2::polygon(&pts).ccw(), holes: vec![] };
|
||||
let (notch, none) = flanges_each(base(), &alu(), &each);
|
||||
|
||||
@@ -492,3 +492,53 @@ fn new_names_take_the_first_free_number() {
|
||||
let next = sketch(&mut doc);
|
||||
assert_eq!(name(&doc, next), names[0], "the first freed number is taken again");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_boolean_targets_name_overlapping_component() {
|
||||
for (operation, offset) in [(Operation::Cut, 0.0), (Operation::Intersect, 0.0), (Operation::Cut, 40.0)] {
|
||||
let (mut doc, sketch) = plate_doc();
|
||||
let imported = doc.add_component(Some("Imported STEP"), 0).unwrap();
|
||||
let part = doc.add_component(Some("Part1"), 0).unwrap();
|
||||
doc.features.last_mut().unwrap().component = imported;
|
||||
doc.feature_mut(sketch).unwrap().component = imported;
|
||||
doc.occurrences.iter_mut().find(|o| o.component == imported).unwrap().transform[2][3] = offset;
|
||||
let mut kind = doc.features.last().unwrap().kind.clone();
|
||||
if let FeatureKind::Extrude { operation: op, .. } = &mut kind {
|
||||
*op = operation;
|
||||
}
|
||||
let cut = doc.add_feature(kind, None).unwrap();
|
||||
doc.feature_mut(cut).unwrap().component = part;
|
||||
let mut model = Model::new();
|
||||
model.evaluate(&doc);
|
||||
let error = model.result(cut).unwrap().error.as_deref().unwrap();
|
||||
assert!(error.contains("component 'Part1'"), "offset {offset}: {error}");
|
||||
assert!(error.contains("'Body1' in component 'Imported STEP'"), "offset {offset}: {error}");
|
||||
assert!(error.contains("activate that component or pick the body as a target"), "offset {offset}: {error}");
|
||||
assert_eq!(model.state().bodies.len(), 1);
|
||||
assert!(rel(measure(&model.state().bodies[0].body).unwrap().volume, 24000.0) < 1e-9);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_boolean_targets_without_overlap_keep_plain_message() {
|
||||
for operation in [Operation::Cut, Operation::Intersect] {
|
||||
let (mut doc, _) = plate_doc();
|
||||
let part = doc.add_component(Some("Part1"), 0).unwrap();
|
||||
let cut = doc
|
||||
.add_feature(
|
||||
FeatureKind::Box {
|
||||
corner: point_expr(Vec3::new(100.0, 100.0, 100.0)),
|
||||
length: "1".into(),
|
||||
width: "1".into(),
|
||||
height: "1".into(),
|
||||
operation,
|
||||
},
|
||||
None,
|
||||
)
|
||||
.unwrap();
|
||||
doc.feature_mut(cut).unwrap().component = part;
|
||||
let mut model = Model::new();
|
||||
model.evaluate(&doc);
|
||||
assert_eq!(model.result(cut).unwrap().error.as_deref(), Some("there is no body to cut or intersect"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,252 @@
|
||||
//! Text parameters: named texts (`Label` = `TAG-1`) that the words of a sketch text can be built
|
||||
//! from, by an expression that joins them and quoted texts with `+` (`Label + '-L'`). They are
|
||||
//! kept apart from the number parameters: a text has no unit and no number expression reads it.
|
||||
//! A parameter edit or a configuration row that sets one relabels every text built from it, and
|
||||
//! the features that use those texts follow in the same rebuild.
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{DocError, Document, FeatureKind, MAX_PARAMS, Result};
|
||||
|
||||
/// The unit that marks a text parameter where parameters are listed, added or imported.
|
||||
pub const TEXT_UNIT: &str = "text";
|
||||
|
||||
/// Longest text a text parameter holds, and longest words expression.
|
||||
const MAX_LEN: usize = 4096;
|
||||
|
||||
/// A named text.
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
pub struct TextParam {
|
||||
pub name: String,
|
||||
pub text: String,
|
||||
#[serde(default, skip_serializing_if = "String::is_empty")]
|
||||
pub comment: String,
|
||||
}
|
||||
|
||||
/// Is `unit` the text unit?
|
||||
pub fn is_text_unit(unit: &str) -> bool {
|
||||
unit.trim() == TEXT_UNIT
|
||||
}
|
||||
|
||||
/// A text as typed for a text parameter: inside matching quotes, what they hold (a quote doubled
|
||||
/// inside stands for one); else the text itself, without surrounding spaces.
|
||||
pub fn unquote(s: &str) -> String {
|
||||
let t = s.trim();
|
||||
for q in ['\'', '"'] {
|
||||
if t.len() >= 2 && t.starts_with(q) && t.ends_with(q) {
|
||||
let inner = t.get(1..t.len() - 1).unwrap_or_default();
|
||||
let doubled = format!("{q}{q}");
|
||||
// Only a text whose inner quotes all come in pairs is one quoted text.
|
||||
if inner.replace(&doubled, "").contains(q) {
|
||||
break;
|
||||
}
|
||||
return inner.replace(&doubled, &q.to_string());
|
||||
}
|
||||
}
|
||||
t.to_string()
|
||||
}
|
||||
|
||||
enum Term {
|
||||
Text(String),
|
||||
Name(String),
|
||||
}
|
||||
|
||||
/// The terms of a words expression with their byte ranges: quoted texts (single or double
|
||||
/// quotes, a quote doubled inside stands for one) and parameter names, joined by `+`.
|
||||
fn terms(s: &str) -> Result<Vec<(Term, usize, usize)>> {
|
||||
if s.len() > MAX_LEN {
|
||||
return Err(DocError::Expr("text expression too long".into()));
|
||||
}
|
||||
let cs: Vec<(usize, char)> = s.char_indices().collect();
|
||||
let at = |i: usize| cs.get(i).map_or(s.len(), |x| x.0);
|
||||
let mut out = Vec::new();
|
||||
let mut i = 0;
|
||||
let mut want_term = true;
|
||||
while let Some(&(_, c)) = cs.get(i) {
|
||||
if c.is_whitespace() {
|
||||
i += 1;
|
||||
} else if !want_term {
|
||||
if c != '+' {
|
||||
return Err(DocError::Expr(format!("unexpected `{c}`: a text expression joins quoted texts and text parameters with +")));
|
||||
}
|
||||
want_term = true;
|
||||
i += 1;
|
||||
} else if c == '\'' || c == '"' {
|
||||
let start = i;
|
||||
let mut text = String::new();
|
||||
i += 1;
|
||||
loop {
|
||||
match cs.get(i).map(|x| x.1) {
|
||||
None => return Err(DocError::Expr(format!("a text in quotes ({c}) is not closed"))),
|
||||
Some(d) if d == c && cs.get(i + 1).is_some_and(|x| x.1 == c) => {
|
||||
text.push(c);
|
||||
i += 2;
|
||||
}
|
||||
Some(d) if d == c => {
|
||||
i += 1;
|
||||
break;
|
||||
}
|
||||
Some(d) => {
|
||||
text.push(d);
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
out.push((Term::Text(text), at(start), at(i)));
|
||||
want_term = false;
|
||||
} else if c.is_alphabetic() || c == '_' {
|
||||
let start = i;
|
||||
while cs.get(i).is_some_and(|x| x.1.is_alphanumeric() || x.1 == '_') {
|
||||
i += 1;
|
||||
}
|
||||
out.push((Term::Name(s.get(at(start)..at(i)).unwrap_or_default().to_string()), at(start), at(i)));
|
||||
want_term = false;
|
||||
} else {
|
||||
return Err(DocError::Expr(format!("unexpected `{c}`: a text expression joins quoted texts and text parameters with +")));
|
||||
}
|
||||
}
|
||||
if want_term {
|
||||
let what = if out.is_empty() { "the text expression is empty" } else { "the text expression ends with +" };
|
||||
return Err(DocError::Expr(what.into()));
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// The parameters a words expression names (none when it does not parse).
|
||||
pub fn references(s: &str) -> Vec<String> {
|
||||
let mut out: Vec<String> = Vec::new();
|
||||
for (t, _, _) in terms(s).unwrap_or_default() {
|
||||
if let Term::Name(n) = t
|
||||
&& !out.contains(&n)
|
||||
{
|
||||
out.push(n);
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// The words expression with every reference to `old` renamed to `new` (quoted texts kept).
|
||||
pub fn rename_reference(s: &str, old: &str, new: &str) -> String {
|
||||
let Ok(terms) = terms(s) else { return s.to_string() };
|
||||
let mut out = String::with_capacity(s.len());
|
||||
let mut last = 0;
|
||||
for (t, a, b) in terms {
|
||||
if matches!(&t, Term::Name(n) if n == old) {
|
||||
out.push_str(s.get(last..a).unwrap_or_default());
|
||||
out.push_str(new);
|
||||
last = b;
|
||||
}
|
||||
}
|
||||
out.push_str(s.get(last..).unwrap_or_default());
|
||||
out
|
||||
}
|
||||
|
||||
/// The words an expression comes to, each parameter's text from `lookup`.
|
||||
pub fn eval(s: &str, lookup: &dyn Fn(&str) -> Result<String>) -> Result<String> {
|
||||
let mut out = String::new();
|
||||
for (t, _, _) in terms(s)? {
|
||||
match t {
|
||||
Term::Text(text) => out.push_str(&text),
|
||||
Term::Name(n) => out.push_str(&lookup(&n)?),
|
||||
}
|
||||
if out.len() > MAX_LEN {
|
||||
return Err(DocError::Expr("the text is too long".into()));
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
impl Document {
|
||||
pub fn text_param(&self, name: &str) -> Option<&TextParam> {
|
||||
self.text_params.iter().find(|p| p.name == name)
|
||||
}
|
||||
|
||||
/// The words a words expression comes to in this design.
|
||||
pub fn eval_words(&self, e: &str) -> Result<String> {
|
||||
eval(e, &|n| match self.text_param(n) {
|
||||
Some(p) => Ok(p.text.clone()),
|
||||
None if self.name_taken(n) => Err(DocError::Expr(format!("`{n}` is a number parameter: a text's words take text parameters"))),
|
||||
None => Err(DocError::Expr(format!("unknown text parameter `{n}`"))),
|
||||
})
|
||||
}
|
||||
|
||||
/// Set text parameter `name` to `text` (as typed: [`unquote`]), adding it when new.
|
||||
pub fn set_text_param(&mut self, name: &str, text: &str, comment: Option<&str>) -> Result<()> {
|
||||
if let Some(p) = Self::param_name_problem(name) {
|
||||
return Err(DocError::Invalid(p));
|
||||
}
|
||||
if text.len() > MAX_LEN {
|
||||
return Err(DocError::Expr("text too long".into()));
|
||||
}
|
||||
if comment.is_some_and(|c| c.len() > 4096) {
|
||||
return Err(DocError::Invalid("comment too long".into()));
|
||||
}
|
||||
let text = unquote(text);
|
||||
if let Some(p) = self.text_params.iter_mut().find(|p| p.name == name) {
|
||||
p.text = text;
|
||||
if let Some(c) = comment {
|
||||
p.comment = c.to_string();
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
if self.name_taken(name) {
|
||||
return Err(DocError::Invalid(format!("`{name}` is a number parameter")));
|
||||
}
|
||||
if self.params.len() + self.text_params.len() >= MAX_PARAMS {
|
||||
return Err(DocError::Invalid("too many parameters".into()));
|
||||
}
|
||||
self.text_params.push(TextParam { name: name.to_string(), text, comment: comment.unwrap_or_default().to_string() });
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Remove text parameter `name`; refused while a text uses it.
|
||||
pub(crate) fn remove_text_param(&mut self, name: &str) -> Result<()> {
|
||||
let users = self.param_users(name);
|
||||
if !users.is_empty() {
|
||||
let list: Vec<String> = users.iter().map(crate::ParamUser::describe).collect();
|
||||
return Err(DocError::Invalid(format!("`{name}` is used by {}", list.join(", "))));
|
||||
}
|
||||
self.text_params.retain(|p| p.name != name);
|
||||
self.favorites.remove(name);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// The sketches whose texts' words read one of `names`.
|
||||
pub(crate) fn features_reading_texts(&self, names: &std::collections::BTreeSet<String>) -> Vec<u64> {
|
||||
self.features
|
||||
.iter()
|
||||
.filter(|f| match &f.kind {
|
||||
FeatureKind::Sketch { sketch, .. } => sketch.text_word_exprs().iter().any(|e| references(e).iter().any(|r| names.contains(r))),
|
||||
_ => false,
|
||||
})
|
||||
.map(|f| f.id)
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn words_expressions_join_quoted_texts_and_parameters() {
|
||||
let look = |n: &str| match n {
|
||||
"Label" => Ok("TAG-1".to_string()),
|
||||
_ => Err(DocError::Expr(format!("unknown text parameter `{n}`"))),
|
||||
};
|
||||
assert_eq!(eval("Label + '-L'", &look).unwrap(), "TAG-1-L");
|
||||
assert_eq!(eval("\"it's \" + Label", &look).unwrap(), "it's TAG-1");
|
||||
assert_eq!(eval("'it''s'", &look).unwrap(), "it's");
|
||||
assert_eq!(eval("'a+b' + 'c'", &look).unwrap(), "a+bc");
|
||||
for bad in ["", "Label +", "+ 'a'", "Label 'a'", "'open", "Label - 'a'", "Other"] {
|
||||
assert!(eval(bad, &look).is_err(), "{bad}");
|
||||
}
|
||||
assert_eq!(references("Label + 'Label' + Other + Label"), ["Label", "Other"]);
|
||||
assert_eq!(rename_reference("Label+'Label-' + Label", "Label", "Tag"), "Tag+'Label-' + Tag");
|
||||
assert_eq!(unquote(" 'A B' "), "A B");
|
||||
assert_eq!(unquote("\"it''s\""), "it''s");
|
||||
assert_eq!(unquote("'it''s'"), "it's");
|
||||
assert_eq!(unquote("'a' + 'b'"), "'a' + 'b'");
|
||||
assert_eq!(unquote("TAG-1"), "TAG-1");
|
||||
}
|
||||
}
|
||||
@@ -117,6 +117,47 @@ fn revolve_cut_round_a_box_corner_does_not_panic() {
|
||||
}
|
||||
}
|
||||
|
||||
/// #5543: a grid of 121 holes cut through a plate, four of its circles drawn a second time on
|
||||
/// top of themselves. Each of those was two profiles of one region and so two coincident tools:
|
||||
/// the cut retried with the tool nudged and took fifty times as long. The profiles drawn twice
|
||||
/// are cut once: no retry, and the plate is the one the 121 circles drawn once make.
|
||||
#[test]
|
||||
fn circles_drawn_twice_are_cut_once() {
|
||||
let cut = |repeats: usize| {
|
||||
let mut s = Session::default();
|
||||
s.execute("sketch.create", &json!({"plane": "XY"})).unwrap();
|
||||
s.execute("sketch.rectangle.two_point", &json!({"p0": [-35, -35], "p1": [35, 35]})).unwrap();
|
||||
s.execute("sketch.finish", &json!({})).unwrap();
|
||||
s.execute("solid.extrude", &json!({"distance": 2, "operation": "new"})).unwrap();
|
||||
s.execute("sketch.create", &json!({"plane": "XY", "offset": 2})).unwrap();
|
||||
let mut centres = Vec::new();
|
||||
for i in -7i32..8 {
|
||||
for j in -8i32..9 {
|
||||
let (x, y) = (f64::from(j) * 3.45 + if i % 2 != 0 { 1.725 } else { 0.0 }, f64::from(i) * 3.0);
|
||||
if x.hypot(y) <= 20.7 {
|
||||
centres.push([x, y]);
|
||||
}
|
||||
}
|
||||
}
|
||||
assert_eq!(centres.len(), 121);
|
||||
for c in centres.iter().chain(centres.iter().take(repeats)) {
|
||||
s.execute("sketch.circle.center", &json!({"center": c, "radius": 1.15})).unwrap();
|
||||
}
|
||||
s.execute("sketch.finish", &json!({})).unwrap();
|
||||
let r = s.execute("solid.extrude", &json!({"operation": "cut", "direction": "negative", "distance": 2, "targets": ["Body1"]})).unwrap();
|
||||
assert!(r["warning"].is_null(), "{}", r["warning"]);
|
||||
let state = s.model.state();
|
||||
let body = &state.body("Body1").unwrap().body;
|
||||
(body.volume_at(1e-4).unwrap(), body.face_count())
|
||||
};
|
||||
let (once, faces_once) = cut(0);
|
||||
let (twice, faces_twice) = cut(4);
|
||||
let analytic = 70.0 * 70.0 * 2.0 - 121.0 * std::f64::consts::PI * 1.15 * 1.15 * 2.0;
|
||||
assert!((once - analytic).abs() < 0.2, "{once} vs {analytic}");
|
||||
assert!((twice - once).abs() < 1e-9 * once, "{twice} vs {once}");
|
||||
assert_eq!(faces_twice, faces_once);
|
||||
}
|
||||
|
||||
/// #1985: the STEP export of a small enclosure never finished. The export reads its own file
|
||||
/// back, and meshing the screw hole's seam cylinder never ended: the boundary walk took
|
||||
/// projected angles millions of turns apart. The file is written, reads back cleanly, and holds
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
//! belong to their feature's component unless moved; occurrences place components (instances
|
||||
//! share contents, "paste new" copies them) and can be grounded and moved.
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use serde_json::{Value, json};
|
||||
use solidcraft_doc::{FeatureKind, Mat, Occurrence};
|
||||
use solidcraft_doc::{Feature, FeatureKind, Mat, Occurrence};
|
||||
use solidcraft_geom::Vec3;
|
||||
|
||||
use super::CommandSpec;
|
||||
@@ -26,6 +28,9 @@ mod transfer;
|
||||
mod occurrence_tests;
|
||||
|
||||
pub static COMMANDS: &[CommandSpec] = &[
|
||||
CommandSpec::new("component.cycle_color", "Cycle Component Color", cycle_color)
|
||||
.icon("colored_components").doc_only()
|
||||
.params("component: id or name; saves the next identification colour and enables Component Colors; shared by every instance, separate from appearances"),
|
||||
CommandSpec::new("component.create", "New Component", new_component)
|
||||
.at("SOLID", "ASSEMBLE")
|
||||
.icon("component")
|
||||
@@ -40,10 +45,10 @@ pub static COMMANDS: &[CommandSpec] = &[
|
||||
),
|
||||
CommandSpec::new("component.properties", "Component Physical Properties", properties::component)
|
||||
.icon("measure").noundo()
|
||||
.params("component?: id or name (default active); descendants?: bool (default true). Measures the first placement, or all placements for root, including pending moves; material-aware mass and center of mass in world coordinates"),
|
||||
.params("component?: id or name (default active); descendants?: bool (default true). Measures the first placement, or all placements for root, including pending moves; material-aware mass and center of mass in world coordinates; volume, density, mass and center of mass only for closed, consistently oriented bodies; total.open_bodies_skipped counts open bodies excluded from volume/mass totals"),
|
||||
CommandSpec::new("occurrence.properties", "Occurrence Physical Properties", properties::occurrence)
|
||||
.icon("measure").noundo()
|
||||
.params("occurrence: id or name; path?: [occurrence ids] (required if nested under multiple instances); descendants?: bool (default true). Physical properties of this placement in world coordinates, including pending moves"),
|
||||
.params("occurrence: id or name; path?: [occurrence ids] (required if nested under multiple instances); descendants?: bool (default true). Physical properties of this placement in world coordinates, including pending moves; volume, density, mass and center of mass only for closed, consistently oriented bodies; total.open_bodies_skipped counts open bodies excluded from volume/mass totals"),
|
||||
CommandSpec::new("component.rename", "Rename Component", rename).icon("rename").params("component, name"),
|
||||
CommandSpec::new("component.delete", "Delete Component", delete).icon("delete").params("component: deletes it, its subcomponents, occurrences and features"),
|
||||
CommandSpec::new("component.unlock", "Unlock Contents", unlock).icon("rigid_group").params(
|
||||
@@ -204,24 +209,30 @@ fn list(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
}
|
||||
v
|
||||
};
|
||||
// Each component's bodies, features, occurrences and children, grouped once rather than
|
||||
// searched for every component (thousands of each in a design with many components).
|
||||
let mut bodies_of: HashMap<u64, Vec<&str>> = HashMap::new();
|
||||
for b in &st.bodies {
|
||||
bodies_of.entry(doc.model_body_component(b)).or_default().push(b.name.as_str());
|
||||
}
|
||||
let mut features_of: HashMap<u64, Vec<&Feature>> = HashMap::new();
|
||||
for f in &doc.features {
|
||||
features_of.entry(f.component).or_default().push(f);
|
||||
}
|
||||
let (mut occurrences_of, mut children_of): (HashMap<u64, Vec<&Occurrence>>, HashMap<u64, Vec<&Occurrence>>) = Default::default();
|
||||
for o in &doc.occurrences {
|
||||
occurrences_of.entry(o.component).or_default().push(o);
|
||||
children_of.entry(o.parent).or_default().push(o);
|
||||
}
|
||||
let node = |id: u64, name: &str, parent: Option<u64>| {
|
||||
let bodies: Vec<&str> = st.bodies.iter().filter(|b| doc.model_body_component(b) == id).map(|b| b.name.as_str()).collect();
|
||||
let features: Vec<&str> = doc
|
||||
.features
|
||||
.iter()
|
||||
.filter(|f| f.component == id && !matches!(f.kind, FeatureKind::Sketch { .. } | FeatureKind::ConstructionPlane { .. }))
|
||||
.map(|f| f.name.as_str())
|
||||
.collect();
|
||||
let sketches: Vec<&str> =
|
||||
doc.features.iter().filter(|f| f.component == id && matches!(f.kind, FeatureKind::Sketch { .. })).map(|f| f.name.as_str()).collect();
|
||||
let construction: Vec<&str> = doc
|
||||
.features
|
||||
.iter()
|
||||
.filter(|f| f.component == id && matches!(f.kind, FeatureKind::ConstructionPlane { .. }))
|
||||
.map(|f| f.name.as_str())
|
||||
.collect();
|
||||
let occurrences: Vec<Value> = doc.occurrences.iter().filter(|o| o.component == id).map(placement).collect();
|
||||
let children: Vec<Value> = doc.occurrences.iter().filter(|o| o.parent == id).map(|o| if compact { json!(o.id) } else { json!(o) }).collect();
|
||||
let bodies = bodies_of.get(&id).cloned().unwrap_or_default();
|
||||
let features = features_of.get(&id).map(Vec::as_slice).unwrap_or_default();
|
||||
let named = |keep: fn(&FeatureKind) -> bool| -> Vec<&str> { features.iter().filter(|f| keep(&f.kind)).map(|f| f.name.as_str()).collect() };
|
||||
let sketches = named(|k| matches!(k, FeatureKind::Sketch { .. }));
|
||||
let construction = named(|k| matches!(k, FeatureKind::ConstructionPlane { .. }));
|
||||
let features = named(|k| !matches!(k, FeatureKind::Sketch { .. } | FeatureKind::ConstructionPlane { .. }));
|
||||
let occurrences: Vec<Value> = occurrences_of.get(&id).into_iter().flatten().map(|o| placement(o)).collect();
|
||||
let children: Vec<Value> = children_of.get(&id).into_iter().flatten().map(|o| if compact { json!(o.id) } else { json!(o) }).collect();
|
||||
let bodies = if body_names { json!(bodies) } else { json!(bodies.len()) };
|
||||
json!({"id": id, "name": name, "parent": parent, "bodies": bodies, "features": names(features), "sketches": names(sketches),
|
||||
"construction": names(construction), "occurrences": occurrences, "children": children})
|
||||
@@ -557,3 +568,13 @@ pub fn to_active_frame(s: &Session, kind: &mut FeatureKind) {
|
||||
kind.transform_geometry(&inv);
|
||||
}
|
||||
}
|
||||
|
||||
fn cycle_color(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
let cmd = "component.cycle_color";
|
||||
let id = component(s, p, "component", cmd)?;
|
||||
let next = solidcraft_doc::component_color::next_color(s.doc.component_identification_color(id));
|
||||
let c = s.doc_mut().components.iter_mut().find(|c| c.id == id).ok_or_else(|| bad(cmd, "choose a component below the design root"))?;
|
||||
c.identification_color = Some(next);
|
||||
s.colored_components = Some(());
|
||||
Ok(json!({"component": id, "color": next}))
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user