diff --git a/assets/locales/pending/geometry-kernel.json b/assets/locales/pending/geometry-kernel.json index d9f814d7d..c2bbbac1a 100644 --- a/assets/locales/pending/geometry-kernel.json +++ b/assets/locales/pending/geometry-kernel.json @@ -3,49 +3,49 @@ "cmd.diagnostics_kernel": "Geometry Kernel", "prefs.geometry_kernel": "Geometry kernel", "prefs.geometry_kernel_environment": "The SOLIDCRAFT_KERNEL environment variable is set; it wins over this setting.", - "prefs.geometry_kernel_note": "Routed uses solidcore only for operations that match SMLib on the kernel test rig; a solidcore failure is reported, never retried on SMLib.", + "prefs.geometry_kernel_note": "Routed uses solidcore, the default, for every operation. Choose SMLib for the C++ kernel. A solidcore failure is reported, never retried on SMLib.", "prefs.geometry_kernel_routed": "Routed" }, "ar": { "cmd.diagnostics_kernel": "نواة الهندسة", "prefs.geometry_kernel": "نواة الهندسة", "prefs.geometry_kernel_environment": "متغير البيئة SOLIDCRAFT_KERNEL مضبوط، وله الأولوية على هذا الإعداد.", - "prefs.geometry_kernel_note": "يستخدم الوضع الموجَّه solidcore فقط للعمليات التي تطابق SMLib على منصة اختبار النواة؛ ويُبلَّغ عن إخفاق solidcore ولا تُعاد المحاولة أبدًا على SMLib.", + "prefs.geometry_kernel_note": "يستخدم الوضع الموجَّه، وهو الافتراضي، solidcore لكل العمليات. اختر SMLib لاستخدام نواة C++‎. ويُبلَّغ عن إخفاق solidcore ولا تُعاد المحاولة أبدًا على SMLib.", "prefs.geometry_kernel_routed": "موجَّه" }, "de": { "cmd.diagnostics_kernel": "Geometriekernel", "prefs.geometry_kernel": "Geometriekernel", "prefs.geometry_kernel_environment": "Die Umgebungsvariable SOLIDCRAFT_KERNEL ist gesetzt; sie hat Vorrang vor dieser Einstellung.", - "prefs.geometry_kernel_note": "Geroutet nutzt solidcore nur für Vorgänge, die auf dem Kernel-Prüfstand mit SMLib übereinstimmen; ein Fehler in solidcore wird gemeldet, nie mit SMLib wiederholt.", + "prefs.geometry_kernel_note": "Geroutet, die Standardeinstellung, nutzt solidcore für alle Vorgänge. Wählen Sie SMLib für den C++-Kernel. Ein Fehler in solidcore wird gemeldet, nie mit SMLib wiederholt.", "prefs.geometry_kernel_routed": "Geroutet" }, "fr": { "cmd.diagnostics_kernel": "Noyau géométrique", "prefs.geometry_kernel": "Noyau géométrique", "prefs.geometry_kernel_environment": "La variable d’environnement SOLIDCRAFT_KERNEL est définie ; elle l’emporte sur ce réglage.", - "prefs.geometry_kernel_note": "Routé n’utilise solidcore que pour les opérations qui concordent avec SMLib sur le banc d’essai du noyau ; un échec de solidcore est signalé, jamais réessayé avec SMLib.", + "prefs.geometry_kernel_note": "Routé, le réglage par défaut, utilise solidcore pour toutes les opérations. Choisissez SMLib pour le noyau C++. Un échec de solidcore est signalé, jamais réessayé avec SMLib.", "prefs.geometry_kernel_routed": "Routé" }, "he": { "cmd.diagnostics_kernel": "ליבת גאומטריה", "prefs.geometry_kernel": "ליבת גאומטריה", "prefs.geometry_kernel_environment": "משתנה הסביבה SOLIDCRAFT_KERNEL מוגדר, והוא גובר על הגדרה זו.", - "prefs.geometry_kernel_note": "מנותב משתמש ב-solidcore רק לפעולות שתואמות את SMLib במתקן הבדיקה של הליבה; כשל של solidcore מדווח, ולעולם אינו מנוסה שוב ב-SMLib.", + "prefs.geometry_kernel_note": "מנותב, ברירת המחדל, משתמש ב-solidcore לכל הפעולות. בחרו ב-SMLib עבור ליבת ה-C++‎. כשל של solidcore מדווח, ולעולם אינו מנוסה שוב ב-SMLib.", "prefs.geometry_kernel_routed": "מנותב" }, "ja": { "cmd.diagnostics_kernel": "ジオメトリ カーネル", "prefs.geometry_kernel": "ジオメトリ カーネル", "prefs.geometry_kernel_environment": "環境変数 SOLIDCRAFT_KERNEL が設定されているため、この設定より優先されます。", - "prefs.geometry_kernel_note": "ルーティングでは、カーネルのテスト環境で SMLib と一致した処理にのみ solidcore を使います。solidcore の失敗は報告され、SMLib で再試行されることはありません。", + "prefs.geometry_kernel_note": "既定のルーティングでは、すべての処理に solidcore を使います。C++ カーネルを使うには SMLib を選択してください。solidcore の失敗は報告され、SMLib で再試行されることはありません。", "prefs.geometry_kernel_routed": "ルーティング" }, "zh": { "cmd.diagnostics_kernel": "几何内核", "prefs.geometry_kernel": "几何内核", "prefs.geometry_kernel_environment": "已设置环境变量 SOLIDCRAFT_KERNEL,它优先于此设置。", - "prefs.geometry_kernel_note": "路由模式仅对在内核测试台上与 SMLib 结果一致的操作使用 solidcore;solidcore 失败时会报告,绝不会改用 SMLib 重试。", + "prefs.geometry_kernel_note": "默认的路由模式对所有操作使用 solidcore。如需使用 C++ 内核,请选择 SMLib。solidcore 失败时会报告,绝不会改用 SMLib 重试。", "prefs.geometry_kernel_routed": "路由" } } diff --git a/crates/engine/src/cmd/diagnostics.rs b/crates/engine/src/cmd/diagnostics.rs index 4faa96b2a..3a7b6d7a1 100644 --- a/crates/engine/src/cmd/diagnostics.rs +++ b/crates/engine/src/cmd/diagnostics.rs @@ -39,9 +39,9 @@ pub static COMMANDS: &[CommandSpec] = &[ --profile and the app's preference; off, it costs nothing measurable. Read-only", ), CommandSpec::new("diagnostics.kernel", "Geometry Kernel", kernel).icon("bug_report").noundo().params( - "choice?: routed | smlib | solidcore (sets which kernel answers: routed = each operation on the kernel the routing \ - table gives it, smlib = the C++ SMLib kernel for all, solidcore = its Rust port for all; bodies already computed \ - keep their results). SOLIDCRAFT_KERNEL, when set, wins over it, and SOLIDCRAFT_KERNEL_ROUTES (op=backend,...) \ + "choice?: routed | smlib | solidcore (sets which kernel answers: routed, the default = each operation on the kernel \ + the routing table gives it, solidcore for every one; smlib = the C++ SMLib kernel for all; solidcore = the Rust port \ + for all; bodies already computed keep their results). SOLIDCRAFT_KERNEL, when set, wins over it, and SOLIDCRAFT_KERNEL_ROUTES (op=backend,...) \ moves single operations on top of both. Returns {choice, environment, overrides: {op: backend}, routes: [{op, \ route, backend}]}: route is the table's kernel for the operation, backend the one it runs on now", ), diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs index 5f49897cc..2e74ace63 100644 --- a/crates/ui-egui/src/prefs.rs +++ b/crates/ui-egui/src/prefs.rs @@ -2478,9 +2478,10 @@ mod tests { } /// The Geometry kernel preference reaches the kernel through diagnostics.kernel, at startup - /// and when it changes, and only a choice the command knows is accepted. (The kernel choice - /// is process-wide and other tests start harnesses meanwhile, so this reads what was applied, - /// and only `smlib`, which runs every family where Routed does today.) + /// and when it changes, and only a choice the command knows is accepted. `smlib` keeps the C++ + /// kernel reachable for every family, the behaviour from before solidcore was the default. + /// (The kernel choice is process-wide and other tests start harnesses meanwhile, so this + /// reads what `smlib` would route and only sets `solidcore`, where Routed runs everything.) #[test] fn the_geometry_kernel_preference_applies_through_its_command() { use serde_json::json; @@ -2492,9 +2493,14 @@ mod tests { assert_eq!(h.app.prefs_window.kernel_environment, environment); assert!(h.call("ui.prefs", json!({"geometry_kernel": "truck"}))["error"].as_str().is_some_and(|e| e.contains("geometry_kernel"))); assert_eq!(h.app.preferences.geometry_kernel, "routed"); - h.call("ui.prefs", json!({"geometry_kernel": "smlib"})); + use solidcraft_engine::kernel::kernel_route::{Backend, Choice, Op, Overrides}; + for op in Op::ALL { + assert_eq!(Choice::from_id("smlib").map(|c| op.backend_with(c, &Overrides::NONE)), Some(Backend::Smlib), "{op:?}"); + assert_eq!(op.backend_with(Choice::Routed, &Overrides::NONE), Backend::Solidcore, "{op:?}"); + } + h.call("ui.prefs", json!({"geometry_kernel": "solidcore"})); h.frames(2); - assert_eq!(h.app.prefs_window.applied_kernel.as_deref(), Some("smlib")); + assert_eq!(h.app.prefs_window.applied_kernel.as_deref(), Some("solidcore")); h.call("ui.prefs", json!({"geometry_kernel": "routed"})); h.frames(2); assert_eq!(h.app.prefs_window.applied_kernel.as_deref(), Some("routed"));