mirror of
https://github.com/bherbruck/solidcraft.git
synced 2026-11-04 02:55:54 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 bherbruck
|
4c5e19a67e | ||
|
bherbruck
|
4e8a462777 |
@@ -784,8 +784,6 @@ Original SolidCraft drawings, Open for owner review; no runtime assignments.
|
||||
| `assets/locales/pending/sketch-offset-instances.json` | SolidCraft contributors | Original offset instance-count label and translations | MIT OR Apache-2.0 |
|
||||
| assets/icons/ui/design/svg/flat/settings_profile.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original analytic head and shoulder geometry for settings profiles | MIT OR Apache-2.0 |
|
||||
| tests/kernel-cases/import/4561-convert-box-mesh-with-a-zero-area-triangle/box-degenerate.stl | SolidCraft contributors | synthetic ASCII STL written by hand: a box with one zero-area triangle, for the kernel regression case of tangency-labs/solidcraft#4561 | MIT OR Apache-2.0 |
|
||||
| assets/locales/pending/theme-blur-ui.json | SolidCraft contributors | Original blur controls, notices and translations | MIT OR Apache-2.0 |
|
||||
| crates/ui-egui/tests/fixtures/theme-blur.json | SolidCraft contributors | Original theme for blur option scenarios and manager review | MIT OR Apache-2.0 |
|
||||
|
||||
## Code adapted from sibling projects
|
||||
|
||||
|
||||
Generated
-1
@@ -4102,7 +4102,6 @@ dependencies = [
|
||||
"ureq",
|
||||
"windows-sys 0.61.2",
|
||||
"winit",
|
||||
"winreg",
|
||||
"x11rb",
|
||||
"zbus 5.19.0",
|
||||
]
|
||||
|
||||
@@ -171,7 +171,6 @@ mod web {
|
||||
|
||||
use solidcraft_engine::Session;
|
||||
use solidcraft_engine::io::vfs;
|
||||
use solidcraft_ui_egui::ui_kit::BackingTooltipExt as _;
|
||||
use solidcraft_ui_egui::{Services, SolveApp, ui_kit};
|
||||
use wasm_bindgen::JsCast as _;
|
||||
|
||||
@@ -501,7 +500,7 @@ mod web {
|
||||
files::pick_from_disk(&self.files, Intent::Open);
|
||||
}
|
||||
if ui_kit::button(ui, "Insert from computer…", ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_drawings_hint"))
|
||||
.on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_drawings_hint"))
|
||||
.clicked()
|
||||
{
|
||||
files::pick_from_disk(&self.files, Intent::Insert);
|
||||
@@ -555,7 +554,7 @@ mod web {
|
||||
let design = solidcraft_engine::io::is_design_path(&e.name);
|
||||
if !design
|
||||
&& ui_kit::button(ui, "Insert", ui_kit::Button::Small)
|
||||
.backing_on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_stored_drawings_hint"))
|
||||
.on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_stored_drawings_hint"))
|
||||
.clicked()
|
||||
{
|
||||
act = Some(("insert", e.name.clone()));
|
||||
@@ -565,7 +564,7 @@ mod web {
|
||||
self.rename_focus = true;
|
||||
}
|
||||
if ui_kit::button(ui, "Save to computer…", ui_kit::Button::Small)
|
||||
.backing_on_hover_text("A copy in a file you choose; the stored design stays here")
|
||||
.on_hover_text("A copy in a file you choose; the stored design stays here")
|
||||
.clicked()
|
||||
{
|
||||
act = Some(("save_copy", e.name.clone()));
|
||||
|
||||
@@ -81,7 +81,6 @@ windows-sys = { version = "0.61", features = [
|
||||
"Win32_UI_HiDpi",
|
||||
"Win32_UI_WindowsAndMessaging",
|
||||
] }
|
||||
winreg = "0.56"
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
muda = { version = "0.21.2", default-features = false }
|
||||
@@ -93,7 +92,7 @@ hidapi = { version = "2.6.7", default-features = false, features = ["macos-share
|
||||
# Files opened from Finder and the Dock (src/open_documents.rs), and the fullscreen title-bar
|
||||
# inset (src/main.rs); all already come with eframe and rfd.
|
||||
objc2 = "0.6"
|
||||
objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSAccessibility", "NSApplication", "NSResponder", "NSWindow", "NSWorkspace"] }
|
||||
objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSWindow"] }
|
||||
objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSProcessInfo", "NSString", "NSURL"] }
|
||||
block2 = "0.6"
|
||||
# Native crash capture (src/native_crash_macos.rs): the signal handler, the faulting module
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
//! Cached accessibility signal, observed only while a theme offers blur. No UI-thread IO.
|
||||
use std::sync::{
|
||||
Arc,
|
||||
atomic::{AtomicBool, AtomicU8, Ordering},
|
||||
};
|
||||
|
||||
#[derive(Default)]
|
||||
struct Reading {
|
||||
needed: AtomicBool,
|
||||
started: AtomicBool,
|
||||
value: AtomicU8,
|
||||
}
|
||||
|
||||
pub fn cached(ctx: &egui::Context) -> Box<dyn Fn(bool) -> Option<bool>> {
|
||||
let state = Arc::new(Reading::default());
|
||||
let ctx = ctx.clone();
|
||||
Box::new(move |needed| {
|
||||
state.needed.store(needed, Ordering::Relaxed);
|
||||
if needed && !state.started.swap(true, Ordering::Relaxed) {
|
||||
let weak = Arc::downgrade(&state);
|
||||
let ctx = ctx.clone();
|
||||
if let Err(error) = std::thread::Builder::new().name("desktop-transparency".into()).spawn(move || {
|
||||
while let Some(state) = weak.upgrade() {
|
||||
if state.needed.load(Ordering::Relaxed) {
|
||||
let code = match read() {
|
||||
Some(true) => 1,
|
||||
Some(false) => 2,
|
||||
None => 0,
|
||||
};
|
||||
if state.value.swap(code, Ordering::Relaxed) != code {
|
||||
ctx.request_repaint();
|
||||
}
|
||||
}
|
||||
drop(state);
|
||||
std::thread::sleep(std::time::Duration::from_secs(5));
|
||||
}
|
||||
}) {
|
||||
log::warn!("desktop transparency: could not observe accessibility setting: {error}");
|
||||
}
|
||||
}
|
||||
match state.value.load(Ordering::Relaxed) {
|
||||
1 => Some(true),
|
||||
2 => Some(false),
|
||||
_ => None,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
fn read() -> Option<bool> {
|
||||
let key =
|
||||
winreg::RegKey::predef(winreg::enums::HKEY_CURRENT_USER).open_subkey(r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize").ok()?;
|
||||
match key.get_value::<u32, _>("EnableTransparency").ok()? {
|
||||
0 => Some(true),
|
||||
1 => Some(false),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
fn read() -> Option<bool> {
|
||||
objc2::rc::autoreleasepool(|_| Some(objc2_app_kit::NSWorkspace::sharedWorkspace().accessibilityDisplayShouldReduceTransparency()))
|
||||
}
|
||||
@@ -24,8 +24,6 @@ mod come_forward;
|
||||
mod control_server;
|
||||
#[cfg(target_os = "linux")]
|
||||
mod desktop_theme;
|
||||
#[cfg(any(target_os = "windows", target_os = "macos"))]
|
||||
mod desktop_transparency;
|
||||
mod device_lost;
|
||||
#[cfg(target_os = "windows")]
|
||||
mod native_crash;
|
||||
@@ -541,10 +539,6 @@ fn services(cc: &eframe::CreationContext<'_>, folder: &DialogFolder) -> Services
|
||||
desktop_dark: Some(desktop_theme::start(&cc.egui_ctx)),
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
desktop_dark: None,
|
||||
#[cfg(any(target_os = "windows", target_os = "macos"))]
|
||||
reduce_transparency: Some(desktop_transparency::cached(&cc.egui_ctx)),
|
||||
#[cfg(not(any(target_os = "windows", target_os = "macos")))]
|
||||
reduce_transparency: None,
|
||||
http_get: Some(std::sync::Arc::new(http_get)),
|
||||
http_download: Some(std::sync::Arc::new(http_download)),
|
||||
// Already an installed app: only the browser build offers to install.
|
||||
|
||||
@@ -2265,14 +2265,6 @@
|
||||
"prefs.auto_operation_note": "ضم أو جسم جديد أو قطع، حسب ما تلامسه المادة.",
|
||||
"prefs.axes": "المحاور",
|
||||
"prefs.axis": "المحور",
|
||||
"prefs.blur_cost": "تكلفة العرض النسبية. زيادة الأشرطة تعني عادةً مزيدًا من العمل.",
|
||||
"prefs.blur_device": "غير متاح على جهاز الرسومات أو مسار العرض هذا",
|
||||
"prefs.blur_guard": "خُفّضت جودة التمويه للحفاظ على استجابة الإطارات. لم يتغير نصف القطر.",
|
||||
"prefs.blur_off": "إيقاف",
|
||||
"prefs.blur_reduce_transparency": "معطّل بسبب إعداد تقليل الشفافية في النظام",
|
||||
"prefs.blur_software": "غير متاح مع الرسومات البرمجية (gpu-software)",
|
||||
"prefs.blur_source": "غير متاح في عرض مساحة العمل هذا",
|
||||
"prefs.blur_web": "غير متاح في مسار عرض الويب هذا",
|
||||
"prefs.bodies_folders": "مجلدات الأجسام",
|
||||
"prefs.bodies_folders_always": "دائمًا",
|
||||
"prefs.bodies_folders_never": "أبدًا",
|
||||
@@ -2658,10 +2650,6 @@
|
||||
"prefs.theme_follow_off": "إيقاف",
|
||||
"prefs.theme_follow_stop": "إيقاف الاتباع",
|
||||
"prefs.theme_import_hint": "انقر لاختيار ملف سمة، أو أفلت ملفًا هنا، أو اضغط Ctrl+V (Cmd+V على Mac) بعد نسخ سمة",
|
||||
"prefs.theme_notice_dismiss": "إخفاء",
|
||||
"prefs.theme_option_blur": "تمويه خلف اللوحات",
|
||||
"prefs.theme_option_blur_help": "تمويه خلف اللوحات شبه الشفافة، بالبكسل الفعلي. الصفر يوقف التمويه.",
|
||||
"prefs.theme_option_invalid": "القيمة المحفوظة للخيار {option} غير صالحة؛ تُستخدم القيمة الافتراضية للسمة. تبقى القيمة المحفوظة كما هي.",
|
||||
"prefs.theme_option_opacity": "العتامة",
|
||||
"prefs.theme_option_opacity_help": "اضبط عتامة اللوحات العائمة. يُطبّق حد أدنى للعتامة للحفاظ على وضوح النص فوق ألوان منطقة العرض.",
|
||||
"prefs.theme_option_tab_colours": "ألوان علامات التبويب",
|
||||
@@ -2670,7 +2658,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "تتغيّر ألوان اللوحات ومنطقة العرض تدريجيًا عند تبديل علامات التبويب. القيمة صفر تبدّلها فورًا.",
|
||||
"prefs.theme_options_badge": "الخيارات",
|
||||
"prefs.theme_options_more": "المزيد · {count}",
|
||||
"prefs.theme_options_newer": "تتطلب هذه السمة إصدارًا أحدث من SolidCraft. بعد الترقية، أعد استيراد السمة الأصلية لاستعادة تعريفات خياراتها.",
|
||||
"prefs.theme_options_reset": "إعادة تعيين",
|
||||
"prefs.theme_options_unavailable": "غير متاح على هذا الجهاز",
|
||||
"prefs.theme_paste": "لصق السمة",
|
||||
@@ -4954,10 +4941,6 @@
|
||||
"ui.fillet_setback_least": "أكثر من {least}",
|
||||
"ui.fillet_setback_tip": "حيث تبدأ رقعة الزاوية الناعمة: المسافة على طول كل حافة من الزاوية. الافتراضي {factor} ضعف نصف القطر. يجب أن تكون أكبر من أقل مسافة إرجاع، حيث تلتقي الاستدارات بدونها: نصف القطر حيث تكون الأوجه متعامدة.",
|
||||
"ui.fillet_smooth_radius": "تغيّر ناعم لنصف القطر",
|
||||
"ui.fillet_turn": "المنعطفات",
|
||||
"ui.fillet_turn_mitre": "وصلة مائلة",
|
||||
"ui.fillet_turn_swept": "مُدار",
|
||||
"ui.fillet_turn_tip": "حيث يلتف تقويسان حول حافة ركن حادة بينهما، مثل التقويسات على قاعدة بروز عند حوافه القائمة.\nوصلة مائلة: يمتد التقويسان حتى يلتقيا في وصلة مائلة.\nمُدار: يتوقف التقويسان عند حافة الركن ويلتفان حولها، والركن طارة مماسة لكليهما. فقط لتقويسين بنصف قطر واحد حول حافة ركن مستقيمة ومحدبة.",
|
||||
"ui.fillet_type_choices_tip": "نصف قطر ثابت: نصف قطر واحد على طول الحافة.\nطول الوتر: يبقى عرض التقويس نفسه مهما كانت الزاوية بين الوجوه.\nنصف قطر متغيّر: نصف قطر عند كل طرف، ومزيد على طول الحافة إن أضفته.\nمتصل الانحناء: مقطع بلا انكسار في الانعكاسات حيث يلتقي بالوجوه المستوية (G2).\nمنحنى: يتبع نصف القطر على طول الحافة أنصاف أقطار تحكّم تحدّدها.",
|
||||
"ui.fillet_type_curvature": "متصل الانحناء",
|
||||
"ui.fillet_type_tip": "المقطع عبر الحافة. متصل الانحناء: مقطع متصل الانحناء (G2) بين وجوه مستوية، فتمر الانعكاسات من الوجوه إلى التقويس دون انكسار.",
|
||||
|
||||
@@ -2248,14 +2248,6 @@
|
||||
"prefs.auto_operation_note": "Vereinigung, Neuer Körper oder Schnitt, je nachdem, was das Material berührt.",
|
||||
"prefs.axes": "Achsen",
|
||||
"prefs.axis": "Achse",
|
||||
"prefs.blur_cost": "Relativer Renderaufwand. Mehr Balken bedeuten meist mehr Arbeit.",
|
||||
"prefs.blur_device": "Auf diesem Grafikgerät oder Renderpfad nicht verfügbar",
|
||||
"prefs.blur_guard": "Die Unschärfequalität wurde für flüssigere Bilder verringert. Der Radius bleibt unverändert.",
|
||||
"prefs.blur_off": "Aus",
|
||||
"prefs.blur_reduce_transparency": "Durch die Systemeinstellung zur Transparenzreduzierung deaktiviert",
|
||||
"prefs.blur_software": "Mit Softwaregrafik nicht verfügbar (gpu-software)",
|
||||
"prefs.blur_source": "In dieser Arbeitsbereichsansicht nicht verfügbar",
|
||||
"prefs.blur_web": "Auf diesem Web-Renderpfad nicht verfügbar",
|
||||
"prefs.bodies_folders": "Körperordner",
|
||||
"prefs.bodies_folders_always": "Immer",
|
||||
"prefs.bodies_folders_never": "Nie",
|
||||
@@ -2636,10 +2628,6 @@
|
||||
"prefs.theme_follow_off": "Aus",
|
||||
"prefs.theme_follow_stop": "Nicht mehr folgen",
|
||||
"prefs.theme_import_hint": "Klicken, um eine Designdatei zu wählen, eine hierher ziehen oder mit kopiertem Design Strg+V (Cmd+V auf dem Mac) drücken",
|
||||
"prefs.theme_notice_dismiss": "Ausblenden",
|
||||
"prefs.theme_option_blur": "Unschärfe hinter Panels",
|
||||
"prefs.theme_option_blur_help": "Unschärfe hinter durchscheinenden Panels in physischen Pixeln. Null bedeutet aus.",
|
||||
"prefs.theme_option_invalid": "Der gespeicherte Wert für {option} ist ungültig; der Designstandard wird verwendet. Der gespeicherte Wert bleibt erhalten.",
|
||||
"prefs.theme_option_opacity": "Deckkraft",
|
||||
"prefs.theme_option_opacity_help": "Deckkraft schwebender Bedienfelder anpassen. Eine Mindestdeckkraft schützt die Lesbarkeit über den Ansichtsfarben.",
|
||||
"prefs.theme_option_tab_colours": "Tabfarben",
|
||||
@@ -2648,7 +2636,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "Panel- und Ansichtsfarben beim Tabwechsel überblenden. Null wechselt sofort.",
|
||||
"prefs.theme_options_badge": "Optionen",
|
||||
"prefs.theme_options_more": "Mehr · {count}",
|
||||
"prefs.theme_options_newer": "Dieses Design benötigt eine neuere Version von SolidCraft. Nach dem Upgrade das Originaldesign erneut importieren, um seine Optionsdefinitionen wiederherzustellen.",
|
||||
"prefs.theme_options_reset": "Zurücksetzen",
|
||||
"prefs.theme_options_unavailable": "Auf diesem Gerät nicht verfügbar",
|
||||
"prefs.theme_paste": "Design einfügen",
|
||||
@@ -4927,10 +4914,6 @@
|
||||
"ui.fillet_setback_least": "Mehr als {least}",
|
||||
"ui.fillet_setback_tip": "Wo das glatte Eckflächenstück beginnt: wie weit von der Ecke entlang jeder Kante. Standard ist {factor} × der Radius. Er muss größer sein als der kleinste Rücksprung, wo sich die Rundungen ohne ihn treffen: der Radius, wo die Flächen rechtwinklig zueinander stehen.",
|
||||
"ui.fillet_smooth_radius": "Radius glatt ändern",
|
||||
"ui.fillet_turn": "Wendungen",
|
||||
"ui.fillet_turn_mitre": "Gehrung",
|
||||
"ui.fillet_turn_swept": "Geschwenkt",
|
||||
"ui.fillet_turn_tip": "Wo zwei Rundungen um eine scharfe Eckkante zwischen ihnen herumlaufen, etwa die Rundungen am Fuß eines Zapfens an seinen senkrechten Kanten.\nGehrung: Die Rundungen laufen weiter, bis sie sich in einer Gehrung treffen.\nGeschwenkt: Die Rundungen enden an der Eckkante und schwenken um sie herum; die Ecke ist ein Torus, tangential zu beiden. Nur für Rundungen mit einem Radius um eine gerade, konvexe Eckkante.",
|
||||
"ui.fillet_type_choices_tip": "Konstanter Radius: ein Radius entlang der ganzen Kante.\nSehnenlänge: die Breite der Rundung bleibt gleich, in welchem Winkel die Flächen auch aufeinandertreffen.\nVariabler Radius: ein Radius an jedem Ende und weitere entlang der Kante, wenn Sie sie hinzufügen.\nKrümmungsstetig: ein Querschnitt ohne Knick in den Spiegelungen, wo er auf ebene Flächen trifft (G2).\nSpline: der Radius entlang der Kante folgt Steuerradien, die Sie festlegen.",
|
||||
"ui.fillet_type_curvature": "Krümmungsstetig",
|
||||
"ui.fillet_type_tip": "Der Querschnitt über die Kante. Krümmungsstetig: ein krümmungsstetiger Querschnitt (G2) zwischen ebenen Flächen, sodass Spiegelungen ohne Knick von den Flächen in die Rundung laufen.",
|
||||
|
||||
@@ -2265,14 +2265,6 @@
|
||||
"prefs.auto_operation_note": "Join, New Body or Cut, from what the material touches.",
|
||||
"prefs.axes": "Axes",
|
||||
"prefs.axis": "Axis",
|
||||
"prefs.blur_cost": "Relative rendering cost. More bars usually mean more work.",
|
||||
"prefs.blur_device": "Unavailable on this graphics device or rendering path",
|
||||
"prefs.blur_guard": "Blur quality was reduced to keep frames responsive. The radius is unchanged.",
|
||||
"prefs.blur_off": "Off",
|
||||
"prefs.blur_reduce_transparency": "Disabled by the system's Reduce transparency setting",
|
||||
"prefs.blur_software": "Unavailable with software graphics (gpu-software)",
|
||||
"prefs.blur_source": "Unavailable in this workspace view",
|
||||
"prefs.blur_web": "Unavailable on this web rendering path",
|
||||
"prefs.bodies_folders": "Bodies folders",
|
||||
"prefs.bodies_folders_always": "Always",
|
||||
"prefs.bodies_folders_never": "Never",
|
||||
@@ -2658,10 +2650,6 @@
|
||||
"prefs.theme_follow_off": "Off",
|
||||
"prefs.theme_follow_stop": "Stop following",
|
||||
"prefs.theme_import_hint": "Click to choose a theme file, drop one here, or press Ctrl+V (Cmd+V on a Mac) with a theme copied",
|
||||
"prefs.theme_notice_dismiss": "Dismiss",
|
||||
"prefs.theme_option_blur": "Blur behind panels",
|
||||
"prefs.theme_option_blur_help": "Blur behind translucent panels, in physical pixels. Zero is off.",
|
||||
"prefs.theme_option_invalid": "Saved value for {option} is invalid; using the theme default. The saved value is kept.",
|
||||
"prefs.theme_option_opacity": "Opacity",
|
||||
"prefs.theme_option_opacity_help": "Adjust floating panel opacity. A readability floor protects text over viewport colors.",
|
||||
"prefs.theme_option_tab_colours": "Tab colors",
|
||||
@@ -2670,7 +2658,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "Fade panel and viewport colors when switching tabs. Zero switches instantly.",
|
||||
"prefs.theme_options_badge": "Options",
|
||||
"prefs.theme_options_more": "More · {count}",
|
||||
"prefs.theme_options_newer": "This theme requires a newer SolidCraft. Upgrade, then reimport the original theme to recover its option definitions.",
|
||||
"prefs.theme_options_reset": "Reset",
|
||||
"prefs.theme_options_unavailable": "Unavailable on this device",
|
||||
"prefs.theme_paste": "Paste theme",
|
||||
@@ -4954,10 +4941,6 @@
|
||||
"ui.fillet_setback_least": "More than {least}",
|
||||
"ui.fillet_setback_tip": "Where the smooth corner patch starts: how far along each edge from the corner. The default is {factor} × the radius. It must be more than the least setback, where the rounds meet without one: the radius where the faces are square to each other.",
|
||||
"ui.fillet_smooth_radius": "Smooth radius change",
|
||||
"ui.fillet_turn": "Turns",
|
||||
"ui.fillet_turn_mitre": "Mitre",
|
||||
"ui.fillet_turn_swept": "Swept",
|
||||
"ui.fillet_turn_tip": "Where two rounds turn round a sharp corner edge between them, such as the rounds along a boss's base at its upright edges.\nMitre: the rounds run on until they meet in a mitre.\nSwept: the rounds stop at the corner edge and turn round it, the corner a torus tangent to both. Only for rounds of one radius round a straight, convex corner edge.",
|
||||
"ui.fillet_type_choices_tip": "Constant radius: one radius all along the edge.\nChord length: the width across the round stays the same, whatever angle the faces meet at.\nVariable radius: a radius at each end, and more along the edge if you add them.\nCurvature continuous: a section without a kink in reflections where it meets flat faces (G2).\nSpline: the radius along the edge follows control radii you set.",
|
||||
"ui.fillet_type_curvature": "Curvature continuous",
|
||||
"ui.fillet_type_tip": "The section across the edge. Curvature continuous: a curvature-continuous (G2) section between planar faces, so reflections run from the faces into the round without a kink.",
|
||||
|
||||
@@ -2265,14 +2265,6 @@
|
||||
"prefs.auto_operation_note": "איחוד, גוף חדש או חיתוך, לפי מה שהחומר נוגע בו.",
|
||||
"prefs.axes": "צירים",
|
||||
"prefs.axis": "ציר",
|
||||
"prefs.blur_cost": "עלות עיבוד יחסית. יותר פסים מציינים בדרך כלל יותר עבודה.",
|
||||
"prefs.blur_device": "לא זמין בהתקן הגרפי או בנתיב העיבוד הזה",
|
||||
"prefs.blur_guard": "איכות הטשטוש הופחתה כדי לשמור על תגובתיות הפריימים. הרדיוס לא השתנה.",
|
||||
"prefs.blur_off": "כבוי",
|
||||
"prefs.blur_reduce_transparency": "מושבת עקב הגדרת הפחתת השקיפות של המערכת",
|
||||
"prefs.blur_software": "לא זמין עם עיבוד גרפי בתוכנה (gpu-software)",
|
||||
"prefs.blur_source": "לא זמין בתצוגת סביבת העבודה הזו",
|
||||
"prefs.blur_web": "לא זמין בנתיב העיבוד הזה בדפדפן",
|
||||
"prefs.bodies_folders": "תיקיות גופים",
|
||||
"prefs.bodies_folders_always": "תמיד",
|
||||
"prefs.bodies_folders_never": "אף פעם",
|
||||
@@ -2658,10 +2650,6 @@
|
||||
"prefs.theme_follow_off": "כבוי",
|
||||
"prefs.theme_follow_stop": "הפסקת המעקב",
|
||||
"prefs.theme_import_hint": "לחצו כדי לבחור קובץ ערכת נושא, שחררו קובץ כאן, או הקישו Ctrl+V (Cmd+V ב-Mac) אחרי שהעתקתם ערכת נושא",
|
||||
"prefs.theme_notice_dismiss": "הסתרה",
|
||||
"prefs.theme_option_blur": "טשטוש מאחורי לוחות",
|
||||
"prefs.theme_option_blur_help": "טשטוש מאחורי לוחות שקופים למחצה, בפיקסלים פיזיים. אפס מכבה את הטשטוש.",
|
||||
"prefs.theme_option_invalid": "הערך השמור עבור {option} אינו תקין; נעשה שימוש בברירת המחדל של ערכת הנושא. הערך השמור נשמר ללא שינוי.",
|
||||
"prefs.theme_option_opacity": "אטימות",
|
||||
"prefs.theme_option_opacity_help": "כוונון אטימות הלוחות הצפים. רמת אטימות מינימלית שומרת על קריאות הטקסט על רקע צבעי חלון התצוגה.",
|
||||
"prefs.theme_option_tab_colours": "צבעי כרטיסיות",
|
||||
@@ -2670,7 +2658,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "שנה בהדרגה את צבעי הלוח ואזור התצוגה בעת מעבר בין כרטיסיות. ערך אפס מבצע את המעבר מיד.",
|
||||
"prefs.theme_options_badge": "אפשרויות",
|
||||
"prefs.theme_options_more": "עוד · {count}",
|
||||
"prefs.theme_options_newer": "ערכת נושא זו דורשת גרסה חדשה יותר של SolidCraft. לאחר השדרוג יש לייבא שוב את ערכת הנושא המקורית כדי לשחזר את הגדרות האפשרויות שלה.",
|
||||
"prefs.theme_options_reset": "איפוס",
|
||||
"prefs.theme_options_unavailable": "לא זמין במכשיר זה",
|
||||
"prefs.theme_paste": "הדבקת ערכת נושא",
|
||||
@@ -4954,10 +4941,6 @@
|
||||
"ui.fillet_setback_least": "יותר מ-{least}",
|
||||
"ui.fillet_setback_tip": "היכן מתחיל טלאי הפינה החלק: המרחק לאורך כל קצה מהפינה. ברירת המחדל היא פי {factor} מהרדיוס. עליה להיות גדולה מהנסיגה המזערית, שבה העיגולים נפגשים בלעדיה: הרדיוס כשהפאות ניצבות זו לזו.",
|
||||
"ui.fillet_smooth_radius": "שינוי רדיוס חלק",
|
||||
"ui.fillet_turn": "פניות",
|
||||
"ui.fillet_turn_mitre": "מיטר",
|
||||
"ui.fillet_turn_swept": "מסובב",
|
||||
"ui.fillet_turn_tip": "היכן ששני עיגולים מסתובבים סביב קצה פינה חד ביניהם, כמו העיגולים בבסיס בליטה ליד הקצוות הזקופים שלה.\nמיטר: העיגולים נמשכים עד שהם נפגשים במיטר.\nמסובב: העיגולים נעצרים בקצה הפינה ומסתובבים סביבו, והפינה היא טורוס המשיק לשניהם. רק לעיגולים ברדיוס אחד סביב קצה פינה ישר וקמור.",
|
||||
"ui.fillet_type_choices_tip": "רדיוס קבוע: רדיוס אחד לכל אורך הקצה.\nאורך מיתר: רוחב העיגול נשאר זהה, בכל זווית שבה הפאות נפגשות.\nרדיוס משתנה: רדיוס בכל קצה, ועוד לאורך הקצה אם מוסיפים.\nרציף בעקמומיות: חתך בלי שבר בהשתקפויות היכן שהוא פוגש פאות מישוריות (G2).\nספליין: הרדיוס לאורך הקצה עוקב אחרי רדיוסי בקרה שאתם קובעים.",
|
||||
"ui.fillet_type_curvature": "רציף בעקמומיות",
|
||||
"ui.fillet_type_tip": "החתך לרוחב הקצה. רציף בעקמומיות: חתך רציף בעקמומיות (G2) בין פאות מישוריות, כך שההשתקפויות עוברות מהפאות אל העיגול בלי שבר.",
|
||||
|
||||
@@ -2265,14 +2265,6 @@
|
||||
"prefs.auto_operation_note": "材料が接触する対象に応じて結合、新規ボディ、切り取りを選びます。",
|
||||
"prefs.axes": "軸",
|
||||
"prefs.axis": "軸",
|
||||
"prefs.blur_cost": "相対的な描画負荷です。バーが多いほど、通常は処理量が増えます。",
|
||||
"prefs.blur_device": "このグラフィックスデバイスまたは描画経路では利用できません",
|
||||
"prefs.blur_guard": "画面の応答性を保つため、ぼかしの品質を下げました。半径は変更されていません。",
|
||||
"prefs.blur_off": "オフ",
|
||||
"prefs.blur_reduce_transparency": "システムの透明度を下げる設定により無効です",
|
||||
"prefs.blur_software": "ソフトウェア描画では利用できません (gpu-software)",
|
||||
"prefs.blur_source": "このワークスペース表示では利用できません",
|
||||
"prefs.blur_web": "このウェブ描画経路では利用できません",
|
||||
"prefs.bodies_folders": "ボディフォルダー",
|
||||
"prefs.bodies_folders_always": "常に表示",
|
||||
"prefs.bodies_folders_never": "表示しない",
|
||||
@@ -2658,10 +2650,6 @@
|
||||
"prefs.theme_follow_off": "オフ",
|
||||
"prefs.theme_follow_stop": "追従を停止",
|
||||
"prefs.theme_import_hint": "クリックしてテーマファイルを選ぶか、ここにドロップするか、テーマをコピーした状態で Ctrl+V（Mac では Cmd+V）を押します",
|
||||
"prefs.theme_notice_dismiss": "非表示",
|
||||
"prefs.theme_option_blur": "パネル背面のぼかし",
|
||||
"prefs.theme_option_blur_help": "半透明パネルの背面のぼかしを物理ピクセル単位で指定します。0でオフになります。",
|
||||
"prefs.theme_option_invalid": "{option} の保存値が無効なため、テーマの既定値を使用します。保存値は保持されます。",
|
||||
"prefs.theme_option_opacity": "不透明度",
|
||||
"prefs.theme_option_opacity_help": "フローティングパネルの不透明度を調整します。ビューポートの色に重なっても文字が読めるように下限が適用されます。",
|
||||
"prefs.theme_option_tab_colours": "タブの色",
|
||||
@@ -2670,7 +2658,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "タブの切り替え時にパネルとビューポートの色を徐々に変えます。0で即座に切り替えます。",
|
||||
"prefs.theme_options_badge": "オプション",
|
||||
"prefs.theme_options_more": "その他 · {count}",
|
||||
"prefs.theme_options_newer": "このテーマには新しいバージョンの SolidCraft が必要です。更新後、元のテーマを再インポートしてオプション定義を復元してください。",
|
||||
"prefs.theme_options_reset": "リセット",
|
||||
"prefs.theme_options_unavailable": "このデバイスでは利用できません",
|
||||
"prefs.theme_paste": "テーマを貼り付け",
|
||||
@@ -4954,10 +4941,6 @@
|
||||
"ui.fillet_setback_least": "{least} より大きく",
|
||||
"ui.fillet_setback_tip": "なめらかなコーナーパッチが始まる位置: コーナーから各エッジに沿った距離。既定値は半径の {factor} 倍。最小セットバック (セットバックなしでラウンド同士が交わる位置。面どうしが直角なら半径) より大きくする必要があります。",
|
||||
"ui.fillet_smooth_radius": "半径をなめらかに変化",
|
||||
"ui.fillet_turn": "曲がり角",
|
||||
"ui.fillet_turn_mitre": "留め継ぎ",
|
||||
"ui.fillet_turn_swept": "回転",
|
||||
"ui.fillet_turn_tip": "2 つのフィレットが間にある鋭いコーナーエッジを回り込む所（ボスの根元のフィレットが立ち上がりエッジを回る所など）。\n留め継ぎ: フィレットは延びて留め継ぎで出会います。\n回転: フィレットはコーナーエッジで止まり、その周りを回ります。コーナーは両方に接するトーラスです。同じ半径のフィレットが、まっすぐな凸のコーナーエッジを回る場合のみ。",
|
||||
"ui.fillet_type_choices_tip": "一定の半径: エッジ全体で一つの半径。\n弦長: 面がどんな角度で交わっても、フィレットの幅が同じ。\n可変半径: 両端の半径と、追加すればエッジ沿いの半径。\n曲率連続: 平面と接する所で映り込みが折れない断面 (G2)。\nスプライン: エッジ沿いの半径が、設定した制御半径に従います。",
|
||||
"ui.fillet_type_curvature": "曲率連続",
|
||||
"ui.fillet_type_tip": "エッジを横切る断面。曲率連続: 平面の間の曲率連続 (G2) 断面で、映り込みが面からフィレットへ折れずにつながります。",
|
||||
|
||||
@@ -1657,14 +1657,6 @@
|
||||
"prefs.auto_operation_note": "재료가 닿는 대상에 따라 결합, 새 바디 또는 자르기를 선택합니다.",
|
||||
"prefs.axes": "축",
|
||||
"prefs.axis": "축",
|
||||
"prefs.blur_cost": "상대적인 렌더링 비용입니다. 막대가 많을수록 일반적으로 더 많은 작업이 필요합니다.",
|
||||
"prefs.blur_device": "이 그래픽 장치 또는 렌더링 경로에서는 사용할 수 없습니다",
|
||||
"prefs.blur_guard": "화면의 원활한 응답을 위해 흐림 품질을 낮췄습니다. 반경은 변경되지 않습니다.",
|
||||
"prefs.blur_off": "끄기",
|
||||
"prefs.blur_reduce_transparency": "시스템의 투명도 줄이기 설정에 의해 비활성화됨",
|
||||
"prefs.blur_software": "소프트웨어 그래픽에서는 사용할 수 없습니다 (gpu-software)",
|
||||
"prefs.blur_source": "이 작업 공간 보기에서는 사용할 수 없습니다",
|
||||
"prefs.blur_web": "이 웹 렌더링 경로에서는 사용할 수 없습니다",
|
||||
"prefs.bodies_folders": "바디 폴더",
|
||||
"prefs.bodies_folders_always": "항상 표시",
|
||||
"prefs.bodies_folders_never": "표시 안 함",
|
||||
@@ -1983,10 +1975,6 @@
|
||||
"prefs.theme_follow_note": "다른 도구가 파일을 다시 쓸 때마다 다시 불러옵니다. 테마를 선택하면 따르기를 중지합니다.",
|
||||
"prefs.theme_follow_off": "끄기",
|
||||
"prefs.theme_follow_stop": "따르기 중지",
|
||||
"prefs.theme_notice_dismiss": "닫기",
|
||||
"prefs.theme_option_blur": "패널 뒤 흐림",
|
||||
"prefs.theme_option_blur_help": "반투명 패널 뒤의 흐림을 물리적 픽셀 단위로 설정합니다. 0이면 꺼집니다.",
|
||||
"prefs.theme_option_invalid": "{option}의 저장된 값이 유효하지 않아 테마 기본값을 사용합니다. 저장된 값은 유지됩니다.",
|
||||
"prefs.theme_option_opacity": "불투명도",
|
||||
"prefs.theme_option_opacity_help": "플로팅 패널의 불투명도를 조정합니다. 뷰포트 색상 위에서도 텍스트를 읽을 수 있도록 최솟값이 적용됩니다.",
|
||||
"prefs.theme_option_tab_colours": "탭 색상",
|
||||
@@ -1995,7 +1983,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "탭을 전환할 때 패널 및 뷰포트 색상을 서서히 변경합니다. 0이면 즉시 전환합니다.",
|
||||
"prefs.theme_options_badge": "옵션",
|
||||
"prefs.theme_options_more": "더 보기 · {count}",
|
||||
"prefs.theme_options_newer": "이 테마에는 더 최신 버전의 SolidCraft가 필요합니다. 업그레이드 후 원본 테마를 다시 가져와 옵션 정의를 복구하세요.",
|
||||
"prefs.theme_options_reset": "초기화",
|
||||
"prefs.theme_options_unavailable": "이 기기에서는 사용할 수 없음",
|
||||
"prefs.timeline_half_hour": "−30분",
|
||||
@@ -3725,10 +3712,6 @@
|
||||
"ui.fillet_setback_least": "{least}보다 크게",
|
||||
"ui.fillet_setback_tip": "부드러운 코너 패치가 시작되는 위치: 코너에서 각 모서리를 따른 거리. 기본값은 반지름의 {factor}배. 최소 셋백(셋백 없이 라운드가 만나는 곳, 면이 서로 직각이면 반지름)보다 커야 합니다.",
|
||||
"ui.fillet_smooth_radius": "반지름 부드럽게 변화",
|
||||
"ui.fillet_turn": "꺾임",
|
||||
"ui.fillet_turn_mitre": "마이터",
|
||||
"ui.fillet_turn_swept": "회전",
|
||||
"ui.fillet_turn_tip": "두 라운드가 사이의 날카로운 코너 모서리를 돌아가는 곳(보스 밑동의 라운드가 세로 모서리를 도는 곳 등).\n마이터: 라운드가 계속 이어져 마이터로 만납니다.\n회전: 라운드가 코너 모서리에서 멈추고 그 둘레를 돕니다. 코너는 둘 모두에 접하는 토러스입니다. 반지름이 같은 라운드가 곧고 볼록한 코너 모서리를 돌 때만.",
|
||||
"ui.fillet_type_choices_tip": "일정한 반지름: 모서리 전체에 하나의 반지름.\n현 길이: 면이 어떤 각도로 만나든 라운드의 폭이 같습니다.\n가변 반지름: 양 끝의 반지름과, 추가하면 모서리를 따라 더.\n곡률 연속: 평면과 만나는 곳에서 반사가 꺾이지 않는 단면(G2).\n스플라인: 모서리를 따라 반지름이 설정한 제어 반지름을 따릅니다.",
|
||||
"ui.fillet_type_curvature": "곡률 연속",
|
||||
"ui.fillet_type_tip": "모서리를 가로지르는 단면. 곡률 연속: 평면 사이의 곡률 연속(G2) 단면으로, 반사가 면에서 라운드로 꺾임 없이 이어집니다.",
|
||||
|
||||
@@ -2265,14 +2265,6 @@
|
||||
"prefs.auto_operation_note": "Nối, Vật thể mới hoặc Cắt, tùy vào phần vật liệu tiếp xúc.",
|
||||
"prefs.axes": "Các trục tọa độ",
|
||||
"prefs.axis": "Trục tọa độ",
|
||||
"prefs.blur_cost": "Chi phí kết xuất tương đối. Nhiều thanh hơn thường có nghĩa là cần xử lý nhiều hơn.",
|
||||
"prefs.blur_device": "Không khả dụng trên thiết bị đồ họa hoặc đường kết xuất này",
|
||||
"prefs.blur_guard": "Chất lượng làm mờ đã giảm để duy trì độ phản hồi của khung hình. Bán kính không thay đổi.",
|
||||
"prefs.blur_off": "Tắt",
|
||||
"prefs.blur_reduce_transparency": "Bị tắt bởi cài đặt Giảm độ trong suốt của hệ thống",
|
||||
"prefs.blur_software": "Không khả dụng với đồ họa phần mềm (gpu-software)",
|
||||
"prefs.blur_source": "Không khả dụng trong chế độ xem không gian làm việc này",
|
||||
"prefs.blur_web": "Không khả dụng trên đường kết xuất web này",
|
||||
"prefs.bodies_folders": "Thư mục thân khối",
|
||||
"prefs.bodies_folders_always": "Luôn luôn",
|
||||
"prefs.bodies_folders_never": "Không bao giờ",
|
||||
@@ -2658,10 +2650,6 @@
|
||||
"prefs.theme_follow_off": "Tắt",
|
||||
"prefs.theme_follow_stop": "Dừng theo dõi",
|
||||
"prefs.theme_import_hint": "Nhấp để chọn tệp giao diện, thả tệp vào đây, hoặc nhấn Ctrl+V (Cmd+V trên Mac) khi đã sao chép một giao diện",
|
||||
"prefs.theme_notice_dismiss": "Ẩn",
|
||||
"prefs.theme_option_blur": "Làm mờ phía sau bảng",
|
||||
"prefs.theme_option_blur_help": "Làm mờ phía sau các bảng bán trong suốt, tính bằng pixel vật lý. Giá trị 0 là tắt.",
|
||||
"prefs.theme_option_invalid": "Giá trị đã lưu cho {option} không hợp lệ; đang dùng giá trị mặc định của giao diện. Giá trị đã lưu vẫn được giữ lại.",
|
||||
"prefs.theme_option_opacity": "Độ đục",
|
||||
"prefs.theme_option_opacity_help": "Điều chỉnh độ đục của các bảng nổi. Giới hạn độ đục tối thiểu giúp văn bản luôn dễ đọc trên nền màu của khung nhìn.",
|
||||
"prefs.theme_option_tab_colours": "Màu thẻ",
|
||||
@@ -2670,7 +2658,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "Chuyển dần màu của bảng điều khiển và khung nhìn khi đổi thẻ. Đặt thành 0 để chuyển ngay lập tức.",
|
||||
"prefs.theme_options_badge": "Tùy chọn",
|
||||
"prefs.theme_options_more": "Thêm · {count}",
|
||||
"prefs.theme_options_newer": "Giao diện này yêu cầu phiên bản SolidCraft mới hơn. Sau khi nâng cấp, hãy nhập lại giao diện gốc để khôi phục các định nghĩa tùy chọn.",
|
||||
"prefs.theme_options_reset": "Đặt lại",
|
||||
"prefs.theme_options_unavailable": "Không khả dụng trên thiết bị này",
|
||||
"prefs.theme_paste": "Dán giao diện",
|
||||
@@ -4954,10 +4941,6 @@
|
||||
"ui.fillet_setback_least": "Lớn hơn {least}",
|
||||
"ui.fillet_setback_tip": "Nơi mảng góc trơn bắt đầu: khoảng cách dọc theo mỗi cạnh tính từ góc. Mặc định là {factor} × bán kính. Giá trị phải lớn hơn khoảng lùi nhỏ nhất, tại đó các đường bo gặp nhau mà không cần lùi: bằng bán kính khi các mặt vuông góc với nhau.",
|
||||
"ui.fillet_smooth_radius": "Thay đổi bán kính trơn",
|
||||
"ui.fillet_turn": "Chỗ rẽ",
|
||||
"ui.fillet_turn_mitre": "Vát góc",
|
||||
"ui.fillet_turn_swept": "Quét vòng",
|
||||
"ui.fillet_turn_tip": "Nơi hai góc lượn rẽ quanh một cạnh góc sắc nằm giữa chúng, ví dụ các góc lượn ở chân một khối lồi tại các cạnh đứng của nó.\nVát góc: các góc lượn kéo dài cho đến khi gặp nhau theo đường vát.\nQuét vòng: các góc lượn dừng ở cạnh góc và quay quanh nó, góc là một mặt xuyến tiếp xúc với cả hai. Chỉ cho các góc lượn cùng bán kính quanh một cạnh góc thẳng và lồi.",
|
||||
"ui.fillet_type_choices_tip": "Bán kính không đổi: một bán kính dọc suốt cạnh.\nĐộ dài dây cung: độ rộng ngang đường bo giữ nguyên, bất kể góc gặp nhau của các mặt.\nBán kính thay đổi: một bán kính ở mỗi đầu, và thêm dọc cạnh nếu bạn thêm vào.\nLiên tục độ cong: mặt cắt không làm gãy phản chiếu tại nơi gặp các mặt phẳng (G2).\nSpline: bán kính dọc cạnh theo các bán kính điều khiển bạn đặt.",
|
||||
"ui.fillet_type_curvature": "Liên tục độ cong",
|
||||
"ui.fillet_type_tip": "Mặt cắt ngang qua cạnh. Liên tục độ cong: mặt cắt liên tục độ cong (G2) giữa các mặt phẳng, nên phản chiếu đi từ các mặt vào đường bo mà không bị gãy.",
|
||||
|
||||
@@ -2265,14 +2265,6 @@
|
||||
"prefs.auto_operation_note": "根据材料接触的对象选择合并、新建实体或切割。",
|
||||
"prefs.axes": "坐标轴",
|
||||
"prefs.axis": "轴",
|
||||
"prefs.blur_cost": "相对渲染开销。条形越多，通常意味着处理工作越多。",
|
||||
"prefs.blur_device": "此图形设备或渲染路径不支持此功能",
|
||||
"prefs.blur_guard": "已降低模糊质量，以保持画面响应。模糊半径未改变。",
|
||||
"prefs.blur_off": "关闭",
|
||||
"prefs.blur_reduce_transparency": "已被系统的降低透明度设置禁用",
|
||||
"prefs.blur_software": "软件图形渲染不支持此功能 (gpu-software)",
|
||||
"prefs.blur_source": "此工作区视图不支持此功能",
|
||||
"prefs.blur_web": "此网页渲染路径不支持此功能",
|
||||
"prefs.bodies_folders": "实体文件夹",
|
||||
"prefs.bodies_folders_always": "始终显示",
|
||||
"prefs.bodies_folders_never": "不显示",
|
||||
@@ -2658,10 +2650,6 @@
|
||||
"prefs.theme_follow_off": "关闭",
|
||||
"prefs.theme_follow_stop": "停止跟随",
|
||||
"prefs.theme_import_hint": "单击选择主题文件，拖放到此处，或复制主题后按 Ctrl+V（Mac 上为 Cmd+V）",
|
||||
"prefs.theme_notice_dismiss": "忽略",
|
||||
"prefs.theme_option_blur": "面板背后模糊",
|
||||
"prefs.theme_option_blur_help": "半透明面板背后的模糊程度，以物理像素为单位。0 表示关闭。",
|
||||
"prefs.theme_option_invalid": "{option} 的已保存值无效；正在使用主题默认值。已保存值将予以保留。",
|
||||
"prefs.theme_option_opacity": "不透明度",
|
||||
"prefs.theme_option_opacity_help": "调整浮动面板的不透明度。最低不透明度限制可确保文字在视口颜色上清晰可读。",
|
||||
"prefs.theme_option_tab_colours": "选项卡颜色",
|
||||
@@ -2670,7 +2658,6 @@
|
||||
"prefs.theme_option_tab_fade_ms_help": "切换选项卡时渐变面板和视口颜色。设为零可立即切换。",
|
||||
"prefs.theme_options_badge": "选项",
|
||||
"prefs.theme_options_more": "更多 · {count}",
|
||||
"prefs.theme_options_newer": "此主题需要更新版本的 SolidCraft。升级后，请重新导入原始主题以恢复其选项定义。",
|
||||
"prefs.theme_options_reset": "重置",
|
||||
"prefs.theme_options_unavailable": "此设备不支持",
|
||||
"prefs.theme_paste": "粘贴主题",
|
||||
@@ -4954,10 +4941,6 @@
|
||||
"ui.fillet_setback_least": "须大于 {least}",
|
||||
"ui.fillet_setback_tip": "平滑角点曲面片开始的位置：从角点沿每条边的距离。默认值为半径的 {factor} 倍。必须大于最小后退距离（不后退时圆角相交之处；面相互垂直时即半径）。",
|
||||
"ui.fillet_smooth_radius": "半径平滑变化",
|
||||
"ui.fillet_turn": "转角",
|
||||
"ui.fillet_turn_mitre": "斜接",
|
||||
"ui.fillet_turn_swept": "旋转",
|
||||
"ui.fillet_turn_tip": "两个圆角绕过它们之间尖锐的角边处，例如凸台根部的圆角绕过其竖直边。\n斜接：圆角继续延伸，直到以斜接相遇。\n旋转：圆角止于角边并绕它旋转，转角是与两者相切的圆环面。仅用于同一半径的圆角绕过笔直的凸角边时。",
|
||||
"ui.fillet_type_choices_tip": "恒定半径：整条边一个半径。\n弦长：无论面以什么角度相交，圆角宽度都相同。\n可变半径：两端各一个半径，添加后沿边还有更多。\n曲率连续：与平面相接处反射没有折痕的截面 (G2)。\n样条：沿边的半径跟随您设置的控制半径。",
|
||||
"ui.fillet_type_curvature": "曲率连续",
|
||||
"ui.fillet_type_tip": "横跨边的截面。曲率连续：平面之间的曲率连续 (G2) 截面，反射从面平滑过渡到圆角，没有折痕。",
|
||||
|
||||
@@ -393,8 +393,6 @@ pub(crate) struct ExactSketchCurves<'a> {
|
||||
/// Each analytic curve's id, whether it is projected (linked) reference geometry, and its
|
||||
/// segments.
|
||||
segments: Vec<(&'a str, bool, Vec<Seg2>)>,
|
||||
/// Each free-form curve's id (ellipses, conics, splines) and its exact segments.
|
||||
free_form: Vec<(&'a str, Vec<Seg2>)>,
|
||||
}
|
||||
|
||||
impl<'a> ExactSketchCurves<'a> {
|
||||
@@ -402,17 +400,10 @@ impl<'a> ExactSketchCurves<'a> {
|
||||
/// and segment allocation must not be repeated for every generated face.
|
||||
pub(crate) fn new(sketch: &'a SolvedSketch) -> Self {
|
||||
let mut segments = Vec::new();
|
||||
let mut free_form = Vec::new();
|
||||
if sketch.sketch.curves.len() > 2000 {
|
||||
return Self { segments, free_form };
|
||||
return Self { segments };
|
||||
}
|
||||
for (index, curve) in sketch.sketch.curves.iter().enumerate() {
|
||||
if !curve.construction
|
||||
&& let Some(exact) = sketch.sketch.exact_segs(index)
|
||||
{
|
||||
free_form.push((curve.id.as_str(), exact));
|
||||
continue;
|
||||
}
|
||||
if curve.construction
|
||||
|| !matches!(
|
||||
curve.kind,
|
||||
@@ -434,21 +425,7 @@ impl<'a> ExactSketchCurves<'a> {
|
||||
};
|
||||
segments.push((curve.id.as_str(), curve.link.is_some(), originals));
|
||||
}
|
||||
Self { segments, free_form }
|
||||
}
|
||||
|
||||
/// The one free-form sketch curve (an ellipse, conic or spline) a generated segment is a
|
||||
/// whole piece of, either way round: one of the exact segments the curve is made of. A
|
||||
/// segment two curves share stays ambiguous.
|
||||
pub(crate) fn find_free_form(&self, generated: &Seg2) -> Option<String> {
|
||||
let reversed = generated.reversed();
|
||||
let mut found: Option<Option<&str>> = None;
|
||||
for (id, originals) in &self.free_form {
|
||||
if originals.iter().any(|original| *original == *generated || *original == reversed) {
|
||||
found = Some(if found.is_some() { None } else { Some(*id) });
|
||||
}
|
||||
}
|
||||
found.flatten().map(str::to_owned)
|
||||
Self { segments }
|
||||
}
|
||||
|
||||
/// The one sketch curve a generated segment lies on. A curve drawn over projected
|
||||
|
||||
@@ -734,10 +734,6 @@ pub enum FeatureKind {
|
||||
/// from the vertex instead of where the rounds meet (a constant-radius fillet only).
|
||||
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
||||
setbacks: Vec<CornerSetback>,
|
||||
/// How two rounds turn where they meet at a sharp side edge: in a mitre (the default) or
|
||||
/// swept round it (a constant-radius, exact, rolling-corner fillet without setbacks only).
|
||||
#[serde(default, skip_serializing_if = "FilletTurn::is_mitre")]
|
||||
turn: FilletTurn,
|
||||
/// Round each picked edge's tangent chain with it (the default: edges continuing it
|
||||
/// smoothly at its ends, as far as they go), or only the picked edges.
|
||||
#[serde(default = "yes", skip_serializing_if = "is_yes")]
|
||||
@@ -1975,38 +1971,6 @@ impl FilletCorner {
|
||||
}
|
||||
}
|
||||
|
||||
/// How two constant rounds of one radius turn round a sharp, straight, convex side edge square to
|
||||
/// both on a plane, such as the rounds along a boss's base at its upright edges.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum FilletTurn {
|
||||
/// The rounds run on to where they cross and meet in a mitre.
|
||||
#[default]
|
||||
Mitre,
|
||||
/// The rounds end at the side edge and the corner is their section revolved about it, a
|
||||
/// torus tangent to both (`solidcraft_kernel::FilletTurn::Swept`).
|
||||
Swept,
|
||||
}
|
||||
|
||||
/// Why a swept turn is refused with a fillet's other options: the kernel sweeps the turn of two
|
||||
/// constant rounds of one radius, at its own corners only.
|
||||
pub const SWEPT_TAKES: &str = "a swept corner turns two constant rounds of one radius: `turn: swept` takes `type: constant`, \
|
||||
`corner: rolling`, no `setbacks` and `fit: exact` or `reduce`";
|
||||
|
||||
impl FilletTurn {
|
||||
pub fn is_mitre(&self) -> bool {
|
||||
*self == FilletTurn::Mitre
|
||||
}
|
||||
|
||||
/// The kernel's turn.
|
||||
pub fn kernel(self) -> solidcraft_kernel::FilletTurn {
|
||||
match self {
|
||||
FilletTurn::Mitre => solidcraft_kernel::FilletTurn::Mitre,
|
||||
FilletTurn::Swept => solidcraft_kernel::FilletTurn::Swept,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// How Extend continues a surface past its edges.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
|
||||
+10
-23
@@ -409,14 +409,13 @@ fn fillet_fitted(
|
||||
edges: &[Vec3],
|
||||
r: f64,
|
||||
fit: crate::FilletFit,
|
||||
turn: kernel::FilletTurn,
|
||||
) -> std::result::Result<(kernel::Body, Option<Vec<f64>>, Vec<Vec3>), kernel::KernelError> {
|
||||
match kernel::fillet_removing(body, edges, r, turn) {
|
||||
match kernel::fillet_removing(body, edges, r) {
|
||||
Ok((b, gone)) => Ok((b, None, gone)),
|
||||
Err(kernel::KernelError::TooLarge(why)) if fit == crate::FilletFit::Exact => {
|
||||
Err(with_largest_fit(why, "radius", || kernel::fillet_max(body, edges, r, turn)))
|
||||
Err(with_largest_fit(why, "radius", || kernel::fillet_max(body, edges, r)))
|
||||
}
|
||||
Err(kernel::KernelError::TooLarge(why)) if fit == crate::FilletFit::Reduce => match kernel::fillet_max_each(body, edges, r, turn)? {
|
||||
Err(kernel::KernelError::TooLarge(why)) if fit == crate::FilletFit::Reduce => match kernel::fillet_max_each(body, edges, r)? {
|
||||
// Built at the radius asked for after all (the groups apart): nothing reduced.
|
||||
Some((used, b)) => Ok((b, used.iter().any(|u| *u < r).then_some(used), Vec::new())),
|
||||
None => Err(kernel::KernelError::TooLarge(why)),
|
||||
@@ -4015,11 +4014,6 @@ fn blend_body(
|
||||
) -> Result<(Traced, Option<Vec<f64>>, Tapered)> {
|
||||
let input = mb.traced();
|
||||
let (mut used, mut tapered) = (None, Vec::new());
|
||||
if let FeatureKind::Fillet { turn: crate::FilletTurn::Swept, style, fit, corner, setbacks, .. } = &f.kind
|
||||
&& (!style.is_constant() || *fit == crate::FilletFit::Taper || !corner.is_rolling() || !setbacks.is_empty())
|
||||
{
|
||||
return Err(DocError::Invalid(crate::SWEPT_TAKES.into()));
|
||||
}
|
||||
// The blended body, and the lineage of what the last blend started from.
|
||||
let (nb, from) = match &f.kind {
|
||||
// A curvature-continuous fillet's corners are G2 patches, whatever `corner` says: SMLib's
|
||||
@@ -4067,8 +4061,8 @@ fn blend_body(
|
||||
tapered = edges.iter().copied().zip(tapers).filter_map(|(p, t)| Some((p, t?))).collect();
|
||||
(b, input)
|
||||
}
|
||||
FeatureKind::Fillet { fit, turn, .. } => {
|
||||
let (b, u, gone) = fillet_fitted(&mb.body, edges, r, *fit, turn.kernel())?;
|
||||
FeatureKind::Fillet { fit, .. } => {
|
||||
let (b, u, gone) = fillet_fitted(&mb.body, edges, r, *fit)?;
|
||||
if let Some(u) = &u {
|
||||
append_warning(warning, reduced_note(u, r));
|
||||
}
|
||||
@@ -4826,13 +4820,8 @@ fn centered_extrude(
|
||||
};
|
||||
// Fit cap surfaces in their own coordinates. Fitting a distant world-space
|
||||
// wire can tilt an otherwise exact planar cap through numeric cancellation.
|
||||
// A side drawn in collinear pieces is one face (#1788), and so is a side along one ellipse
|
||||
// or spline, whatever pieces the profile holds it in.
|
||||
let curves = sketch.map(crate::config::ExactSketchCurves::new);
|
||||
let one_curve = |s: &solidcore_record::Seg2, t: &solidcore_record::Seg2| {
|
||||
curves.as_ref().is_some_and(|c| c.find_free_form(s).is_some_and(|id| c.find_free_form(t).is_some_and(|other| other == id)))
|
||||
};
|
||||
let bodies = kernel::extrude_whole_sides(&Plane::XY, std::slice::from_ref(region), start, end, &one_curve)?;
|
||||
// A side drawn in collinear pieces is one face (#1788).
|
||||
let bodies = kernel::extrude_whole_sides(&Plane::XY, std::slice::from_ref(region), start, end)?;
|
||||
if *plane == Plane::XY {
|
||||
return Ok(bodies.into_iter().map(|body| roles.tool(body, None)).collect());
|
||||
}
|
||||
@@ -6329,12 +6318,12 @@ fn replay(
|
||||
let nb = match &src.kind {
|
||||
FeatureKind::Chamfer { distance2, angle, flip, .. } => chamfer_with(vals, &mb.body, &moved, r, distance2, angle, *flip)?,
|
||||
// A copy is congruent to the original: the radius it was reduced to first.
|
||||
FeatureKind::Fillet { fit, turn, .. } => match st.fitted.get(&src.id) {
|
||||
FeatureKind::Fillet { fit, .. } => match st.fitted.get(&src.id) {
|
||||
Some(used) => {
|
||||
let used: Vec<f64> = idx.iter().map(|i| used.get(*i).copied().unwrap_or(r)).collect();
|
||||
kernel::fillet_each(&mb.body, &moved, &used, turn.kernel())?
|
||||
kernel::fillet_each(&mb.body, &moved, &used)?
|
||||
}
|
||||
None => fillet_fitted(&mb.body, &moved, r, *fit, turn.kernel())?.0,
|
||||
None => fillet_fitted(&mb.body, &moved, r, *fit)?.0,
|
||||
},
|
||||
_ => kernel::fillet(&mb.body, &moved, r)?,
|
||||
};
|
||||
@@ -8556,7 +8545,6 @@ mod chain_tests {
|
||||
fit: Default::default(),
|
||||
corner: Default::default(),
|
||||
setbacks: Vec::new(),
|
||||
turn: Default::default(),
|
||||
tangent_chain: true,
|
||||
},
|
||||
None,
|
||||
@@ -8585,7 +8573,6 @@ mod chain_tests {
|
||||
fit: Default::default(),
|
||||
corner: Default::default(),
|
||||
setbacks: Vec::new(),
|
||||
turn: Default::default(),
|
||||
tangent_chain,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
//! A fillet saves `turn: "swept"` when two of its rounds that turn round a sharp side edge (the
|
||||
//! rounds along a boss's base, at its upright edges) are swept round that edge, their corner an
|
||||
//! exact torus; absent, the default `mitre`, they meet in a mitre, as designs before this change were
|
||||
//! built. An older design has none and keeps its mitres. The last release refuses a design with
|
||||
//! this change (the newer format number).
|
||||
@@ -239,10 +239,7 @@ impl<'a> ProfileRoles<'a> {
|
||||
// Every curve the segment is drawn on (one, or several coincident or collinear ones).
|
||||
let curve = |segment: usize| -> Vec<String> {
|
||||
let (Some(curves), Some(segment)) = (curves.as_ref(), segments.get(segment)) else { return Vec::new() };
|
||||
let mut drawn: Vec<String> = curves.find_all_along(segment).into_iter().map(|id| format!("side:{id}")).collect();
|
||||
if drawn.is_empty() {
|
||||
drawn.extend(curves.find_free_form(segment).map(|id| format!("side:{id}")));
|
||||
}
|
||||
let drawn: Vec<String> = curves.find_all_along(segment).into_iter().map(|id| format!("side:{id}")).collect();
|
||||
match self.thin {
|
||||
// A thin wall's side beside its curve (the other side may lie on it).
|
||||
Some(thin) if drawn.is_empty() => curves.find_offset(segment, &thin.curves, thin.distances),
|
||||
|
||||
@@ -295,7 +295,6 @@ fn box_fillet_cut_timeline() {
|
||||
fit: Default::default(),
|
||||
corner: Default::default(),
|
||||
setbacks: Vec::new(),
|
||||
turn: Default::default(),
|
||||
tangent_chain: true,
|
||||
},
|
||||
None,
|
||||
@@ -371,7 +370,6 @@ fn errors_are_reported_not_fatal() {
|
||||
fit: Default::default(),
|
||||
corner: Default::default(),
|
||||
setbacks: Vec::new(),
|
||||
turn: Default::default(),
|
||||
tangent_chain: true,
|
||||
},
|
||||
None,
|
||||
@@ -869,39 +867,12 @@ fn fillet_setbacks_default_to_none_and_round_trip() {
|
||||
fit: Default::default(),
|
||||
corner: Default::default(),
|
||||
setbacks: vec![CornerSetback { vertex: Position(Vec3::new(60.0, 40.0, 20.0)), distance: "8 mm".into() }],
|
||||
turn: Default::default(),
|
||||
tangent_chain: true,
|
||||
};
|
||||
let back: FeatureKind = serde_json::from_value(serde_json::to_value(&set).unwrap()).unwrap();
|
||||
assert_eq!(back, set);
|
||||
}
|
||||
|
||||
/// A fillet saved before turns reads as mitred and writes no `turn`; a swept one saves
|
||||
/// `turn: "swept"` and keeps it through a save and an open; a turn of another name is refused.
|
||||
#[test]
|
||||
fn fillet_turn_defaults_to_mitre_round_trips_and_refuses_unknown_turns() {
|
||||
let old = serde_json::json!({"type": "fillet", "edges": [[15.0, 0.0, 10.0]], "radius": "2"});
|
||||
let kind: FeatureKind = serde_json::from_value(old.clone()).unwrap();
|
||||
let FeatureKind::Fillet { turn, .. } = &kind else { panic!("{kind:?}") };
|
||||
assert_eq!(*turn, crate::FilletTurn::Mitre);
|
||||
assert!(serde_json::to_value(&kind).unwrap().get("turn").is_none());
|
||||
let mut swept = old.clone();
|
||||
swept["turn"] = serde_json::json!("swept");
|
||||
let kind: FeatureKind = serde_json::from_value(swept).unwrap();
|
||||
assert!(matches!(kind, FeatureKind::Fillet { turn: crate::FilletTurn::Swept, .. }), "{kind:?}");
|
||||
assert_eq!(serde_json::to_value(&kind).unwrap()["turn"], "swept");
|
||||
let mut doc = Document::new("turn");
|
||||
doc.add_feature(kind.clone(), None).unwrap();
|
||||
let saved = doc.to_json();
|
||||
let opened = Document::from_json(&saved).unwrap();
|
||||
assert_eq!(opened.features.last().map(|f| &f.kind), Some(&kind));
|
||||
assert_eq!(opened.to_json(), saved);
|
||||
let mut unknown = old;
|
||||
unknown["turn"] = serde_json::json!("round");
|
||||
let e = serde_json::from_value::<FeatureKind>(unknown).unwrap_err().to_string();
|
||||
assert!(e.contains("unknown variant `round`") && e.contains("mitre") && e.contains("swept"), "{e}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn timeline_group_legacy_json_omits_empty_joint_membership() {
|
||||
let old = serde_json::json!({"id":100, "name":"Folder", "parent":null, "features":[]});
|
||||
@@ -1085,68 +1056,3 @@ fn feature_kind_key_and_type_name_mappings() {
|
||||
assert_eq!(FeatureKind::type_name_to_kind_key("MeshFeature"), Some("mesh_import"));
|
||||
assert_eq!(FeatureKind::type_name_to_kind_key("NonExistent"), None);
|
||||
}
|
||||
|
||||
/// An extruded ellipse has one side face, and a spline in a profile one wall, each named by its
|
||||
/// sketch curve alone (no piece number): the same names on a second build and after reopening.
|
||||
#[test]
|
||||
fn an_extruded_ellipse_or_spline_is_one_wall_named_by_its_curve() {
|
||||
let extrude = |sketch: u64| FeatureKind::Extrude {
|
||||
thin: None,
|
||||
sketch: crate::SketchId(sketch),
|
||||
profiles: ProfileSel::All,
|
||||
extent: Extent {
|
||||
convention: crate::ExtrudeConvention::LegacyPerSide,
|
||||
distance: "20".into(),
|
||||
direction: Direction::Positive,
|
||||
distance2: None,
|
||||
start_offset: None,
|
||||
through_all: false,
|
||||
taper: None,
|
||||
corner: Default::default(),
|
||||
to: None,
|
||||
to_offset: None,
|
||||
from: None,
|
||||
to_body_apart: false,
|
||||
},
|
||||
operation: Operation::NewBody,
|
||||
targets: vec![],
|
||||
};
|
||||
for spline in [false, true] {
|
||||
let mut sk = Sketch::new();
|
||||
let curve = if spline {
|
||||
let pts: Vec<usize> =
|
||||
[(0., 0.), (10., -3.), (20., 4.), (30., 0.)].iter().map(|&(x, y)| sk.add_point(Vec2::new(x, y), None).unwrap()).collect();
|
||||
let (a, b) = (sk.add_point(Vec2::new(30., 20.), None).unwrap(), sk.add_point(Vec2::new(0., 20.), None).unwrap());
|
||||
let curve = sk
|
||||
.add_curve(solidcraft_sketch::CurveKind::Spline { pts: pts.clone(), control: false, degree: 3, periodic: false, nurbs: None }, None)
|
||||
.unwrap();
|
||||
sk.add_line_pts(pts[3], a, None).unwrap();
|
||||
sk.add_line_pts(a, b, None).unwrap();
|
||||
sk.add_line_pts(b, pts[0], None).unwrap();
|
||||
curve
|
||||
} else {
|
||||
let m = sk.add_point(Vec2::new(10., 0.), None).unwrap();
|
||||
sk.add_curve(solidcraft_sketch::CurveKind::Ellipse { c: 0, m, r: 5. }, None).unwrap()
|
||||
};
|
||||
let id = sk.curves[curve].id.clone();
|
||||
let mut doc = Document::new("one wall");
|
||||
let s = doc.add_feature(FeatureKind::Sketch { plane: PlaneRef::Origin { name: "XY".into() }, sketch: sk }, None).unwrap();
|
||||
let f = doc.add_feature(extrude(s), None).unwrap();
|
||||
let names = |doc: &Document| {
|
||||
let mut m = Model::new();
|
||||
m.evaluate(doc);
|
||||
assert!(m.results.iter().all(|r| r.error.is_none()), "{:?}", m.results);
|
||||
let st = m.state();
|
||||
let mut names = crate::naming::face_names(&st.bodies[0]).as_ref().clone();
|
||||
names.sort();
|
||||
names
|
||||
};
|
||||
let first = names(&doc);
|
||||
let wall = format!("F{f}:side:{id}");
|
||||
assert_eq!(first.iter().filter(|n| **n == wall).count(), 1, "{first:?}");
|
||||
assert_eq!(first.len(), if spline { 6 } else { 3 }, "{first:?}");
|
||||
assert!(first.iter().all(|n| !n.contains('#')), "no piece names: {first:?}");
|
||||
assert_eq!(names(&doc), first, "a second build");
|
||||
assert_eq!(names(&Document::from_json(&doc.to_json()).unwrap()), first, "reopened");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,7 +54,6 @@ impl Walk for solidcraft_kernel::DraftCorner {}
|
||||
impl Walk for crate::document::Direction {}
|
||||
impl Walk for crate::document::FilletFit {}
|
||||
impl Walk for crate::document::FilletCorner {}
|
||||
impl Walk for crate::document::FilletTurn {}
|
||||
impl Walk for crate::document::MeshData {}
|
||||
impl Walk for crate::document::RevolveConvention {}
|
||||
impl Walk for crate::document::RailFit {}
|
||||
|
||||
@@ -13,8 +13,8 @@ use solidcraft_geom::prelude::*;
|
||||
use super::{CommandSpec, not_in_sketch};
|
||||
use crate::params::{UNKNOWN_COMMAND, bad, bool_, expr, expr_problem, req_expr, str_, string_list, string_list_or_default, vec2, vec3};
|
||||
use crate::schema::features::{
|
||||
AppliedRadius, BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureNotice, FeatureResult, FilletParams,
|
||||
FilletResult, NoticeAction, OffsetPlaneParams, PipeParams, PlaneAtAngleParams, ScaleParams, SphereParams, TorusParams,
|
||||
BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureNotice, FeatureResult, NoticeAction, OffsetPlaneParams,
|
||||
PipeParams, PlaneAtAngleParams, ScaleParams, SphereParams, TorusParams,
|
||||
};
|
||||
use crate::schema::{TypedContract, output_schema_for};
|
||||
use crate::{EngineError, Result, Session};
|
||||
@@ -30,7 +30,6 @@ const BOUNDING_SOLID_CONTRACT: TypedContract<BoundingSolidParams> = TypedContrac
|
||||
const SCALE_CONTRACT: TypedContract<ScaleParams> = TypedContract::new();
|
||||
const OFFSET_PLANE_CONTRACT: TypedContract<OffsetPlaneParams> = TypedContract::new();
|
||||
const PLANE_AT_ANGLE_CONTRACT: TypedContract<PlaneAtAngleParams> = TypedContract::new();
|
||||
const FILLET_CONTRACT: TypedContract<FilletParams> = TypedContract::new();
|
||||
|
||||
pub static COMMANDS: &[CommandSpec] = &[
|
||||
CommandSpec::new("solid.extrude", "Extrude", crate::checked!("solid.extrude", extrude))
|
||||
@@ -79,13 +78,11 @@ pub static COMMANDS: &[CommandSpec] = &[
|
||||
.contract(&CONE_CONTRACT)
|
||||
.output(output_schema_for::<FeatureResult>)
|
||||
.params("radius | diameter, height: expr (the base circle, and the top's distance along the axis; a negative height goes the other way); top_radius? | top_diameter?: expr (the top circle; default 0: a full cone ending in an apex); base?: [x,y,z] (centre of the base circle: numbers in mm or length expressions; default: the origin); axis?: X|Y|Z|[x,y,z] (default Z); operation?, touching?, targets?: [body], name?, body_name?"),
|
||||
CommandSpec::new("solid.fillet", "Fillet", crate::checked!("solid.fillet", fillet))
|
||||
CommandSpec::new("solid.fillet", "Fillet", fillet)
|
||||
.at("SOLID", "MODIFY")
|
||||
.icon("fillet")
|
||||
.key("F")
|
||||
.contract(&FILLET_CONTRACT)
|
||||
.output(output_schema_for::<FilletResult>)
|
||||
.params("edges: [[x,y,z] point on edge | {body, index}] ; radius: expr; tangent_chain?: bool (default true: each picked edge's tangent chain is rounded with it; false: exactly the picked edges); body?; type?: constant|curvature (alias g2: curvature-continuous quintic between planar faces along straight edges, one planar end face at each end (including sloped ends); radius sets the equivalent circular setback, not constant curvature; exact fit only)|chord (radius is the width across)|variable (radius at the end nearest start, radius2 at the other; one end may be 0, where the round closes to the corner)|spline (the radius along the edge is a clamped B-spline from the end nearest start: radius is its first control radius, radii the rest, knots its knot vector from 0 to 1; one end may be 0); radius2?; start?: [x,y,z]; radii?: [expr, …]; knots?: [number, …]; mid?: [[position 0…1 from start, radius expr], …] (variable radii between the ends); smooth?: bool (smooth instead of straight between the radii); corner?: rolling|g2 (rolling, the default: the corners where three blended edges meet are pieces of the rolling ball's sphere, tangent to each blend; a curvature round's corners are always g2 patches, between its own sections; g2: each corner where three or more rounded edges meet, and every edge there is rounded, is set back (1.5 × the radius along each edge unless `setbacks` names it) and filled with a patch meeting the rounds and the faces round it to the second order (curvature-continuous seams, clear of the points where a round's section ends on a face), constant-radius exact fillets only, refused where it cannot be built); setbacks?: [{vertex: [x,y,z], distance: expr}, …] (corner setbacks: the corner at the vertex nearest `vertex`, where every edge meeting it is rounded, starts its patch `distance` along each of those edges from the vertex, past where the rounds would meet (past the radius at a square corner), so the rounds blend through a larger patch; one distance for all of a corner's edges; constant-radius exact fillets only; with `corner: g2`, the G2 patch's corners); turn?: mitre|swept (where two rounds turn round a sharp, straight, convex side edge square to both on a plane, such as the rounds along a boss's base at its upright edges: mitre, the default, runs them on to meet in a mitre; swept ends them at the side edge and fills the corner with their section revolved about it, a torus; swept takes type: constant, corner: rolling, no setbacks and fit: exact or reduce, and is refused with the reason where the rounds are unequal or the side edge is concave, curved or tangent); fit?: exact|reduce|taper (exact, the default: a radius too large for the geometry around the edges is refused, naming the largest that fits; reduce: where it doesn't fit it is reduced to the largest that does, one radius for edges sharing a face; the smallest used is returned as `radius_applied`, each edge's as `radii_applied: [{edge: [x,y,z], radius}]`, and noted in the feature's warning; taper: along each straight edge between planar faces where it doesn't fit, the radius follows the room there as a smooth spline, down to 0 where a face closes to a point, noted in the feature's warning)"),
|
||||
.params("edges: [[x,y,z] point on edge | {body, index}] ; radius: expr; tangent_chain?: bool (default true: each picked edge's tangent chain is rounded with it; false: exactly the picked edges); body?; type?: constant|curvature (alias g2: curvature-continuous quintic between planar faces along straight edges, one planar end face at each end (including sloped ends); radius sets the equivalent circular setback, not constant curvature; exact fit only)|chord (radius is the width across)|variable (radius at the end nearest start, radius2 at the other; one end may be 0, where the round closes to the corner)|spline (the radius along the edge is a clamped B-spline from the end nearest start: radius is its first control radius, radii the rest, knots its knot vector from 0 to 1; one end may be 0); radius2?; start?: [x,y,z]; radii?: [expr, …]; knots?: [number, …]; mid?: [[position 0…1 from start, radius expr], …] (variable radii between the ends); smooth?: bool (smooth instead of straight between the radii); corner?: rolling|g2 (rolling, the default: the corners where three blended edges meet are pieces of the rolling ball's sphere, tangent to each blend; a curvature round's corners are always g2 patches, between its own sections; g2: each corner where three or more rounded edges meet, and every edge there is rounded, is set back (1.5 × the radius along each edge unless `setbacks` names it) and filled with a patch meeting the rounds and the faces round it to the second order (curvature-continuous seams, clear of the points where a round's section ends on a face), constant-radius exact fillets only, refused where it cannot be built); setbacks?: [{vertex: [x,y,z], distance: expr}, …] (corner setbacks: the corner at the vertex nearest `vertex`, where every edge meeting it is rounded, starts its patch `distance` along each of those edges from the vertex, past where the rounds would meet (past the radius at a square corner), so the rounds blend through a larger patch; one distance for all of a corner's edges; constant-radius exact fillets only; with `corner: g2`, the G2 patch's corners); fit?: exact|reduce|taper (exact, the default: a radius too large for the geometry around the edges is refused, naming the largest that fits; reduce: where it doesn't fit it is reduced to the largest that does, one radius for edges sharing a face; the smallest used is returned as `radius_applied`, each edge's as `radii_applied: [{edge: [x,y,z], radius}]`, and noted in the feature's warning; taper: along each straight edge between planar faces where it doesn't fit, the radius follows the room there as a smooth spline, down to 0 where a face closes to a point, noted in the feature's warning)"),
|
||||
CommandSpec::new("solid.chamfer", "Chamfer", chamfer).at("SOLID", "MODIFY").icon("chamfer").params("edges: [[x,y,z] | {body, index}] ; distance: expr; tangent_chain?: bool (default true: each picked edge's tangent chain is cut with it; false: exactly the picked edges); distance2?: expr (along the second face) | angle?: expr (from the first face); flip?: bool (which face is first: by default the one facing up most); body?"),
|
||||
CommandSpec::new("solid.combine", "Combine", combine).at("SOLID", "MODIFY").icon("combine").params("target: body; tools: [body]; operation?: join|cut|intersect; touching?: separate|one_body (what a join makes of pieces that share no face: separate, the default, makes each piece that touches another only along an edge or at a point a body of its own and keeps pieces that touch nothing in one body; one_body keeps every piece in one body); keep_tools?: bool; new_component?: bool (the result goes into a new component; component_name?)"),
|
||||
CommandSpec::new("solid.pattern.rectangular", "Rectangular Pattern", pattern_rect)
|
||||
@@ -1791,15 +1788,6 @@ fn fillet(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
return Err(bad(cmd, "`setbacks` are built for a constant-radius fillet (`type: constant`, `fit: exact`) only"));
|
||||
}
|
||||
}
|
||||
// How two rounds turn at a sharp side edge.
|
||||
let turn = match str_(p, "turn").map(str::to_ascii_lowercase).as_deref() {
|
||||
None | Some("mitre") => solidcraft_doc::FilletTurn::Mitre,
|
||||
Some("swept") => solidcraft_doc::FilletTurn::Swept,
|
||||
Some(o) => return Err(bad(cmd, format!("unknown turn `{o}` (mitre or swept)"))),
|
||||
};
|
||||
if !turn.is_mitre() && (!style.is_constant() || fit == solidcraft_doc::FilletFit::Taper || !corner.is_rolling() || !setbacks.is_empty()) {
|
||||
return Err(bad(cmd, solidcraft_doc::SWEPT_TAKES));
|
||||
}
|
||||
let mut out = add_feature(
|
||||
s,
|
||||
p,
|
||||
@@ -1811,7 +1799,6 @@ fn fillet(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
fit,
|
||||
corner,
|
||||
setbacks,
|
||||
turn,
|
||||
tangent_chain: bool_(p, "tangent_chain").unwrap_or(true),
|
||||
},
|
||||
)?;
|
||||
@@ -1821,9 +1808,9 @@ fn fillet(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
&& let Some(r) = state.fitted_radius(id)
|
||||
{
|
||||
out["radius_applied"] = serde_json::json!(r);
|
||||
let each: Vec<AppliedRadius> =
|
||||
state.fitted_edges(id).unwrap_or_default().into_iter().map(|(p, radius)| AppliedRadius { edge: [p.x, p.y, p.z], radius }).collect();
|
||||
out["radii_applied"] = serde_json::to_value(each).map_err(|e| EngineError::Internal(cmd.into(), e.to_string()))?;
|
||||
let each: Vec<Value> =
|
||||
state.fitted_edges(id).unwrap_or_default().into_iter().map(|(p, r)| serde_json::json!({"edge": [p.x, p.y, p.z], "radius": r})).collect();
|
||||
out["radii_applied"] = Value::Array(each);
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
@@ -3580,87 +3567,6 @@ mod corner_tests {
|
||||
eprintln!("mixed corner g2: {err}");
|
||||
assert!(err.contains("not supported yet") && err.contains("(40.000, 20.000, 20.000)") && err.contains("all convex or all concave"), "{err}");
|
||||
}
|
||||
|
||||
/// `solid.fillet turn?: mitre|swept` on the four base edges of a 10 x 10 x 5 boss on a
|
||||
/// 40 x 30 x 10 plate, r 1: at each upright boss edge the two rounds turn round it. Each base
|
||||
/// edge gains the spandrel A = (1 - π/4) r² along its 10, and the corners the rounds' part
|
||||
/// beyond both walls, whose section's first moment about the upright edge is
|
||||
/// M = (5/6 - π/4) r³: mitred (the default), 8 M; swept, that section revolved a quarter turn at
|
||||
/// each corner, 2π M, the corner's face the horn torus of radii r, r about the upright edge,
|
||||
/// centred r above the plate. The turn is saved; an unknown turn and a swept chord round are
|
||||
/// refused as parameters, and swept rounds along a pocket's floor (its upright edges concave)
|
||||
/// with the kernel's reason.
|
||||
#[test]
|
||||
fn rounds_turning_round_a_boss_edge_are_mitred_or_swept() {
|
||||
use std::f64::consts::PI;
|
||||
const BASE: [[f64; 3]; 4] = [[20.0, 10.0, 10.0], [25.0, 15.0, 10.0], [20.0, 20.0, 10.0], [15.0, 15.0, 10.0]];
|
||||
let boss = || {
|
||||
let mut s = Session::default();
|
||||
run(&mut s, "solid.box", &json!({"length": 40, "width": 30, "height": 10, "body_name": "B"}));
|
||||
run(&mut s, "solid.box", &json!({"corner": [15, 10, 10], "length": 10, "width": 10, "height": 5, "operation": "join"}));
|
||||
s
|
||||
};
|
||||
let turned = |turn: Option<&str>| {
|
||||
let mut s = boss();
|
||||
let mut p = json!({"edges": BASE, "radius": 1});
|
||||
if let Some(t) = turn {
|
||||
p["turn"] = json!(t);
|
||||
}
|
||||
let reply = run(&mut s, "solid.fillet", &p);
|
||||
assert_eq!(reply["warning"], json!(null), "{reply}");
|
||||
let body = s.world_state().unwrap().body("B").unwrap().body.clone();
|
||||
assert!(body.validity().is_empty(), "{:?}", body.validity());
|
||||
(s, solidcraft_kernel::measure(&body).unwrap(), body)
|
||||
};
|
||||
let (mitred, mitre, _) = turned(None);
|
||||
let (_, named, _) = turned(Some("mitre"));
|
||||
let (swept_session, swept, body) = turned(Some("swept"));
|
||||
eprintln!("mitre: {} faces, {:.9}; swept: {} faces, {:.9}", mitre.faces, mitre.volume, swept.faces, swept.volume);
|
||||
let r: f64 = 1.0;
|
||||
let (a, m) = ((1.0 - PI / 4.0) * r * r, (5.0 / 6.0 - PI / 4.0) * r * r * r);
|
||||
let near = |v: f64, want: f64| (v - want).abs() < 1e-9 * want;
|
||||
assert!(near(mitre.volume, 12500.0 + 40.0 * a + 8.0 * m), "{}", mitre.volume);
|
||||
assert!(near(swept.volume, 12500.0 + 40.0 * a + 2.0 * PI * m), "{}", swept.volume);
|
||||
assert_eq!(named.volume.to_bits(), mitre.volume.to_bits(), "mitre is the default");
|
||||
assert_eq!((mitre.faces, swept.faces), (15, 19));
|
||||
// The four corner faces (the record's torus is a ring torus, so a horn torus is its exact
|
||||
// rational form): every point on the horn torus about its upright edge.
|
||||
let mut corners = 0;
|
||||
for f in &body.record().faces {
|
||||
if !matches!(f.surface, solidcore_record::brep::Surface::RationalSpline { .. }) {
|
||||
continue;
|
||||
}
|
||||
corners += 1;
|
||||
let eval = solidcraft_geom::brep::eval::SurfaceEval::new(&f.surface).unwrap();
|
||||
let [[u0, u1], [v0, v1]] = f.domain;
|
||||
for i in 0..=4 {
|
||||
for j in 0..=4 {
|
||||
let p = eval.point([u0 + (u1 - u0) * f64::from(i) / 4.0, v0 + (v1 - v0) * f64::from(j) / 4.0]).unwrap();
|
||||
let (cx, cy) = (if p.x < 20.0 { 15.0 } else { 25.0 }, if p.y < 15.0 { 10.0 } else { 20.0 });
|
||||
let rho = (p.x - cx).hypot(p.y - cy);
|
||||
let off = ((rho - r).powi(2) + (p.z - 10.0 - r).powi(2)).sqrt() - r;
|
||||
assert!(off.abs() < 1e-9, "{p:?} is {off} off the horn torus");
|
||||
}
|
||||
}
|
||||
}
|
||||
assert_eq!(corners, 4);
|
||||
assert!(!mitred.doc.to_json().contains("\"turn\""));
|
||||
assert!(swept_session.doc.to_json().contains("\"turn\": \"swept\""));
|
||||
let mut s = boss();
|
||||
let e = s.execute("solid.fillet", &json!({"edges": BASE, "radius": 1, "turn": "round"})).unwrap_err().to_string();
|
||||
assert!(e.contains("unknown turn `round` (mitre or swept)"), "{e}");
|
||||
let e = s.execute("solid.fillet", &json!({"edges": BASE, "radius": 1, "turn": "swept", "type": "chord"})).unwrap_err().to_string();
|
||||
assert!(e.contains(solidcraft_doc::SWEPT_TAKES), "{e}");
|
||||
// A pocket 5 deep in the plate, its floor's edges rounded: the rounds meet at its concave
|
||||
// upright edges.
|
||||
let mut s = Session::default();
|
||||
run(&mut s, "solid.box", &json!({"length": 40, "width": 30, "height": 10, "body_name": "P"}));
|
||||
run(&mut s, "solid.box", &json!({"corner": [10, 10, 5], "length": 20, "width": 10, "height": 6, "operation": "cut"}));
|
||||
let rim = json!([[20, 10, 5], [30, 15, 5], [20, 20, 5], [10, 15, 5]]);
|
||||
let e = s.execute("solid.fillet", &json!({"edges": rim, "radius": 1, "turn": "swept"})).unwrap_err().to_string();
|
||||
eprintln!("swept along a pocket's rim: {e}");
|
||||
assert!(e.contains("swept corner at (") && e.contains("round that edge at a radius of at least 1 first"), "{e}");
|
||||
}
|
||||
}
|
||||
#[cfg(test)]
|
||||
#[path = "fillet_connected_rounds_tests.rs"]
|
||||
|
||||
@@ -98,53 +98,8 @@ fn a_trays_faces_have_readable_sheet_names_that_follow_its_size() {
|
||||
assert_eq!(again, names);
|
||||
let right = point(&s, &format!("sheet:Body1:F{sd}.1:top"));
|
||||
assert!((right.x - 399.0).abs() < 1e-3, "{right:?}");
|
||||
let rim = format!("sheet:Body1:F{fb}.1:rim.far");
|
||||
let far = point(&s, &rim);
|
||||
let st = s.model.state();
|
||||
let hit = solidcraft_doc::naming::locate_one(&st, None, &rim).unwrap();
|
||||
on_planar_face(&st.bodies[hit.body].body, hit.face, far);
|
||||
assert!((far.z - 30.0).abs() < 1e-9 && (199.0..=200.0).contains(&far.y), "the back flange's far rim: {far:?}");
|
||||
}
|
||||
|
||||
/// `p` lies on face `face` of `body`, on its exact geometry: within rounding at the part's scale
|
||||
/// of the plane the face lies on, and inside the boundary its edges trace there (each a line,
|
||||
/// counted by crossings).
|
||||
fn on_planar_face(body: &solidcraft_kernel::Body, face: usize, p: Vec3) {
|
||||
use solidcore_record::brep::{Curve, Loop};
|
||||
let rounding = 1e-12 * body.size().max(1.0);
|
||||
let surface = solidcraft_kernel::face_surface(body, face).unwrap();
|
||||
let on = surface.nearest(p).unwrap();
|
||||
assert!(on.dist(p) <= rounding, "{p:?} is {} off face {face}'s surface", on.dist(p));
|
||||
let solidcraft_kernel::FaceSurface::Plane { normal, .. } = surface else { panic!("face {face} is not planar: {surface:?}") };
|
||||
// Coordinates in the plane: along `x` and `y`, square to its normal.
|
||||
let x = if normal.cross(Vec3::X).len() > 0.5 { normal.cross(Vec3::X).normalized().unwrap() } else { normal.cross(Vec3::Y).normalized().unwrap() };
|
||||
let y = normal.cross(x);
|
||||
let local = |q: Vec3| ((q - p).dot(x), (q - p).dot(y));
|
||||
let record = body.record();
|
||||
let point = |v: u32| {
|
||||
let q = record.vertices[v as usize].point;
|
||||
Vec3::new(q[0], q[1], q[2])
|
||||
};
|
||||
// Crossings of the ray from `p` along +x with the face's boundary.
|
||||
let mut crossings = 0;
|
||||
for l in &record.faces[face].loops {
|
||||
let Loop::Edges { edges } = l else { continue };
|
||||
for e in edges {
|
||||
let edge = &record.edges[e.edge as usize];
|
||||
assert!(matches!(edge.parameters(), Curve::Line { .. }), "an edge of face {face} is not a line: {:?}", edge.parameters());
|
||||
let [a, b] = edge.vertices.map(|v| local(point(v)));
|
||||
let distance = {
|
||||
let (dx, dy) = (b.0 - a.0, b.1 - a.1);
|
||||
let t = (-(a.0 * dx + a.1 * dy) / (dx * dx + dy * dy)).clamp(0.0, 1.0);
|
||||
(a.0 + t * dx).hypot(a.1 + t * dy)
|
||||
};
|
||||
assert!(distance > rounding, "{p:?} is on the boundary of face {face}");
|
||||
if (a.1 > 0.0) != (b.1 > 0.0) && a.0 + (b.0 - a.0) * (0.0 - a.1) / (b.1 - a.1) > 0.0 {
|
||||
crossings += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
assert_eq!(crossings % 2, 1, "{p:?} is outside face {face}'s boundary");
|
||||
let far = point(&s, &format!("sheet:Body1:F{fb}.1:rim.far"));
|
||||
assert!((199.0 - 1e-3..=200.0 + 1e-3).contains(&far.y) && (0.0..=400.0).contains(&far.x) && (far.z - 30.0).abs() < 1e-3, "{far:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -349,16 +349,20 @@ impl Ahead {
|
||||
/// [`Ahead::evaluate`], setting `step` to the number of the command running (from 1), so a
|
||||
/// front end can say how far a batch has got.
|
||||
pub fn evaluate_counting(self, commands: &[(String, Value)], step: &std::sync::atomic::AtomicUsize) -> Result<Evaluated> {
|
||||
let (after, _) = self.0.preview_in_place(commands, Some(step))?;
|
||||
after.world_state()?.warm_display();
|
||||
Ok(Evaluated(after.model))
|
||||
let stop = self.0.stop.clone();
|
||||
stop.within(|| {
|
||||
let (after, _) = self.0.preview_in_place(commands, Some(step))?;
|
||||
after.world_state()?.warm_display();
|
||||
Ok(Evaluated(after.model))
|
||||
})
|
||||
}
|
||||
|
||||
/// Run `commands` one after another, each reply or error in turn (what they evaluate stays
|
||||
/// in the shared evaluation cache): the checks a front end makes before a command, such as
|
||||
/// what a delete takes with it (#2678), computed off its window thread.
|
||||
pub fn replies(mut self, commands: &[(String, Value)]) -> Vec<Result<Value>> {
|
||||
commands.iter().map(|(id, params)| self.0.execute(id, params)).collect()
|
||||
let stop = self.0.stop.clone();
|
||||
stop.within(|| commands.iter().map(|(id, params)| self.0.execute(id, params)).collect())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -534,6 +538,10 @@ pub struct Session {
|
||||
/// not a move of the design's, so the placements the design reports and Capture Position
|
||||
/// keeps leave it out ([`Session::uncaptured_moves`]).
|
||||
pub exploded: std::collections::BTreeMap<u64, solidcraft_doc::Mat>,
|
||||
/// Stops the work computing off the window thread for this design, shared with its copies.
|
||||
stop: solidcraft_kernel::Stop,
|
||||
/// A copy of a design ([`Session::scratch`]), sharing its token.
|
||||
is_copy: bool,
|
||||
world_cache: std::sync::Mutex<Option<WorldCache>>,
|
||||
/// The design the joints were last solved for, as the solve left it, and the model it read
|
||||
/// (see [`Session::solve_joints`]).
|
||||
@@ -794,6 +802,8 @@ impl Session {
|
||||
/// A session on `doc` evaluated as `model`, with what it hides.
|
||||
pub(crate) fn with_model(doc: Arc<Document>, visibility: Visibility, model: Model) -> Self {
|
||||
Session {
|
||||
stop: Default::default(),
|
||||
is_copy: false,
|
||||
saved: doc.clone(),
|
||||
doc,
|
||||
model,
|
||||
@@ -874,6 +884,11 @@ impl Session {
|
||||
/// design before the batch, which is what the batch promised (#3242). The design is what a
|
||||
/// checkpoint keeps, not the replaced session's file path (docs/mcp.md).
|
||||
pub fn replace_design(&mut self, fresh: Session) {
|
||||
// Nothing still computing for the design that leaves has anywhere to go. A copy leaves
|
||||
// the design it came from going, and its token with it.
|
||||
if !self.is_copy {
|
||||
self.stop_computing();
|
||||
}
|
||||
let auto_project = self.auto_project;
|
||||
let validation = self.validation();
|
||||
let single_surface_analysis = self.single_surface_analysis;
|
||||
@@ -905,6 +920,19 @@ impl Session {
|
||||
self.replacements = replacements;
|
||||
}
|
||||
|
||||
/// The token over the work running off the window thread for this design, on any of its
|
||||
/// copies: a job started from a copy runs [`solidcraft_kernel::Stop::within`] it.
|
||||
pub fn stop_token(&self) -> solidcraft_kernel::Stop {
|
||||
self.stop.clone()
|
||||
}
|
||||
|
||||
/// This design is going away: the work still computing for it stops at the kernel's next
|
||||
/// check, and its results go nowhere (they are only ever for this design's evaluation cache).
|
||||
/// A kernel call that doesn't check runs to its end, on a kernel of its own, holding up nothing.
|
||||
pub fn stop_computing(&self) {
|
||||
self.stop.stop();
|
||||
}
|
||||
|
||||
/// Install (or with `None` remove) the check [`Session::execute`] runs before every command,
|
||||
/// for an app that embeds the engine and decides which commands may run. A refusal comes back
|
||||
/// as [`EngineError::Refused`] and leaves the session as it was.
|
||||
@@ -1871,6 +1899,8 @@ impl Session {
|
||||
/// commands on without touching this one.
|
||||
pub fn scratch(&self) -> Session {
|
||||
Session {
|
||||
stop: self.stop.clone(),
|
||||
is_copy: true,
|
||||
doc: self.doc.clone(),
|
||||
model: self.model.clone(),
|
||||
undo: Vec::new(),
|
||||
@@ -1972,6 +2002,16 @@ impl Session {
|
||||
commands: &[(String, Value)],
|
||||
marker: Option<Option<usize>>,
|
||||
original: Option<Session>,
|
||||
) -> Result<ComputedCommands> {
|
||||
let stop = self.stop.clone();
|
||||
stop.within(|| self.compute_commands_under(commands, marker, original))
|
||||
}
|
||||
|
||||
fn compute_commands_under(
|
||||
self,
|
||||
commands: &[(String, Value)],
|
||||
marker: Option<Option<usize>>,
|
||||
original: Option<Session>,
|
||||
) -> Result<ComputedCommands> {
|
||||
let editor_original = original.as_ref().map(|session| session.doc.clone());
|
||||
let mut computed = self.scratch();
|
||||
|
||||
@@ -10,10 +10,9 @@ use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
|
||||
use super::types::{
|
||||
AngleExpr, AxisDir, AxisLine, ConventionParam, DirectionParam, EdgeRefs, ExtentKeyword, ExtrudeOperation, FacesParam, FeatureCommon,
|
||||
FilletCornerParam, FilletFitParam, FilletTurnParam, FilletTypeParam, FromPoint, GeoRefParam, IdOrName, LengthExpr, NumberExpr, OperationParam,
|
||||
PlaneCommon, PlaneOrFace, Point3, PointExpr3, ProfilesParam, ScaleFactors, SketchRef, StringList, ThinSideParam, ToPoint, TouchingParam,
|
||||
feature_common, present,
|
||||
AngleExpr, AxisDir, AxisLine, ConventionParam, DirectionParam, ExtentKeyword, ExtrudeOperation, FacesParam, FeatureCommon, FromPoint,
|
||||
GeoRefParam, IdOrName, LengthExpr, NumberExpr, OperationParam, PlaneCommon, PlaneOrFace, Point3, PointExpr3, ProfilesParam, ScaleFactors,
|
||||
SketchRef, StringList, ThinSideParam, ToPoint, TouchingParam, feature_common, present,
|
||||
};
|
||||
|
||||
/// Add a box primitive.
|
||||
@@ -433,92 +432,6 @@ pub struct PlaneAtAngleParams {
|
||||
pub common: PlaneCommon,
|
||||
}
|
||||
|
||||
/// Round edges of a body: a constant radius by default, or a chord, a curvature-continuous
|
||||
/// section or a radius varying along each edge (`type`).
|
||||
#[derive(Debug, Deserialize, JsonSchema)]
|
||||
#[schemars(deny_unknown_fields)]
|
||||
pub struct FilletParams {
|
||||
/// The edges to round: a point on each, or `{body, index}`.
|
||||
pub edges: EdgeRefs,
|
||||
/// The radius; the chord's width with `type: chord`, the equivalent circular setback with
|
||||
/// `type: curvature`, the start radius with `type: variable` or `spline`.
|
||||
pub radius: LengthExpr,
|
||||
/// The body whose edges the points pick. Default: whichever body has an edge there.
|
||||
#[serde(default)]
|
||||
pub body: Option<String>,
|
||||
/// Round each picked edge's tangent chain with it. Default: true; false rounds exactly the
|
||||
/// picked edges.
|
||||
#[serde(default)]
|
||||
pub tangent_chain: Option<bool>,
|
||||
#[serde(default, rename = "type")]
|
||||
pub kind: Option<FilletTypeParam>,
|
||||
/// `type: variable`: the radius at the end away from `start`; it or `radius` may be 0, where
|
||||
/// the round closes to the corner.
|
||||
#[serde(default)]
|
||||
pub radius2: Option<LengthExpr>,
|
||||
/// `type: variable` or `spline`: a point near the end the radius starts from.
|
||||
#[serde(default)]
|
||||
pub start: Option<Point3>,
|
||||
/// `type: variable`: radii between the ends, each `[position, radius]`, the position between 0
|
||||
/// and 1 from the start end. At most 100 are read.
|
||||
#[serde(default)]
|
||||
pub mid: Option<Vec<(f64, LengthExpr)>>,
|
||||
/// `type: variable`: smooth instead of straight between the radii. Default: false.
|
||||
#[serde(default)]
|
||||
pub smooth: Option<bool>,
|
||||
/// `type: spline`: the control radii after `radius`. At most 100 are read.
|
||||
#[serde(default)]
|
||||
pub radii: Option<Vec<LengthExpr>>,
|
||||
/// `type: spline`: the knot vector from 0 to 1, as many knots as all control radii, the
|
||||
/// degree (1 to 3) and one more.
|
||||
#[serde(default)]
|
||||
pub knots: Option<Vec<f64>>,
|
||||
#[serde(default)]
|
||||
pub fit: Option<FilletFitParam>,
|
||||
#[serde(default)]
|
||||
pub corner: Option<FilletCornerParam>,
|
||||
/// Corner setbacks: the corner at the vertex nearest each `vertex`, where every edge meeting it
|
||||
/// is rounded, starts its patch `distance` along each of those edges from the vertex, past
|
||||
/// where the rounds would meet. Constant-radius exact fillets only.
|
||||
#[serde(default)]
|
||||
pub setbacks: Option<Vec<SetbackParam>>,
|
||||
#[serde(default)]
|
||||
pub turn: Option<FilletTurnParam>,
|
||||
#[serde(flatten, deserialize_with = "feature_common")]
|
||||
pub common: FeatureCommon,
|
||||
}
|
||||
|
||||
/// A fillet corner set back.
|
||||
#[derive(Debug, Deserialize, JsonSchema)]
|
||||
pub struct SetbackParam {
|
||||
/// A point at the corner's vertex.
|
||||
pub vertex: Point3,
|
||||
/// How far along each edge there the corner's patch starts.
|
||||
pub distance: LengthExpr,
|
||||
}
|
||||
|
||||
/// The radius `fit: reduce` gave one edge.
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
pub struct AppliedRadius {
|
||||
/// A point on the edge.
|
||||
pub edge: [f64; 3],
|
||||
/// The radius it was rounded at.
|
||||
pub radius: f64,
|
||||
}
|
||||
|
||||
/// What `solid.fillet` returns: a feature command's reply, with the radii `fit: reduce` used.
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
pub struct FilletResult {
|
||||
#[serde(flatten)]
|
||||
pub feature: FeatureResult,
|
||||
/// With `fit: reduce` where it reduced the radius: the smallest radius used.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub radius_applied: Option<f64>,
|
||||
/// With `fit: reduce` where it reduced the radius: each edge's radius.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub radii_applied: Option<Vec<AppliedRadius>>,
|
||||
}
|
||||
|
||||
/// What a feature command returns.
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
pub struct FeatureResult {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use super::{
|
||||
BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureResult, FilletParams, FilletResult, OffsetPlaneParams,
|
||||
PipeParams, PlaneAtAngleParams, ScaleParams, SphereParams, TorusParams,
|
||||
BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureResult, OffsetPlaneParams, PipeParams, PlaneAtAngleParams,
|
||||
ScaleParams, SphereParams, TorusParams,
|
||||
};
|
||||
use crate::Session;
|
||||
use crate::schema::tests::{assert_keys, assert_strict_keeps_todays_errors, conforms, sketch_rectangle};
|
||||
@@ -87,30 +87,6 @@ fn schemas_and_the_key_check_agree() {
|
||||
assert_keys(input_schema_for::<ScaleParams>(), &["bodies", "factor", "factors", "name", "origin", "participants"]);
|
||||
assert_keys(input_schema_for::<OffsetPlaneParams>(), &["base", "name", "offset", "participants", "through"]);
|
||||
assert_keys(input_schema_for::<PlaneAtAngleParams>(), &["angle", "axis", "base", "name", "participants"]);
|
||||
assert_keys(
|
||||
input_schema_for::<FilletParams>(),
|
||||
&[
|
||||
"body",
|
||||
"body_name",
|
||||
"body_names",
|
||||
"corner",
|
||||
"edges",
|
||||
"fit",
|
||||
"knots",
|
||||
"mid",
|
||||
"name",
|
||||
"participants",
|
||||
"radii",
|
||||
"radius",
|
||||
"radius2",
|
||||
"setbacks",
|
||||
"smooth",
|
||||
"start",
|
||||
"tangent_chain",
|
||||
"turn",
|
||||
"type",
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -181,13 +157,6 @@ fn strict_keeps_todays_errors() {
|
||||
("construct.plane.at_angle", json!({"base": "XY", "axis": {"face": "x", "point": [0, 0, 0]}, "angle": 30})),
|
||||
("construct.plane.at_angle", json!({"base": "XY", "axis": {"face": "x"}, "angle": 30})),
|
||||
("construct.plane.at_angle", json!({"base": "XY", "axis": "X", "angle": true})),
|
||||
("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "turn": "round"})),
|
||||
("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "turn": "ROUND"})),
|
||||
("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "type": "bogus"})),
|
||||
("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "fit": "bogus"})),
|
||||
("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "corner": "round"})),
|
||||
("solid.fillet", json!({"edges": [], "radius": 1})),
|
||||
("solid.fillet", json!({"edges": 5, "radius": 1})),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -244,47 +213,6 @@ fn replies_match_the_output_schema() {
|
||||
assert!(!conforms(schema, schema, &bad), "{bad}");
|
||||
}
|
||||
|
||||
/// `solid.fillet` replies with `FilletResult` in each of its forms, its contract taking each: a
|
||||
/// boss's base rounded with each turn and its options spelled out, a reduced round (with the radii
|
||||
/// it used), chord and curvature rounds, a smooth-patch corner with setbacks, and the variable and
|
||||
/// spline forms.
|
||||
#[test]
|
||||
fn fillet_replies_match_its_output_schema() {
|
||||
let schema = output_schema_for::<FilletResult>();
|
||||
let schema = schema.as_value();
|
||||
// A 40 x 30 x 10 plate with a 10 x 10 x 5 boss on it, whose base edges `boss` are.
|
||||
let run = |p: Value| {
|
||||
let mut s = Session { param_check: ParamCheck::Warn, ..Session::default() };
|
||||
s.execute("solid.box", &json!({"length": 40, "width": 30, "height": 10, "body_name": "B"})).unwrap_or_else(|e| panic!("{e}"));
|
||||
s.execute("solid.box", &json!({"corner": [15, 10, 10], "length": 10, "width": 10, "height": 5, "operation": "join"}))
|
||||
.unwrap_or_else(|e| panic!("{e}"));
|
||||
let r = s.execute("solid.fillet", &p).unwrap_or_else(|e| panic!("{p}: {e}"));
|
||||
assert!(conforms(schema, schema, &r), "{r} doesn't match {schema}");
|
||||
assert!(r.get("param_warnings").is_none(), "{p}: {r}");
|
||||
r
|
||||
};
|
||||
let boss = json!([[20, 10, 10], [25, 15, 10], [20, 20, 10], [15, 15, 10]]);
|
||||
run(
|
||||
json!({"edges": boss, "radius": 1, "turn": "mitre", "type": "constant", "fit": "exact", "corner": "rolling", "tangent_chain": true, "body": "B", "name": "Round"}),
|
||||
);
|
||||
run(json!({"edges": boss, "radius": "1 mm", "turn": "Swept"}));
|
||||
run(json!({"edges": boss, "radius": 1, "turn": "swept", "fit": "reduce"}));
|
||||
let reduced = run(json!({"edges": [[20, 0, 10]], "radius": 15, "fit": "reduce"}));
|
||||
assert!(reduced.get("radius_applied").is_some_and(Value::is_number) && reduced.get("radii_applied").is_some_and(Value::is_array), "{reduced}");
|
||||
run(json!({"edges": [[20, 0, 10]], "radius": 1, "type": "chord"}));
|
||||
run(json!({"edges": [{"body": "B", "index": 0}], "radius": 0.5, "tangent_chain": false}));
|
||||
run(json!({"edges": [[20, 0, 10]], "radius": 1, "type": "curvature"}));
|
||||
// Variable and spline radii: solidcore fails a variable round on a box edge at this pin (status
|
||||
// 1001, as `variable_radius_on_a_box_edge`), so their forms are checked against the contract.
|
||||
for p in [
|
||||
json!({"edges": [[20, 0, 10]], "radius": 1, "type": "variable", "radius2": 2, "start": [0, 0, 10], "mid": [[0.5, "1.5 mm"]], "smooth": true}),
|
||||
json!({"edges": [[20, 0, 10]], "radius": 1, "type": "spline", "start": [0, 0, 10], "radii": [2], "knots": [0, 0, 1, 1]}),
|
||||
] {
|
||||
assert!(crate::schema::Contract::check(&crate::schema::TypedContract::<FilletParams>::new(), &p).is_empty(), "{p}");
|
||||
}
|
||||
run(json!({"edges": [[20, 0, 10], [40, 15, 10], [40, 0, 5]], "radius": 2, "corner": "g2", "setbacks": [{"vertex": [40, 0, 10], "distance": 4}]}));
|
||||
}
|
||||
|
||||
/// The feature commands converted after box and extrude answer with `FeatureResult` too, and
|
||||
/// their contracts take every form these calls use: in Warn, a contract that refused one would
|
||||
/// still run the command, so the replies are checked for warnings too.
|
||||
|
||||
@@ -367,7 +367,7 @@ fn issues_are_read_from_the_commands_own_contract() {
|
||||
assert_eq!(messages(&issues), ["unknown key `operaton`; did you mean `operation`?"]);
|
||||
assert_eq!(issues, box_contract().check(&json!({"length": 1, "width": 1, "height": 1, "operaton": "cut"})));
|
||||
// No contract, or no such command: nothing to say.
|
||||
assert!(super::issues("solid.chamfer", &json!({"nonsense": 1})).is_empty());
|
||||
assert!(super::issues("solid.fillet", &json!({"nonsense": 1})).is_empty());
|
||||
assert!(super::issues("no.such", &json!({"nonsense": 1})).is_empty());
|
||||
}
|
||||
|
||||
|
||||
@@ -464,66 +464,6 @@ fn enum_schema(values: &[&str], description: &str) -> Schema {
|
||||
json_schema!({"description": description, "type": "string", "enum": values})
|
||||
}
|
||||
|
||||
/// A keyword a handler reads with `str_` and lowercases, refusing any other word with `unknown
|
||||
/// <what> `<word>` (<expected>)`; the lowercased word is kept for the handler.
|
||||
macro_rules! keyword_param {
|
||||
($(#[$doc:meta])* $name:ident, $what:literal, $values:expr, $expected:literal, $description:literal) => {
|
||||
$(#[$doc])*
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct $name(pub String);
|
||||
|
||||
impl<'de> Deserialize<'de> for $name {
|
||||
fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
|
||||
let ok = |s: &str| $values.contains(&s.to_ascii_lowercase().as_str());
|
||||
let unknown = |s: &str| whole(format!(concat!("unknown ", $what, " `{}` (", $expected, ")"), s.to_ascii_lowercase()));
|
||||
string_matching(d, ok, $expected, unknown).map(|s| $name(s.to_ascii_lowercase()))
|
||||
}
|
||||
}
|
||||
|
||||
impl JsonSchema for $name {
|
||||
fn schema_name() -> Cow<'static, str> {
|
||||
stringify!($name).into()
|
||||
}
|
||||
fn json_schema(_: &mut SchemaGenerator) -> Schema {
|
||||
enum_schema($values, $description)
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
keyword_param!(
|
||||
/// `solid.fillet`'s `type`.
|
||||
FilletTypeParam,
|
||||
"fillet type",
|
||||
&["constant", "rolling_ball", "chord", "chord_length", "curvature", "g2", "variable", "spline"],
|
||||
"constant, chord, variable, spline or curvature",
|
||||
"The round's section: constant (the default; rolling_ball is an alias), chord (`radius` is the width across; alias chord_length), curvature (alias g2: curvature-continuous between planar faces along straight edges, `radius` the equivalent circular setback), variable (`radius` at the end nearest `start`, `radius2` at the other) or spline (the radius a clamped B-spline from `start`: `radius`, then `radii`, over `knots`). Matching ignores case."
|
||||
);
|
||||
keyword_param!(
|
||||
/// `solid.fillet`'s `fit`.
|
||||
FilletFitParam,
|
||||
"fit",
|
||||
&["exact", "reduce", "taper"],
|
||||
"exact, reduce or taper",
|
||||
"What a radius too large for the geometry around the edges does: exact (the default) refuses it naming the largest that fits, reduce reduces it where it doesn't fit, taper follows the room along straight edges between planar faces. reduce and taper take type: constant. Matching ignores case."
|
||||
);
|
||||
keyword_param!(
|
||||
/// `solid.fillet`'s `corner`.
|
||||
FilletCornerParam,
|
||||
"corner",
|
||||
&["rolling", "g2"],
|
||||
"rolling or g2",
|
||||
"What fills a corner where three rounded edges meet: rolling (the default), the rolling ball's sphere, or g2, a set-back patch meeting the rounds to the second order (type: constant, fit: exact only). Matching ignores case."
|
||||
);
|
||||
keyword_param!(
|
||||
/// `solid.fillet`'s `turn`.
|
||||
FilletTurnParam,
|
||||
"turn",
|
||||
&["mitre", "swept"],
|
||||
"mitre or swept",
|
||||
"How two rounds turn round a sharp, straight, convex side edge square to both on a plane (the rounds along a boss's base, at its upright edges): mitre (the default) runs them on to meet in a mitre; swept ends them at the side edge and fills the corner with their section revolved about it, a torus. swept takes type: constant, corner: rolling, no setbacks and fit: exact or reduce, and is refused with the reason where the rounds are unequal or the side edge is concave, curved or tangent. Matching ignores case."
|
||||
);
|
||||
|
||||
/// How a feature combines with existing bodies, as `features::operation` reads it.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub struct OperationParam(pub Operation);
|
||||
|
||||
@@ -308,6 +308,7 @@ solid.coil
|
||||
solid.combine
|
||||
solid.draft
|
||||
solid.emboss
|
||||
solid.fillet
|
||||
solid.hole
|
||||
solid.loft
|
||||
solid.mirror
|
||||
|
||||
@@ -410,6 +410,7 @@ mod curved_seam_round;
|
||||
mod flush_join_loft;
|
||||
mod gltf_import;
|
||||
mod import_component;
|
||||
mod kernel_pool;
|
||||
mod large_step_import;
|
||||
mod loft_ring;
|
||||
mod loft_spacing;
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
//! A design's bodies are made and used on whichever kernel of the pool is free
|
||||
//! (`solidcraft_smlib`'s `core::Pool`). What it builds must not depend on which: to the last
|
||||
//! number, on a new kernel or one that has done much, while another is busy, with bodies made on
|
||||
//! one kernel going into operations on another, through the evaluation cache, undo and redo.
|
||||
|
||||
use super::*;
|
||||
|
||||
/// A hole, a round and a chamfer, each building on the last.
|
||||
fn features() -> Vec<(&'static str, Value)> {
|
||||
vec![
|
||||
("solid.box", json!({"length": 40, "width": 30, "height": 20})),
|
||||
("solid.cylinder", json!({"base": [12, 15, -1], "axis": [0, 0, 1], "radius": 3.4, "height": 30, "operation": "cut"})),
|
||||
("solid.fillet", json!({"edges": [[0, 0, 10]], "radius": 2})),
|
||||
("solid.chamfer", json!({"edges": [[20, 0, 20]], "distance": 1})),
|
||||
]
|
||||
}
|
||||
|
||||
fn join() -> (&'static str, Value) {
|
||||
("solid.box", json!({"corner": [25, 10, 20], "length": 10, "width": 10, "height": 5, "operation": "join"}))
|
||||
}
|
||||
|
||||
/// Everything a design built, exactly: each body's name, whole B-rep record and triangle count.
|
||||
fn built(s: &Session) -> Vec<String> {
|
||||
let st = s.model.state();
|
||||
st.bodies
|
||||
.iter()
|
||||
.map(|b| {
|
||||
let record = serde_json::to_string(b.body.record()).unwrap();
|
||||
format!("{} {} {record}", b.name, b.mesh().triangles.len())
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn design(features: &[(&'static str, Value)]) -> Session {
|
||||
let mut s = Session::default();
|
||||
for (id, p) in features {
|
||||
run(&mut s, id, p.clone());
|
||||
}
|
||||
s
|
||||
}
|
||||
|
||||
fn assert_same(what: &str, a: &[String], b: &[String]) {
|
||||
assert_eq!(a.len(), b.len(), "{what}: how many bodies");
|
||||
assert!(a == b, "{what}: the design built differently");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_design_rebuilds_the_same_on_any_kernel() {
|
||||
let f = features();
|
||||
let first = built(&design(&f));
|
||||
assert!(!first.is_empty());
|
||||
// On a new kernel, the one that built it above busy elsewhere.
|
||||
let held = solidcraft_kernel::hold_a_kernel();
|
||||
assert_same("a new kernel", &first, &built(&design(&f)));
|
||||
// And another new one, with both of those out of use.
|
||||
let held_too = solidcraft_kernel::hold_a_kernel();
|
||||
assert_same("another new kernel", &first, &built(&design(&f)));
|
||||
drop((held, held_too));
|
||||
// On one that has built plenty since.
|
||||
for _ in 0..3 {
|
||||
design(&f);
|
||||
}
|
||||
assert_same("a kernel that did much before", &first, &built(&design(&f)));
|
||||
}
|
||||
|
||||
/// A curvature round, whose procedural blends take their serials from the kernel: one body made
|
||||
/// on each of two kernels, the serials of neither mistaken for the other's in the kernel that
|
||||
/// solves stations for both.
|
||||
#[test]
|
||||
fn a_procedural_blend_builds_the_same_on_any_kernel() {
|
||||
let f = vec![
|
||||
("solid.box", json!({"length": 40, "width": 30, "height": 20})),
|
||||
("solid.fillet", json!({"edges": [[20, 0, 20]], "radius": 3, "type": "curvature"})),
|
||||
];
|
||||
let first = design(&f);
|
||||
let held = solidcraft_kernel::hold_a_kernel();
|
||||
let second = design(&f);
|
||||
let b = built(&second);
|
||||
assert_same("a new kernel", &built(&first), &b);
|
||||
let v = |s: &mut Session| run(s, "inspect.measure", json!({}))["total"]["volume_mm3"].as_f64().unwrap();
|
||||
let (mut first, mut second) = (first, second);
|
||||
let beside = v(&mut second);
|
||||
drop(held);
|
||||
assert_eq!(v(&mut first).to_bits(), beside.to_bits(), "one measured right after the other on one kernel");
|
||||
}
|
||||
|
||||
/// A modeled thread, a screw sweep and its boolean, on a short hole.
|
||||
#[test]
|
||||
fn a_thread_builds_the_same_on_any_kernel() {
|
||||
let f = vec![
|
||||
("solid.box", json!({"length": 20, "width": 20, "height": 4})),
|
||||
("solid.cylinder", json!({"base": [10, 10, -1], "axis": [0, 0, 1], "radius": 3.4, "height": 10, "operation": "cut"})),
|
||||
("solid.thread", json!({"face": [13.4, 10, 2], "modeled": true})),
|
||||
];
|
||||
let first = built(&design(&f));
|
||||
let held = solidcraft_kernel::hold_a_kernel();
|
||||
assert_same("a new kernel", &first, &built(&design(&f)));
|
||||
drop(held);
|
||||
}
|
||||
|
||||
/// Bodies from the evaluation cache and the undo stack go on into operations on another kernel:
|
||||
/// the join's boolean takes a body the held kernel made, undo restores it, redo brings back the
|
||||
/// join's, and each is what the whole design built in one go on a single kernel gives.
|
||||
#[test]
|
||||
fn bodies_from_another_kernel_go_on_through_the_cache_undo_and_redo() {
|
||||
let f = features();
|
||||
let mut all = f.clone();
|
||||
all.push(join());
|
||||
let (before, after) = (built(&design(&f)), built(&design(&all)));
|
||||
|
||||
let mut s = design(&f);
|
||||
let held = solidcraft_kernel::hold_a_kernel();
|
||||
let (id, p) = join();
|
||||
run(&mut s, id, p);
|
||||
assert_same("joined on another kernel", &after, &built(&s));
|
||||
run(&mut s, "edit.undo", json!({}));
|
||||
assert_same("undone", &before, &built(&s));
|
||||
drop(held);
|
||||
let held = solidcraft_kernel::hold_a_kernel();
|
||||
run(&mut s, "edit.redo", json!({}));
|
||||
assert_same("redone", &after, &built(&s));
|
||||
// Rebuilt without the cache, every feature again, while that kernel stays out of use.
|
||||
s.model.no_cache = true;
|
||||
*s.model.cache.lock().unwrap() = Default::default();
|
||||
run(&mut s, "timeline.roll_to", json!({"position": 0}));
|
||||
run(&mut s, "timeline.roll_to", json!({}));
|
||||
assert_same("rebuilt from the start", &after, &built(&s));
|
||||
drop(held);
|
||||
// And the body goes on from there, back on the first kernel.
|
||||
run(&mut s, "solid.box", json!({"corner": [-5, 0, 0], "length": 5, "width": 5, "height": 5, "operation": "join"}));
|
||||
let mut more = all.clone();
|
||||
more.push(("solid.box", json!({"corner": [-5, 0, 0], "length": 5, "width": 5, "height": 5, "operation": "join"})));
|
||||
assert_same("a further join", &built(&design(&more)), &built(&s));
|
||||
}
|
||||
|
||||
/// A design rebuilt while other work keeps kernels of the pool busy on other threads builds what
|
||||
/// it builds alone, whichever kernels its calls happen to get.
|
||||
#[test]
|
||||
fn a_design_rebuilt_beside_other_work_builds_the_same() {
|
||||
let f = features();
|
||||
let alone = built(&design(&f));
|
||||
let done = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||||
let busy: Vec<_> = (0..3)
|
||||
.map(|_| {
|
||||
let (done, f) = (done.clone(), f.clone());
|
||||
std::thread::spawn(move || {
|
||||
while !done.load(std::sync::atomic::Ordering::Relaxed) {
|
||||
design(&f);
|
||||
}
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
for _ in 0..3 {
|
||||
assert_same("beside other work", &alone, &built(&design(&f)));
|
||||
}
|
||||
done.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||
for b in busy {
|
||||
b.join().unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
/// A copy that replaces its own design leaves the design it was copied from going: the token over
|
||||
/// that design's work is stopped only when that design itself closes or is replaced.
|
||||
#[test]
|
||||
fn a_copy_replacing_its_design_does_not_stop_the_design_it_came_from() {
|
||||
let mut s = Session::default();
|
||||
run(&mut s, "solid.box", json!({"length": 10, "width": 10, "height": 10}));
|
||||
let token = s.stop_token();
|
||||
let new = [("file.new".to_string(), json!({}))];
|
||||
assert!(s.ahead().replies(&new).iter().all(Result::is_ok));
|
||||
assert!(!token.is_stopped(), "a copy evaluating ahead");
|
||||
let _ = s.scratch().compute_commands(&new, None);
|
||||
assert!(!token.is_stopped(), "a copy computing a dialog's commands");
|
||||
assert!(s.preview(&new).is_ok());
|
||||
assert!(!token.is_stopped(), "a preview");
|
||||
// It still works, and the design's own replacement does stop it.
|
||||
run(&mut s, "solid.box", json!({"corner": [20, 0, 0], "length": 10, "width": 10, "height": 10}));
|
||||
run(&mut s, "file.new", json!({}));
|
||||
assert!(token.is_stopped(), "the design itself replaced");
|
||||
assert!(!s.stop_token().is_stopped());
|
||||
}
|
||||
@@ -1296,7 +1296,6 @@ mod tests {
|
||||
fit: Default::default(),
|
||||
corner: Default::default(),
|
||||
setbacks: Vec::new(),
|
||||
turn: Default::default(),
|
||||
tangent_chain: true,
|
||||
},
|
||||
None,
|
||||
@@ -1419,7 +1418,6 @@ mod tests {
|
||||
fit: Default::default(),
|
||||
corner: Default::default(),
|
||||
setbacks: Vec::new(),
|
||||
turn: Default::default(),
|
||||
tangent_chain: true,
|
||||
},
|
||||
None,
|
||||
|
||||
+20
-39
@@ -234,40 +234,22 @@ fn closed(input: &Body, b: Body) -> Result<Body> {
|
||||
}
|
||||
}
|
||||
|
||||
/// How two constant rounds of one radius turn round a sharp, straight, convex side edge square to
|
||||
/// both on a plane, such as the rounds along a boss's base at its upright edges.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||
pub enum FilletTurn {
|
||||
/// The rounds run on to where they cross and meet in a mitre.
|
||||
#[default]
|
||||
Mitre,
|
||||
/// The rounds end at the side edge and the corner is their section revolved about it, a
|
||||
/// torus tangent to both. Refused where it is not built (unequal or variable rounds, a
|
||||
/// concave, curved or tangent side edge, a corner of four edges), with the reason.
|
||||
Swept,
|
||||
}
|
||||
|
||||
/// Constant-radius fillet of the edges nearest to the given points. A radius too large for the
|
||||
/// faces around the edges is refused with [`KernelError::TooLarge`] ([`fillet_max`] finds the
|
||||
/// largest that works).
|
||||
pub fn fillet(body: &Body, edges: &[Vec3], radius: f64) -> Result<Body> {
|
||||
fillet_turning(body, edges, radius, FilletTurn::Mitre)
|
||||
}
|
||||
|
||||
/// [`fillet`], its rounds turning at side edges as `turn` says.
|
||||
fn fillet_turning(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Body> {
|
||||
let _span = solidcraft_profile::span("kernel", "fillet");
|
||||
body.require_brep("fillet")?;
|
||||
crate::blend_smlib::fillet(body, edges, radius, turn).and_then(|b| closed(body, b))
|
||||
crate::blend_smlib::fillet(body, edges, radius).and_then(|b| closed(body, b))
|
||||
}
|
||||
|
||||
/// [`fillet`], its rounds turning at side edges as `turn` says, with the picks whose edges are
|
||||
/// gone: where some of the rounds overflow their faces, those are built first, and a picked edge
|
||||
/// one of them removes whole is not rounded (the others round what is left of their edges).
|
||||
pub fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<(Body, Vec<Vec3>)> {
|
||||
/// [`fillet`], with the picks whose edges are gone: where some of the rounds overflow their
|
||||
/// faces, those are built first, and a picked edge one of them removes whole is not rounded (the
|
||||
/// others round what is left of their edges).
|
||||
pub fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64) -> Result<(Body, Vec<Vec3>)> {
|
||||
let _span = solidcraft_profile::span("kernel", "fillet");
|
||||
body.require_brep("fillet")?;
|
||||
let (b, gone) = crate::blend_smlib::fillet_removing(body, edges, radius, turn)?;
|
||||
let (b, gone) = crate::blend_smlib::fillet_removing(body, edges, radius)?;
|
||||
Ok((closed(body, b)?, gone))
|
||||
}
|
||||
|
||||
@@ -533,11 +515,10 @@ fn radius_step(radius: f64) -> f64 {
|
||||
/// them (a refusal of a fillet feature's exact fit runs it to name the largest that fits, and
|
||||
/// so does `fit: reduce`). Only a refusal as too large
|
||||
/// ([`KernelError::TooLarge`]) narrows the search: any other failure of a candidate is the
|
||||
/// search's error, since a smaller radius would not be the largest that fits. The rounds turn at
|
||||
/// side edges as `turn` says.
|
||||
pub fn fillet_max(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Option<(f64, Body)>> {
|
||||
/// search's error, since a smaller radius would not be the largest that fits.
|
||||
pub fn fillet_max(body: &Body, edges: &[Vec3], radius: f64) -> Result<Option<(f64, Body)>> {
|
||||
let _span = solidcraft_profile::span("kernel", "fillet_max");
|
||||
largest_that_fits(radius, |r| fillet_turning(body, edges, r, turn))
|
||||
largest_that_fits(radius, |r| fillet(body, edges, r))
|
||||
}
|
||||
|
||||
/// [`fillet_max`] for an equal-distance chamfer of these edges: the largest distance below
|
||||
@@ -585,21 +566,21 @@ fn largest_that_fits(size: f64, blend: impl Fn(f64) -> Result<Body>) -> Result<O
|
||||
/// each reduced to fit, are too large together, or there are too many to search (each search is
|
||||
/// up to 16 fillets, and this runs in the live preview). Any failure other than a refusal as too
|
||||
/// large is the error.
|
||||
pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Option<(Vec<f64>, Body)>> {
|
||||
pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64) -> Result<Option<(Vec<f64>, Body)>> {
|
||||
let _span = solidcraft_profile::span("kernel", "fillet_max_each");
|
||||
const MAX_GROUPS: usize = 8;
|
||||
const MAX_SEARCHES: usize = 2;
|
||||
let one = || -> Result<Option<(Vec<f64>, Body)>> { Ok(fillet_max(body, edges, radius, turn)?.map(|(r, b)| (vec![r; edges.len()], b))) };
|
||||
let one = || -> Result<Option<(Vec<f64>, Body)>> { Ok(fillet_max(body, edges, radius)?.map(|(r, b)| (vec![r; edges.len()], b))) };
|
||||
let Some(groups) = interacting_groups(body, edges).filter(|g| g.len() > 1 && g.len() <= MAX_GROUPS) else { return one() };
|
||||
let mut radii = vec![radius; edges.len()];
|
||||
let mut searches = 0;
|
||||
for g in &groups {
|
||||
let pts: Vec<Vec3> = g.iter().filter_map(|i| edges.get(*i).copied()).collect();
|
||||
let r = match fillet_turning(body, &pts, radius, turn) {
|
||||
let r = match fillet(body, &pts, radius) {
|
||||
Ok(_) => continue,
|
||||
Err(KernelError::TooLarge(_)) if searches < MAX_SEARCHES => {
|
||||
searches += 1;
|
||||
match fillet_max(body, &pts, radius, turn)? {
|
||||
match fillet_max(body, &pts, radius)? {
|
||||
Some((r, _)) => r,
|
||||
None => return one(),
|
||||
}
|
||||
@@ -613,7 +594,7 @@ pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTur
|
||||
}
|
||||
}
|
||||
}
|
||||
match fillet_each(body, edges, &radii, turn) {
|
||||
match fillet_each(body, edges, &radii) {
|
||||
Ok(b) => Ok(Some((radii, b))),
|
||||
Err(KernelError::TooLarge(_)) => one(),
|
||||
Err(e) => Err(e),
|
||||
@@ -622,16 +603,16 @@ pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTur
|
||||
|
||||
/// The fillet of each edge at its own radius (`radii` in `edges`' order), all in one SMLib
|
||||
/// blend.
|
||||
pub fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64], turn: FilletTurn) -> Result<Body> {
|
||||
pub fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64]) -> Result<Body> {
|
||||
let _span = solidcraft_profile::span("kernel", "fillet_each");
|
||||
if radii.len() != edges.len() {
|
||||
return Err(KernelError::Invalid("one radius per edge".into()));
|
||||
}
|
||||
if let Some(r) = radii.first().filter(|r| radii.iter().all(|x| x.to_bits() == r.to_bits())) {
|
||||
return fillet_turning(body, edges, *r, turn);
|
||||
return fillet(body, edges, *r);
|
||||
}
|
||||
body.require_brep("fillet")?;
|
||||
crate::blend_smlib::fillet_each(body, edges, radii, turn).and_then(|b| closed(body, b))
|
||||
crate::blend_smlib::fillet_each(body, edges, radii).and_then(|b| closed(body, b))
|
||||
}
|
||||
|
||||
/// The points' edges (each the edge a blend's pick there takes) grouped where they share a face
|
||||
@@ -1618,7 +1599,7 @@ mod tests {
|
||||
assert!(matches!(e, KernelError::TooLarge(_)), "{e}");
|
||||
let e = e.to_string();
|
||||
assert!(e.contains("into the hollow at (0.000, 30.000, 40.000) and open the part"), "{e}");
|
||||
let (largest, _) = fillet_max(&case, &[top], 7.0, FilletTurn::Mitre).unwrap().unwrap();
|
||||
let (largest, _) = fillet_max(&case, &[top], 7.0).unwrap().unwrap();
|
||||
assert!((largest - 6.828).abs() < 1e-9, "{largest}");
|
||||
|
||||
// Just short of the corner it rounds, its whole section along the 104.
|
||||
@@ -1632,8 +1613,8 @@ mod tests {
|
||||
// inner R7's arc (centre (23, 33)) only at sqrt2 (r - 9) + 7 = r, r = 13.83.
|
||||
let inside = Vec3::new(0.0, 30.0, 40.0);
|
||||
assert!(fillet(&case, &[top, inside], 7.0).is_ok());
|
||||
assert!(fillet_each(&case, &[top, inside], &[13.8, 7.0], FilletTurn::Mitre).is_ok());
|
||||
let e = fillet_each(&case, &[top, inside], &[13.9, 7.0], FilletTurn::Mitre).unwrap_err().to_string();
|
||||
assert!(fillet_each(&case, &[top, inside], &[13.8, 7.0]).is_ok());
|
||||
let e = fillet_each(&case, &[top, inside], &[13.9, 7.0]).unwrap_err().to_string();
|
||||
assert!(e.contains("into the hollow at"), "{e}");
|
||||
}
|
||||
|
||||
|
||||
@@ -261,7 +261,7 @@ pub fn fillet_radii(body: &Body, edges: &[(Vec3, f64)]) -> Result<Body> {
|
||||
return Err(KernelError::Invalid("fillet size must be positive".into()));
|
||||
}
|
||||
let (points, radii): (Vec<Vec3>, Vec<f64>) = edges.iter().copied().unzip();
|
||||
crate::blend_smlib::fillet_each(body, &points, &radii, crate::FilletTurn::Mitre)
|
||||
crate::blend_smlib::fillet_each(body, &points, &radii)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
@@ -17,7 +17,7 @@ use solidcore_record::Vec3;
|
||||
|
||||
use crate::blend_variable::RadiusSpline;
|
||||
use crate::body::Body;
|
||||
use crate::{FilletTurn, KernelError, Result};
|
||||
use crate::{KernelError, Result};
|
||||
|
||||
/// What SMLib cannot build yet.
|
||||
pub(crate) fn unsupported(what: &str) -> KernelError {
|
||||
@@ -25,24 +25,22 @@ pub(crate) fn unsupported(what: &str) -> KernelError {
|
||||
}
|
||||
|
||||
/// A constant-radius round of the edges nearest `edges` ([`crate::fillet`]).
|
||||
/// The rounds turn at side edges as `turn` says.
|
||||
pub(crate) fn fillet(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Body> {
|
||||
imp::blend(body, "fillet", Kind::Round(turn), edges, &vec![radius; edges.len()])
|
||||
pub(crate) fn fillet(body: &Body, edges: &[Vec3], radius: f64) -> Result<Body> {
|
||||
imp::blend(body, "fillet", Kind::Round, edges, &vec![radius; edges.len()])
|
||||
}
|
||||
|
||||
/// [`fillet`], with the picks whose edges a larger, overflowing round removed whole.
|
||||
pub(crate) fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<(Body, Vec<Vec3>)> {
|
||||
let (b, dropped) = imp::blend_dropping(body, "fillet", Kind::Round(turn), edges, &vec![radius; edges.len()])?;
|
||||
pub(crate) fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64) -> Result<(Body, Vec<Vec3>)> {
|
||||
let (b, dropped) = imp::blend_dropping(body, "fillet", Kind::Round, edges, &vec![radius; edges.len()])?;
|
||||
Ok((b, edges.iter().zip(dropped).filter(|(_, d)| *d).map(|(p, _)| *p).collect()))
|
||||
}
|
||||
|
||||
/// Each edge rounded at its own radius ([`crate::fillet_each`]), turning at side edges as `turn`
|
||||
/// says.
|
||||
pub(crate) fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64], turn: FilletTurn) -> Result<Body> {
|
||||
/// Each edge rounded at its own radius ([`crate::fillet_each`]).
|
||||
pub(crate) fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64]) -> Result<Body> {
|
||||
if radii.len() != edges.len() {
|
||||
return Err(KernelError::Invalid("one radius per edge".into()));
|
||||
}
|
||||
imp::blend(body, "fillet", Kind::Round(turn), edges, radii)
|
||||
imp::blend(body, "fillet", Kind::Round, edges, radii)
|
||||
}
|
||||
|
||||
/// A constant-radius round whose corners at `setbacks` (a point at each corner's vertex, and the
|
||||
@@ -65,7 +63,7 @@ pub(crate) struct OpenCorners {
|
||||
/// that would fill each corner, for the caller to fill.
|
||||
/// `curvature`: the rounds' sections are curvature-continuous ([`fillet_g2`]), else circular.
|
||||
pub(crate) fn fillet_setback_open(body: &Body, edges: &[Vec3], radius: f64, setbacks: &[(Vec3, f64)], curvature: bool) -> Result<OpenCorners> {
|
||||
let kind = if curvature { Kind::Curvature } else { Kind::Round(FilletTurn::Mitre) };
|
||||
let kind = if curvature { Kind::Curvature } else { Kind::Round };
|
||||
imp::blend_setback_open(body, kind, edges, &vec![radius; edges.len()], setbacks)
|
||||
}
|
||||
|
||||
@@ -106,8 +104,7 @@ pub(crate) fn picked_edges(body: &Body, picks: &[Vec3]) -> Result<(Vec<usize>, V
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
enum Kind {
|
||||
/// Constant-radius rounds, turning at side edges as the [`FilletTurn`] says.
|
||||
Round(FilletTurn),
|
||||
Round,
|
||||
Curvature,
|
||||
Chord,
|
||||
Chamfer,
|
||||
@@ -118,7 +115,7 @@ mod imp {
|
||||
use std::collections::BTreeSet;
|
||||
|
||||
use solidcore_record::Vec3;
|
||||
use solidcraft_smlib::{Blend, Brep, ChamferSecond, CheckLevel, Error as SmError, Turn};
|
||||
use solidcraft_smlib::{Blend, Brep, ChamferSecond, CheckLevel, Error as SmError};
|
||||
|
||||
use super::Kind;
|
||||
use crate::blend_variable::RadiusSpline;
|
||||
@@ -228,21 +225,13 @@ mod imp {
|
||||
/// SMLib's blend of each kind.
|
||||
fn blend_kind(kind: Kind) -> Blend {
|
||||
match kind {
|
||||
Kind::Round(_) => Blend::Round,
|
||||
Kind::Round => Blend::Round,
|
||||
Kind::Curvature => Blend::Curvature,
|
||||
Kind::Chord => Blend::Chord,
|
||||
Kind::Chamfer => Blend::Chamfer,
|
||||
}
|
||||
}
|
||||
|
||||
/// SMLib's turn of each kind of turn.
|
||||
fn smlib_turn(turn: crate::FilletTurn) -> Turn {
|
||||
match turn {
|
||||
crate::FilletTurn::Mitre => Turn::Mitre,
|
||||
crate::FilletTurn::Swept => Turn::Swept,
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn blend(body: &Body, what: &str, kind: Kind, edges: &[Vec3], sizes: &[f64]) -> Result<Body> {
|
||||
blend_dropping(body, what, kind, edges, sizes).map(|(b, _)| b)
|
||||
}
|
||||
@@ -254,22 +243,21 @@ mod imp {
|
||||
sizes_ok(what, sizes)?;
|
||||
let picked = resolve(body, edges)?;
|
||||
let next = crate::blend::unfinished_chain(body, edges, &picked.edges, &picked.hidden)?;
|
||||
if matches!(kind, Kind::Round(_)) {
|
||||
if matches!(kind, Kind::Round) {
|
||||
crate::blend::rounds_too_small(body, edges, &picked.edges, sizes)?;
|
||||
crate::blend::rounds_into_hollow(body, edges, &picked.edges, sizes)?;
|
||||
}
|
||||
let tol = pick_tolerance(body);
|
||||
let Kind::Round(turn) = kind else {
|
||||
let Kind::Round = kind else {
|
||||
let kind = blend_kind(kind);
|
||||
return run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(kind, Turn::Mitre, &picked.points, sizes, tol))
|
||||
return run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(kind, &picked.points, sizes, tol))
|
||||
.map(|(out, dropped, _)| (out, dropped))
|
||||
.map_err(|e| crate::blend::with_continuation(e, next));
|
||||
};
|
||||
// Constant-radius rounds: the body keeps what they were made on, and a later round at a
|
||||
// corner where they meet blends them again with it (crate::blend_corner).
|
||||
let turn = smlib_turn(turn);
|
||||
let out = match crate::blend_corner::later_corners(body, &picked.edges, sizes)? {
|
||||
Some((later, new)) => reblend(body, what, &later, turn).map(|(b, dropped_new)| {
|
||||
Some((later, new)) => reblend(body, what, &later).map(|(b, dropped_new)| {
|
||||
// A picked seam has no round of its own: only the new edges can be removed.
|
||||
let dropped = picked
|
||||
.edges
|
||||
@@ -278,7 +266,7 @@ mod imp {
|
||||
.collect();
|
||||
(b.with_rounds(body, new), dropped)
|
||||
}),
|
||||
None => run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(Blend::Round, turn, &picked.points, sizes, tol))
|
||||
None => run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(Blend::Round, &picked.points, sizes, tol))
|
||||
.map(|(out, dropped, _)| (out.with_rounds(body, picked.edges.iter().copied().zip(sizes.iter().copied()).collect()), dropped)),
|
||||
};
|
||||
out.map_err(|e| crate::blend::with_continuation(e, next))
|
||||
@@ -287,9 +275,8 @@ mod imp {
|
||||
/// The blend `later` makes of its base, every round from the earliest meeting the new edges'
|
||||
/// corners on and the new edges in one, with its history over `body`, the body the later
|
||||
/// round was given ([`crate::blend_corner::rebase`]), and whether each new edge (in
|
||||
/// `later`'s order) was removed whole by a larger, overflowing round. The rounds turn at side
|
||||
/// edges as `turn` says.
|
||||
fn reblend(body: &Body, what: &str, later: &crate::blend_corner::Later, turn: Turn) -> Result<(Body, Vec<bool>)> {
|
||||
/// `later`'s order) was removed whole by a larger, overflowing round.
|
||||
fn reblend(body: &Body, what: &str, later: &crate::blend_corner::Later) -> Result<(Body, Vec<bool>)> {
|
||||
let base = &later.base;
|
||||
let mesh = base.mesh(&crate::MeshTolerance::chord((base.size() * 2e-3).max(1e-3)))?;
|
||||
let mut indices = Vec::with_capacity(later.edges.len());
|
||||
@@ -304,7 +291,7 @@ mod imp {
|
||||
}
|
||||
sizes_ok(what, &radii)?;
|
||||
let tol = pick_tolerance(base);
|
||||
let (out, dropped, _) = run_with(base, what, &indices, &[], |b| b.blend_dropping(Blend::Round, turn, &points, &radii, tol))?;
|
||||
let (out, dropped, _) = run_with(base, what, &indices, &[], |b| b.blend_dropping(Blend::Round, &points, &radii, tol))?;
|
||||
// The new edges are the last of `later.edges`.
|
||||
let dropped_new = dropped.get(dropped.len().saturating_sub(later.new_count())..).map(<[bool]>::to_vec).unwrap_or_default();
|
||||
let history = out.history().and_then(|h| crate::blend_corner::rebase(h, later, body));
|
||||
@@ -459,11 +446,6 @@ mod imp {
|
||||
run on tangentially into each other, or meet in a way no blend corner builds)"
|
||||
)),
|
||||
SmError::NoRoom => KernelError::TooLarge(format!("the {what} is larger than the faces beside its edges allow")),
|
||||
// Not a size a smaller radius fixes: solidcore builds no swept turn there.
|
||||
SmError::TurnRefused { why, at, .. } => {
|
||||
let at = at.map(|[x, y, z]| format!(" at ({x:.3}, {y:.3}, {z:.3})")).unwrap_or_default();
|
||||
KernelError::Invalid(format!("the {what}'s swept corner{at} is not built: {why}"))
|
||||
}
|
||||
SmError::TooLarge { size, kind, at, why } => {
|
||||
let mut beside = match at {
|
||||
Some([x, y, z]) => format!(", at the edge at ({x:.3}, {y:.3}, {z:.3})"),
|
||||
@@ -612,7 +594,7 @@ mod tests {
|
||||
fn a_round_loses_its_corner_and_its_face_comes_from_the_edge() {
|
||||
let b = cube();
|
||||
let at = Vec3::new(10.0, 20.0, 20.0);
|
||||
let r = imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[at], &[2.0]).unwrap();
|
||||
let r = imp::blend(&b, "fillet", Kind::Round, &[at], &[2.0]).unwrap();
|
||||
assert!(near(volume(&r), 8000.0 - QUARTER * 4.0 * 20.0), "{}", volume(&r));
|
||||
assert_eq!(r.face_count(), 7);
|
||||
let h = r.history().expect("a history");
|
||||
@@ -626,8 +608,8 @@ mod tests {
|
||||
// (20, 20, 10) is on the vertical edge only; (20, 20, 20) is a corner of three edges, which
|
||||
// the body's own order resolves, never left to SMLib.
|
||||
let b = cube();
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(20.0, 20.0, 20.0)], &[1.0]).is_ok());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(60.0, 60.0, 60.0)], &[1.0]).is_err());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(20.0, 20.0, 20.0)], &[1.0]).is_ok());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(60.0, 60.0, 60.0)], &[1.0]).is_err());
|
||||
}
|
||||
|
||||
/// A ball's rim on a block's back face, tangent to the back face's bottom edge at (2.5, 22.5, 0).
|
||||
@@ -695,7 +677,7 @@ mod tests {
|
||||
fn each_edge_takes_its_own_size() {
|
||||
let b = cube();
|
||||
let picks = [Vec3::new(10.0, 20.0, 20.0), Vec3::new(10.0, 0.0, 20.0)];
|
||||
let r = imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &picks, &[2.0, 3.0]).unwrap();
|
||||
let r = imp::blend(&b, "fillet", Kind::Round, &picks, &[2.0, 3.0]).unwrap();
|
||||
assert!(near(volume(&r), 8000.0 - QUARTER * 13.0 * 20.0), "{}", volume(&r));
|
||||
let c = imp::blend(&b, "chamfer", Kind::Chamfer, &picks, &[2.0, 3.0]).unwrap();
|
||||
assert!(near(volume(&c), 8000.0 - 0.5 * 13.0 * 20.0), "{}", volume(&c));
|
||||
@@ -768,9 +750,9 @@ mod tests {
|
||||
// A radius law down to zero inside the edge would pinch the round to a point.
|
||||
let pinch = RadiusSpline { degree: 1, knots: vec![0.0, 0.0, 0.5, 1.0, 1.0], radii: vec![4.0, 0.0, 4.0] };
|
||||
assert!(imp::variable(&b, Vec3::new(10.0, 20.0, 20.0), Vec3::new(0.0, 20.0, 20.0), &pinch).is_err());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(10.0, 20.0, 20.0)], &[f64::NAN]).is_err());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(f64::NAN, 20.0, 20.0)], &[1.0]).is_err());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[], &[]).is_err());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(10.0, 20.0, 20.0)], &[f64::NAN]).is_err());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(f64::NAN, 20.0, 20.0)], &[1.0]).is_err());
|
||||
assert!(imp::blend(&b, "fillet", Kind::Round, &[], &[]).is_err());
|
||||
}
|
||||
|
||||
/// A smooth edge (a round's seam with the face it runs into) has nothing to round: refused
|
||||
@@ -782,30 +764,30 @@ mod tests {
|
||||
#[test]
|
||||
fn smooth_edges_and_unfinished_tangent_chains_are_refused_saying_why() {
|
||||
let b = cube();
|
||||
let rounded = fillet(&b, &[Vec3::new(10.0, 20.0, 20.0)], 3.0, FilletTurn::Mitre).unwrap();
|
||||
let rounded = fillet(&b, &[Vec3::new(10.0, 20.0, 20.0)], 3.0).unwrap();
|
||||
// the seam where the r3 round meets the top, 3 in from the old edge
|
||||
let seam = imp::blend(&rounded, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(10.0, 17.0, 20.0)], &[1.0]).unwrap_err().to_string();
|
||||
let seam = imp::blend(&rounded, "fillet", Kind::Round, &[Vec3::new(10.0, 17.0, 20.0)], &[1.0]).unwrap_err().to_string();
|
||||
assert!(seam.contains("is smooth: its faces meet tangentially, so there is nothing to round"), "{seam}");
|
||||
// the end face's top edge runs on tangentially into the round's end arc: its r1 round
|
||||
// goes on along y through the r3 round until that drops below it, at y = 17 + sqrt(5)
|
||||
// (the rig case's closed form: 8000 - 20 (9 - 9 pi/4) - 17 (1 - pi/4) - 0.218236)
|
||||
let top = Vec3::new(0.0, 8.0, 20.0);
|
||||
let alone = fillet(&rounded, &[top], 1.0, FilletTurn::Mitre).unwrap();
|
||||
let alone = fillet(&rounded, &[top], 1.0).unwrap();
|
||||
assert!((volume(&alone) - 7957.505202).abs() < 1e-3, "{}", volume(&alone));
|
||||
let chain = crate::tangent_chain(&rounded, &[top]).unwrap();
|
||||
assert!(chain.len() > 1, "{chain:?}");
|
||||
let whole = fillet(&rounded, &chain, 1.0, FilletTurn::Mitre).unwrap();
|
||||
let whole = fillet(&rounded, &chain, 1.0).unwrap();
|
||||
assert!(volume(&whole) < volume(&rounded));
|
||||
|
||||
// r5 and r3 on two top edges at a corner, then r2 on the vertical edge under them: it
|
||||
// runs on up the r5 round's end arc, and SMLib ends it there
|
||||
let b = box_solid(Vec3::new(0.0, 0.0, 0.0), Vec3::new(60.0, 40.0, 20.0)).unwrap();
|
||||
let b = fillet(&b, &[Vec3::new(30.0, 40.0, 20.0)], 5.0, FilletTurn::Mitre).unwrap();
|
||||
let b = fillet(&b, &[Vec3::new(60.0, 20.0, 20.0)], 3.0, FilletTurn::Mitre).unwrap();
|
||||
let b = fillet(&b, &[Vec3::new(30.0, 40.0, 20.0)], 5.0).unwrap();
|
||||
let b = fillet(&b, &[Vec3::new(60.0, 20.0, 20.0)], 3.0).unwrap();
|
||||
let vertical = Vec3::new(60.0, 40.0, 8.0);
|
||||
let chain = crate::tangent_chain(&b, &[vertical]).unwrap();
|
||||
assert!(chain.len() > 1, "{chain:?}");
|
||||
let run_on = fillet(&b, &[vertical], 2.0, FilletTurn::Mitre).unwrap();
|
||||
let run_on = fillet(&b, &[vertical], 2.0).unwrap();
|
||||
assert!(volume(&run_on) < volume(&b));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -454,15 +454,18 @@ const MAX_REFUSAL_PROBES: usize = 20_000;
|
||||
|
||||
impl Refusal {
|
||||
/// The refusal of `record` for `error`, with the face SMLib refuses on its own.
|
||||
fn of(record: &Brep, error: &solidcraft_smlib::Error) -> Refusal {
|
||||
pub(crate) fn of(record: &Brep, error: &solidcraft_smlib::Error) -> Refusal {
|
||||
if let solidcraft_smlib::Error::Internal(why) = error {
|
||||
return Refusal { face: None, surface: None, why: why.clone(), internal: true };
|
||||
}
|
||||
let _span = solidcraft_profile::span("kernel", "smlib_refusal_face");
|
||||
let alone = |f: usize| crate::surfaces::Parts::of(record, &[(f, false)]).and_then(|p| p.canonical()).map(|c| c.brep);
|
||||
let face = (record.faces.len() <= MAX_REFUSAL_PROBES)
|
||||
.then(|| (0..record.faces.len()).find(|&f| alone(f).is_ok_and(|r| solidcraft_smlib::Brep::from_record(&r, true).is_err())))
|
||||
.flatten();
|
||||
// It is kept with the body for every later reader: a stopped job's probes must not decide it.
|
||||
let face = solidcraft_smlib::stop::unstoppable(|| {
|
||||
let alone = |f: usize| crate::surfaces::Parts::of(record, &[(f, false)]).and_then(|p| p.canonical()).map(|c| c.brep);
|
||||
(record.faces.len() <= MAX_REFUSAL_PROBES)
|
||||
.then(|| (0..record.faces.len()).find(|&f| alone(f).is_ok_and(|r| solidcraft_smlib::Brep::from_record(&r, true).is_err())))
|
||||
.flatten()
|
||||
});
|
||||
let surface = face.and_then(|f| record.faces.get(f)).map(|f| SurfaceKind::of(&f.surface));
|
||||
Refusal { face, surface, why: error.to_string(), internal: false }
|
||||
}
|
||||
@@ -545,7 +548,10 @@ impl Body {
|
||||
pub fn smlib(&self) -> Result<&solidcraft_smlib::Brep> {
|
||||
self.require_brep("an SMLib operation")?;
|
||||
self.smlib
|
||||
.get_or_init(|| solidcraft_smlib::Brep::from_record(&self.record, true).map_err(|e| Refusal::of(&self.record, &e)))
|
||||
.get_or_init(|| {
|
||||
solidcraft_smlib::stop::unstoppable(|| solidcraft_smlib::Brep::from_record(&self.record, true))
|
||||
.map_err(|e| Refusal::of(&self.record, &e))
|
||||
})
|
||||
.as_ref()
|
||||
.map_err(
|
||||
|r| if r.internal { KernelError::Internal(format!("SMLib: {}", r.why)) } else { KernelError::Failed(format!("SMLib: {}", r.why)) },
|
||||
|
||||
@@ -68,32 +68,20 @@ pub(crate) fn frame_ok(plane: &Plane) -> bool {
|
||||
/// Extrude each region from `start` to `end` along the plane normal (offsets in mm, `end > start`).
|
||||
pub fn extrude(plane: &Plane, regions: &[Region2], start: f64, end: f64) -> Result<Vec<Body>> {
|
||||
let _span = solidcraft_profile::span("kernel", "extrude");
|
||||
extrude_with(plane, regions, start, end, None)
|
||||
extrude_with(plane, regions, start, end, false)
|
||||
}
|
||||
|
||||
/// [`extrude`] with each run of profile lines that continue one another in a straight line (a side
|
||||
/// drawn in two pieces, a mirrored half meeting its mirror image) swept into one side face over
|
||||
/// all its pieces, rather than coplanar faces with an edge between them (#1788), and each run of
|
||||
/// free-form segments (conics, Béziers) that `one_curve` says are pieces of one curve (an
|
||||
/// ellipse's four quarters, a spline's spans) swept as that one curve into one wall. The side's
|
||||
/// all its pieces, rather than coplanar faces with an edge between them (#1788). The side's
|
||||
/// history lists every piece under it. For the Extrude feature; other builders (sheet metal's
|
||||
/// flat pattern, tools) keep a face per segment.
|
||||
pub fn extrude_whole_sides(plane: &Plane, regions: &[Region2], start: f64, end: f64, one_curve: &dyn Fn(&Seg2, &Seg2) -> bool) -> Result<Vec<Body>> {
|
||||
pub fn extrude_whole_sides(plane: &Plane, regions: &[Region2], start: f64, end: f64) -> Result<Vec<Body>> {
|
||||
let _span = solidcraft_profile::span("kernel", "extrude_whole_sides");
|
||||
extrude_with(plane, regions, start, end, Some(one_curve))
|
||||
extrude_with(plane, regions, start, end, true)
|
||||
}
|
||||
|
||||
/// The degree of a free-form segment (a conic or a Bézier), none for a line or an arc.
|
||||
fn free_form_degree(s: &Seg2) -> Option<u8> {
|
||||
match *s {
|
||||
Seg2::Conic { .. } => Some(2),
|
||||
Seg2::Cubic { .. } => Some(3),
|
||||
Seg2::Bezier { n, .. } => Some(n),
|
||||
Seg2::Line { .. } | Seg2::Arc { .. } => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn extrude_with(plane: &Plane, regions: &[Region2], start: f64, end: f64, one_curve: Option<&dyn Fn(&Seg2, &Seg2) -> bool>) -> Result<Vec<Body>> {
|
||||
fn extrude_with(plane: &Plane, regions: &[Region2], start: f64, end: f64, whole_sides: bool) -> Result<Vec<Body>> {
|
||||
if !frame_ok(plane) {
|
||||
return Err(KernelError::Invalid("extrude frame is not finite and orthonormal".into()));
|
||||
}
|
||||
@@ -110,26 +98,8 @@ fn extrude_with(plane: &Plane, regions: &[Region2], start: f64, end: f64, one_cu
|
||||
.map(|r| {
|
||||
region_ok(r)?;
|
||||
let pieces = oriented(r)?;
|
||||
let Some(one_curve) = one_curve else {
|
||||
return crate::smlib_sweeps::extrude(plane, &crate::smlib_sweeps::region_pieces(&pieces, &pieces), Some(r), lo, hi - lo, 1.0, None);
|
||||
};
|
||||
// Pieces of one curve: free-form segments of one degree that the caller says are one
|
||||
// curve. Each loop starts where such a run starts, so no run wraps round its end.
|
||||
let joins = |s: &Seg2, t: &Seg2| free_form_degree(s).is_some_and(|d| free_form_degree(t) == Some(d)) && one_curve(s, t);
|
||||
let numbered = pieces.map_loops(|l| l.merged_lines(continues_straight).starting_a_run(joins));
|
||||
let mut swept = crate::smlib_sweeps::region_pieces(&numbered, &pieces);
|
||||
let mut k = 0;
|
||||
for l in numbered.loops() {
|
||||
for i in 1..l.lp.segs.len() {
|
||||
if let (Some(s), Some(t)) = (l.lp.segs.get(i - 1), l.lp.segs.get(i))
|
||||
&& let Some(x) = swept.get_mut(k + i)
|
||||
{
|
||||
x.joins_previous = joins(s, t);
|
||||
}
|
||||
}
|
||||
k += l.lp.segs.len();
|
||||
}
|
||||
crate::smlib_sweeps::extrude(plane, &swept, Some(r), lo, hi - lo, 1.0, None)
|
||||
let numbered = if whole_sides { pieces.map_loops(|l| l.merged_lines(continues_straight)) } else { pieces.clone() };
|
||||
crate::smlib_sweeps::extrude(plane, &crate::smlib_sweeps::region_pieces(&numbered, &pieces), Some(r), lo, hi - lo, 1.0, None)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ fn collinear_profile_lines_extrude_into_one_side_face() {
|
||||
let region = Region2 { outer: Loop2::polygon(&pts), holes: vec![] };
|
||||
// Plain `extrude` keeps a face per segment (sheet metal's flat pattern relies on it).
|
||||
assert_eq!(crate::extrude(&Plane::XY, std::slice::from_ref(®ion), 0.0, 5.0).unwrap()[0].face_count(), 7);
|
||||
let body = crate::extrude_whole_sides(&Plane::XY, &[region], 0.0, 5.0, &|_, _| false).unwrap().pop().unwrap();
|
||||
let body = crate::extrude_whole_sides(&Plane::XY, &[region], 0.0, 5.0).unwrap().pop().unwrap();
|
||||
assert_eq!(body.face_count(), 6, "a box has six faces");
|
||||
assert!((crate::measure(&body).unwrap().volume - 1000.0).abs() < 1e-9);
|
||||
let h = body.history().unwrap();
|
||||
@@ -276,75 +276,10 @@ fn collinear_profile_lines_extrude_into_one_side_face() {
|
||||
);
|
||||
// A corner is not a straight run: an L-shaped step keeps its faces.
|
||||
let step = [(0.0, 0.0), (10.0, 0.0), (10.0, 5.0), (20.0, 5.0), (20.0, 10.0), (0.0, 10.0)].map(|(x, y)| Vec2::new(x, y));
|
||||
let body = crate::extrude_whole_sides(&Plane::XY, &[Region2 { outer: Loop2::polygon(&step), holes: vec![] }], 0.0, 5.0, &|_, _| false)
|
||||
.unwrap()
|
||||
.pop()
|
||||
.unwrap();
|
||||
let body = crate::extrude_whole_sides(&Plane::XY, &[Region2 { outer: Loop2::polygon(&step), holes: vec![] }], 0.0, 5.0).unwrap().pop().unwrap();
|
||||
assert_eq!(body.face_count(), 8);
|
||||
}
|
||||
|
||||
/// The pieces of one ellipse (four conic quarters) or one spline (its cubic spans) that the
|
||||
/// caller calls one curve sweep into one wall generated by all of them, the same solid as a face
|
||||
/// per piece: the ellipse's volume is π a b h. Pieces not called one curve keep a face each.
|
||||
#[test]
|
||||
fn pieces_of_one_curve_extrude_into_one_wall() {
|
||||
use solidcore_record::{Loop2, Plane, Region2, Seg2, Vec2};
|
||||
let v = Vec2::new;
|
||||
let (c, u, w) = (v(1.0, 2.0), v(10.0, 0.0), v(0.0, 5.0));
|
||||
let corners = [c + u, c + w, c - u, c - w];
|
||||
let ellipse: Vec<Seg2> = (0..4)
|
||||
.map(|i| {
|
||||
let (a, b) = (corners[i], corners[(i + 1) % 4]);
|
||||
Seg2::Conic { a, apex: a + b - c, b, w: std::f64::consts::FRAC_1_SQRT_2 }
|
||||
})
|
||||
.collect();
|
||||
// A cubic spline's three spans (C2 at its joints, on unequal knot spans), closed by lines.
|
||||
let spline = vec![
|
||||
Seg2::Cubic {
|
||||
p0: v(0.0, 0.0),
|
||||
p1: v(3.478154619431441, -1.9606112245268097),
|
||||
p2: v(6.956309238862882, -3.921222449053619),
|
||||
p3: v(10.0, -3.0),
|
||||
},
|
||||
Seg2::Cubic {
|
||||
p0: v(10.0, -3.0),
|
||||
p1: v(13.55861013478923, -1.9229288384169465),
|
||||
p2: v(16.52332013301099, 3.0935296384274267),
|
||||
p3: v(20.0, 4.0),
|
||||
},
|
||||
Seg2::Cubic {
|
||||
p0: v(20.0, 4.0),
|
||||
p1: v(23.067612954017893, 4.799814860722723),
|
||||
p2: v(26.533806477008945, 2.3999074303613614),
|
||||
p3: v(30.0, 0.0),
|
||||
},
|
||||
Seg2::Line { a: v(30.0, 0.0), b: v(30.0, 20.0) },
|
||||
Seg2::Line { a: v(30.0, 20.0), b: v(0.0, 20.0) },
|
||||
Seg2::Line { a: v(0.0, 20.0), b: v(0.0, 0.0) },
|
||||
];
|
||||
for (segs, walls, pieces) in [(ellipse, 1, 4), (spline, 4, 3)] {
|
||||
let region = Region2 { outer: Loop2 { segs }, holes: vec![] };
|
||||
let apart = crate::extrude_whole_sides(&Plane::XY, std::slice::from_ref(®ion), 0.0, 7.0, &|_, _| false).unwrap().remove(0);
|
||||
let body = crate::extrude_whole_sides(&Plane::XY, std::slice::from_ref(®ion), 0.0, 7.0, &|_, _| true).unwrap().remove(0);
|
||||
assert_eq!(apart.face_count(), 2 + walls - 1 + pieces, "a face per piece when they are not one curve");
|
||||
assert_eq!(body.face_count(), 2 + walls, "one wall over the curve's pieces");
|
||||
let (joined, each) = (crate::measure(&body).unwrap().volume, crate::measure(&apart).unwrap().volume);
|
||||
assert!((joined - each).abs() < 1e-9 * each, "{joined} vs {each}");
|
||||
let h = body.history().unwrap();
|
||||
h.check(&body, &[]).unwrap();
|
||||
let curved: Vec<Vec<FaceOrigin>> = h.faces.iter().map(|f| f.origins.clone()).filter(|o| o.len() > 1).collect();
|
||||
assert_eq!(curved.len(), 1, "{:?}", h.faces);
|
||||
let mut segments: Vec<usize> =
|
||||
curved[0].iter().filter_map(|o| if let FaceOrigin::Profile { segment } = o { Some(*segment) } else { None }).collect();
|
||||
segments.sort();
|
||||
assert_eq!(segments, (0..pieces).collect::<Vec<_>>(), "the wall is generated by every piece of the curve");
|
||||
if walls == 1 {
|
||||
let exact = std::f64::consts::PI * 10.0 * 5.0 * 7.0;
|
||||
assert!((joined - exact).abs() < 1e-6 * exact, "{joined} vs π a b h = {exact}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A tapered extrude joins a side drawn in collinear pieces as the straight extrude does
|
||||
/// (#1788): one sloped face generated by both pieces, and the same solid as a side in one piece.
|
||||
#[test]
|
||||
|
||||
@@ -88,7 +88,7 @@ fn chamfers_crossing_each_other_are_refused() {
|
||||
too_large(crate::chamfer(&rib, &edges, 3.0));
|
||||
too_large(crate::fillet(&rib, &edges, 3.0));
|
||||
assert_eq!(crate::chamfer_max(&rib, &edges, 3.0).unwrap().map(|x| x.0), Some(2.0));
|
||||
assert_eq!(crate::fillet_max(&rib, &edges, 3.0, crate::FilletTurn::Mitre).unwrap().map(|x| x.0), Some(2.0));
|
||||
assert_eq!(crate::fillet_max(&rib, &edges, 3.0).unwrap().map(|x| x.0), Some(2.0));
|
||||
// Below half the width both build.
|
||||
let b = crate::chamfer(&rib, &edges, 1.5).unwrap();
|
||||
assert!((b.volume_at(0.01).unwrap() - (3200.0 - 2.0 * 0.5 * 1.5 * 1.5 * 40.0)).abs() < 1e-6);
|
||||
|
||||
@@ -156,7 +156,7 @@ mod validity;
|
||||
pub mod watch;
|
||||
|
||||
pub use blend::{
|
||||
ChamferSide, FilletTurn, SETBACK_AT_LEAST, blend_edges, chamfer, chamfer_max, chamfer_sides, fillet, fillet_each, fillet_g2, fillet_g2_corners,
|
||||
ChamferSide, SETBACK_AT_LEAST, blend_edges, chamfer, chamfer_max, chamfer_sides, fillet, fillet_each, fillet_g2, fillet_g2_corners,
|
||||
fillet_g2_with_g2_corners, fillet_least_setback, fillet_max, fillet_max_each, fillet_removing, fillet_setback, largest_fit_note,
|
||||
names_largest_fit, tangent_chain, with_fit_note,
|
||||
};
|
||||
@@ -215,6 +215,8 @@ pub use prism_curve::{PlanarPiece, PlanarSpline};
|
||||
pub use prism_measure::{PrismSection, certified_prism_equivalent, certified_prism_section};
|
||||
pub use repair::{Hole, RebuiltFace, RefusedFace, RepairOptions, RepairReport, SewnGap, repair};
|
||||
pub use sew::{EdgeSpec, FaceSpec, SurfSpec, sew, sew_touching};
|
||||
pub use solidcraft_smlib::hold_a_kernel;
|
||||
pub use solidcraft_smlib::stop::Stop;
|
||||
pub use solidcraft_smlib::trace as smlib_trace;
|
||||
pub use splitface::{SplitTool, split_body, split_faces, split_faces_with_map};
|
||||
pub use step::step_export;
|
||||
|
||||
@@ -152,19 +152,6 @@ impl NumberedLoop {
|
||||
out
|
||||
}
|
||||
|
||||
/// The same loop started at a segment `joins` does not join to the one before it, so no run of
|
||||
/// joined segments wraps round the loop's end (as it is when every segment joins the next).
|
||||
pub(crate) fn starting_a_run(&self, joins: impl Fn(&Seg2, &Seg2) -> bool) -> NumberedLoop {
|
||||
let segs = &self.lp.segs;
|
||||
let n = segs.len();
|
||||
let joined = |i: usize| matches!((segs.get((i + n - 1) % n), segs.get(i)), (Some(s), Some(t)) if joins(s, t));
|
||||
let mut out = self.clone();
|
||||
if let Some(k) = (0..n).find(|&i| !joined(i)) {
|
||||
out.rotate_left(k);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// Split segment `k` in half, both halves over what it ran over.
|
||||
fn split_half(&mut self, k: usize) {
|
||||
if k >= self.lp.segs.len() || k >= self.from.len() {
|
||||
|
||||
@@ -28,9 +28,10 @@ fn pool() -> Option<&'static rayon::ThreadPool> {
|
||||
/// thread. Waking the pool's workers costs tens of microseconds, so callers ask for it only
|
||||
/// when the items carry more work than that (decided from the work, not the item count).
|
||||
pub(crate) fn map<T: Sync, R: Send>(what: &'static str, items: &[T], parallel: bool, f: impl Fn(&T) -> Result<R> + Sync) -> Vec<Result<R>> {
|
||||
// The workers run under the caller's validation mode (`crate::validation`).
|
||||
// The workers run under the caller's validation mode (`crate::validation`) and stop token.
|
||||
let scope = crate::validation::current();
|
||||
let one = |item: &T| crate::validation::within(scope.clone(), || guard(what, || f(item)));
|
||||
let stop = solidcraft_smlib::stop::current();
|
||||
let one = |item: &T| solidcraft_smlib::stop::scoped(stop.clone(), || crate::validation::within(scope.clone(), || guard(what, || f(item))));
|
||||
// The browser build has no worker pool: everything runs on the calling thread.
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
let _ = parallel;
|
||||
@@ -87,7 +88,8 @@ pub fn map_with_local_pools<T: Sync, R: Send>(items: &[T], max_threads: usize, f
|
||||
}
|
||||
let pool = cell.get().ok_or_else(|| crate::KernelError::Failed("missing mesh worker".into()))?;
|
||||
let scope = crate::validation::current();
|
||||
pool.install(|| crate::validation::within(scope, || guard("mesh worker", || f(item))))
|
||||
let stop = solidcraft_smlib::stop::current();
|
||||
pool.install(|| solidcraft_smlib::stop::scoped(stop, || crate::validation::within(scope, || guard("mesh worker", || f(item)))))
|
||||
})
|
||||
};
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
@@ -101,9 +103,12 @@ pub fn map_with_local_pools<T: Sync, R: Send>(items: &[T], max_threads: usize, f
|
||||
/// `f` over `items` as [`for_each_on_threads`] runs it, results in item order (`None` where an
|
||||
/// item panicked).
|
||||
pub fn map_on_threads<T: Sync, R: Send>(items: &[T], max_threads: usize, f: impl Fn(&T) -> R + Sync) -> Vec<Option<R>> {
|
||||
// The threads run under the caller's validation mode (`crate::validation`).
|
||||
// The threads run under the caller's validation mode (`crate::validation`) and stop token.
|
||||
let scope = crate::validation::current();
|
||||
let one = |item: &T| crate::validation::within(scope.clone(), || guard("parallel item", || Ok(f(item))).ok());
|
||||
let stop = solidcraft_smlib::stop::current();
|
||||
let one = |item: &T| {
|
||||
solidcraft_smlib::stop::scoped(stop.clone(), || crate::validation::within(scope.clone(), || guard("parallel item", || Ok(f(item))).ok()))
|
||||
};
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
{
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
|
||||
@@ -172,119 +172,6 @@ pub(super) fn same_support(a: &Plane, b: &Plane, at: Resolution) -> bool {
|
||||
&& (a.origin - b.origin).dot(nb).abs() <= at.linear
|
||||
}
|
||||
|
||||
/// A source a face on its plane can take: the plane it names (for a shell's inner role, the
|
||||
/// source's plane moved in and turned round), the source, and whether it is that inner role.
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
struct Candidate<'a> {
|
||||
plane: Plane,
|
||||
source: &'a FaceSource,
|
||||
inner: bool,
|
||||
}
|
||||
|
||||
/// What a mapping's inputs say of one plane of its result.
|
||||
#[derive(Debug, PartialEq)]
|
||||
enum Support<'a> {
|
||||
/// A face without a role, or a competing tool face, lies on the plane.
|
||||
Blocked,
|
||||
/// Every candidate on the plane is one source, plane and role: the pieces of one logical face.
|
||||
Source(Candidate<'a>),
|
||||
/// No candidate lies on the plane, or candidates of distinct identities do.
|
||||
Unnamed,
|
||||
}
|
||||
|
||||
/// Planes partitioned into supports, in their order: a plane starts a group unless it is one
|
||||
/// support (`same_support`) with the first plane of an earlier group, which it then joins. Returns
|
||||
/// each plane's group and each group's first plane; `looked` counts the planes looked at.
|
||||
fn group_supports(planes: &[Plane], at: Resolution, looked: &mut usize) -> (Vec<usize>, Vec<usize>) {
|
||||
let index = PlaneIndex::new(planes.iter(), at);
|
||||
let mut group: Vec<Option<usize>> = vec![None; planes.len()];
|
||||
let mut first = Vec::new();
|
||||
for (i, plane) in planes.iter().enumerate() {
|
||||
if group.get(i).is_some_and(Option::is_some) {
|
||||
continue;
|
||||
}
|
||||
let g = first.len();
|
||||
first.push(i);
|
||||
let near = index.near(plane);
|
||||
*looked += near.len();
|
||||
for j in near {
|
||||
if let Some(slot @ None) = group.get_mut(j)
|
||||
&& (j == i || planes.get(j).is_some_and(|other| same_support(plane, other, at)))
|
||||
{
|
||||
*slot = Some(g);
|
||||
}
|
||||
}
|
||||
}
|
||||
(group.into_iter().map(|g| g.unwrap_or(usize::MAX)).collect(), first)
|
||||
}
|
||||
|
||||
/// The candidates and blocking planes of a mapping grouped by support once, so each result face
|
||||
/// looks up its plane's few groups instead of every candidate on that plane: with many coplanar
|
||||
/// faces the work grows with the faces plus the candidates, not with their product.
|
||||
struct SupportDecisions<'a> {
|
||||
/// Each candidate group's first plane, and its decision: its first candidate, or none when
|
||||
/// the group holds candidates of distinct identities.
|
||||
groups: Vec<(Plane, Option<Candidate<'a>>)>,
|
||||
group_index: PlaneIndex,
|
||||
/// The first plane of each group of the faces without a role and the competing tool faces.
|
||||
blocking: Vec<Plane>,
|
||||
blocking_index: PlaneIndex,
|
||||
at: Resolution,
|
||||
/// The planes looked at, building the groups and deciding faces.
|
||||
looked: usize,
|
||||
}
|
||||
|
||||
impl<'a> SupportDecisions<'a> {
|
||||
/// `candidates` in the order that decides between them.
|
||||
fn new(candidates: &[Candidate<'a>], unknown: &[Plane], competing: &[Plane], at: Resolution) -> Self {
|
||||
let mut looked = 0;
|
||||
let planes: Vec<Plane> = candidates.iter().map(|c| c.plane).collect();
|
||||
let (group, first) = group_supports(&planes, at, &mut looked);
|
||||
let mut groups: Vec<(Plane, Option<Candidate<'a>>)> = first.iter().filter_map(|&i| candidates.get(i)).map(|c| (c.plane, Some(*c))).collect();
|
||||
for (candidate, g) in candidates.iter().zip(&group) {
|
||||
if let Some((_, decision)) = groups.get_mut(*g)
|
||||
&& decision.is_some_and(|d| d != *candidate)
|
||||
{
|
||||
*decision = None;
|
||||
}
|
||||
}
|
||||
let group_index = PlaneIndex::new(groups.iter().map(|g| &g.0), at);
|
||||
let all_blocking: Vec<Plane> = unknown.iter().chain(competing).copied().collect();
|
||||
let (_, first) = group_supports(&all_blocking, at, &mut looked);
|
||||
let blocking: Vec<Plane> = first.iter().filter_map(|&i| all_blocking.get(i).copied()).collect();
|
||||
let blocking_index = PlaneIndex::new(blocking.iter(), at);
|
||||
SupportDecisions { groups, group_index, blocking, blocking_index, at, looked }
|
||||
}
|
||||
|
||||
/// What the inputs say of a face on `actual`.
|
||||
fn at(&mut self, actual: &Plane) -> Support<'a> {
|
||||
let at = self.at;
|
||||
let near = self.blocking_index.near(actual);
|
||||
self.looked += near.len();
|
||||
if near.into_iter().any(|i| self.blocking.get(i).is_some_and(|plane| same_support(plane, actual, at))) {
|
||||
return Support::Blocked;
|
||||
}
|
||||
let mut near = self.group_index.near(actual);
|
||||
self.looked += near.len();
|
||||
// Groups are numbered in the candidates' order, so the first matching group's first
|
||||
// candidate is the first candidate on the plane.
|
||||
near.sort_unstable();
|
||||
let mut chosen: Option<Candidate<'a>> = None;
|
||||
for (plane, decision) in near.into_iter().filter_map(|g| self.groups.get(g)) {
|
||||
if !same_support(plane, actual, at) {
|
||||
continue;
|
||||
}
|
||||
match (chosen, decision) {
|
||||
(_, None) => return Support::Unnamed,
|
||||
(None, Some(d)) => chosen = Some(*d),
|
||||
(Some(c), Some(d)) if c != *d => return Support::Unnamed,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
chosen.map_or(Support::Unnamed, Support::Source)
|
||||
}
|
||||
}
|
||||
|
||||
fn base_plane(source: &FaceSource, actual: &Plane) -> Option<Plane> {
|
||||
match source {
|
||||
FaceSource::CertifiedExtrudeSide { plane: Some(p), .. }
|
||||
@@ -452,40 +339,98 @@ impl Body {
|
||||
unknown_supports.push(actual);
|
||||
continue;
|
||||
}
|
||||
if descriptor_cost(source).is_none() {
|
||||
let Some(cost) = descriptor_cost(source) else {
|
||||
unknown_supports.push(actual);
|
||||
continue;
|
||||
}
|
||||
candidates.push(Candidate { plane, source, inner: false });
|
||||
};
|
||||
candidates.push((plane, source, false, cost));
|
||||
if let Some(t) = shell {
|
||||
let inner = Plane::new(plane.origin - plane.normal() * t, plane.x, -plane.y)
|
||||
.ok_or_else(|| KernelError::Invalid("invalid shell inner source plane".into()))?;
|
||||
candidates.push(Candidate { plane: inner, source, inner: true });
|
||||
candidates.push((inner, source, true, cost));
|
||||
}
|
||||
}
|
||||
// The candidates are taken in the order of their normal's x: where several match one
|
||||
// face, the first decides which the rest are compared with.
|
||||
candidates.sort_by(|a, b| a.plane.normal().x.total_cmp(&b.plane.normal().x));
|
||||
let mut decide = SupportDecisions::new(&candidates, &unknown_supports, &competing, at);
|
||||
candidates.sort_by(|a, b| a.0.normal().x.total_cmp(&b.0.normal().x));
|
||||
let unknown_index = PlaneIndex::new(unknown_supports.iter(), at);
|
||||
let competing_index = PlaneIndex::new(competing.iter(), at);
|
||||
let candidate_index = PlaneIndex::new(candidates.iter().map(|c| &c.0), at);
|
||||
let mut metadata = 2_000_000usize;
|
||||
let mut identity_bytes = 16_000_000usize;
|
||||
let mut result = Vec::new();
|
||||
for (index, actual) in actual_planes(&self)?.into_iter().enumerate() {
|
||||
// A face no candidate names keeps what it had, where an operation could have left
|
||||
// it a source no role describes.
|
||||
let existing = || {
|
||||
self.face_sources()
|
||||
let mut found = None;
|
||||
if let Some(actual) = actual {
|
||||
let on = |planes: &[Plane], index: &PlaneIndex| {
|
||||
index.near(&actual).into_iter().any(|i| planes.get(i).is_some_and(|plane| same_support(plane, &actual, at)))
|
||||
};
|
||||
let blocked = on(&unknown_supports, &unknown_index) || on(&competing, &competing_index);
|
||||
if blocked {
|
||||
let existing = self
|
||||
.face_sources()
|
||||
.and_then(|sources| sources.get(index))
|
||||
.and_then(|s| s.as_ref())
|
||||
.filter(|s| (boolean || self.face_was_coalesced(index)) && !boolean_source(s, constructed));
|
||||
let keep = existing.and_then(|s| {
|
||||
descriptor_cost(s).and_then(|cost| {
|
||||
metadata.checked_sub(cost).map(|remaining| {
|
||||
metadata = remaining;
|
||||
s.clone()
|
||||
})
|
||||
})
|
||||
});
|
||||
result.push(keep);
|
||||
continue;
|
||||
}
|
||||
let mut chosen: Option<(Plane, &FaceSource, bool, usize)> = None;
|
||||
let mut near = candidate_index.near(&actual);
|
||||
near.sort_unstable();
|
||||
for (plane, source, inner, cost) in near.into_iter().filter_map(|i| candidates.get(i)) {
|
||||
if same_support(plane, &actual, at) {
|
||||
if let Some((previous_plane, previous_source, previous_inner, _)) = chosen {
|
||||
let Some(remaining) = identity_bytes.checked_sub(*cost) else {
|
||||
chosen = None;
|
||||
break;
|
||||
};
|
||||
identity_bytes = remaining;
|
||||
// Several current pieces of one exact source are one
|
||||
// logical face; distinct source identities remain ambiguous.
|
||||
if previous_plane != *plane || previous_source != *source || previous_inner != *inner {
|
||||
chosen = None;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
chosen = Some((*plane, *source, *inner, *cost));
|
||||
}
|
||||
}
|
||||
}
|
||||
if let Some((plane, source, inner, cost)) = chosen
|
||||
&& let Some(remaining) = metadata.checked_sub(cost)
|
||||
{
|
||||
metadata = remaining;
|
||||
found = Some(if shell.is_some() {
|
||||
FaceSource::ShellPlanar { producer: None, source: Box::new(source.clone()), inner, plane }
|
||||
} else {
|
||||
source.clone()
|
||||
});
|
||||
}
|
||||
}
|
||||
if found.is_none() && (boolean || self.face_was_coalesced(index)) {
|
||||
found = self
|
||||
.face_sources()
|
||||
.and_then(|sources| sources.get(index))
|
||||
.and_then(|s| s.as_ref())
|
||||
.filter(|s| (boolean || self.face_was_coalesced(index)) && !boolean_source(s, constructed) && descriptor_cost(s).is_some())
|
||||
.cloned()
|
||||
};
|
||||
let found = match actual.map(|actual| decide.at(&actual)) {
|
||||
Some(Support::Source(Candidate { plane, source, inner })) => Some(if shell.is_some() {
|
||||
FaceSource::ShellPlanar { producer: None, source: Box::new(source.clone()), inner, plane }
|
||||
} else {
|
||||
source.clone()
|
||||
}),
|
||||
Some(Support::Blocked | Support::Unnamed) | None => existing(),
|
||||
};
|
||||
.filter(|s| !boolean_source(s, constructed))
|
||||
.and_then(|s| {
|
||||
descriptor_cost(s).and_then(|cost| {
|
||||
metadata.checked_sub(cost).map(|remaining| {
|
||||
metadata = remaining;
|
||||
s.clone()
|
||||
})
|
||||
})
|
||||
});
|
||||
}
|
||||
result.push(found);
|
||||
}
|
||||
Ok(result)
|
||||
@@ -629,90 +574,6 @@ mod tests {
|
||||
assert!(matches > 2 * planes.len(), "the planes meet each other, not only themselves: {matches}");
|
||||
}
|
||||
|
||||
/// Many faces on one plane are decided with work that grows with the faces plus the
|
||||
/// candidates: each face looks at its plane's one group, never at every candidate on it.
|
||||
#[test]
|
||||
fn coplanar_faces_are_decided_by_group_in_linear_work() {
|
||||
let body = box_solid(Vec3::ZERO, Vec3::new(1000., 1000., 10.)).unwrap();
|
||||
let at = Resolution::of(&body);
|
||||
let top = Plane::new(Vec3::new(0., 0., 10.), Vec3::X, Vec3::Y).unwrap();
|
||||
let one = FaceSource::Box { producer: Some(1), axis: 2, high: true, plane: top };
|
||||
let other = FaceSource::Box { producer: Some(2), axis: 2, high: true, plane: top };
|
||||
for n in [100usize, 1000] {
|
||||
// `n` pieces of one cap and `n` faces of the result on its plane, each a little moved
|
||||
// along the plane (as a split face's pieces are).
|
||||
let pieces: Vec<Plane> = (0..n).map(|k| Plane::new(Vec3::new(k as f64, 0., 10.), Vec3::X, Vec3::Y).unwrap()).collect();
|
||||
let candidates: Vec<Candidate> = (0..n).map(|_| Candidate { plane: top, source: &one, inner: false }).collect();
|
||||
let mut decide = SupportDecisions::new(&candidates, &[], &[], at);
|
||||
for piece in &pieces {
|
||||
assert_eq!(decide.at(piece), Support::Source(Candidate { plane: top, source: &one, inner: false }));
|
||||
}
|
||||
// One look per candidate to group them, one per face to find its group: a scan of
|
||||
// every candidate per face would look n * n times.
|
||||
assert_eq!(decide.looked, 2 * n);
|
||||
// A second identity among the candidates leaves the plane unnamed; a face without a
|
||||
// role on it blocks it.
|
||||
let mut mixed = candidates.clone();
|
||||
mixed[n / 2] = Candidate { plane: top, source: &other, inner: false };
|
||||
assert_eq!(SupportDecisions::new(&mixed, &[], &[], at).at(&pieces[0]), Support::Unnamed);
|
||||
let unknown = vec![top; n];
|
||||
let mut blocked = SupportDecisions::new(&candidates, &unknown, &[], at);
|
||||
assert!(pieces.iter().all(|piece| blocked.at(piece) == Support::Blocked));
|
||||
assert_eq!(blocked.looked, 3 * n);
|
||||
}
|
||||
}
|
||||
|
||||
/// A plate with 300 holes whose top a comb of grooves cuts into 62 strips: every strip keeps
|
||||
/// the top cap's source, every bottom face the bottom cap's, however many there are.
|
||||
#[test]
|
||||
fn many_coplanar_pieces_of_a_holed_plate_all_keep_their_cap_source() {
|
||||
use solidcore_record::{Loop2, Region2, Vec2};
|
||||
let holes: Vec<Loop2> =
|
||||
(0..60).flat_map(|k| (0..5).map(move |r| Loop2::circle(Vec2::new(10. + 10. * k as f64, 5. + 10. * r as f64), 1.))).collect();
|
||||
let outer = Loop2::polygon(&[Vec2::new(0., 0.), Vec2::new(610., 0.), Vec2::new(610., 50.), Vec2::new(0., 50.)]);
|
||||
let region = Region2 { outer, holes };
|
||||
let raw = crate::extrude(&Plane::XY, std::slice::from_ref(®ion), 0., 10.).unwrap().remove(0);
|
||||
let hole_ids: Vec<Vec<String>> = (0..300).map(|k| vec![format!("c{k}")]).collect();
|
||||
let signatures: Vec<_> = raw
|
||||
.face_sources()
|
||||
.unwrap()
|
||||
.iter()
|
||||
.map(|s| matches!(s, Some(FaceSource::ExtrudeCap { .. })).then(|| (vec!["l1".to_string()], hole_ids.clone())))
|
||||
.collect();
|
||||
let plate = raw.with_extrude_cap_certificates(5, 3, &signatures).unwrap();
|
||||
// A comb: 61 teeth 2 wide across the plate between the columns of holes, 2 deep.
|
||||
let mut comb = vec![Vec2::new(-5., 55.), Vec2::new(-5., 60.), Vec2::new(615., 60.), Vec2::new(615., 55.)];
|
||||
for k in (0..=60).rev() {
|
||||
let x = 4. + 10. * k as f64;
|
||||
comb.extend([Vec2::new(x + 2., 55.), Vec2::new(x + 2., -5.), Vec2::new(x, -5.), Vec2::new(x, 55.)]);
|
||||
}
|
||||
let comb = Region2 { outer: Loop2::polygon(&comb), holes: vec![] };
|
||||
let tool = crate::extrude(&Plane::XY, std::slice::from_ref(&comb), 8., 12.).unwrap().remove(0);
|
||||
let cut = crate::boolean(&plate, &tool, crate::BoolOp::Cut).unwrap().unwrap();
|
||||
let sources = cut.face_sources().unwrap();
|
||||
let (mut tops, mut bottoms) = (0, 0);
|
||||
for (i, plane) in actual_planes(&cut).unwrap().into_iter().enumerate() {
|
||||
let Some(plane) = plane else { continue };
|
||||
let high = if plane.normal().dot(Vec3::Z) > 0.999999 && (plane.origin.z - 10.).abs() < 1e-9 {
|
||||
true
|
||||
} else if plane.normal().dot(Vec3::Z) < -0.999999 && plane.origin.z.abs() < 1e-9 {
|
||||
false
|
||||
} else {
|
||||
continue;
|
||||
};
|
||||
let Some(FaceSource::CertifiedExtrudeCap { producer: 5, high: h, holes, .. }) = &sources[i] else {
|
||||
panic!("face {i} on the {} cap lost its source: {:?}", if high { "top" } else { "bottom" }, sources[i]);
|
||||
};
|
||||
assert_eq!((*h, holes.len()), (high, 300));
|
||||
if high {
|
||||
tops += 1;
|
||||
} else {
|
||||
bottoms += 1;
|
||||
}
|
||||
}
|
||||
assert_eq!((tops, bottoms), (62, 1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rounded_shell_planar_roles_are_exact_distinct_and_transformable() {
|
||||
for (width, thickness) in [(80., 2.), (100., 3.)] {
|
||||
|
||||
@@ -31,17 +31,11 @@ pub(crate) struct Piece {
|
||||
/// The segment as drawn that names it: itself, or for collinear lines joined into one, the
|
||||
/// first of them.
|
||||
pub drawn: Seg2,
|
||||
/// It carries on the piece before it as one curve (pieces of one ellipse or spline): SMLib
|
||||
/// gets the run as one B-spline and sweeps one wall over it.
|
||||
pub joins_previous: bool,
|
||||
}
|
||||
|
||||
/// The segments of `loops` as pieces, loop after loop.
|
||||
pub(crate) fn pieces<'a>(loops: impl IntoIterator<Item = &'a NumberedLoop>) -> Vec<Piece> {
|
||||
loops
|
||||
.into_iter()
|
||||
.flat_map(|l| l.lp.segs.iter().enumerate().map(|(i, s)| Piece { seg: *s, numbers: l.numbers(i).to_vec(), drawn: *s, joins_previous: false }))
|
||||
.collect()
|
||||
loops.into_iter().flat_map(|l| l.lp.segs.iter().enumerate().map(|(i, s)| Piece { seg: *s, numbers: l.numbers(i).to_vec(), drawn: *s })).collect()
|
||||
}
|
||||
|
||||
/// The pieces of `joined` (`drawn` with collinear lines joined): outer loop, then holes, each
|
||||
@@ -151,70 +145,8 @@ mod imp {
|
||||
})
|
||||
}
|
||||
|
||||
/// The pieces as SMLib's curves: one each, but one B-spline for each run of pieces that join
|
||||
/// the one before them ([`Piece::joins_previous`]).
|
||||
fn curves(plane: &Plane, pieces: &[Piece]) -> Result<Vec<Curve>> {
|
||||
let mut out = Vec::new();
|
||||
let mut run = Vec::new();
|
||||
for x in pieces {
|
||||
if !x.joins_previous && !run.is_empty() {
|
||||
out.push(joined(std::mem::take(&mut run))?);
|
||||
}
|
||||
run.push(curve(plane, &x.seg)?);
|
||||
}
|
||||
if !run.is_empty() {
|
||||
out.push(joined(run)?);
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// Bézier curves of one degree, each starting where the one before ends, as the one B-spline
|
||||
/// they are, exactly: their control points in a row (each joint once) on knots repeated the
|
||||
/// degree times at each joint. A rational piece's weights are scaled (which leaves it the same
|
||||
/// curve) to meet the weight the piece before ends with. Each piece's knot span is as long as
|
||||
/// keeps the speed through the joint the same on both sides, so pieces meeting tangentially
|
||||
/// (the pieces of one ellipse or spline) join with a continuous first derivative: SMLib makes
|
||||
/// one wall over a curve that is, and splits it where the derivative jumps.
|
||||
fn joined(run: Vec<Curve>) -> Result<Curve> {
|
||||
if run.len() == 1 {
|
||||
return run.into_iter().next().ok_or_else(|| KernelError::Invalid("an empty run of curves".into()));
|
||||
}
|
||||
let not_one = || KernelError::Invalid("the pieces of one curve are not Béziers of one degree".into());
|
||||
let xyz = |q: &[f64; 4]| Vec3::new(q[0], q[1], q[2]);
|
||||
let mut degree = None;
|
||||
let mut points: Vec<[f64; 4]> = Vec::new();
|
||||
let mut knots = Vec::new();
|
||||
// The knot at the last joint, and the length of the span before it.
|
||||
let (mut at, mut span) = (0.0, 1.0);
|
||||
for c in &run {
|
||||
let Curve::Nurbs { degree: d, points: ps, .. } = c else { return Err(not_one()) };
|
||||
if degree.is_some_and(|p| p != *d) || ps.len() != d + 1 || *d == 0 {
|
||||
return Err(not_one());
|
||||
}
|
||||
degree = Some(*d);
|
||||
let (Some(first), Some(second)) = (ps.first(), ps.get(1)) else { return Err(not_one()) };
|
||||
let (Some(last), Some(before)) = (points.last(), points.len().checked_sub(2).and_then(|i| points.get(i))) else {
|
||||
points.extend(ps.iter().copied());
|
||||
knots.extend(std::iter::repeat_n(0.0, d + 1));
|
||||
continue;
|
||||
};
|
||||
let scale = last[3] / first[3];
|
||||
if !(scale.is_finite() && scale > 0.0) {
|
||||
return Err(not_one());
|
||||
}
|
||||
// The derivative of a rational Bézier on a span of length h at its end is
|
||||
// d (w[d-1] / w[d]) (P[d] - P[d-1]) / h, at its start d (w[1] / w[0]) (P[1] - P[0]) / h.
|
||||
let ending = (xyz(last) - xyz(before)) * (before[3] / last[3]) * (1.0 / span);
|
||||
let starting = (xyz(second) - xyz(first)) * (second[3] / first[3]);
|
||||
let next = starting.len() / ending.len();
|
||||
at += span;
|
||||
span = if next.is_finite() && next > 0.0 { next } else { 1.0 };
|
||||
points.extend(ps.iter().skip(1).map(|q| [q[0], q[1], q[2], q[3] * scale]));
|
||||
knots.extend(std::iter::repeat_n(at, *d));
|
||||
}
|
||||
let degree = degree.ok_or_else(not_one)?;
|
||||
knots.extend(std::iter::repeat_n(at + span, degree + 1));
|
||||
Ok(Curve::Nurbs { degree, points, knots })
|
||||
pieces.iter().map(|x| curve(plane, &x.seg)).collect()
|
||||
}
|
||||
|
||||
/// A chain of sketch segments on `plane` as SMLib's curves, one each, exactly (lines, arcs,
|
||||
@@ -632,26 +564,11 @@ mod imp {
|
||||
};
|
||||
crate::FaceSource::ExtrudeSide { segment: x.drawn, plane, coalesced: false }
|
||||
}),
|
||||
// The one wall over a whole run of pieces of one curve: named by its first piece.
|
||||
Role::Wall(set) if run_starts(pieces, set).is_some() => run_starts(pieces, set)
|
||||
.and_then(|i| pieces.get(i))
|
||||
.map(|x| crate::FaceSource::ExtrudeSide { segment: x.drawn, plane: None, coalesced: false }),
|
||||
_ => None,
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// The first piece of the run of joined pieces `set` is exactly (all of it, and nothing else).
|
||||
fn run_starts(pieces: &[Piece], set: &BTreeSet<usize>) -> Option<usize> {
|
||||
let (&first, &last) = (set.first()?, set.last()?);
|
||||
let run = pieces.get(first..=last)?;
|
||||
let whole = last - first + 1 == set.len()
|
||||
&& run.first().is_some_and(|x| !x.joins_previous)
|
||||
&& run.iter().skip(1).all(|x| x.joins_previous)
|
||||
&& pieces.get(last + 1).is_none_or(|x| !x.joins_previous);
|
||||
(set.len() > 1 && whole).then_some(first)
|
||||
}
|
||||
|
||||
fn numbered_segments(r: &Region2) -> usize {
|
||||
r.outer.segs.len() + r.holes.iter().map(|h| h.segs.len()).sum::<usize>()
|
||||
}
|
||||
@@ -678,7 +595,7 @@ mod imp {
|
||||
let walls: Vec<Piece> = pieces
|
||||
.iter()
|
||||
.filter(|x| [0.0, 0.5, 1.0].iter().any(|t| off_axis(plane.to_world(x.seg.point_at(*t)))))
|
||||
.map(|x| Piece { seg: x.seg, numbers: x.numbers.clone(), drawn: x.drawn, joins_previous: false })
|
||||
.map(|x| Piece { seg: x.seg, numbers: x.numbers.clone(), drawn: x.drawn })
|
||||
.collect();
|
||||
let about = |q: Vec3, a: f64| origin + turned(q - origin, k, a);
|
||||
let full = turn >= std::f64::consts::TAU - 1e-9;
|
||||
@@ -1618,7 +1535,7 @@ mod imp {
|
||||
all.extend(q.numbers.iter().copied());
|
||||
}
|
||||
}
|
||||
Piece { seg: x.seg, numbers: all.into_iter().collect(), drawn: x.drawn, joins_previous: false }
|
||||
Piece { seg: x.seg, numbers: all.into_iter().collect(), drawn: x.drawn }
|
||||
})
|
||||
.collect();
|
||||
let roles = roles(&body, start, Some(&last.0), &seeds(start, &columns, |q| q), &[], false)?;
|
||||
|
||||
@@ -331,14 +331,14 @@ fn fillet_max_finds_the_largest_radius_that_works() {
|
||||
let b = box_solid(Vec3::new(14.0, 0.0, 0.0), Vec3::new(28.0, 6.0, 10.0)).unwrap();
|
||||
let mids = [Vec3::new(14.0, 0.0, 5.0), Vec3::new(28.0, 0.0, 5.0), Vec3::new(14.0, 6.0, 5.0), Vec3::new(28.0, 6.0, 5.0)];
|
||||
assert!(too_large(&b, &mids, 3.5));
|
||||
let (r, body) = fillet_max(&b, &mids, 3.5, FilletTurn::Mitre).unwrap().unwrap();
|
||||
let (r, body) = fillet_max(&b, &mids, 3.5).unwrap().unwrap();
|
||||
assert_eq!(r, 3.0);
|
||||
assert!(rel(measure(&body).unwrap().volume, 840.0 - (4.0 - PI) * 90.0) < 2e-4);
|
||||
// No edge there: the fillet's own error, not a smaller radius (only a refusal as too large
|
||||
// narrows the search).
|
||||
let e = fillet(&b, &[Vec3::new(500.0, 0.0, 5.0)], 1.0).unwrap_err();
|
||||
assert!(!matches!(e, KernelError::TooLarge(_)), "{e}");
|
||||
assert_eq!(fillet_max(&b, &[Vec3::new(500.0, 0.0, 5.0)], 1.0, FilletTurn::Mitre).unwrap_err().to_string(), e.to_string());
|
||||
assert_eq!(fillet_max(&b, &[Vec3::new(500.0, 0.0, 5.0)], 1.0).unwrap_err().to_string(), e.to_string());
|
||||
}
|
||||
|
||||
/// Edges that share no face get their own largest radius: a 2 mm fin's top edge takes at most
|
||||
@@ -360,7 +360,7 @@ fn fillet_max_each_reduces_only_where_the_radius_does_not_fit() {
|
||||
// at its edge less the quarter disc about (17, 26), inside the fin (x >= 19): 2 x 4 less the
|
||||
// disc's part, in closed form; the corner's round (1 − π/4)·16 along 20.
|
||||
let both = fillet(&body, &edges, 4.0).unwrap();
|
||||
let (radii, b) = fillet_max_each(&body, &edges, 4.0, FilletTurn::Mitre).unwrap().unwrap();
|
||||
let (radii, b) = fillet_max_each(&body, &edges, 4.0).unwrap().unwrap();
|
||||
assert_eq!(radii, vec![4.0, 4.0], "{radii:?}");
|
||||
assert!(b.validity().is_empty(), "{:?}", b.validity());
|
||||
let disc = |a: f64| 0.5 * (a * (16.0 - a * a).max(0.0).sqrt() + 16.0 * (a / 4.0).asin());
|
||||
@@ -371,7 +371,7 @@ fn fillet_max_each_reduces_only_where_the_radius_does_not_fit() {
|
||||
// The post's four edges limit each other: one radius, as `fillet_max`.
|
||||
let post = box_solid(Vec3::new(14.0, 0.0, 0.0), Vec3::new(28.0, 6.0, 10.0)).unwrap();
|
||||
let mids = [Vec3::new(14.0, 0.0, 5.0), Vec3::new(28.0, 0.0, 5.0), Vec3::new(14.0, 6.0, 5.0), Vec3::new(28.0, 6.0, 5.0)];
|
||||
assert_eq!(fillet_max_each(&post, &mids, 3.5, FilletTurn::Mitre).unwrap().map(|x| x.0), Some(vec![3.0; 4]));
|
||||
assert_eq!(fillet_max_each(&post, &mids, 3.5).unwrap().map(|x| x.0), Some(vec![3.0; 4]));
|
||||
}
|
||||
|
||||
/// R21 on an edge of a 20 mm cube overflows on its tangent sides, which a round may, taking all
|
||||
@@ -2439,3 +2439,17 @@ fn a_box_cut_round_a_small_hole_of_a_long_plate_keeps_the_hole() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A refusal is kept with its body for every later reader: which face it names doesn't depend on
|
||||
/// whether the job that found it had been stopped, whose probes would all be refused.
|
||||
#[test]
|
||||
fn a_stopped_job_does_not_decide_which_face_a_refusal_names() {
|
||||
let body = crate::build::box_solid(Vec3::ZERO, Vec3::new(10.0, 10.0, 10.0)).unwrap();
|
||||
let why = solidcraft_smlib::Error::Argument;
|
||||
let plain = crate::body::Refusal::of(body.record(), &why);
|
||||
assert_eq!(plain.face, None, "every face of a box is taken on its own");
|
||||
let stop = crate::Stop::new();
|
||||
stop.stop();
|
||||
let stopped = stop.within(|| crate::body::Refusal::of(body.record(), &why));
|
||||
assert_eq!(stopped.face, plain.face);
|
||||
}
|
||||
|
||||
@@ -3480,9 +3480,9 @@ fn a_bridged_server_checks_calls_at_its_param_check_level() {
|
||||
assert_eq!(r["result"]["isError"], json!(true), "{r}");
|
||||
assert!(text(&r).contains(&format!("invalid parameters for `solid.box`: {warning}")), "{r}");
|
||||
assert_eq!(sent("engine.execute solid.box"), 0, "refused unsent");
|
||||
let r = raw_tool(&mut s, "execute", json!({"command": "solid.chamfer", "params": {"nonsense": 1}}));
|
||||
let r = raw_tool(&mut s, "execute", json!({"command": "solid.fillet", "params": {"nonsense": 1}}));
|
||||
assert_ne!(r["result"]["isError"], json!(true), "{r}");
|
||||
assert_eq!(sent("engine.execute solid.chamfer"), 1, "no contract here: the app decides");
|
||||
assert_eq!(sent("engine.execute solid.fillet"), 1, "no contract here: the app decides");
|
||||
let r = raw_tool(&mut s, "batch", json!({"commands": [good, misspelt]}));
|
||||
assert_eq!(r["result"]["isError"], json!(true), "{r}");
|
||||
let reply: Value = serde_json::from_str(&text(&r)).unwrap();
|
||||
|
||||
+105
-23
@@ -11,7 +11,7 @@ use std::sync::{Mutex, PoisonError};
|
||||
|
||||
use solidcore::geom::attribute::{AttributeStore, ObjectKey};
|
||||
use solidcore::geom::vector3d::Vec3;
|
||||
use solidcore::kernel::{Kernel, KernelOptions, UpstreamFixes};
|
||||
use solidcore::kernel::{CancelToken, Kernel, KernelOptions, Rng, UpstreamFixes};
|
||||
use solidcore::mass::integrator::properties::{PropertyAttributes, brep_volume};
|
||||
use solidcore::primitive::api_primitives as primitives;
|
||||
|
||||
@@ -412,7 +412,8 @@ const HELD_BACK: &[&str] = &["fillet_refuse_rounds_breaking_through"];
|
||||
|
||||
/// How far apart two kernels' procedural blend serials start. A body keeps the serials of the
|
||||
/// kernel that made it and may be used on any other, whose memo of solved stations is keyed by
|
||||
/// serial alone: the ranges keep one definition's stations from answering for another's.
|
||||
/// serial alone: the ranges keep one definition's stations from answering for another's. A serial
|
||||
/// only names a definition, so which range one comes from changes no answer.
|
||||
pub(crate) const BLEND_SERIALS_PER_KERNEL: u64 = 1 << 40;
|
||||
|
||||
/// A new kernel. Each takes the next range of blend serials, the first starting at 0.
|
||||
@@ -424,30 +425,85 @@ fn fresh() -> Kernel {
|
||||
k
|
||||
}
|
||||
|
||||
/// Most kernels kept for later calls; those over it are dropped when their call ends.
|
||||
const MOST_IDLE: usize = 8;
|
||||
|
||||
/// The kernels no call is using, the last used on top. The lock is only held to take or put back
|
||||
/// a kernel, never during a call: a call that runs long (or never returns) holds up nothing but
|
||||
/// its own body, so one design's long operation never delays another's. Calls one after another
|
||||
/// all get the same kernel, as a single kernel would serve them; one that starts while another
|
||||
/// runs gets one of its own (solidcore keeps no global state, and a body's identities are valid
|
||||
/// only in the kernel that issued them, so any kernel takes any body).
|
||||
static IDLE: Mutex<Vec<Kernel>> = Mutex::new(Vec::new());
|
||||
|
||||
fn take_kernel() -> Kernel {
|
||||
IDLE.lock().unwrap_or_else(PoisonError::into_inner).pop().unwrap_or_else(fresh)
|
||||
/// The kernels calls run on. The lock is only held to take or put back a kernel, never during a
|
||||
/// call: a call that runs long (or never returns) holds up nothing but its own body, so one
|
||||
/// design's long operation never delays another's. Calls one after another all get the same
|
||||
/// kernel; one that starts while another runs gets one of its own (solidcore keeps no global
|
||||
/// state, and a body's identities are valid only in the kernel that issued them, so any kernel
|
||||
/// takes any body).
|
||||
///
|
||||
/// A call stuck for good keeps its kernel and the thread it runs on, and costs nothing more: at
|
||||
/// most `most_idle` kernels wait between calls, however many calls once ran side by side. A job
|
||||
/// that starts again and sticks again holds one more each time, so at `most_running` calls a new
|
||||
/// call fails, saying so, rather than grow without end or wait for calls that may never return.
|
||||
pub(crate) struct Pool<K> {
|
||||
pub(crate) idle: Vec<K>,
|
||||
pub(crate) running: usize,
|
||||
pub(crate) most_idle: usize,
|
||||
pub(crate) most_running: usize,
|
||||
}
|
||||
|
||||
fn put_kernel(k: Kernel) {
|
||||
let mut idle = IDLE.lock().unwrap_or_else(PoisonError::into_inner);
|
||||
if idle.len() < MOST_IDLE {
|
||||
idle.push(k);
|
||||
impl<K> Pool<K> {
|
||||
/// A kernel for a call, the last used first; `None` when too many are running.
|
||||
pub(crate) fn take(&mut self, make: impl FnOnce() -> K) -> Option<K> {
|
||||
if self.running >= self.most_running {
|
||||
return None;
|
||||
}
|
||||
self.running += 1;
|
||||
Some(self.idle.pop().unwrap_or_else(make))
|
||||
}
|
||||
|
||||
/// A call ended, handing back its kernel if it is fit to use again.
|
||||
pub(crate) fn put(&mut self, kernel: Option<K>) {
|
||||
self.running = self.running.saturating_sub(1);
|
||||
if let Some(kernel) = kernel
|
||||
&& self.idle.len() < self.most_idle
|
||||
{
|
||||
self.idle.push(kernel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Most calls at once. Far above what any work needs: an operation runs on at most 16 threads.
|
||||
const MOST_RUNNING: usize = 256;
|
||||
|
||||
static POOL: Mutex<Pool<Kernel>> = Mutex::new(Pool { idle: Vec::new(), running: 0, most_idle: 8, most_running: MOST_RUNNING });
|
||||
|
||||
fn take_kernel() -> Option<Kernel> {
|
||||
POOL.lock().unwrap_or_else(PoisonError::into_inner).take(fresh)
|
||||
}
|
||||
|
||||
fn put_kernel(k: Option<Kernel>) {
|
||||
POOL.lock().unwrap_or_else(PoisonError::into_inner).put(k);
|
||||
}
|
||||
|
||||
/// What a call must not find from the calls before it: the same operation on the same bodies
|
||||
/// answers the same on any kernel, however much that kernel did first. (Its draws of random rays,
|
||||
/// the stations it remembers; marks, identities and what is only kept to reuse memory change no
|
||||
/// answer. Tolerances and fixes are the same on every kernel.)
|
||||
fn start_clean(k: &mut Kernel) {
|
||||
k.rng = Rng::new(KernelOptions::default().seed);
|
||||
*k.blend_station_memo.borrow_mut() = Default::default();
|
||||
k.fillet_point_step.set(None);
|
||||
k.upstream_ub_passed.clear();
|
||||
}
|
||||
|
||||
/// A kernel kept out of use until dropped ([`crate::hold_a_kernel`]).
|
||||
pub struct HeldKernel(Option<Kernel>);
|
||||
|
||||
impl Drop for HeldKernel {
|
||||
fn drop(&mut self) {
|
||||
put_kernel(self.0.take());
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn hold_a_kernel() -> HeldKernel {
|
||||
HeldKernel(take_kernel())
|
||||
}
|
||||
|
||||
/// Runs `f` on a kernel of its own. A panic in solidcore is caught: the kernel, which it may have
|
||||
/// left half-updated, is replaced by a fresh one and the call fails with [`Error::Internal`].
|
||||
/// left half-updated, is dropped and the call fails with [`Error::Internal`]. A token over this
|
||||
/// thread's work ([`crate::stop`]) stops it.
|
||||
pub(crate) fn run<T: dump::Answer>(call: &'static str, f: impl FnOnce(&mut Kernel) -> std::result::Result<T, solidcore::SolidError>) -> Result<T> {
|
||||
run_on(call, &[], f)
|
||||
}
|
||||
@@ -470,7 +526,26 @@ pub(crate) fn run_on<T: dump::Answer>(
|
||||
inputs: dump::Inputs<'_>,
|
||||
f: impl FnOnce(&mut Kernel) -> std::result::Result<T, solidcore::SolidError>,
|
||||
) -> Result<T> {
|
||||
let mut k = take_kernel();
|
||||
let stop = crate::stop::token();
|
||||
if stop.as_ref().is_some_and(CancelToken::is_cancelled) {
|
||||
return Err(Error::Solidcore(format!("{call}: cancelled")));
|
||||
}
|
||||
call_on(call, inputs, stop, f)
|
||||
}
|
||||
|
||||
/// [`run_on`], stopped by `stop`.
|
||||
fn call_on<T: dump::Answer>(
|
||||
call: &'static str,
|
||||
inputs: dump::Inputs<'_>,
|
||||
stop: Option<CancelToken>,
|
||||
f: impl FnOnce(&mut Kernel) -> std::result::Result<T, solidcore::SolidError>,
|
||||
) -> Result<T> {
|
||||
let Some(mut k) = take_kernel() else {
|
||||
log::warn!(target: "smlib", "{call}: refused, {MOST_RUNNING} kernel calls are still running");
|
||||
return Err(Error::Solidcore(format!("{call}: {MOST_RUNNING} kernel calls are still running")));
|
||||
};
|
||||
start_clean(&mut k);
|
||||
k.cancel = stop.clone();
|
||||
// A profiler span per call: where the kernel's time goes.
|
||||
let _span = solidcraft_profile::span("solidcore", call);
|
||||
let in_flight = dump::in_flight(call);
|
||||
@@ -495,6 +570,11 @@ pub(crate) fn run_on<T: dump::Answer>(
|
||||
}
|
||||
};
|
||||
drop(in_flight);
|
||||
// Stopped, it is no failure to look into, and solidcore may have left the kernel part way.
|
||||
if stop.is_some_and(|s| s.is_cancelled()) {
|
||||
put_kernel(None);
|
||||
return r;
|
||||
}
|
||||
let why = match &r {
|
||||
Ok(v) => v.refusal(),
|
||||
Err(e) => Some(e.to_string()),
|
||||
@@ -503,7 +583,8 @@ pub(crate) fn run_on<T: dump::Answer>(
|
||||
// The kernel the call ran on, or the fresh one that replaced it after a panic.
|
||||
dump::failed(&k, call, &why, inputs);
|
||||
}
|
||||
put_kernel(k);
|
||||
k.cancel = None;
|
||||
put_kernel(Some(k));
|
||||
r
|
||||
}
|
||||
|
||||
@@ -530,7 +611,8 @@ pub(crate) fn with_body<T: dump::Answer>(
|
||||
if body.0.is_poisoned() {
|
||||
return Err(Error::Internal(format!("{call}: the body was left unfinished by an earlier panic")));
|
||||
}
|
||||
run_on(call, &[("brep", body)], |k| f(k, &mut body.0.lock().unwrap_or_else(PoisonError::into_inner)))
|
||||
// No token stops it: stopped part way, solidcore may leave the body it borrows half-changed.
|
||||
call_on(call, &[("brep", body)], None, |k| f(k, &mut body.0.lock().unwrap_or_else(PoisonError::into_inner)))
|
||||
}
|
||||
|
||||
/// An axis-aligned box from its lower corner (`SmApiCreateBox`, as `smlib_make_box` checks it:
|
||||
|
||||
@@ -53,7 +53,7 @@ use solidcore::topology::topology_traverser::Marks;
|
||||
use solidcore::topology::{Brep, EdgeId, EdgeuseId, FaceId, FaceuseId, VertexId, edge, vertex};
|
||||
|
||||
use super::{Body, answer};
|
||||
use crate::{Blend, ChamferSecond, Error, Hole, HoleEdge, MAX_POINTS, Result, Turn};
|
||||
use crate::{Blend, ChamferSecond, Error, Hole, HoleEdge, MAX_POINTS, Result};
|
||||
|
||||
/// Why solidcore refuses the 3x2 mixed-convexity corner whose rails cross
|
||||
/// (`fixes.fillet_refuse_mixed_corner_crossing_rails`, [`MIXED_CORNER_RAILS_CROSS`]): it builds no
|
||||
@@ -248,9 +248,7 @@ fn chamfer_radius(k: &Kernel, b: &mut Brep, e: EdgeId, distance: f64) -> solidco
|
||||
/// What `round_edges` makes: the capi's kinds less the chamfer, which `chamfer_offsets` makes.
|
||||
#[derive(Clone, Copy, PartialEq)]
|
||||
enum Section<'a> {
|
||||
/// A circular section of constant radius (or of a variable radius's law), the turns of two
|
||||
/// such rounds at a side edge as the [`Turn`] says (`SetSweptTurns`).
|
||||
Round(Turn),
|
||||
Round,
|
||||
/// The curvature-continuous section (`SM_FSG_BLEND_CURVE`): the Gⁿ generator's order 2 at the
|
||||
/// equal-area thumbweight (`SMLIB_BLEND_THUMBWEIGHT`, fork 6148773; solidcore#2261 under
|
||||
/// `fillet_gn_section_generator`), which takes off what the ball's circle does.
|
||||
@@ -340,23 +338,6 @@ fn room_reason(r: NoRoomReason) -> Option<crate::RoomReason> {
|
||||
})
|
||||
}
|
||||
|
||||
/// The refusal of a swept turn `CreateFilletCorners` noted at its vertex (`SmBlendCorner::Classify`
|
||||
/// with `GetSweptTurns()`): [`Error::TurnRefused`] with solidcore's reason, without its "Fillet
|
||||
/// Error: " prefix, and where it is; `None` for a note of another kind.
|
||||
fn turn_refusal(info: &ErrorInfo<FilletObject>) -> Option<Error> {
|
||||
let room = match info.code {
|
||||
c if c == FilletErrorType::NoRoom as i32 => true,
|
||||
c if c == FilletErrorType::CornerUnsupported as i32 => false,
|
||||
_ => return None,
|
||||
};
|
||||
let why = info.comment.trim();
|
||||
if why.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let why = why.strip_prefix("Fillet Error:").map_or(why, str::trim_start).to_owned();
|
||||
Some(Error::TurnRefused { room, why, at: info.location.map(|p| [p.x, p.y, p.z]) })
|
||||
}
|
||||
|
||||
/// [`blend_failure`] where solidcore gives no size.
|
||||
fn blend_failure_unsized(info: &ErrorInfo<FilletObject>, e: SolidError, corner: bool) -> Error {
|
||||
if e.is_unported() {
|
||||
@@ -452,16 +433,13 @@ fn blend_edges_stopping(
|
||||
let mut fit_edge = None;
|
||||
let done = {
|
||||
let mut s = FilletSession::new(k, b)?;
|
||||
// `SetSweptTurns`: read as the corners are made (`fixes.fillet_blend_corner`).
|
||||
let swept = section == Section::Round(Turn::Swept);
|
||||
s.set_swept_turns(swept);
|
||||
// `SetFilletParameters(b, es, sections, solvers, values, laws, -1, -1, -1, -1,
|
||||
// continuity 1, thumbweight 1)`: the session sets the executive's global merge first, as
|
||||
// `SmApiFilletEdges` does, and `SetFilletParameters` resets it, as in the capi.
|
||||
let prepared = match (section, law) {
|
||||
(Section::Round(_), None) => s.prepare_per_edge_constant_radius(k, edges, sizes, &[FilletSurfaceGeneratorType::Circular], 1, 1.0),
|
||||
(Section::Round, None) => s.prepare_per_edge_constant_radius(k, edges, sizes, &[FilletSurfaceGeneratorType::Circular], 1, 1.0),
|
||||
// The size is the start radius (`smlib_fillet_variable`).
|
||||
(Section::Round(_), Some(law)) => match sizes.first() {
|
||||
(Section::Round, Some(law)) => match sizes.first() {
|
||||
Some(&size) => s.prepare_variable_radius_edges(k, edges, size, law, 1, 1),
|
||||
None => return Ok(Err(Err(Error::Argument))),
|
||||
},
|
||||
@@ -481,10 +459,7 @@ fn blend_edges_stopping(
|
||||
s.add_set_back_vertex(sb.vertex);
|
||||
}
|
||||
}
|
||||
let prepared_ok = prepared.is_ok();
|
||||
let mut step = prepared.and_then(|()| s.create_corners(k, None)).map(|()| Ok(Vec::new()));
|
||||
// A swept turn `CreateFilletCorners` refused, with solidcore's reason ([`turn_refusal`]).
|
||||
let refused_turn = if swept && prepared_ok && step.is_err() { turn_refusal(s.error_info()) } else { None };
|
||||
// A vertex `CreateFilletCorners` made no corner for, noted before a later step notes its
|
||||
// own failure over it ([`blend_failure`]).
|
||||
let corner = step.is_ok() && s.error_info().code == FilletErrorType::CornerUnsupported as i32;
|
||||
@@ -513,14 +488,11 @@ fn blend_edges_stopping(
|
||||
}
|
||||
},
|
||||
Ok(Err(refusal)) => Ok(Err(refusal)),
|
||||
Err(e) => match refused_turn {
|
||||
Some(why) => Ok(Err(Err(why))),
|
||||
None => {
|
||||
let (why, edge) = blend_failure(&s, e, corner);
|
||||
fit_edge = edge;
|
||||
Ok(Err(Err(why)))
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
let (why, edge) = blend_failure(&s, e, corner);
|
||||
fit_edge = edge;
|
||||
Ok(Err(Err(why)))
|
||||
}
|
||||
}
|
||||
};
|
||||
let done: solidcore::Result<std::result::Result<(Vec<usize>, Vec<(usize, FaceId)>), std::result::Result<usize, Error>>> = done;
|
||||
@@ -853,9 +825,9 @@ pub(crate) fn blend(
|
||||
|
||||
/// `smlib_blend_dropping`: [`blend`] with one size per point, no corners, and per point whether it
|
||||
/// picked an edge that a larger round, overflowing its faces, removed whole.
|
||||
pub(crate) fn blend_dropping(body: &Body, kind: Blend, turn: Turn, points: &[[f64; 3]], sizes: &[f64], tolerance: f64) -> Result<(Body, Vec<bool>)> {
|
||||
pub(crate) fn blend_dropping(body: &Body, kind: Blend, points: &[[f64; 3]], sizes: &[f64], tolerance: f64) -> Result<(Body, Vec<bool>)> {
|
||||
let mut dropped = vec![false; points.len()];
|
||||
let (b, _) = blend_call(body, kind, turn, points, sizes, tolerance, &[], &[], Corners::Filled, &mut dropped)?;
|
||||
let (b, _) = blend_call(body, kind, points, sizes, tolerance, &[], &[], Corners::Filled, &mut dropped)?;
|
||||
Ok((b, dropped))
|
||||
}
|
||||
|
||||
@@ -874,17 +846,15 @@ pub(crate) fn blend_holes(
|
||||
setbacks: &[f64],
|
||||
open: Corners,
|
||||
) -> Result<(Body, Vec<Hole>)> {
|
||||
blend_call(body, kind, Turn::Mitre, points, sizes, tolerance, corners, setbacks, open, &mut vec![false; points.len()])
|
||||
blend_call(body, kind, points, sizes, tolerance, corners, setbacks, open, &mut vec![false; points.len()])
|
||||
}
|
||||
|
||||
/// `blend_call`: [`blend_holes`], with per point in `dropped` whether it picked an edge an
|
||||
/// overflowing round removed whole ([`overflow_first`]), and the rounds' turns at side edges as
|
||||
/// `turn` says (a swept turn is for [`Blend::Round`] only).
|
||||
/// overflowing round removed whole ([`overflow_first`]).
|
||||
#[allow(clippy::too_many_arguments)] // the capi's blend_call
|
||||
fn blend_call(
|
||||
body: &Body,
|
||||
kind: Blend,
|
||||
turn: Turn,
|
||||
points: &[[f64; 3]],
|
||||
sizes: &[f64],
|
||||
tolerance: f64,
|
||||
@@ -899,7 +869,6 @@ fn blend_call(
|
||||
|| !(one_size || sizes.len() == points.len())
|
||||
|| !points_ok(corners, true)
|
||||
|| setbacks.len() != corners.len()
|
||||
|| (turn == Turn::Swept && kind != Blend::Round)
|
||||
{
|
||||
return Err(Error::Argument);
|
||||
}
|
||||
@@ -929,7 +898,7 @@ fn blend_call(
|
||||
}
|
||||
let solid_in = brep_p2::is_manifold_solid(&w)?;
|
||||
let section = match kind {
|
||||
Blend::Round => Section::Round(turn),
|
||||
Blend::Round => Section::Round,
|
||||
// Every edge of one call takes the equal-area thumbweight of the first's wedge
|
||||
// (solidcore#2250's comment 6563419897): edges of other wedges would take off another
|
||||
// area than their own, so they are not built together.
|
||||
@@ -1411,7 +1380,7 @@ pub(crate) fn fillet_variable(
|
||||
// (`NoRoomReason::BallsFold`), [`Error::NoRoom`].
|
||||
let solid_in = brep_p2::is_manifold_solid(&w)?;
|
||||
let (r0, r1) = (radii.first().copied().unwrap_or(0.0), radii.last().copied().unwrap_or(0.0));
|
||||
Ok(match blend_edges(k, &mut w, &[e], &[r0.max(r1)], Section::Round(Turn::Mitre), Some(law), &[], None)? {
|
||||
Ok(match blend_edges(k, &mut w, &[e], &[r0.max(r1)], Section::Round, Some(law), &[], None)? {
|
||||
Ok(()) => finish(w, solid_in)?,
|
||||
Err(Ok(_)) => Err(Error::Unsupported),
|
||||
Err(Err(e)) => Err(e),
|
||||
|
||||
@@ -12,7 +12,7 @@ use super::blend::{Corners, blend, blend_dropping, blend_holes, chamfer_sides, f
|
||||
use super::boolean::boolean;
|
||||
use super::{Body, counts, make_box, make_cylinder, to_arrays, volume};
|
||||
use crate::export::native;
|
||||
use crate::{Blend, BooleanOp, ChamferSecond, Error, Turn};
|
||||
use crate::{Blend, BooleanOp, ChamferSecond, Error};
|
||||
|
||||
/// A case longer than this is a hang.
|
||||
const TIMEOUT: Duration = Duration::from_secs(300);
|
||||
@@ -399,7 +399,7 @@ fn overflow_goes_first() {
|
||||
];
|
||||
for (points, sizes, dropped, want, bound) in cases {
|
||||
let got = timed("overflow_first", move || {
|
||||
let (b, d) = blend_dropping(&Shape::Box([0.0; 3], [20.0; 3]).core(), Blend::Round, Turn::Mitre, points, sizes, 1.0).unwrap();
|
||||
let (b, d) = blend_dropping(&Shape::Box([0.0; 3], [20.0; 3]).core(), Blend::Round, points, sizes, 1.0).unwrap();
|
||||
native(&to_arrays(&b).unwrap()).unwrap();
|
||||
(volume(&b, 1e-8).unwrap(), d)
|
||||
});
|
||||
@@ -445,71 +445,6 @@ fn rounds_at_a_concave_face_corner_are_mitred() {
|
||||
assert!(rel(got, v) < 1e-8, "{got} vs {v}");
|
||||
}
|
||||
|
||||
/// A 40 x 30 x 10 plate with a 10 x 10 x 5 boss on it (x 15..25, y 10..20), the boss's four base
|
||||
/// edges rounded at r 1: at each upright boss edge two concave rounds turn round the sharp convex
|
||||
/// edge. Each base edge gains the spandrel A = (1 - π/4) r² along its 10, and each corner the
|
||||
/// rounds' part beyond both walls, whose section's first moment about the upright edge is
|
||||
/// M = (5/6 - π/4) r³: mitred, 8 M in all; swept, the section revolved a quarter turn at each,
|
||||
/// 2π M, the corner a horn torus of radii r, r. Swept with unequal radii, or along a pocket's floor
|
||||
/// (its upright edges sharp and concave), is refused with solidcore's reason.
|
||||
#[test]
|
||||
fn rounds_turning_round_a_boss_edge_mitred_or_swept() {
|
||||
let made = |a: Body, b: Body, op| boolean(&a, &b, op).unwrap().unwrap();
|
||||
let boss =
|
||||
move || made(make_box([0.0; 3], [40.0, 30.0, 10.0]).unwrap(), make_box([15.0, 10.0, 10.0], [10.0, 10.0, 5.0]).unwrap(), BooleanOp::Union);
|
||||
let pocket =
|
||||
move || made(make_box([0.0; 3], [40.0, 30.0, 10.0]).unwrap(), make_box([10.0, 10.0, 5.0], [20.0, 10.0, 6.0]).unwrap(), BooleanOp::Subtract);
|
||||
const BASE: [[f64; 3]; 4] = [[20.0, 10.0, 10.0], [25.0, 15.0, 10.0], [20.0, 20.0, 10.0], [15.0, 15.0, 10.0]];
|
||||
const RIM: [[f64; 3]; 4] = [[20.0, 10.0, 5.0], [30.0, 15.0, 5.0], [20.0, 20.0, 5.0], [10.0, 15.0, 5.0]];
|
||||
let r = 1.0;
|
||||
let rounded =
|
||||
move |body: Body, at: [[f64; 3]; 4], turn, sizes: [f64; 4]| blend_dropping(&body, Blend::Round, turn, &at, &sizes, 0.1).map(|(b, _)| b);
|
||||
// solidcore's tori, and the record's kinds of surface: its torus is a ring torus, so a horn
|
||||
// torus's face there is its exact rational form.
|
||||
let measured = |b: &Body| {
|
||||
use solidcore::surface::surface::p2::SurfaceKind;
|
||||
let (rec, _) = native(&to_arrays(b).unwrap()).unwrap();
|
||||
rec.validate().unwrap();
|
||||
let mut tori = Vec::new();
|
||||
{
|
||||
let g = b.0.lock().unwrap();
|
||||
for f in solidcore::query::api_queries::get_faces(&g).unwrap() {
|
||||
if let Some(s) = solidcore::topology::face::p2::surface(&g, f).unwrap()
|
||||
&& let SurfaceKind::Torus(t) = s.kind()
|
||||
{
|
||||
tori.push((t.major_radius(), t.minor_radius()));
|
||||
}
|
||||
}
|
||||
}
|
||||
(volume(b, 1e-10).unwrap(), counts(b).unwrap()[0], tori, kinds(&rec))
|
||||
};
|
||||
let (mitre, swept) =
|
||||
timed("turn", move || (rounded(boss(), BASE, Turn::Mitre, [r; 4]).unwrap(), rounded(boss(), BASE, Turn::Swept, [r; 4]).unwrap()));
|
||||
let (vm, fm, tm, km) = measured(&mitre);
|
||||
let (vs, fs, ts, ks) = measured(&swept);
|
||||
println!("mitre: {vm:.9}, {fm} faces {km:?}; swept: {vs:.9}, {fs} faces {ks:?}, tori {ts:?}");
|
||||
let (a, m) = (spandrel(r), (5.0 / 6.0 - PI / 4.0) * r * r * r);
|
||||
let base = 12500.0 + 40.0 * a;
|
||||
assert!(rel(vm, base + 8.0 * m) < 1e-9, "mitre {vm} vs {}", base + 8.0 * m);
|
||||
assert!(rel(vs, base + 2.0 * PI * m) < 1e-9, "swept {vs} vs {}", base + 2.0 * PI * m);
|
||||
assert_eq!((fm, tm.len(), km.get("rational_spline")), (15, 0, None));
|
||||
assert_eq!((fs, ts.len(), ks.get("rational_spline")), (19, 4, Some(&4)));
|
||||
assert!(ts.iter().all(|(major, minor)| (major - r).abs() < 1e-12 && (minor - r).abs() < 1e-12), "{ts:?}");
|
||||
// Swept is for rounds only.
|
||||
assert_eq!(blend_dropping(&boss(), Blend::Chamfer, Turn::Swept, &BASE, &[r; 4], 0.1).err(), Some(Error::Argument));
|
||||
let unequal = timed("turn unequal", move || rounded(boss(), BASE, Turn::Swept, [1.0, 1.5, 1.0, 1.5]).err());
|
||||
let rim = timed("turn rim", move || rounded(pocket(), RIM, Turn::Swept, [r; 4]).err());
|
||||
println!("unequal: {unequal:?}\nrim: {rim:?}");
|
||||
assert!(
|
||||
matches!(&unequal, Some(Error::TurnRefused { room: false, why, at: Some(_) }) if why.starts_with("a swept turn is built between constant rounds of one radius")),
|
||||
"{unequal:?}"
|
||||
);
|
||||
assert!(
|
||||
matches!(&rim, Some(Error::TurnRefused { room: true, why, at: Some(_) }) if why.contains("round that edge at a radius of at least 1 first")),
|
||||
"{rim:?}"
|
||||
);
|
||||
}
|
||||
|
||||
/// Solidcore alone: edge attributes across a cliff overflow. A 40 x 30 x 10 block notched below its
|
||||
/// top at (40, 0), its front and right top edges rounded r8 (their rails run off over the notch).
|
||||
/// The back and left top edges are each trimmed 8 by those rounds: (0, 30)-(32, 30) and (0, 8)-(0, 30)
|
||||
|
||||
+9
-13
@@ -19,13 +19,14 @@ pub mod pcurves;
|
||||
mod sheets;
|
||||
mod split;
|
||||
pub mod ssi;
|
||||
pub mod stop;
|
||||
pub mod sweeps;
|
||||
pub mod trace;
|
||||
pub mod trim;
|
||||
|
||||
pub use check::{CheckLevel, CheckReport};
|
||||
pub use measure::{MEASURE_ACCURACY, MassProperties, PointClass};
|
||||
pub use ops::{Blend, BooleanOp, ChamferSecond, Hole, HoleEdge, MAX_POINTS, MAX_UNION_BREPS, Turn};
|
||||
pub use ops::{Blend, BooleanOp, ChamferSecond, Hole, HoleEdge, MAX_POINTS, MAX_UNION_BREPS};
|
||||
|
||||
/// Why an SMLib call failed.
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
@@ -61,11 +62,6 @@ pub enum Error {
|
||||
Unsupported,
|
||||
/// A blend's edges meet at a vertex of a kind no SMLib blend corner handles yet.
|
||||
CornerUnsupported,
|
||||
/// A swept turn ([`Turn::Swept`]) solidcore does not build at the corner `at`: `room` where
|
||||
/// no radius builds it (a sharp concave side edge between the rounds, solidcore's `NoRoom`),
|
||||
/// else not supported there (`CornerUnsupported`: unequal or variable rounds, a corner of
|
||||
/// four edges, a curved, drafted or tangent side edge); `why` is solidcore's reason.
|
||||
TurnRefused { room: bool, why: String, at: Option<[f64; 3]> },
|
||||
/// SMLib does not set back the corner of corner point `corner`: SMLib sets back a corner
|
||||
/// only where every edge meeting it is blended and they are all convex or all concave.
|
||||
CornerRefused { corner: usize },
|
||||
@@ -197,13 +193,6 @@ impl std::fmt::Display for Error {
|
||||
}
|
||||
Error::Unsupported => write!(f, "not supported yet: SMLib cannot build this exactly"),
|
||||
Error::CornerUnsupported => write!(f, "not supported yet: a corner of this kind is not supported yet by SMLib's blends"),
|
||||
Error::TurnRefused { why, at, .. } => {
|
||||
write!(f, "the swept corner is not built")?;
|
||||
if let Some([x, y, z]) = at {
|
||||
write!(f, " at ({x:.3}, {y:.3}, {z:.3})")?;
|
||||
}
|
||||
write!(f, ": {why}")
|
||||
}
|
||||
Error::CornerRefused { corner } => write!(
|
||||
f,
|
||||
"not supported yet: SMLib does not set back corner {}: it sets back a corner only where every edge meeting it is blended, all convex or all concave",
|
||||
@@ -244,6 +233,13 @@ pub fn current_call() -> Option<String> {
|
||||
core::dump::current()
|
||||
}
|
||||
|
||||
/// Keeps one of the kernels calls run on out of use until dropped: the next calls run on another.
|
||||
/// For tests of what happens when a design's bodies come from a kernel that is busy elsewhere.
|
||||
#[doc(hidden)]
|
||||
pub fn hold_a_kernel() -> core::HeldKernel {
|
||||
core::hold_a_kernel()
|
||||
}
|
||||
|
||||
/// Is this thread inside a solidcore call? A panic there is caught and becomes
|
||||
/// [`Error::Internal`]; crash reports mark it recovered.
|
||||
pub fn in_call() -> bool {
|
||||
|
||||
+4
-29
@@ -58,30 +58,6 @@ impl Blend {
|
||||
}
|
||||
}
|
||||
|
||||
/// How two constant rounds of one radius turn round a sharp, straight, convex side edge square to
|
||||
/// both on a plane (the rounds along a boss's base, at its upright edges): the turn of
|
||||
/// [`Brep::blend_dropping`]'s rounds ([`Blend::Round`] only).
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||
pub enum Turn {
|
||||
/// The rounds run on to where they cross and meet in a mitre, the plane section of the two.
|
||||
#[default]
|
||||
Mitre,
|
||||
/// The rounds end on their sections at the side edge, and the corner's face is that section
|
||||
/// revolved about the side edge, an exact torus tangent to both rounds. A corner where this
|
||||
/// is not built is [`Error::TurnRefused`].
|
||||
Swept,
|
||||
}
|
||||
|
||||
impl Turn {
|
||||
/// The turn's name in a trace ([`crate::trace`]).
|
||||
pub fn word(self) -> &'static str {
|
||||
match self {
|
||||
Turn::Mitre => "mitre",
|
||||
Turn::Swept => "swept",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The second side of [`Brep::chamfer_sides`].
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub enum ChamferSecond {
|
||||
@@ -196,19 +172,18 @@ impl Brep {
|
||||
|
||||
/// [`Brep::blend`], with whether each point picked an edge that a larger round, overflowing
|
||||
/// its faces, removed whole: that edge is gone and not rounded (SMLib rounds the edges whose
|
||||
/// blends overflow first, then what is left of the others). Two rounds turn at a side edge as
|
||||
/// `turn` says; [`Turn::Swept`] is for [`Blend::Round`] only ([`Error::Argument`] otherwise).
|
||||
pub fn blend_dropping(&self, kind: Blend, turn: Turn, edges: &[[f64; 3]], sizes: &[f64], tolerance: f64) -> Result<(Brep, Vec<bool>)> {
|
||||
/// blends overflow first, then what is left of the others).
|
||||
pub fn blend_dropping(&self, kind: Blend, edges: &[[f64; 3]], sizes: &[f64], tolerance: f64) -> Result<(Brep, Vec<bool>)> {
|
||||
if edges.len() > MAX_POINTS || edges.is_empty() || sizes.len() != edges.len() {
|
||||
return Err(Error::Argument);
|
||||
}
|
||||
let r = core::blend::blend_dropping(self.core(), kind, turn, edges, sizes, tolerance).map(|(b, d)| (Brep::made_core(b), d));
|
||||
let r = core::blend::blend_dropping(self.core(), kind, edges, sizes, tolerance).map(|(b, d)| (Brep::made_core(b), d));
|
||||
trace::call(
|
||||
"blend_dropping",
|
||||
&[self],
|
||||
&r,
|
||||
|(b, _)| vec![b.id],
|
||||
|| json!({"kind": kind.word(), "turn": turn.word(), "edges": trace::picks(self, PickKind::Edge, edges, tolerance), "sizes": sizes}),
|
||||
|| json!({"kind": kind.word(), "edges": trace::picks(self, PickKind::Edge, edges, tolerance), "sizes": sizes}),
|
||||
);
|
||||
r
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ impl Spec {
|
||||
impl Surface {
|
||||
/// solidcore's surface, made the first time it is needed.
|
||||
fn core(&self) -> Result<&crate::core::split::Tool> {
|
||||
self.core.get_or_init(|| crate::core::ssi::surface(&self.spec)).as_ref().map_err(Clone::clone)
|
||||
self.core.get_or_init(|| crate::stop::unstoppable(|| crate::core::ssi::surface(&self.spec))).as_ref().map_err(Clone::clone)
|
||||
}
|
||||
|
||||
pub(crate) fn spec(&self) -> &Spec {
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
//! Stopping the kernel calls of work nobody waits for any more: the jobs of a design that closed.
|
||||
//! Work runs [`Stop::within`] its design's token; once the token is stopped, each operation under
|
||||
//! it refuses to start, and one running stops when solidcore next checks ([`solidcore::kernel::Kernel::cancel`]).
|
||||
//!
|
||||
//! A stopped operation is an error like any other, and the caller's bodies are as they were: only
|
||||
//! operations that build on copies stop. Calls that answer from a body itself ([`crate::core::with_body`],
|
||||
//! measuring, say) always run to their end, since solidcore may leave what a stopped call borrows
|
||||
//! half-changed.
|
||||
|
||||
use std::cell::RefCell;
|
||||
|
||||
use solidcore::kernel::CancelToken;
|
||||
|
||||
thread_local! {
|
||||
static CURRENT: RefCell<Option<Stop>> = const { RefCell::new(None) };
|
||||
}
|
||||
|
||||
/// Stops the kernel work running under it, on every thread it reached.
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct Stop(CancelToken);
|
||||
|
||||
impl Stop {
|
||||
pub fn new() -> Stop {
|
||||
Stop::default()
|
||||
}
|
||||
|
||||
/// Stop the work under this token, now and from now on.
|
||||
pub fn stop(&self) {
|
||||
self.0.cancel();
|
||||
}
|
||||
|
||||
pub fn is_stopped(&self) -> bool {
|
||||
self.0.is_cancelled()
|
||||
}
|
||||
|
||||
/// Run `f` with this token over the kernel work it does on this thread.
|
||||
pub fn within<R>(&self, f: impl FnOnce() -> R) -> R {
|
||||
scoped(Some(self.clone()), f)
|
||||
}
|
||||
}
|
||||
|
||||
/// The token over this thread's work, to hand to the worker threads it starts.
|
||||
pub fn current() -> Option<Stop> {
|
||||
CURRENT.with(|c| c.borrow().clone())
|
||||
}
|
||||
|
||||
/// Run `f` under `stop` (`None`: under none), as [`current`] was on the thread that started it.
|
||||
pub fn scoped<R>(stop: Option<Stop>, f: impl FnOnce() -> R) -> R {
|
||||
let previous = CURRENT.with(|c| c.replace(stop));
|
||||
struct Restore(Option<Option<Stop>>);
|
||||
impl Drop for Restore {
|
||||
fn drop(&mut self) {
|
||||
if let Some(previous) = self.0.take() {
|
||||
CURRENT.with(|c| *c.borrow_mut() = previous);
|
||||
}
|
||||
}
|
||||
}
|
||||
let _restore = Restore(Some(previous));
|
||||
f()
|
||||
}
|
||||
|
||||
/// Run `f` so that no token stops it: for what fills a cell every later user of a body reads,
|
||||
/// which must not keep a stopped job's error.
|
||||
pub fn unstoppable<R>(f: impl FnOnce() -> R) -> R {
|
||||
scoped(None, f)
|
||||
}
|
||||
|
||||
/// solidcore's token of the work on this thread.
|
||||
pub(crate) fn token() -> Option<CancelToken> {
|
||||
CURRENT.with(|c| c.borrow().as_ref().map(|s| s.0.clone()))
|
||||
}
|
||||
@@ -78,7 +78,7 @@ fn calls_from_many_threads_are_serialised() {
|
||||
static DUMP_DIR_TESTS: std::sync::Mutex<()> = std::sync::Mutex::new(());
|
||||
|
||||
/// Entry points that ask no kernel, so have nothing to say here.
|
||||
const NO_KERNEL: [&str; 13] = [
|
||||
const NO_KERNEL: [&str; 14] = [
|
||||
"inertia_tensor",
|
||||
"is_valid",
|
||||
"failed_tests",
|
||||
@@ -92,6 +92,7 @@ const NO_KERNEL: [&str; 13] = [
|
||||
"word",
|
||||
"words",
|
||||
"in_call",
|
||||
"hold_a_kernel",
|
||||
];
|
||||
|
||||
const ANSWERING: [&str; 63] = [
|
||||
@@ -191,7 +192,7 @@ fn every_entry_point_is_in_the_guard() {
|
||||
fn every_entry_point_answers() {
|
||||
use crate::sweeps::{Affine, Curve, DraftCorner, Ends, SweepFrame};
|
||||
use crate::trim::{Continuation, Holes};
|
||||
use crate::{Blend, BooleanOp, ChamferSecond, CheckLevel, Turn};
|
||||
use crate::{Blend, BooleanOp, ChamferSecond, CheckLevel};
|
||||
fn says<T>(_name: &str, r: Result<T>) -> Option<T> {
|
||||
r.ok()
|
||||
}
|
||||
@@ -222,7 +223,7 @@ fn every_entry_point_answers() {
|
||||
says("fillet", a.fillet(&edge, 0.1, 1.0));
|
||||
says("chamfer", a.chamfer(&edge, 0.1, 1.0));
|
||||
says("blend", a.blend(Blend::Round, &edge, &[1.0], 0.1));
|
||||
says("blend_dropping", a.blend_dropping(Blend::Round, Turn::Mitre, &edge, &[1.0], 0.1));
|
||||
says("blend_dropping", a.blend_dropping(Blend::Round, &edge, &[1.0], 0.1));
|
||||
let corner = [p(10.0, 10.0, 10.0)];
|
||||
let three = [p(5.0, 10.0, 10.0), p(10.0, 5.0, 10.0), p(10.0, 10.0, 5.0)];
|
||||
says("blend_setback", a.blend_setback(Blend::Round, &three, &[1.0; 3], &corner, &[2.0], 0.1));
|
||||
@@ -510,3 +511,82 @@ fn a_panic_beside_a_running_call_costs_only_its_own_kernel() {
|
||||
release.send(()).unwrap();
|
||||
held.join().unwrap().unwrap();
|
||||
}
|
||||
|
||||
/// A stuck call keeps its kernel and nothing more: the pool never holds more than its limit of
|
||||
/// idle kernels however many calls ran side by side, and once as many calls as it allows are
|
||||
/// stuck, a new call is refused rather than growing it or waiting.
|
||||
#[test]
|
||||
fn the_kernel_pool_stays_bounded_when_calls_stick() {
|
||||
let mut pool = core::Pool { idle: Vec::new(), running: 0, most_idle: 1, most_running: 3 };
|
||||
let mut made = 0;
|
||||
let mut make = || {
|
||||
made += 1;
|
||||
made
|
||||
};
|
||||
let (a, b, c) = (pool.take(&mut make), pool.take(&mut make), pool.take(&mut make));
|
||||
assert_eq!((a, b, c), (Some(1), Some(2), Some(3)), "side by side, each on its own");
|
||||
assert_eq!(pool.take(&mut make), None, "refused, not waiting, not one more");
|
||||
pool.put(a);
|
||||
assert_eq!(pool.take(&mut make), Some(1), "room again, its kernel used again");
|
||||
// The other two never come back here: they still count, and hold no idle slot.
|
||||
pool.put(Some(1));
|
||||
pool.put(b);
|
||||
assert_eq!(pool.idle, [1], "no more idle than allowed");
|
||||
assert_eq!(pool.running, 1, "one still stuck");
|
||||
// A stopped call's kernel is not used again.
|
||||
pool.put(None);
|
||||
assert_eq!(pool.running, 0);
|
||||
assert_eq!(pool.idle, [1]);
|
||||
}
|
||||
|
||||
/// A stop reaches a running call at solidcore's next check and later calls before they start;
|
||||
/// the kernel it ran on is not used again; calls of other work and answers from a body go on.
|
||||
#[test]
|
||||
fn a_stopped_call_ends_at_its_next_check_and_holds_up_nothing() {
|
||||
let stop = stop::Stop::new();
|
||||
let (started, is_started) = std::sync::mpsc::channel();
|
||||
let running = {
|
||||
let stop = stop.clone();
|
||||
std::thread::spawn(move || {
|
||||
stop.within(|| {
|
||||
let first: Result<()> = core::run("stopped_call", |k| {
|
||||
let _ = started.send(());
|
||||
// A long solidcore loop, until it is stopped.
|
||||
loop {
|
||||
k.check_cancelled("stopped_call")?;
|
||||
std::thread::yield_now();
|
||||
}
|
||||
});
|
||||
let next = Brep::make_box([0.0; 3], [1.0; 3]);
|
||||
(first, next.map(|_| ()))
|
||||
})
|
||||
})
|
||||
};
|
||||
is_started.recv().unwrap();
|
||||
let body = answered(|| Brep::make_box([0.0; 3], [10.0; 3]).unwrap());
|
||||
stop.stop();
|
||||
let (first, next) = answered(move || running.join().unwrap());
|
||||
assert!(first.is_err_and(|e| e.to_string().contains("cancel")));
|
||||
assert!(next.is_err_and(|e| e.to_string().contains("cancelled")), "refused before it starts");
|
||||
// Under a stopped token, a body still answers, and is as it was.
|
||||
let v = stop.within(|| body.volume(1e-7)).unwrap();
|
||||
assert!((v - 1000.0).abs() < 1e-6, "{v}");
|
||||
assert!(stop.within(|| body.boolean(&body, BooleanOp::Union)).is_err(), "an operation is refused");
|
||||
// What fills a shared cell is not stopped.
|
||||
assert!(stop.within(|| stop::unstoppable(|| Brep::make_box([0.0; 3], [1.0; 3]))).is_ok());
|
||||
// And nothing else is affected.
|
||||
let v = body.boolean(&body, BooleanOp::Union).unwrap().unwrap().volume(1e-7).unwrap();
|
||||
assert!((v - 1000.0).abs() < 1e-6, "{v}");
|
||||
}
|
||||
|
||||
/// Every call starts with the same draws of random rays, whatever its kernel did before: what
|
||||
/// depends on them answers the same on any kernel of the pool.
|
||||
#[test]
|
||||
fn every_call_starts_clean_on_any_kernel() {
|
||||
let draw = |k: &mut solidcore::kernel::Kernel| Ok(k.rng.next_f64());
|
||||
let first = core::run("draw", draw).unwrap();
|
||||
assert_eq!(core::run("draw", draw).unwrap(), first, "the same kernel, later");
|
||||
let held = hold_a_kernel();
|
||||
assert_eq!(core::run("draw", draw).unwrap(), first, "another kernel");
|
||||
drop(held);
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
//! changes.
|
||||
|
||||
use crate::fonts::RichTextExt as _;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use std::hash::{Hash, Hasher};
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -71,7 +70,7 @@ fn spans(ui: &mut egui::Ui, spans: &[Span], size: f32, color: Color32) {
|
||||
for (label, url) in links {
|
||||
// The text above already shows the label; the button says where it goes.
|
||||
let to = format!("↗ {}", host(url));
|
||||
ui.hyperlink_to(RichText::new(to).size(size - (t.font_button - t.font_body)), url).backing_on_hover_text(format!("{label}: {url}"));
|
||||
ui.hyperlink_to(RichText::new(to).size(size - (t.font_button - t.font_body)), url).on_hover_text(format!("{label}: {url}"));
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -95,21 +94,17 @@ pub fn show(ui: &mut egui::Ui, slot: usize, src: &str) {
|
||||
ui.add(egui::Label::new(RichText::new(markdown::plain(s)).size(size).semibold().color(t.text)).selectable(true).wrap());
|
||||
}
|
||||
Block::Code { text, .. } => {
|
||||
crate::ui_kit::Container::show_backing(
|
||||
ui,
|
||||
egui::Frame::NONE.fill(t.field).corner_radius(t.radius_sm).inner_margin(Margin::same(6)),
|
||||
|ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
ui.add(
|
||||
egui::Label::new(RichText::new(text).monospace().size(size - (t.font_button - t.font_body)).color(t.text))
|
||||
.selectable(true)
|
||||
.wrap(),
|
||||
);
|
||||
if crate::ui_kit::button(ui, tr("ui.agent_chat_copy"), crate::ui_kit::Button::Small).clicked() {
|
||||
ui.ctx().copy_text(text.clone());
|
||||
}
|
||||
},
|
||||
);
|
||||
egui::Frame::NONE.fill(t.field).corner_radius(t.radius_sm).inner_margin(Margin::same(6)).show(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
ui.add(
|
||||
egui::Label::new(RichText::new(text).monospace().size(size - (t.font_button - t.font_body)).color(t.text))
|
||||
.selectable(true)
|
||||
.wrap(),
|
||||
);
|
||||
if crate::ui_kit::button(ui, tr("ui.agent_chat_copy"), crate::ui_kit::Button::Small).clicked() {
|
||||
ui.ctx().copy_text(text.clone());
|
||||
}
|
||||
});
|
||||
}
|
||||
Block::List { ordered, start, items } => {
|
||||
for (i, item) in items.iter().enumerate() {
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
//! width and fold are preferences, so they come back next time.
|
||||
|
||||
use crate::fonts::RichTextExt as _;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{Container, Edge, Surface};
|
||||
use egui::{Align, Align2, Color32, Id, Layout, Rect, RichText, Sense, Stroke, pos2, vec2};
|
||||
|
||||
@@ -380,7 +379,7 @@ fn context_chips(ui: &mut egui::Ui, context: &Context, removable: bool) -> Optio
|
||||
})
|
||||
.response;
|
||||
if !item.detail.is_empty() {
|
||||
chip.backing_on_hover_text(&item.detail);
|
||||
chip.on_hover_text(&item.detail);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -426,7 +425,7 @@ fn picture_strip(ui: &mut egui::Ui, n: usize, pictures: &[Picture]) -> Option<us
|
||||
let thumb = ui.add(egui::Image::new((texture.id(), size)).corner_radius(t.radius_sm).sense(Sense::click()));
|
||||
crate::scenario::publish_handle(&format!("agent_chat:picture:{n}:{i}"), thumb.rect.center());
|
||||
let hover_max = (ui.ctx().content_rect().size() * 0.5).min(vec2(PREVIEW_MAX.0, PREVIEW_MAX.1));
|
||||
let thumb = thumb.on_hover_cursor(egui::CursorIcon::PointingHand).backing_on_hover_ui(|ui| {
|
||||
let thumb = thumb.on_hover_cursor(egui::CursorIcon::PointingHand).on_hover_ui(|ui| {
|
||||
ui.add(egui::Image::new((texture.id(), fit(texture.size_vec2(), hover_max))).corner_radius(t.radius_sm));
|
||||
if !picture.note.is_empty() {
|
||||
ui.label(&picture.note);
|
||||
@@ -584,8 +583,7 @@ fn window(app: &mut SolveApp, ctx: &egui::Context) {
|
||||
}
|
||||
let t = Tokens::get();
|
||||
let frame = Container::new(ui.ctx(), Surface::Panel).edge_frame(t.dialog_body);
|
||||
let panel = Container::new(ui.ctx(), Surface::Viewport).central();
|
||||
let r = Container::show_central(ui, panel, frame, |ui| ui_kit::scope(ui, |ui| body(app, ui, false)));
|
||||
let r = Container::new(ui.ctx(), Surface::Viewport).central().frame(frame).show(ui, |ui| ui_kit::scope(ui, |ui| body(app, ui, false)));
|
||||
// The picture viewer opens over this window, where the click was, not over the main one.
|
||||
gallery_window(app, ui.ctx());
|
||||
if class == egui::ViewportClass::EmbeddedWindow {
|
||||
@@ -674,7 +672,7 @@ fn glyph_button(ui: &mut egui::Ui, kind: &str, tip: &str) -> egui::Response {
|
||||
}
|
||||
crate::scenario::publish_rect(&format!("agent_chat:{kind}"), r);
|
||||
crate::scenario::publish_handle(&format!("agent_chat:{kind}"), r.center());
|
||||
resp.backing_on_hover_text(tip)
|
||||
resp.on_hover_text(tip)
|
||||
}
|
||||
|
||||
fn state_color(state: State) -> Color32 {
|
||||
@@ -717,7 +715,7 @@ fn strip(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
t.primary_border(t.border),
|
||||
);
|
||||
let tip = format!("{} · {}", tip(app), state.label());
|
||||
if resp.backing_on_hover_text(tip).clicked() {
|
||||
if resp.on_hover_text(tip).clicked() {
|
||||
app.preferences.agent_chat_minimized = false;
|
||||
}
|
||||
}
|
||||
@@ -969,7 +967,7 @@ fn desktop_body(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
)
|
||||
})
|
||||
.inner;
|
||||
let permissions = permissions.backing_on_hover_text(mode.label());
|
||||
let permissions = permissions.on_hover_text(mode.label());
|
||||
crate::scenario::publish_rect("agent_chat:permissions", permissions.rect);
|
||||
crate::scenario::publish_handle("agent_chat:permissions", permissions.rect.center());
|
||||
// A message waits for files still being read.
|
||||
@@ -1006,8 +1004,8 @@ fn desktop_body(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
let attach = ui
|
||||
.add_enabled_ui(images, |ui| ui_kit::checkbox(ui, tr("ui.agent_chat_attach_view"), &mut app.agent_chat.attach_view))
|
||||
.inner
|
||||
.backing_on_hover_text(tr("ui.agent_chat_attach_view_tip"))
|
||||
.backing_on_disabled_hover_text(tr("ui.agent_chat_no_images"));
|
||||
.on_hover_text(tr("ui.agent_chat_attach_view_tip"))
|
||||
.on_disabled_hover_text(tr("ui.agent_chat_no_images"));
|
||||
crate::scenario::publish_handle("agent_chat:attach", attach.rect.center());
|
||||
// What is selected in the model goes with the message: text for the agent,
|
||||
// chips in the conversation.
|
||||
@@ -1018,11 +1016,11 @@ fn desktop_body(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
tr("ui.agent_chat_attach_selection").to_string()
|
||||
};
|
||||
let pick = ui_kit::checkbox(ui, &label, &mut app.agent_chat.attach_selection)
|
||||
.backing_on_hover_text(tr("ui.agent_chat_attach_selection_tip"));
|
||||
.on_hover_text(tr("ui.agent_chat_attach_selection_tip"));
|
||||
crate::scenario::publish_handle("agent_chat:attach_selection", pick.rect.center());
|
||||
// Choose faces, edges, features and bodies on purpose, then OK.
|
||||
let picker = ui_kit::button(ui, tr("ui.agent_chat_pick_context"), ui_kit::Button::Enabled(app.dialog.is_none()))
|
||||
.backing_on_hover_text(tr("ui.agent_chat_pick_context_tip"));
|
||||
.on_hover_text(tr("ui.agent_chat_pick_context_tip"));
|
||||
crate::scenario::publish_handle("agent_chat:pick_context", picker.rect.center());
|
||||
pick_clicked = picker.clicked();
|
||||
if let Some(turn) = &app.agent_chat.turn {
|
||||
@@ -1103,7 +1101,7 @@ fn switcher(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
ui_kit::dropdown_menu(ui, "sc_agent_switch", &label, |ui| {
|
||||
for e in &all {
|
||||
let sel = current.as_ref().is_some_and(|c| c.id == e.id);
|
||||
let r = ui_kit::list_picker(ui, &e.id, &e.name, sel).backing_on_hover_text(format!("{} {}", e.detail(), e.login));
|
||||
let r = ui_kit::list_picker(ui, &e.id, &e.name, sel).on_hover_text(format!("{} {}", e.detail(), e.login));
|
||||
crate::scenario::publish_handle(&format!("agent_chat:agent:{}", e.id), r.rect.center());
|
||||
if r.clicked() {
|
||||
picked = Some(e.id.clone());
|
||||
@@ -1121,7 +1119,7 @@ fn switcher(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
.inner;
|
||||
crate::scenario::publish_rect("agent_chat:switcher", combo.rect);
|
||||
crate::scenario::publish_handle("agent_chat:switcher", combo.rect.center());
|
||||
combo.backing_on_hover_text(tr("ui.ai_switch_tip"));
|
||||
combo.on_hover_text(tr("ui.ai_switch_tip"));
|
||||
if add {
|
||||
super::settings::open_add(app);
|
||||
}
|
||||
@@ -1150,7 +1148,7 @@ fn switcher(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
.inner;
|
||||
crate::scenario::publish_rect("agent_chat:mode", r.rect);
|
||||
crate::scenario::publish_handle("agent_chat:mode", r.rect.center());
|
||||
r.backing_on_hover_text(tr("ui.ai_agent_mode_tip"));
|
||||
r.on_hover_text(tr("ui.ai_agent_mode_tip"));
|
||||
if let Some(m) = pick {
|
||||
set_mode(app, &m);
|
||||
}
|
||||
@@ -1189,7 +1187,7 @@ fn switcher(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
)
|
||||
})
|
||||
.inner;
|
||||
picker.response.backing_on_hover_text(tr("ui.agent_chat_model_tip"));
|
||||
picker.response.on_hover_text(tr("ui.agent_chat_model_tip"));
|
||||
match picker.inner {
|
||||
Some(ui_kit::Picked::Listed(m)) => set_model(app, &m),
|
||||
Some(ui_kit::Picked::Custom(m)) => {
|
||||
@@ -1207,7 +1205,7 @@ fn switcher(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
ui.horizontal(|ui| {
|
||||
let b = if app.agent_chat.state().running() {
|
||||
ui_kit::button(ui, tr("ui.agent_chat_stop"), ui_kit::Button::Normal).backing_on_hover_text(tr("ui.agent_chat_stop_tip"))
|
||||
ui_kit::button(ui, tr("ui.agent_chat_stop"), ui_kit::Button::Normal).on_hover_text(tr("ui.agent_chat_stop_tip"))
|
||||
} else {
|
||||
let label = if app.agent_chat.state() == State::Failed { "ui.agent_chat_retry" } else { "ui.agent_chat_connect" };
|
||||
ui_kit::button(ui, tr(label), ui_kit::Button::Normal)
|
||||
@@ -1374,11 +1372,11 @@ fn config_select(app: &mut SolveApp, ui: &mut egui::Ui, option: &acp::ConfigOpti
|
||||
if let Some(group) = group
|
||||
&& previous_group != Some(group)
|
||||
{
|
||||
ui.label(RichText::new(compact_text(group, 32)).color(t.text_dim).size(t.font_small)).backing_on_hover_text(group);
|
||||
ui.label(RichText::new(compact_text(group, 32)).color(t.text_dim).size(t.font_small)).on_hover_text(group);
|
||||
}
|
||||
previous_group = group;
|
||||
let row = ui_kit::list_picker(ui, &choice.value, &compact_text(&choice.name, 32), choice.value == option.current_value);
|
||||
let row = row.backing_on_hover_text(
|
||||
let row = row.on_hover_text(
|
||||
[choice.name.as_str(), choice.description.as_str()]
|
||||
.into_iter()
|
||||
.filter(|part| !part.is_empty())
|
||||
@@ -1402,7 +1400,7 @@ fn config_select(app: &mut SolveApp, ui: &mut egui::Ui, option: &acp::ConfigOpti
|
||||
response
|
||||
};
|
||||
response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::ComboBox, enabled, format!("{name}: {selected}")));
|
||||
response.backing_on_hover_text(tip);
|
||||
response.on_hover_text(tip);
|
||||
match picked {
|
||||
Some(ui_kit::Picked::Listed(value)) => super::set_config_option(app, &option.id, &value),
|
||||
Some(ui_kit::Picked::Custom(value)) => {
|
||||
@@ -1558,7 +1556,7 @@ fn agent_list(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
for e in &all {
|
||||
let selected = current.as_ref().is_some_and(|c| c.id == e.id);
|
||||
let resp = ui_kit::list_picker(ui, &e.id, &e.name, selected).backing_on_hover_text(format!("{} {}", e.detail(), e.login));
|
||||
let resp = ui_kit::list_picker(ui, &e.id, &e.name, selected).on_hover_text(format!("{} {}", e.detail(), e.login));
|
||||
crate::scenario::publish_handle(&format!("agent_chat:pick:{}", e.id), resp.rect.center());
|
||||
if resp.clicked() {
|
||||
app.agent_chat.agent_id = Some(e.id.clone());
|
||||
@@ -1577,7 +1575,7 @@ fn agent_list(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
for m in missing {
|
||||
ui.horizontal(|ui| {
|
||||
ui_kit::text(ui, m.name, ui_kit::Text::Inline);
|
||||
if ui_kit::button(ui, tr("ui.agent_chat_copy"), ui_kit::Button::Small).backing_on_hover_text(m.install).clicked() {
|
||||
if ui_kit::button(ui, tr("ui.agent_chat_copy"), ui_kit::Button::Small).on_hover_text(m.install).clicked() {
|
||||
ui.ctx().copy_text(m.install.to_string());
|
||||
}
|
||||
});
|
||||
@@ -1814,7 +1812,7 @@ fn conversation(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
ui_kit::assistant_actions(ui, |ui| {
|
||||
let allow = ui_kit::primary_button(ui, tr("ui.agent_chat_allow_once"));
|
||||
let always = ui_kit::button(ui, tr("ui.ai_always_allow"), ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(trf("ui.ai_always_allow_tip", &[("tool", tool)]));
|
||||
.on_hover_text(trf("ui.ai_always_allow_tip", &[("tool", tool)]));
|
||||
let deny = ui
|
||||
.with_layout(Layout::left_to_right(Align::Center), |ui| {
|
||||
ui_kit::button(ui, tr("ui.agent_chat_deny"), ui_kit::Button::Normal)
|
||||
@@ -1844,8 +1842,7 @@ fn conversation(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
if *undone {
|
||||
ui.label(RichText::new(tr("ui.agent_chat_undone")).color(t.text_dim).size(crate::theme::Tokens::get().font_caption));
|
||||
} else if Arc::ptr_eq(doc, ¤t_doc) {
|
||||
let b =
|
||||
ui_kit::button(ui, tr("ui.agent_chat_undo_changes"), ui_kit::Button::Normal).backing_on_hover_text(tr("ui.ai_undo_tip"));
|
||||
let b = ui_kit::button(ui, tr("ui.agent_chat_undo_changes"), ui_kit::Button::Normal).on_hover_text(tr("ui.ai_undo_tip"));
|
||||
crate::scenario::publish_handle("agent_chat:undo", b.rect.center());
|
||||
if b.clicked() {
|
||||
undo = Some(n);
|
||||
@@ -1870,62 +1867,61 @@ fn conversation(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
let mut edit_buf = editing.as_ref().map(|(_, b)| b.clone());
|
||||
for (n, p) in app.agent_chat.pending.iter().enumerate() {
|
||||
ui.add_space(6.0);
|
||||
let frame = Container::new(ui.ctx(), Surface::Panel)
|
||||
Container::new(ui.ctx(), Surface::Panel)
|
||||
.edge_frame(t.panel)
|
||||
.stroke(Stroke::new(1.0, t.accent))
|
||||
.corner_radius(t.control_radius)
|
||||
.inner_margin(egui::Margin::same(6));
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
ui.horizontal(|ui| {
|
||||
let tag = if stopped && !busy { "ui.agent_chat_queued_stopped" } else { "ui.agent_chat_queued" };
|
||||
ui.label(RichText::new(tr(tag)).color(t.accent).semibold().size(crate::theme::Tokens::get().font_small));
|
||||
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
|
||||
let x = ui_kit::button(ui, "×", ui_kit::Button::Small).backing_on_hover_text(tr("ui.agent_chat_remove"));
|
||||
crate::scenario::publish_handle(&format!("agent_chat:pending_remove:{n}"), x.rect.center());
|
||||
if x.clicked() {
|
||||
remove = Some(n);
|
||||
}
|
||||
if editing.as_ref().is_none_or(|(i, _)| *i != n) {
|
||||
let e = ui_kit::button(ui, tr("ui.agent_chat_edit"), ui_kit::Button::Small);
|
||||
crate::scenario::publish_handle(&format!("agent_chat:pending_edit:{n}"), e.rect.center());
|
||||
if e.clicked() {
|
||||
start_edit = Some((n, p.text.clone()));
|
||||
.inner_margin(egui::Margin::same(6))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
ui.horizontal(|ui| {
|
||||
let tag = if stopped && !busy { "ui.agent_chat_queued_stopped" } else { "ui.agent_chat_queued" };
|
||||
ui.label(RichText::new(tr(tag)).color(t.accent).semibold().size(crate::theme::Tokens::get().font_small));
|
||||
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
|
||||
let x = ui_kit::button(ui, "×", ui_kit::Button::Small).on_hover_text(tr("ui.agent_chat_remove"));
|
||||
crate::scenario::publish_handle(&format!("agent_chat:pending_remove:{n}"), x.rect.center());
|
||||
if x.clicked() {
|
||||
remove = Some(n);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
match (&editing, edit_buf.as_mut()) {
|
||||
(Some((i, _)), Some(buf)) if *i == n => {
|
||||
let te = ui_kit::message_field(ui, Id::new(("sc_agent_pending_input", n)), buf, "");
|
||||
crate::scenario::publish_rect("agent_chat:pending_input", te.rect);
|
||||
ui.horizontal(|ui| {
|
||||
if ui_kit::button(ui, tr("ui.agent_chat_save"), ui_kit::Button::Normal).clicked() {
|
||||
edit_done = Some((n, Some(buf.clone())));
|
||||
}
|
||||
if ui_kit::button(ui, tr("ui.agent_chat_cancel"), ui_kit::Button::Normal).clicked() {
|
||||
edit_done = Some((n, None));
|
||||
if editing.as_ref().is_none_or(|(i, _)| *i != n) {
|
||||
let e = ui_kit::button(ui, tr("ui.agent_chat_edit"), ui_kit::Button::Small);
|
||||
crate::scenario::publish_handle(&format!("agent_chat:pending_edit:{n}"), e.rect.center());
|
||||
if e.clicked() {
|
||||
start_edit = Some((n, p.text.clone()));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
_ => {
|
||||
if !p.text.is_empty() {
|
||||
ui.add(egui::Label::new(RichText::new(&p.text).color(t.text)).selectable(true).wrap());
|
||||
});
|
||||
match (&editing, edit_buf.as_mut()) {
|
||||
(Some((i, _)), Some(buf)) if *i == n => {
|
||||
let te = ui_kit::message_field(ui, Id::new(("sc_agent_pending_input", n)), buf, "");
|
||||
crate::scenario::publish_rect("agent_chat:pending_input", te.rect);
|
||||
ui.horizontal(|ui| {
|
||||
if ui_kit::button(ui, tr("ui.agent_chat_save"), ui_kit::Button::Normal).clicked() {
|
||||
edit_done = Some((n, Some(buf.clone())));
|
||||
}
|
||||
if ui_kit::button(ui, tr("ui.agent_chat_cancel"), ui_kit::Button::Normal).clicked() {
|
||||
edit_done = Some((n, None));
|
||||
}
|
||||
});
|
||||
}
|
||||
if p.image {
|
||||
ui.label(RichText::new(tr("ui.agent_chat_view_attached")).color(t.text_dim).size(crate::theme::Tokens::get().font_small));
|
||||
_ => {
|
||||
if !p.text.is_empty() {
|
||||
ui.add(egui::Label::new(RichText::new(&p.text).color(t.text)).selectable(true).wrap());
|
||||
}
|
||||
if p.image {
|
||||
ui.label(RichText::new(tr("ui.agent_chat_view_attached")).color(t.text_dim).size(crate::theme::Tokens::get().font_small));
|
||||
}
|
||||
context_chips(ui, &p.context, false);
|
||||
files_line(ui, p.files.iter().map(|f| f.name.as_str()));
|
||||
}
|
||||
context_chips(ui, &p.context, false);
|
||||
files_line(ui, p.files.iter().map(|f| f.name.as_str()));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
if !app.agent_chat.pending.is_empty() && editing.is_none() {
|
||||
ui.horizontal(|ui| {
|
||||
if busy {
|
||||
let b =
|
||||
ui_kit::button(ui, tr("ui.agent_chat_send_now"), ui_kit::Button::Normal).backing_on_hover_text(tr("ui.agent_chat_send_now_tip"));
|
||||
let b = ui_kit::button(ui, tr("ui.agent_chat_send_now"), ui_kit::Button::Normal).on_hover_text(tr("ui.agent_chat_send_now_tip"));
|
||||
crate::scenario::publish_handle("agent_chat:send_now", b.rect.center());
|
||||
send_now_clicked = b.clicked();
|
||||
} else {
|
||||
@@ -2058,38 +2054,34 @@ pub(super) fn remove_tip(f: &attach::Attachment) -> &'static str {
|
||||
fn loading_chip(ui: &mut egui::Ui, name: &str, importing: bool, i: usize, w: f32) -> bool {
|
||||
let t = Tokens::get();
|
||||
let mut clicked = false;
|
||||
let r = crate::ui_kit::Container::show_backing(
|
||||
ui,
|
||||
egui::Frame::NONE
|
||||
.fill(t.toolbar)
|
||||
.stroke(t.control_border_stroke(t.border))
|
||||
.corner_radius(t.control_radius)
|
||||
.inner_margin(egui::Margin::symmetric(4, 3)),
|
||||
|ui| {
|
||||
let r = egui::Frame::NONE
|
||||
.fill(t.toolbar)
|
||||
.stroke(t.control_border_stroke(t.border))
|
||||
.corner_radius(t.control_radius)
|
||||
.inner_margin(egui::Margin::symmetric(4, 3))
|
||||
.show(ui, |ui| {
|
||||
let inner = (w - 10.0).max(40.0);
|
||||
ui.set_width(inner);
|
||||
ui.horizontal(|ui| {
|
||||
ui.spacing_mut().item_spacing.x = 4.0;
|
||||
let doing = tr(if importing { "ui.agent_chat_file_importing" } else { "ui.agent_chat_file_loading" });
|
||||
let mark = ui.add(egui::Spinner::new().size(t.form_icon_size)).backing_on_hover_text(doing).rect.width();
|
||||
let mark = ui.add(egui::Spinner::new().size(t.form_icon_size)).on_hover_text(doing).rect.width();
|
||||
let name_w = (inner - mark - 18.0 - 8.0).max(8.0);
|
||||
ui.allocate_ui(vec2(name_w, 20.0), |ui| {
|
||||
ui.set_width(name_w);
|
||||
ui.add(egui::Label::new(RichText::new(name).size(t.font_small).color(t.text_dim)).truncate())
|
||||
})
|
||||
.inner
|
||||
.backing_on_hover_text(name);
|
||||
.on_hover_text(name);
|
||||
let (r, x) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::click());
|
||||
let c = r.center();
|
||||
let s = Stroke::new(1.3, if x.hovered() { t.text } else { t.text_dim });
|
||||
ui.painter().line_segment([c + vec2(-3.5, -3.5), c + vec2(3.5, 3.5)], s);
|
||||
ui.painter().line_segment([c + vec2(-3.5, 3.5), c + vec2(3.5, -3.5)], s);
|
||||
crate::scenario::publish_handle(&format!("agent_chat:file_loading_remove:{i}"), c);
|
||||
clicked =
|
||||
x.backing_on_hover_text(tr(if importing { "ui.agent_chat_remove_imported" } else { "ui.agent_chat_remove_file" })).clicked();
|
||||
clicked = x.on_hover_text(tr(if importing { "ui.agent_chat_remove_imported" } else { "ui.agent_chat_remove_file" })).clicked();
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
crate::scenario::publish_handle(&format!("agent_chat:file_loading:{i}"), r.response.rect.center());
|
||||
clicked
|
||||
}
|
||||
@@ -2099,14 +2091,12 @@ fn loading_chip(ui: &mut egui::Ui, name: &str, importing: bool, i: usize, w: f32
|
||||
fn chip(ui: &mut egui::Ui, thumbs: &mut std::collections::HashMap<u64, egui::TextureHandle>, f: &attach::Attachment, i: usize, w: f32) -> bool {
|
||||
let t = Tokens::get();
|
||||
let mut clicked = false;
|
||||
let r = crate::ui_kit::Container::show_backing(
|
||||
ui,
|
||||
egui::Frame::NONE
|
||||
.fill(t.toolbar)
|
||||
.stroke(t.control_border_stroke(t.border))
|
||||
.corner_radius(t.control_radius)
|
||||
.inner_margin(egui::Margin::symmetric(4, 3)),
|
||||
|ui| {
|
||||
let r = egui::Frame::NONE
|
||||
.fill(t.toolbar)
|
||||
.stroke(t.control_border_stroke(t.border))
|
||||
.corner_radius(t.control_radius)
|
||||
.inner_margin(egui::Margin::symmetric(4, 3))
|
||||
.show(ui, |ui| {
|
||||
let inner = (w - 10.0).max(40.0);
|
||||
ui.set_width(inner);
|
||||
ui.horizontal(|ui| {
|
||||
@@ -2140,17 +2130,16 @@ fn chip(ui: &mut egui::Ui, thumbs: &mut std::collections::HashMap<u64, egui::Tex
|
||||
ui.add(egui::Label::new(RichText::new(&f.name).size(t.font_small)).truncate())
|
||||
})
|
||||
.inner
|
||||
.backing_on_hover_text(&f.name);
|
||||
.on_hover_text(&f.name);
|
||||
let (r, x) = ui.allocate_exact_size(vec2(18.0, 18.0), Sense::click());
|
||||
let c = r.center();
|
||||
let s = Stroke::new(1.3, if x.hovered() { t.text } else { t.text_dim });
|
||||
ui.painter().line_segment([c + vec2(-3.5, -3.5), c + vec2(3.5, 3.5)], s);
|
||||
ui.painter().line_segment([c + vec2(-3.5, 3.5), c + vec2(3.5, -3.5)], s);
|
||||
crate::scenario::publish_handle(&format!("agent_chat:file_remove:{i}"), c);
|
||||
clicked = x.backing_on_hover_text(remove_tip(f)).clicked();
|
||||
clicked = x.on_hover_text(remove_tip(f)).clicked();
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
crate::scenario::publish_target(&format!("agent_chat:file:{i}"), r.response.rect);
|
||||
clicked
|
||||
}
|
||||
@@ -2175,7 +2164,7 @@ fn add_menu(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
});
|
||||
crate::scenario::publish_handle("agent_chat:add", r.response.rect.center());
|
||||
r.response.backing_on_hover_text(tr("ui.agent_chat_add"));
|
||||
r.response.on_hover_text(tr("ui.agent_chat_add"));
|
||||
if choose {
|
||||
app.pick_file(tr("ui.agent_chat_attachable"), &attach::extensions(), |app, path| {
|
||||
if let Some(path) = path
|
||||
@@ -2243,7 +2232,7 @@ fn tool_card(ui: &mut egui::Ui, n: usize, call: &ToolCall) {
|
||||
Some(words) => RichText::new(words).size(t.font_caption).color(t.text),
|
||||
None => RichText::new(summary::plain_title(call.title)).monospace().size(t.font_caption).color(t.text),
|
||||
};
|
||||
ui.add(egui::Label::new(text).truncate().selectable(false)).backing_on_hover_text(call.title);
|
||||
ui.add(egui::Label::new(text).truncate().selectable(false)).on_hover_text(call.title);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -2253,7 +2242,7 @@ fn tool_card(ui: &mut egui::Ui, n: usize, call: &ToolCall) {
|
||||
state_.toggle(ui);
|
||||
}
|
||||
if details {
|
||||
click.backing_on_hover_text(tr("ui.ai_tool_unfold"));
|
||||
click.on_hover_text(tr("ui.ai_tool_unfold"));
|
||||
}
|
||||
state_.show_body_unindented(ui, |ui| {
|
||||
ui.indent(id.with("detail"), |ui| {
|
||||
|
||||
@@ -7,7 +7,6 @@ use super::agents::{self, AgentConfig, Kind, Mode, Protocol};
|
||||
use super::backend::TestError;
|
||||
use super::*;
|
||||
use crate::ui_kit;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||
pub enum AddKind {
|
||||
@@ -406,7 +405,7 @@ fn start_test(app: &SolveApp, e: &agents::Entry, key: Option<String>) -> Test {
|
||||
/// An endpoint's request timeout field: seconds, 30 s to an hour.
|
||||
fn timeout_field(ui: &mut egui::Ui, secs: &mut u64, handle: &str) -> bool {
|
||||
let r = ui_kit::number_field(ui, secs, agents::MIN_REQUEST_TIMEOUT_S..=agents::MAX_REQUEST_TIMEOUT_S, 5.0, "")
|
||||
.backing_on_hover_text(tr("ui.ai_request_timeout_hint"));
|
||||
.on_hover_text(tr("ui.ai_request_timeout_hint"));
|
||||
r.widget_info(|| {
|
||||
let mut info = egui::WidgetInfo::drag_value(ui.is_enabled(), *secs as f64);
|
||||
info.label = Some(tr("prefs.assistant_seconds_aria").to_owned());
|
||||
@@ -420,7 +419,7 @@ fn timeout_field(ui: &mut egui::Ui, secs: &mut u64, handle: &str) -> bool {
|
||||
/// The free-text reasoning effort field with its hover hint; true when the text changed.
|
||||
fn effort_field(ui: &mut egui::Ui, effort: &mut String, handle: &str) -> bool {
|
||||
let response = ui_kit::cell_editor(ui, ui.id().with("ai_reasoning_effort"), effort, tr("ui.ai_reasoning_effort_field_hint"), false)
|
||||
.backing_on_hover_text(tr("ui.ai_reasoning_effort_hint"));
|
||||
.on_hover_text(tr("ui.ai_reasoning_effort_hint"));
|
||||
crate::scenario::publish_target(handle, response.rect);
|
||||
response.changed()
|
||||
}
|
||||
@@ -447,14 +446,14 @@ pub fn page(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
ui_kit::settings_heading(ui, tr("prefs.assistant"), tr("ai.prefs.intro"));
|
||||
ui_kit::settings_section(ui, "assistant_availability", tr("ai.prefs.availability"), |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
let response = ui_kit::checkbox(ui, tr("ui.ai_show_features"), &mut app.preferences.ai_features)
|
||||
.backing_on_hover_text(tr("ui.ai_show_features_note"));
|
||||
let response =
|
||||
ui_kit::checkbox(ui, tr("ui.ai_show_features"), &mut app.preferences.ai_features).on_hover_text(tr("ui.ai_show_features_note"));
|
||||
crate::scenario::publish_handle("prefs:ai_features", response.rect.center());
|
||||
ui_kit::help_icon(ui, tr("ui.ai_show_features_note"));
|
||||
});
|
||||
ui.add_enabled_ui(app.preferences.ai_features && !cfg!(target_arch = "wasm32"), |ui| {
|
||||
let response = ui_kit::checkbox(ui, tr("ui.ai_toolbar_button"), &mut app.preferences.ai_toolbar_button)
|
||||
.backing_on_hover_text(tr("ui.ai_toolbar_button_note"));
|
||||
.on_hover_text(tr("ui.ai_toolbar_button_note"));
|
||||
crate::scenario::publish_handle("prefs:ai_toolbar_button", response.rect.center());
|
||||
});
|
||||
if cfg!(target_arch = "wasm32") {
|
||||
@@ -488,7 +487,7 @@ fn connecting_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
("ai.prefs.open_at_start", "ai.prefs.open_at_start_note", "agent_chat_open_at_start", &mut app.preferences.agent_chat_open_at_start),
|
||||
] {
|
||||
ui.horizontal(|ui| {
|
||||
let response = ui_kit::checkbox(ui, tr(label), value).backing_on_hover_text(tr(help));
|
||||
let response = ui_kit::checkbox(ui, tr(label), value).on_hover_text(tr(help));
|
||||
crate::scenario::publish_handle(&format!("prefs:{handle}"), response.rect.center());
|
||||
ui_kit::help_icon(ui, tr(help));
|
||||
});
|
||||
@@ -541,8 +540,7 @@ fn permissions_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
.collect();
|
||||
ui_kit::section_count(ui, "always_allowed", tr("ui.ai_always_allowed"), false, Some(remembered.len()), |ui| {
|
||||
if remembered.is_empty() {
|
||||
ui_kit::text(ui, tr("ai.prefs.no_saved_approvals"), ui_kit::Text::Hint("none"))
|
||||
.backing_on_hover_text(tr("ui.ai_always_allowed_none"));
|
||||
ui_kit::text(ui, tr("ai.prefs.no_saved_approvals"), ui_kit::Text::Hint("none")).on_hover_text(tr("ui.ai_always_allowed_none"));
|
||||
}
|
||||
let names: std::collections::HashMap<_, _> = agents::entries(app).into_iter().map(|entry| (entry.id, entry.name)).collect();
|
||||
for (agent, tools) in remembered {
|
||||
@@ -607,7 +605,7 @@ fn panel_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
if limit != 0 {
|
||||
let response =
|
||||
ui_kit::settings_number(ui, &mut p.agent_chat_turn_limit, 1..=200, 1.0).backing_on_hover_text(tr("ai.prefs.turn_limit_hint"));
|
||||
ui_kit::settings_number(ui, &mut p.agent_chat_turn_limit, 1..=200, 1.0).on_hover_text(tr("ai.prefs.turn_limit_hint"));
|
||||
response.widget_info(|| {
|
||||
let mut info = egui::WidgetInfo::drag_value(ui.is_enabled(), f64::from(p.agent_chat_turn_limit));
|
||||
info.label = Some(tr("prefs.assistant_limit").to_owned());
|
||||
@@ -627,7 +625,7 @@ fn pointer_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
ui,
|
||||
|ui| {
|
||||
let response = ui_kit::checkbox(ui, tr("ai.prefs.show_pointer"), &mut app.ui.agent_cursor.show)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Show the pointer an AI agent moves (#35)"));
|
||||
.on_hover_text(crate::i18n::tr_label("Show the pointer an AI agent moves (#35)"));
|
||||
crate::scenario::publish_target("prefs:agent_pointer_show", response.rect);
|
||||
ui.add_enabled_ui(app.ui.agent_cursor.show, |ui| {
|
||||
let speed_label_width = ui_kit::ContentWidth::label(ui, tr("ai.prefs.pointer_speed")) + crate::theme::Tokens::get().space_4;
|
||||
@@ -655,7 +653,7 @@ fn pointer_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
});
|
||||
ui.horizontal(|ui| {
|
||||
let response = ui_kit::checkbox(ui, tr("ai.prefs.follow_camera"), &mut app.ui.agent_cursor.follow_camera)
|
||||
.backing_on_hover_text(tr("prefs.assistant_follow_help"));
|
||||
.on_hover_text(tr("prefs.assistant_follow_help"));
|
||||
crate::scenario::publish_target("prefs:agent_pointer_follow", response.rect);
|
||||
ui_kit::help_icon(ui, tr("prefs.assistant_follow_help"));
|
||||
});
|
||||
@@ -721,13 +719,13 @@ fn agents_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
Kind::Api => "ui.ai_test_api_tip",
|
||||
Kind::Anthropic => "ui.ai_test_anthropic_tip",
|
||||
};
|
||||
if test_button.backing_on_hover_text(tr(tip)).clicked() {
|
||||
if test_button.on_hover_text(tr(tip)).clicked() {
|
||||
test = Some(entry.clone());
|
||||
}
|
||||
if !entry.found {
|
||||
let edit_button = ui_kit::button(ui, tr("ui.ai_edit"), ui_kit::Button::Small);
|
||||
crate::scenario::publish_handle(&format!("prefs:ai_edit:{}", entry.id), edit_button.rect.center());
|
||||
if edit_button.backing_on_hover_text(tr("ui.ai_edit_tip")).clicked() {
|
||||
if edit_button.on_hover_text(tr("ui.ai_edit_tip")).clicked() {
|
||||
edit = Some(entry.id.clone());
|
||||
}
|
||||
}
|
||||
@@ -750,7 +748,7 @@ fn agents_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
},
|
||||
);
|
||||
ui_kit::settings_short_note(ui, &detail).backing_on_hover_text(&entry.id);
|
||||
ui_kit::settings_short_note(ui, &detail).on_hover_text(&entry.id);
|
||||
// Wide enough for an endpoint's "Request timeout" or "Reasoning effort" too,
|
||||
// so all rows line up.
|
||||
let label_w = [tr("ui.ai_permissions"), tr("ui.ai_request_timeout"), tr("ui.ai_reasoning_effort")]
|
||||
@@ -821,7 +819,7 @@ fn agents_section(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
if app.preferences.agent_permissions.get(&entry.id) == Some(&Mode::All) {
|
||||
ui_kit::text(ui, tr("ai.prefs.override_all_warning"), ui_kit::Text::Report("agent_permissions_warning", true))
|
||||
.backing_on_hover_text(tr("ui.ai_mode_all_warning"));
|
||||
.on_hover_text(tr("ui.ai_mode_all_warning"));
|
||||
}
|
||||
test_line(ui, &app.agent_chat.settings.tests.get(&entry.id));
|
||||
});
|
||||
|
||||
@@ -502,8 +502,7 @@ pub fn paint(app: &SolveApp, ctx: &egui::Context) {
|
||||
.interactable(false)
|
||||
.fade_in(false)
|
||||
.show(ctx, |ui| {
|
||||
let frame = Container::popup_frame(ui.style()).fill(t.overlay);
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
Container::popup_frame(ui.style()).fill(t.overlay).show(ui, |ui| {
|
||||
ui.label(egui::RichText::new(crate::i18n::tr_label(label)).size(t.font_label).color(t.text));
|
||||
});
|
||||
});
|
||||
|
||||
+4
-124
@@ -40,24 +40,19 @@ impl Counters {
|
||||
}
|
||||
|
||||
pub fn validate_radius(radius: f32) -> Result<f32, &'static str> {
|
||||
if radius.is_finite() && (0.0..=60.0).contains(&radius) {
|
||||
if radius.is_finite() && (0.0..=40.0).contains(&radius) {
|
||||
Ok(radius)
|
||||
} else {
|
||||
Err("blur radius must be finite and between 0 and 60 physical pixels")
|
||||
Err("blur radius must be finite and between 0 and 40 physical pixels")
|
||||
}
|
||||
}
|
||||
|
||||
/// Original Kawase schedule. Offsets are in input texels; the first level is half sized.
|
||||
pub fn schedule(radius: f32) -> Option<(usize, f32)> {
|
||||
schedule_capped(radius, 5)
|
||||
}
|
||||
|
||||
/// A transient quality cap changes pass count, retaining the requested physical radius.
|
||||
pub fn schedule_capped(radius: f32, cap: usize) -> Option<(usize, f32)> {
|
||||
if validate_radius(radius).ok()? == 0.0 {
|
||||
return None;
|
||||
}
|
||||
let steps = (if radius <= 8.0 {
|
||||
let steps = if radius <= 8.0 {
|
||||
2
|
||||
} else if radius <= 18.0 {
|
||||
3
|
||||
@@ -65,120 +60,13 @@ pub fn schedule_capped(radius: f32, cap: usize) -> Option<(usize, f32)> {
|
||||
4
|
||||
} else {
|
||||
5
|
||||
})
|
||||
.min(cap.clamp(2, 5));
|
||||
};
|
||||
// Per-axis tap variance: down 1/2, up 4/3, scaled by input texel size.
|
||||
// Target tap sigma = radius / 2. Resampling adds its own measurable footprint.
|
||||
let variance = (35.0 / 18.0) * (4.0_f32.powi(steps as i32) - 1.0);
|
||||
Some((steps, radius / (2.0 * variance.sqrt())))
|
||||
}
|
||||
|
||||
/// Evidence from the native pass owner's actual submission, never UI construction time.
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct PaintedFrame {
|
||||
pub frame: u64,
|
||||
pub interval_ms: Option<f64>,
|
||||
pub continuous: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct Guard {
|
||||
pub cap: usize,
|
||||
pub streak: u8,
|
||||
pub notice: bool,
|
||||
pub opted_out: bool,
|
||||
original: Option<usize>,
|
||||
announced: bool,
|
||||
}
|
||||
|
||||
impl Default for Guard {
|
||||
fn default() -> Self {
|
||||
Self { cap: 5, streak: 0, notice: false, opted_out: false, original: None, announced: false }
|
||||
}
|
||||
}
|
||||
|
||||
impl Guard {
|
||||
pub fn reset(&mut self) {
|
||||
self.streak = 0;
|
||||
}
|
||||
|
||||
pub fn observe(&mut self, radius: f32, interval_ms: f64, eligible: bool) {
|
||||
let steps = schedule_capped(radius, self.cap).map_or(0, |s| s.0);
|
||||
if self.opted_out || !eligible || !interval_ms.is_finite() || interval_ms <= 22.0 || steps <= 2 {
|
||||
self.reset();
|
||||
return;
|
||||
}
|
||||
self.streak = self.streak.saturating_add(1);
|
||||
if self.streak == 60 {
|
||||
self.original.get_or_insert(self.cap);
|
||||
self.cap = steps - 1;
|
||||
self.reset();
|
||||
if !self.announced {
|
||||
self.notice = true;
|
||||
self.announced = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn undo(&mut self) {
|
||||
if let Some(original) = self.original.take() {
|
||||
self.cap = original;
|
||||
}
|
||||
self.opted_out = true;
|
||||
self.notice = false;
|
||||
self.reset();
|
||||
}
|
||||
}
|
||||
|
||||
/// Session-only state. Harness inputs never replace a real GPU capability with success.
|
||||
#[derive(Default)]
|
||||
pub(crate) struct Session {
|
||||
pub guard: Guard,
|
||||
pub harness_radius: Option<f32>,
|
||||
pub harness_unavailable: Option<&'static str>,
|
||||
pub evidence_fixture: Option<&'static str>,
|
||||
identity: Option<(u64, u32)>,
|
||||
frame: Option<u64>,
|
||||
painted: Option<u64>,
|
||||
dismissed: std::collections::VecDeque<u64>,
|
||||
}
|
||||
|
||||
impl Session {
|
||||
pub fn sample(&mut self, ctx: &egui::Context, revision: u64, radius: f32, available: bool, paint: Option<PaintedFrame>) {
|
||||
let frame = ctx.cumulative_frame_nr();
|
||||
if self.frame == Some(frame) {
|
||||
return;
|
||||
} // egui layout re-passes do not count twice.
|
||||
self.frame = Some(frame);
|
||||
let identity = (revision, radius.to_bits());
|
||||
if self.identity.as_ref() != Some(&identity) {
|
||||
self.identity = Some(identity);
|
||||
self.painted = paint.map(|p| p.frame);
|
||||
self.guard.reset();
|
||||
return;
|
||||
}
|
||||
let eligible = available
|
||||
&& radius > 0.0
|
||||
&& ctx.requested_repaint_last_pass()
|
||||
&& ctx.input(|i| i.viewport().visible() != Some(false))
|
||||
&& paint.is_some_and(|p| p.frame.checked_add(1) == Some(frame) && self.painted != Some(p.frame) && p.continuous);
|
||||
self.painted = paint.map(|p| p.frame);
|
||||
self.guard.observe(radius, paint.and_then(|p| p.interval_ms).unwrap_or(0.0), eligible);
|
||||
}
|
||||
|
||||
pub fn dismissed(&self, key: u64) -> bool {
|
||||
self.dismissed.contains(&key)
|
||||
}
|
||||
pub fn dismiss(&mut self, key: u64) {
|
||||
if !self.dismissed(key) {
|
||||
if self.dismissed.len() == 64 {
|
||||
self.dismissed.pop_front();
|
||||
}
|
||||
self.dismissed.push_back(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[path = "blur_native.rs"]
|
||||
mod implementation;
|
||||
@@ -212,14 +100,6 @@ mod implementation {
|
||||
}
|
||||
pub fn begin(&mut self, _: &egui::Context, _: bool) {}
|
||||
pub fn set_surface_alpha(&mut self, _: Option<u8>) {}
|
||||
pub fn set_available(&mut self, _: bool) {}
|
||||
pub fn set_tier_cap(&mut self, _: usize) {}
|
||||
pub fn software_adapter(&self) -> bool {
|
||||
false
|
||||
}
|
||||
pub fn painted_frame(&self) -> Option<PaintedFrame> {
|
||||
None
|
||||
}
|
||||
}
|
||||
pub fn enabled() -> bool {
|
||||
false
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Original SolidCraft backdrop dual-Kawase and rounded surface composition.
|
||||
// Original SolidCraft viewport-only dual-Kawase and rounded panel composition.
|
||||
struct Params { a: vec4<f32>, rect: vec4<f32>, corners: vec4<f32>, top: vec4<f32>, bottom: vec4<f32>, outside: vec4<f32> }
|
||||
@group(0) @binding(0) var image: texture_2d<f32>;
|
||||
@group(0) @binding(1) var filtering: sampler;
|
||||
@@ -16,7 +16,7 @@ fn gamma(c: vec3<f32>) -> vec3<f32> {
|
||||
}
|
||||
fn load_linear(at: vec2<i32>) -> vec4<f32> {
|
||||
let c = textureLoad(image, clamp(at, vec2<i32>(0), vec2<i32>(textureDimensions(image)) - vec2<i32>(1)), 0);
|
||||
// Only the scene/composition input is gamma encoded on unorm targets. Decoding
|
||||
// Only the source is gamma encoded on unorm targets. It is opaque, so decoding
|
||||
// each texel BEFORE bilinear interpolation avoids filtering encoded colors.
|
||||
return vec4<f32>(linear(c.rgb), c.a);
|
||||
}
|
||||
@@ -60,7 +60,7 @@ fn sample_at(uv: vec2<f32>) -> vec4<f32> {
|
||||
let alpha = clamp(0.5 - distance, 0.0, 1.0) * p.a.w;
|
||||
let c = textureSample(image, filtering, v.position.xy / vec2<f32>(textureDimensions(image)));
|
||||
// Match egui: coverage/opacity multiply gamma-premultiplied RGB BEFORE the
|
||||
// framebuffer conversion. The sampled backdrop remains linear color.
|
||||
// framebuffer conversion. B itself remains linear, opaque viewport color.
|
||||
let premultiplied_gamma = gamma(c.rgb) * alpha;
|
||||
let rgb = select(premultiplied_gamma, linear(premultiplied_gamma), p.a.z > 0.5);
|
||||
return vec4<f32>(rgb, alpha);
|
||||
|
||||
@@ -11,8 +11,8 @@ const BUDGET: u64 = 256 * 1024 * 1024;
|
||||
const MAX_MARKERS: usize = 256;
|
||||
type Params = [f32; 24];
|
||||
|
||||
fn capability(adapter: &wgpu::Adapter, device_type: wgpu::DeviceType, format: wgpu::TextureFormat, split: bool, msaa: u32) -> Capability {
|
||||
if device_type == wgpu::DeviceType::Cpu {
|
||||
fn capability(adapter: &wgpu::Adapter, format: wgpu::TextureFormat, split: bool, msaa: u32) -> Capability {
|
||||
if solidcraft_gpu::select::tier_of(adapter.get_info().device_type) == solidcraft_gpu::select::Tier::Software {
|
||||
return Capability::Unavailable("software adapter (gpu-software)");
|
||||
}
|
||||
rendering_capability(adapter, format, split, msaa)
|
||||
@@ -38,7 +38,6 @@ fn rendering_capability(adapter: &wgpu::Adapter, format: wgpu::TextureFormat, sp
|
||||
#[derive(Clone)]
|
||||
struct Host {
|
||||
adapter: wgpu::Adapter,
|
||||
device_type: wgpu::DeviceType,
|
||||
device: wgpu::Device,
|
||||
queue: wgpu::Queue,
|
||||
renderer: std::sync::Weak<egui::epaint::mutex::RwLock<egui_wgpu::Renderer>>,
|
||||
@@ -50,14 +49,12 @@ struct Host {
|
||||
}
|
||||
impl Host {
|
||||
fn capability(&self) -> Capability {
|
||||
*self.capability.get_or_init(|| capability(&self.adapter, self.device_type, self.format, self.split, self.msaa))
|
||||
*self.capability.get_or_init(|| capability(&self.adapter, self.format, self.split, self.msaa))
|
||||
}
|
||||
}
|
||||
|
||||
pub struct State {
|
||||
radius: f32,
|
||||
available: bool,
|
||||
tier_cap: usize,
|
||||
host: Option<Host>,
|
||||
active: Option<Arc<Shared>>,
|
||||
retired: Counters,
|
||||
@@ -72,8 +69,6 @@ impl Default for State {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
radius: 0.0,
|
||||
available: true,
|
||||
tier_cap: 5,
|
||||
host: None,
|
||||
active: None,
|
||||
retired: Counters::default(),
|
||||
@@ -92,7 +87,6 @@ impl State {
|
||||
self.failure = None;
|
||||
self.host = Some(Host {
|
||||
adapter: rs.adapter.clone(),
|
||||
device_type: rs.adapter.get_info().device_type,
|
||||
device: rs.device.clone(),
|
||||
queue: rs.queue.clone(),
|
||||
renderer: Arc::downgrade(&rs.renderer),
|
||||
@@ -130,25 +124,6 @@ impl State {
|
||||
pub fn radius(&self) -> f32 {
|
||||
self.radius
|
||||
}
|
||||
pub fn software_adapter(&self) -> bool {
|
||||
self.host.as_ref().is_some_and(|h| h.device_type == wgpu::DeviceType::Cpu)
|
||||
}
|
||||
pub fn set_available(&mut self, available: bool) {
|
||||
self.available = available;
|
||||
if !available {
|
||||
self.retire();
|
||||
}
|
||||
}
|
||||
pub fn set_tier_cap(&mut self, cap: usize) {
|
||||
let cap = cap.clamp(2, 5);
|
||||
if self.tier_cap != cap {
|
||||
self.retire();
|
||||
self.tier_cap = cap;
|
||||
}
|
||||
}
|
||||
pub fn painted_frame(&self) -> Option<PaintedFrame> {
|
||||
self.active.as_ref()?.inner.lock().ok()?.painted
|
||||
}
|
||||
pub fn capability(&self) -> Capability {
|
||||
let base = self.base_capability();
|
||||
if base == Capability::Available && self.active.as_ref().is_some_and(|s| s.inner.lock().is_ok_and(|i| i.missing_source)) {
|
||||
@@ -232,7 +207,7 @@ impl State {
|
||||
self.last_size = Some(size_key);
|
||||
}
|
||||
}
|
||||
if !self.available || self.base_capability() != Capability::Available || !size.is_finite() || size.x <= 0.0 || size.y <= 0.0 {
|
||||
if self.base_capability() != Capability::Available || !size.is_finite() || size.x <= 0.0 || size.y <= 0.0 {
|
||||
self.retire();
|
||||
return Scope { previous, alpha };
|
||||
}
|
||||
@@ -241,7 +216,6 @@ impl State {
|
||||
Arc::new(Shared {
|
||||
host: host.clone(),
|
||||
radius: self.radius,
|
||||
tier_cap: self.tier_cap,
|
||||
painting_owner: std::sync::atomic::AtomicBool::new(true),
|
||||
inner: Mutex::new(Inner { counts: self.retired, ..Inner::default() }),
|
||||
})
|
||||
@@ -251,12 +225,6 @@ impl State {
|
||||
inner.serial = inner.serial.wrapping_add(1);
|
||||
inner.source_seen = false;
|
||||
inner.source_count = 0;
|
||||
if inner.frame != ctx.cumulative_frame_nr() {
|
||||
inner.frame = ctx.cumulative_frame_nr();
|
||||
inner.continuous = ctx.requested_repaint_last_pass();
|
||||
}
|
||||
inner.rendered = false;
|
||||
inner.drawn_before = inner.counts.markers_drawn;
|
||||
}
|
||||
if let Some(renderer) = host.renderer.upgrade() {
|
||||
renderer.write().frame_compositor = Some(shared.clone());
|
||||
@@ -285,11 +253,8 @@ pub(crate) fn fixture_state(
|
||||
) -> State {
|
||||
State {
|
||||
radius: 0.0,
|
||||
available: true,
|
||||
tier_cap: 5,
|
||||
host: Some(Host {
|
||||
adapter: adapter.clone(),
|
||||
device_type: adapter.get_info().device_type,
|
||||
device: device.clone(),
|
||||
queue: queue.clone(),
|
||||
renderer: Arc::downgrade(renderer),
|
||||
@@ -352,18 +317,11 @@ pub fn panel_fill(fill: Color32) -> Color32 {
|
||||
struct Shared {
|
||||
host: Host,
|
||||
radius: f32,
|
||||
tier_cap: usize,
|
||||
inner: Mutex<Inner>,
|
||||
painting_owner: std::sync::atomic::AtomicBool,
|
||||
}
|
||||
#[derive(Default)]
|
||||
struct Inner {
|
||||
frame: u64,
|
||||
continuous: bool,
|
||||
rendered: bool,
|
||||
drawn_before: u64,
|
||||
painted: Option<PaintedFrame>,
|
||||
submitted_at: Option<std::time::Instant>,
|
||||
gpu: Option<Gpu>,
|
||||
markers: Vec<Marker>,
|
||||
counts: Counters,
|
||||
@@ -382,14 +340,10 @@ struct Marker {
|
||||
corners: egui::CornerRadius,
|
||||
opacity: f32,
|
||||
snap: bool,
|
||||
// Identity only: the paint job owns this callback for the entire frame. Keeping
|
||||
// its Arc here would create a Shared -> callback -> Shared ownership cycle.
|
||||
callback_id: usize,
|
||||
}
|
||||
|
||||
pub fn decorate(painter: &Painter, frame: Frame, content: Rect, ordinary: Shape) -> Shape {
|
||||
let opacity = painter.opacity();
|
||||
if frame.fill.a() == 0 || (frame.fill.a() == 255 && opacity >= 1.0) || !opacity.is_finite() || opacity <= 0.0 || !painter.is_visible() {
|
||||
if frame.fill.a() == 255 || frame.fill.a() == 0 || !painter.is_visible() {
|
||||
return ordinary;
|
||||
}
|
||||
CURRENT.with(|c| {
|
||||
@@ -402,7 +356,7 @@ pub fn decorate(painter: &Painter, frame: Frame, content: Rect, ordinary: Shape)
|
||||
if !rect.is_finite() || !rect.is_positive() {
|
||||
return ordinary;
|
||||
}
|
||||
let callback = if let Ok(mut inner) = shared.inner.lock() {
|
||||
let index = if let Ok(mut inner) = shared.inner.lock() {
|
||||
if inner.markers.len() >= MAX_MARKERS {
|
||||
inner.failure = Some("blur panel limit exceeded");
|
||||
inner.gpu = None;
|
||||
@@ -410,19 +364,18 @@ pub fn decorate(painter: &Painter, frame: Frame, content: Rect, ordinary: Shape)
|
||||
return ordinary;
|
||||
}
|
||||
let index = inner.markers.len();
|
||||
let callback = egui_wgpu::Callback::new_paint_callback(rect, PanelMarker { shared: shared.clone(), index });
|
||||
inner.markers.push(Marker {
|
||||
rect,
|
||||
corners: frame.corner_radius,
|
||||
opacity,
|
||||
opacity: painter.opacity(),
|
||||
snap: painter.ctx().tessellation_options(|o| o.round_rects_to_pixels),
|
||||
callback_id: Arc::as_ptr(&callback.callback) as *const () as usize,
|
||||
});
|
||||
inner.counts.markers_emitted += 1;
|
||||
callback
|
||||
index
|
||||
} else {
|
||||
return ordinary;
|
||||
};
|
||||
let callback = egui_wgpu::Callback::new_paint_callback(rect, PanelMarker { shared: shared.clone(), index });
|
||||
Shape::Vec(vec![Shape::Callback(callback), ordinary])
|
||||
})
|
||||
}
|
||||
@@ -524,7 +477,7 @@ impl CallbackTrait for Source {
|
||||
return Vec::new();
|
||||
}
|
||||
inner.source_seen = true;
|
||||
let Some((steps, offset)) = schedule_capped(self.shared.radius, self.shared.tier_cap) else { return Vec::new() };
|
||||
let Some((steps, offset)) = schedule(self.shared.radius) else { return Vec::new() };
|
||||
let Some(bytes) = target_bytes(screen.size_in_pixels, steps, self.shared.host.device.limits().max_texture_dimension_2d) else {
|
||||
inner.failure = Some("blur target is empty, exceeds device limits or memory budget");
|
||||
inner.gpu = None;
|
||||
@@ -586,9 +539,13 @@ impl CallbackTrait for Source {
|
||||
}
|
||||
}
|
||||
counts.source_passes += 1;
|
||||
// The backdrop pyramid is built at paint-order boundaries in render(),
|
||||
// after the underlying UI has actually been drawn, rather than from this
|
||||
// scene-only texture during preparation.
|
||||
for step in &gpu.chain {
|
||||
let mut pass = pass(encoder, "blur_kawase", &step.target.view, wgpu::Color::TRANSPARENT);
|
||||
pass.set_pipeline(if step.down { &gpu.down } else { &gpu.up });
|
||||
pass.set_bind_group(0, &step.binding.group, &[]);
|
||||
pass.draw(0..3, 0..1);
|
||||
counts.blur_passes += 1;
|
||||
}
|
||||
gpu.pending = Some(key);
|
||||
Vec::new()
|
||||
}
|
||||
@@ -618,7 +575,6 @@ impl Source {
|
||||
screen.size_in_pixels.hash(&mut h);
|
||||
screen.pixels_per_point.to_bits().hash(&mut h);
|
||||
self.shared.radius.to_bits().hash(&mut h);
|
||||
self.shared.tier_cap.hash(&mut h);
|
||||
self.shared.host.format.hash(&mut h);
|
||||
h.finish()
|
||||
}
|
||||
@@ -716,7 +672,7 @@ impl FrameCompositor for Shared {
|
||||
if !self.painting_owner.load(std::sync::atomic::Ordering::Relaxed) {
|
||||
return false;
|
||||
}
|
||||
let (composition, pipeline, binding, marker_ids) = {
|
||||
let (composition, pipeline, binding) = {
|
||||
let Ok(mut inner) = self.inner.lock() else { return false };
|
||||
if !inner.source_seen {
|
||||
inner.missing_source = true;
|
||||
@@ -732,51 +688,14 @@ impl FrameCompositor for Shared {
|
||||
if gpu.ready_serial != inner.serial || gpu.size != screen.size_in_pixels {
|
||||
return false;
|
||||
}
|
||||
let mut marker_ids: Vec<_> = inner.markers.iter().map(|marker| marker.callback_id).collect();
|
||||
marker_ids.sort_unstable();
|
||||
let data = (gpu.composition.view.clone(), gpu.present.clone(), gpu.presentation.group.clone(), marker_ids);
|
||||
let data = (gpu.composition.view.clone(), gpu.present.clone(), gpu.presentation.group.clone());
|
||||
inner.counts.composition_passes += 1;
|
||||
data
|
||||
};
|
||||
{
|
||||
let color = wgpu::Color { r: clear[0] as f64, g: clear[1] as f64, b: clear[2] as f64, a: clear[3] as f64 };
|
||||
let _clear = pass(encoder, "blur_ui_composition", &composition, color);
|
||||
}
|
||||
let mut start = 0;
|
||||
let mut mesh_offset = 0;
|
||||
let mut segment_passes = 0;
|
||||
for end in 0..=jobs.len() {
|
||||
let callback_id = jobs.get(end).and_then(|job| {
|
||||
let egui::epaint::Primitive::Callback(callback) = &job.primitive else { return None };
|
||||
Some(Arc::as_ptr(&callback.callback) as *const () as usize)
|
||||
});
|
||||
let marker = callback_id.is_some_and(|identity| marker_ids.binary_search(&identity).is_ok());
|
||||
if !marker && end != jobs.len() {
|
||||
continue;
|
||||
}
|
||||
if start < end {
|
||||
let mut ui = load_pass(encoder, "blur_ui_segment", &composition);
|
||||
renderer.render_with_mesh_offset(&mut ui, &jobs[start..end], screen, mesh_offset);
|
||||
mesh_offset += jobs[start..end].iter().filter(|job| matches!(&job.primitive, egui::epaint::Primitive::Mesh(_))).count();
|
||||
segment_passes += 1;
|
||||
}
|
||||
if marker {
|
||||
// The preceding segment is complete before sampling its color target.
|
||||
// Reuse the pyramid, but include previously painted UI in the backdrop.
|
||||
if let Ok(mut inner) = self.inner.lock() {
|
||||
let Inner { gpu, counts, .. } = &mut *inner;
|
||||
if let Some(gpu) = gpu {
|
||||
for step in &gpu.chain {
|
||||
let mut blur = pass(encoder, "blur_backdrop", &step.target.view, wgpu::Color::TRANSPARENT);
|
||||
blur.set_pipeline(if step.down { &gpu.down } else { &gpu.up });
|
||||
blur.set_bind_group(0, &step.binding.group, &[]);
|
||||
blur.draw(0..3, 0..1);
|
||||
counts.blur_passes += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
start = end;
|
||||
let mut ui = pass(encoder, "blur_ui_composition", &composition, color);
|
||||
renderer.render(&mut ui, jobs, screen);
|
||||
}
|
||||
{
|
||||
let mut present = pass(encoder, "blur_present", target, wgpu::Color::TRANSPARENT);
|
||||
@@ -785,9 +704,7 @@ impl FrameCompositor for Shared {
|
||||
present.draw(0..3, 0..1);
|
||||
}
|
||||
if let Ok(mut inner) = self.inner.lock() {
|
||||
inner.counts.composition_passes += segment_passes;
|
||||
inner.counts.present_passes += 1;
|
||||
inner.rendered = true;
|
||||
}
|
||||
true
|
||||
}
|
||||
@@ -796,19 +713,6 @@ impl FrameCompositor for Shared {
|
||||
return;
|
||||
}
|
||||
if let Ok(mut inner) = self.inner.lock() {
|
||||
if inner.rendered && inner.counts.markers_drawn > inner.drawn_before && !self.host.lost.is_lost() {
|
||||
let now = std::time::Instant::now();
|
||||
inner.painted = Some(PaintedFrame {
|
||||
frame: inner.frame,
|
||||
interval_ms: inner.submitted_at.map(|at| now.duration_since(at).as_secs_f64() * 1000.0),
|
||||
continuous: inner.continuous,
|
||||
});
|
||||
inner.submitted_at = Some(now);
|
||||
inner.rendered = false;
|
||||
} else {
|
||||
inner.painted = None;
|
||||
inner.submitted_at = None;
|
||||
}
|
||||
if self.host.lost.is_lost() {
|
||||
inner.gpu = None;
|
||||
inner.counts.clear_live();
|
||||
@@ -907,19 +811,6 @@ fn background_params(rect: Rect, clip: Rect, colors: [Color32; 2], outside: Colo
|
||||
}
|
||||
|
||||
fn pass(encoder: &mut wgpu::CommandEncoder, label: &'static str, view: &wgpu::TextureView, clear: wgpu::Color) -> wgpu::RenderPass<'static> {
|
||||
attachment_pass(encoder, label, view, wgpu::LoadOp::Clear(clear))
|
||||
}
|
||||
|
||||
fn load_pass(encoder: &mut wgpu::CommandEncoder, label: &'static str, view: &wgpu::TextureView) -> wgpu::RenderPass<'static> {
|
||||
attachment_pass(encoder, label, view, wgpu::LoadOp::Load)
|
||||
}
|
||||
|
||||
fn attachment_pass(
|
||||
encoder: &mut wgpu::CommandEncoder,
|
||||
label: &'static str,
|
||||
view: &wgpu::TextureView,
|
||||
load: wgpu::LoadOp<wgpu::Color>,
|
||||
) -> wgpu::RenderPass<'static> {
|
||||
encoder
|
||||
.begin_render_pass(&wgpu::RenderPassDescriptor {
|
||||
label: Some(label),
|
||||
@@ -927,7 +818,7 @@ fn attachment_pass(
|
||||
view,
|
||||
resolve_target: None,
|
||||
depth_slice: None,
|
||||
ops: wgpu::Operations { load, store: wgpu::StoreOp::Store },
|
||||
ops: wgpu::Operations { load: wgpu::LoadOp::Clear(clear), store: wgpu::StoreOp::Store },
|
||||
})],
|
||||
depth_stencil_attachment: None,
|
||||
timestamp_writes: None,
|
||||
@@ -1040,7 +931,7 @@ impl Gpu {
|
||||
dimensions.push(last.map(|d| d.div_ceil(2)));
|
||||
}
|
||||
for (index, dims) in dimensions.iter().skip(1).enumerate() {
|
||||
let input = chain.last().map_or(&composition.view, |s| &s.target.view);
|
||||
let input = chain.last().map_or(&source.view, |s| &s.target.view);
|
||||
let mut p = [0.0; 24];
|
||||
p[0] = offset;
|
||||
p[1] = u8::from(index == 0 && !format.is_srgb()) as f32;
|
||||
@@ -1049,7 +940,7 @@ impl Gpu {
|
||||
chain.push(Step { target, binding, down: true });
|
||||
}
|
||||
for dims in dimensions.iter().take(steps).rev() {
|
||||
let input = chain.last().map_or(&composition.view, |s| &s.target.view);
|
||||
let input = chain.last().map_or(&source.view, |s| &s.target.view);
|
||||
let mut p = [0.0; 24];
|
||||
p[0] = offset;
|
||||
let binding = Binding::new(device, &layout, &sampler, input, p, counts);
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
//! viewport, a double-click on a sketch edits it, and a right-click opens the item's menu
|
||||
//! ([`crate::context_menu`]).
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{Container, Surface};
|
||||
use solidcraft_engine::geom::prelude::*;
|
||||
|
||||
@@ -1202,7 +1201,7 @@ fn browser_collapsed_rail(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
crate::scenario::publish_handle("left-browser-toggle", disclosure.center());
|
||||
crate::scenario::publish_target("browser:header", disclosure);
|
||||
response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), crate::i18n::tr("ui.browser_title")));
|
||||
if response.backing_on_hover_text(crate::i18n::tr("ui.browser_expand")).clicked() {
|
||||
if response.on_hover_text(crate::i18n::tr("ui.browser_expand")).clicked() {
|
||||
app.preferences.timeline_left_browser_collapsed = false;
|
||||
}
|
||||
let galley = ui.painter().layout_no_wrap(crate::i18n::tr("ui.browser_title").to_owned(), crate::fonts::semibold(t.font_body), t.text);
|
||||
@@ -1290,7 +1289,7 @@ fn browser_header(app: &mut SolveApp, ui: &mut egui::Ui, collapsible: bool) {
|
||||
ui.painter().galley(pos2(right - galley.size().x, rect.center().y - galley.size().y / 2.0), galley, t.text_dim);
|
||||
if collapsible {
|
||||
let tip = crate::i18n::tr(if collapsed { "ui.browser_expand" } else { "ui.browser_collapse" });
|
||||
if response.on_hover_cursor(egui::CursorIcon::PointingHand).backing_on_hover_text(tip).clicked() {
|
||||
if response.on_hover_cursor(egui::CursorIcon::PointingHand).on_hover_text(tip).clicked() {
|
||||
if stacked {
|
||||
app.preferences.timeline_left_browser_collapsed = !app.preferences.timeline_left_browser_collapsed;
|
||||
} else if vertical {
|
||||
@@ -1717,7 +1716,7 @@ fn occurrence_rows_inner(
|
||||
}
|
||||
if let Some(resp) = &r.resp {
|
||||
let inherited = if own_visible && !visible { "\nHidden by a parent placement. Show the parent to reveal this instance." } else { "" };
|
||||
resp.clone().backing_on_hover_ui(|ui| {
|
||||
resp.clone().on_hover_ui(|ui| {
|
||||
ui.label(&placement.tooltip);
|
||||
if !inherited.is_empty() {
|
||||
ui.label(inherited.trim_start());
|
||||
|
||||
@@ -351,7 +351,7 @@ fn marker_row(app: &SolveApp, ui: &mut egui::Ui, depth: usize) -> egui::Response
|
||||
if response.hovered() || response.dragged() {
|
||||
ui.ctx().set_cursor_icon(egui::CursorIcon::Grab);
|
||||
}
|
||||
response.backing_on_hover_text(crate::i18n::tr("ui.history_marker_tip"))
|
||||
response.on_hover_text(crate::i18n::tr("ui.history_marker_tip"))
|
||||
}
|
||||
|
||||
/// Dragging the marker shows where it lands; letting go rolls the history there, through the
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
//! command has its geometry, so typing a number sets the value at once; Enter applies, Tab
|
||||
//! moves on, Esc cancels.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{Container, Surface};
|
||||
use egui::{Color32, Pos2, Stroke, vec2};
|
||||
use solidcore_record::{Vec2, Vec3};
|
||||
@@ -928,8 +927,7 @@ fn value_box_full(
|
||||
// Background: under Preferences, Report a bug and other system windows (#9016). The box is
|
||||
// already kept clear of the command window (#6608), which floats at Middle with Features.
|
||||
Container::new(ui.ctx(), Surface::Canvas).area(area).fixed_pos(at).pivot(pivot).order(egui::Order::Background).show(ui.ctx(), |ui| {
|
||||
let frame = Container::popup_frame(ui.style()).inner_margin(egui::Margin::symmetric(6, 3));
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
Container::popup_frame(ui.style()).inner_margin(egui::Margin::symmetric(6, 3)).show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(egui::RichText::new(crate::i18n::tr_label(label)).color(t.text_dim).size(crate::theme::Tokens::get().font_caption));
|
||||
let r = crate::ui_kit::canvas_value_field(ui, id, value, keep_tab);
|
||||
@@ -1803,8 +1801,7 @@ fn draw_revolve(
|
||||
.order(egui::Order::Background)
|
||||
.interactable(false);
|
||||
area.show(ui.ctx(), |ui| {
|
||||
let frame = Container::popup_frame(ui.style()).inner_margin(egui::Margin::symmetric(6, 3));
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
Container::popup_frame(ui.style()).inner_margin(egui::Margin::symmetric(6, 3)).show(ui, |ui| {
|
||||
let text = if extent.curved_to {
|
||||
"To surface".into()
|
||||
} else if extent.sweep.is_finite() {
|
||||
@@ -1812,7 +1809,7 @@ fn draw_revolve(
|
||||
} else {
|
||||
"Choose target".into()
|
||||
};
|
||||
ui.label(text).backing_on_hover_text(crate::i18n::tr_label("Determined by To Object. Choose Angle to edit the angular extent."));
|
||||
ui.label(text).on_hover_text(crate::i18n::tr_label("Determined by To Object. Choose Angle to edit the angular extent."));
|
||||
});
|
||||
});
|
||||
} else if let Kind::Revolve { angle, .. } = &mut d.kind {
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
//! ships with its help: `every_toolbar_command_has_help` fails otherwise.
|
||||
|
||||
use crate::i18n;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
|
||||
/// The commands that have help text. Each one needs a `help.<id>` message in the catalogs.
|
||||
pub const DOCUMENTED: &[&str] = &[
|
||||
@@ -336,7 +335,7 @@ pub fn help(command: &str) -> Option<String> {
|
||||
/// with the help of `command` below it when there is one.
|
||||
pub fn tooltip(response: egui::Response, command: &str, tip: String) -> egui::Response {
|
||||
let help = help(command);
|
||||
response.backing_on_hover_ui(move |ui| {
|
||||
response.on_hover_ui(move |ui| {
|
||||
ui.set_max_width(300.0);
|
||||
ui.label(tip);
|
||||
if let Some(help) = help {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
//! Structured configuration rule editing and non-mutating row preview.
|
||||
use crate::SolveApp;
|
||||
use crate::ui_kit;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use egui::Ui;
|
||||
use serde_json::{Value, json};
|
||||
use solidcraft_engine::doc::config::{Column, ConfigRule, RuleCondition, RuleEffect, RuleOperator};
|
||||
@@ -117,13 +116,13 @@ pub(super) fn show(ui: &mut Ui, app: &mut SolveApp, error: &mut Option<String>,
|
||||
if ui_kit::button(ui, crate::i18n::tr_label("Edit"), ui_kit::Button::Normal).clicked() {
|
||||
editor.rule = rule.clone();
|
||||
}
|
||||
let up = ui_kit::button(ui, "↑", ui_kit::Button::Enabled(index > 0)).backing_on_hover_text(crate::i18n::tr_label("Move earlier"));
|
||||
let up = ui_kit::button(ui, "↑", ui_kit::Button::Enabled(index > 0)).on_hover_text(crate::i18n::tr_label("Move earlier"));
|
||||
crate::scenario::publish_handle(&format!("config:rule:{}:up", rule.id), up.rect.center());
|
||||
if up.clicked() {
|
||||
*error = app.run("config.rule", json!({"id":rule.id,"index":index-1})).err();
|
||||
}
|
||||
if ui_kit::button(ui, "↓", ui_kit::Button::Enabled(index + 1 < rules.len()))
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Move later"))
|
||||
.on_hover_text(crate::i18n::tr_label("Move later"))
|
||||
.clicked()
|
||||
{
|
||||
*error = app.run("config.rule", json!({"id":rule.id,"index":index+1})).err();
|
||||
|
||||
@@ -653,8 +653,8 @@ fn dispatch(app: &mut SolveApp, ctx: &egui::Context, method: &str, p: &Value) ->
|
||||
"ui.blur" => {
|
||||
// Internal rendering harness; deliberately no saved preference or product UI.
|
||||
let radius = if let Some(radius) = p.get("radius_px") {
|
||||
let Some(radius) = radius.as_f64().filter(|v| v.is_finite() && (0.0..=60.0).contains(v)) else {
|
||||
return err("radius_px must be finite and between 0 and 60");
|
||||
let Some(radius) = radius.as_f64().filter(|v| v.is_finite() && (0.0..=40.0).contains(v)) else {
|
||||
return err("radius_px must be finite and between 0 and 40");
|
||||
};
|
||||
Some(radius as f32)
|
||||
} else {
|
||||
@@ -673,70 +673,18 @@ fn dispatch(app: &mut SolveApp, ctx: &egui::Context, method: &str, p: &Value) ->
|
||||
} else {
|
||||
None
|
||||
};
|
||||
// Explicit, labelled evidence fixtures only. They can force a failure, never fake
|
||||
// real renderer support. All validation precedes mutation, including old fields.
|
||||
let fixture = if let Some(fixture) = p.get("fixture") {
|
||||
let Some(fixture) =
|
||||
fixture.as_str().filter(|s| matches!(*s, "clear" | "gpu-software" | "reduce-transparency" | "web-unsupported" | "guard-60"))
|
||||
else {
|
||||
return err("unknown blur evidence fixture");
|
||||
};
|
||||
Some(fixture)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
if let Some(radius) = radius {
|
||||
if let Err(error) = app.blur.set_radius(radius) {
|
||||
return err(error);
|
||||
}
|
||||
app.blur_session.harness_radius = Some(radius);
|
||||
ctx.request_repaint();
|
||||
}
|
||||
if let Some(alpha) = alpha {
|
||||
app.blur.set_surface_alpha(alpha);
|
||||
ctx.request_repaint();
|
||||
}
|
||||
if let Some(fixture) = fixture {
|
||||
match fixture {
|
||||
"clear" => {
|
||||
app.blur_session.harness_unavailable = None;
|
||||
app.blur_session.harness_radius = None;
|
||||
app.blur_session.evidence_fixture = None;
|
||||
}
|
||||
"gpu-software" => {
|
||||
app.blur_session.harness_unavailable = Some("prefs.blur_software");
|
||||
app.blur_session.evidence_fixture = Some("gpu-software");
|
||||
}
|
||||
"reduce-transparency" => {
|
||||
app.blur_session.harness_unavailable = Some("prefs.blur_reduce_transparency");
|
||||
app.blur_session.evidence_fixture = Some("reduce-transparency");
|
||||
}
|
||||
"web-unsupported" => {
|
||||
app.blur_session.harness_unavailable = Some("prefs.blur_web");
|
||||
app.blur_session.evidence_fixture = Some("web-unsupported");
|
||||
}
|
||||
"guard-60" => {
|
||||
let radius = app.blur.radius();
|
||||
for _ in 0..60 {
|
||||
app.blur_session.guard.observe(radius, 23.0, true);
|
||||
}
|
||||
app.blur_session.evidence_fixture = Some("guard-60");
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
ctx.request_repaint();
|
||||
}
|
||||
let availability = crate::prefs::blur_availability(app);
|
||||
let reason = match availability {
|
||||
crate::theme_options::Availability::Unavailable(reason) => Some(app.tr(reason)),
|
||||
crate::theme_options::Availability::Available => None,
|
||||
};
|
||||
ok(
|
||||
json!({"radius_px":app.blur.radius(), "max_radius_px":60, "capability":app.blur.capability_for(ctx.viewport_id()), "counters":app.blur.counters(),
|
||||
"available": availability == crate::theme_options::Availability::Available, "reason": reason,
|
||||
"evidence_fixture": app.blur_session.evidence_fixture,
|
||||
"guard": {"tier_cap": app.blur_session.guard.cap, "streak": app.blur_session.guard.streak,
|
||||
"notice": app.blur_session.guard.notice, "opted_out": app.blur_session.guard.opted_out}}),
|
||||
json!({"radius_px":app.blur.radius(), "max_radius_px":40, "capability":app.blur.capability_for(ctx.viewport_id()), "counters":app.blur.counters()}),
|
||||
)
|
||||
}
|
||||
"ui.status_fixture" => wrap(crate::viewport_status_fixture::control(app, p)),
|
||||
@@ -1746,7 +1694,7 @@ mod tests {
|
||||
#[test]
|
||||
fn blur_control_validates_before_mutation_and_reports_no_gpu() {
|
||||
let mut h = crate::scenario::Harness::new();
|
||||
for invalid in [json!(-1), json!(61), json!("18"), json!(null)] {
|
||||
for invalid in [json!(-1), json!(41), json!("18"), json!(null)] {
|
||||
let reply = h.call("ui.blur", json!({"radius_px":invalid}));
|
||||
assert_eq!(reply["ok"], false, "{reply}");
|
||||
assert_eq!(h.app.blur.radius(), 0.0);
|
||||
@@ -1764,43 +1712,6 @@ mod tests {
|
||||
assert_eq!(h.app.blur.radius(), 0.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn blur_evidence_fixtures_are_atomic_transient_and_never_fake_support() {
|
||||
let mut h = crate::scenario::Harness::new();
|
||||
let source: Value = serde_json::from_str(include_str!("../tests/fixtures/theme-blur.json")).unwrap();
|
||||
assert_eq!(h.call("ui.prefs", json!({"theme_import":source,"theme_options":{"blur-review":{"blur":40}}}))["ok"], true);
|
||||
h.frames(2);
|
||||
let saved = h.app.preferences.theme_options.clone();
|
||||
let revision = h.app.session.revision;
|
||||
for invalid in [json!(null), json!([]), json!("available"), json!("unknown")] {
|
||||
assert_eq!(h.call("ui.blur", json!({"fixture":invalid,"radius_px":8}))["ok"], false);
|
||||
assert_eq!(h.app.blur.radius(), 40.0);
|
||||
assert_eq!(h.app.blur_session.harness_radius, None);
|
||||
}
|
||||
for fixture in ["gpu-software", "reduce-transparency", "web-unsupported"] {
|
||||
let reply = h.call("ui.blur", json!({"fixture":fixture}));
|
||||
assert_eq!(reply["result"]["evidence_fixture"], fixture);
|
||||
assert_eq!(reply["result"]["available"], false);
|
||||
h.frames(2);
|
||||
assert_eq!(h.app.blur.counters().textures_created, 0);
|
||||
assert_eq!(h.app.blur.counters().markers_emitted, 0);
|
||||
assert_eq!(h.app.preferences.theme_options, saved);
|
||||
}
|
||||
h.call("ui.blur", json!({"fixture":"clear"}));
|
||||
h.call("ui.blur", json!({"fixture":"guard-60"}));
|
||||
assert_eq!((h.app.blur_session.guard.cap, h.app.blur_session.guard.notice), (4, true));
|
||||
assert_eq!(h.app.blur_session.evidence_fixture, Some("guard-60"));
|
||||
h.app.blur_session.guard.undo();
|
||||
assert_eq!((h.app.blur_session.guard.cap, h.app.blur_session.guard.opted_out), (5, true));
|
||||
h.call("ui.blur", json!({"fixture":"guard-60"}));
|
||||
assert_eq!(h.app.blur_session.guard.cap, 5);
|
||||
assert_eq!(h.app.session.revision, revision, "quality actions never enter document undo");
|
||||
assert_eq!(h.app.preferences.theme_options, saved);
|
||||
h.call("ui.blur", json!({"fixture":"clear"}));
|
||||
assert!(h.app.blur_session.evidence_fixture.is_none());
|
||||
assert!(matches!(h.app.blur.capability(), crate::blur::Capability::Unavailable(_)), "clearing a fixture cannot manufacture a GPU");
|
||||
}
|
||||
|
||||
use serde_json::json;
|
||||
use solidcraft_engine::{Sel, Session};
|
||||
|
||||
|
||||
+14
-136
@@ -2,7 +2,6 @@
|
||||
//! inputs (geometry picked in the viewport, never typed), then runs its command; it never
|
||||
//! changes the design itself. Things selected before the command starts become its input.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::choice_row;
|
||||
use solidcraft_engine::geom::prelude::*;
|
||||
use std::hash::{Hash, Hasher};
|
||||
@@ -527,11 +526,6 @@ pub struct Dialog {
|
||||
pub(crate) chain_applied: bool,
|
||||
/// A pattern's objects of the Object Type not shown now, restored when it is chosen again.
|
||||
pub(crate) other_objects: Vec<Sel>,
|
||||
/// The multi-pick input whose picked items are listed under it, each removable (#3683).
|
||||
pub(crate) listed: Option<usize>,
|
||||
/// The listed item (and its input) whose row is under the pointer: the view lights it as a
|
||||
/// hover (`viewport::list_hover`).
|
||||
pub(crate) list_hover: Option<(usize, Sel)>,
|
||||
/// Shell feedback is derived from the picks, never saved as additional face references.
|
||||
shell_chain: std::cell::RefCell<Option<ShellChain>>,
|
||||
/// An extrude Press Pull opened with nothing selected: its first pick may be a curved face or
|
||||
@@ -799,8 +793,6 @@ impl Dialog {
|
||||
picked_edges: Vec::new(),
|
||||
chain_applied,
|
||||
other_objects: Vec::new(),
|
||||
listed: None,
|
||||
list_hover: None,
|
||||
shell_chain: Default::default(),
|
||||
press_pull: false,
|
||||
op_auto: Default::default(),
|
||||
@@ -1866,80 +1858,6 @@ impl Dialog {
|
||||
inp.items = items;
|
||||
self.error = None;
|
||||
}
|
||||
|
||||
/// What input `i`'s list of picked items shows, one row each (#3683): what its chip counts.
|
||||
/// A rim or a surface split into pieces is one row, as it is one pick; a Shell with Tangent
|
||||
/// Chain lists every face it opens.
|
||||
pub(crate) fn listed_items(&self, s: &Session, i: usize) -> Vec<Sel> {
|
||||
if i == 0
|
||||
&& let Some(faces) = self.shell_faces(s)
|
||||
{
|
||||
return faces;
|
||||
}
|
||||
let mut rows: Vec<Sel> = Vec::new();
|
||||
let mut shown: Vec<Sel> = Vec::new();
|
||||
for item in self.inputs.get(i).map(|inp| inp.items.as_slice()).unwrap_or_default() {
|
||||
if shown.iter().any(|x| selection::same_item(x, item)) {
|
||||
continue;
|
||||
}
|
||||
shown.extend(crate::viewport::grouped_selection(s, item));
|
||||
rows.push(item.clone());
|
||||
}
|
||||
rows
|
||||
}
|
||||
|
||||
/// Remove a listed row's item from input `i`, as picking it again toggles it off: the
|
||||
/// pieces of its rim or surface go with it, and the hand-picked edges and the explicit
|
||||
/// profile choice follow. A face a Shell's tangent chain opens goes with the picks whose
|
||||
/// chain holds it.
|
||||
pub(crate) fn remove_listed(&mut self, s: &Session, i: usize, item: &Sel) {
|
||||
let shell_chain = i == 0 && self.shell_faces(s).is_some();
|
||||
// A Fillet or Chamfer row its Tangent Chain brought goes with the picks whose chain holds
|
||||
// it, as picking it again would; else ticking Tangent Chain again brings it back.
|
||||
let fillet_chain = i == 0 && matches!(self.kind, Kind::Fillet { chain: true, .. }) && self.chain_applied;
|
||||
let state = s.world_state().ok();
|
||||
let mut gone = if shell_chain { Vec::new() } else { crate::viewport::grouped_selection(s, item) };
|
||||
gone.push(item.clone());
|
||||
if fillet_chain {
|
||||
let seeds: Vec<Sel> = self
|
||||
.picked_edges
|
||||
.iter()
|
||||
.filter(|seed| fillet_edges(s, seed, true).iter().any(|x| gone.iter().any(|g| selection::same_item(x, g))))
|
||||
.cloned()
|
||||
.collect();
|
||||
for seed in &seeds {
|
||||
gone.extend(fillet_edges(s, seed, true));
|
||||
}
|
||||
gone.extend(seeds);
|
||||
}
|
||||
let Some(inp) = self.inputs.get_mut(i) else { return };
|
||||
match (shell_chain, item, state.as_ref()) {
|
||||
(true, Sel::Face { body, index, .. }, Some(st)) => {
|
||||
let model = st.body(body);
|
||||
inp.items.retain(|pick| {
|
||||
let Sel::Face { body: b, point, .. } = pick else { return true };
|
||||
b != body || !model.is_some_and(|m| solidcraft_engine::doc::tangent_face_chain(m, &[*point]).iter().any(|(f, _)| f == index))
|
||||
});
|
||||
}
|
||||
// Without the model to find the chain in, the row goes on its own.
|
||||
_ => {
|
||||
inp.items.retain(|x| !gone.iter().any(|g| selection::same_item(x, g)));
|
||||
if i == 0 {
|
||||
self.picked_edges.retain(|x| !gone.iter().any(|g| selection::same_item(x, g)));
|
||||
}
|
||||
}
|
||||
}
|
||||
let empty = inp.items.is_empty();
|
||||
if empty && self.listed == Some(i) {
|
||||
self.listed = None;
|
||||
}
|
||||
if i == 0 && matches!(self.kind, Kind::Extrude { .. } | Kind::Revolve { .. } | Kind::Emboss { .. }) {
|
||||
self.profile_selection_changed = true;
|
||||
}
|
||||
self.list_hover = None;
|
||||
self.error = None;
|
||||
self.sync_thread(s);
|
||||
}
|
||||
}
|
||||
|
||||
/// The edges a Fillet or Chamfer pick stands for: its tangent chain when `chain` is on, else
|
||||
@@ -2675,7 +2593,7 @@ fn object_type_row(d: &mut Dialog, ui: &mut egui::Ui) {
|
||||
let cur = usize::from(inp.accept == selection::FEATURES);
|
||||
let mut ty = cur;
|
||||
// What the two kinds are, and that a sketch is neither (#10057).
|
||||
choice_row(ui, "Object Type", "pat_obj", &mut ty, &["Bodies", "Features"]).backing_on_hover_text(crate::i18n::tr("ui.pattern_object_type_tip"));
|
||||
choice_row(ui, "Object Type", "pat_obj", &mut ty, &["Bodies", "Features"]).on_hover_text(crate::i18n::tr("ui.pattern_object_type_tip"));
|
||||
if ty != cur {
|
||||
inp.accept = if ty == 1 { selection::FEATURES } else { BODIES };
|
||||
inp.label = objects_label(inp.accept);
|
||||
@@ -2932,8 +2850,6 @@ pub(crate) fn input_rows_range(d: &mut Dialog, ui: &mut egui::Ui, s: &Session, n
|
||||
// Only one field may look active at a time (#10066): while a text editor holds the keyboard,
|
||||
// no pick field draws its accent ring, and clicking a pick field takes the keyboard back.
|
||||
let text_focus = crate::ui_kit::editor_has_focus(ui.ctx());
|
||||
let mut toggle_list: Option<usize> = None;
|
||||
let mut hovered: Option<(usize, Sel)> = None;
|
||||
let shell_count = d.shell_faces(s).map(|faces| faces.len());
|
||||
for (i, inp) in d.inputs.iter().enumerate().skip(range.start).take(range.end.saturating_sub(range.start)) {
|
||||
let stored_reference = stored_input_reference_key(d, i).and_then(|key| d.extra.get(key)).filter(|_| inp.items.is_empty());
|
||||
@@ -2988,7 +2904,7 @@ pub(crate) fn input_rows_range(d: &mut Dialog, ui: &mut egui::Ui, s: &Session, n
|
||||
} else {
|
||||
format!("{} (click to pick into this input)", hint(inp))
|
||||
};
|
||||
if chip.backing_on_hover_text(tooltip).clicked() {
|
||||
if chip.on_hover_text(tooltip).clicked() {
|
||||
activate = Some(i);
|
||||
surrender_keyboard_focus(ui);
|
||||
}
|
||||
@@ -3003,51 +2919,22 @@ pub(crate) fn input_rows_range(d: &mut Dialog, ui: &mut egui::Ui, s: &Session, n
|
||||
clear = Some(i);
|
||||
surrender_keyboard_focus(ui);
|
||||
}
|
||||
// Several picks: an arrow beside the clear button lists them, each with its
|
||||
// own remove button (#3683). Drawn straight into the row, which is this field's
|
||||
// own: a scope around it would take room and widen the dialog.
|
||||
if inp.multi {
|
||||
let open = d.listed == Some(i);
|
||||
let at = rect.translate(vec2(-t.space_24, 0.0));
|
||||
let label = crate::i18n::tr_label(if open { "Hide the picked items" } else { "Show the picked items" });
|
||||
let arrow = crate::ui_kit::disclosure_button_at(ui, at, open, label);
|
||||
crate::scenario::publish_handle(&format!("dialog:list_toggle:{}", inp.label), arrow.rect.center());
|
||||
if arrow.clicked() {
|
||||
toggle_list = Some(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
if inp.multi && d.listed == Some(i) && !inp.items.is_empty() {
|
||||
let rows = d.listed_items(s, i);
|
||||
egui::ScrollArea::vertical().id_salt(("picked_items", i)).max_height(t.control_height * 6.5).show(ui, |ui| {
|
||||
for (index, item) in rows.into_iter().enumerate() {
|
||||
let row = crate::ui_kit::list_row(ui, &format!("{}:{index}", inp.label), &selection_label(s, names, d, inp, &item));
|
||||
if row.hovered() {
|
||||
hovered = Some((i, item.clone()));
|
||||
}
|
||||
if row.clicked() {
|
||||
remove = Some((i, item));
|
||||
}
|
||||
if matches!(d.kind, Kind::SketchModify(_)) && inp.multi {
|
||||
for (index, item) in inp.items.iter().enumerate() {
|
||||
if crate::ui_kit::list_row(ui, &format!("{}:{index}", inp.label), &selection_label(s, names, d, inp, item)).clicked() {
|
||||
remove = Some((i, index));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
// The row under the pointer lights its item in the view; rows of inputs drawn elsewhere
|
||||
// keep theirs.
|
||||
let ours = |h: &Option<(usize, Sel)>| h.as_ref().is_some_and(|(i, _)| range.contains(i));
|
||||
if hovered.is_some() || ours(&d.list_hover) {
|
||||
if d.list_hover != hovered {
|
||||
ui.ctx().request_repaint();
|
||||
}
|
||||
d.list_hover = hovered;
|
||||
}
|
||||
if let Some(i) = toggle_list {
|
||||
d.listed = if d.listed == Some(i) { None } else { Some(i) };
|
||||
}
|
||||
if let Some((input, item)) = remove {
|
||||
d.remove_listed(s, input, &item);
|
||||
if let Some((input, index)) = remove
|
||||
&& let Some(input) = d.inputs.get_mut(input)
|
||||
&& index < input.items.len()
|
||||
{
|
||||
input.items.remove(index);
|
||||
}
|
||||
if let Some(i) = activate {
|
||||
d.active = i;
|
||||
@@ -3060,10 +2947,6 @@ pub(crate) fn input_rows_range(d: &mut Dialog, ui: &mut egui::Ui, s: &Session, n
|
||||
if let Some(key) = stored_input_reference_key(d, i) {
|
||||
d.extra.remove(key);
|
||||
}
|
||||
if d.listed == Some(i) {
|
||||
d.listed = None;
|
||||
d.list_hover = None;
|
||||
}
|
||||
let Some(inp) = d.inputs.get_mut(i) else { return };
|
||||
inp.items.clear();
|
||||
if i == 0 {
|
||||
@@ -3188,7 +3071,7 @@ fn error_rows(app: &mut SolveApp, ctx: &egui::Context, d: &mut Dialog, ui: &mut
|
||||
ui.vertical(|ui| {
|
||||
match &plain {
|
||||
Some(FilletRefusal::Plain(plain)) => {
|
||||
crate::ui_kit::text(ui, plain, crate::ui_kit::Text::Report("error", true)).backing_on_hover_text(shown_error(&error));
|
||||
crate::ui_kit::text(ui, plain, crate::ui_kit::Text::Report("error", true)).on_hover_text(shown_error(&error));
|
||||
}
|
||||
Some(FilletRefusal::InField) => {}
|
||||
None => {
|
||||
@@ -3199,7 +3082,7 @@ fn error_rows(app: &mut SolveApp, ctx: &egui::Context, d: &mut Dialog, ui: &mut
|
||||
if plain.is_some() {
|
||||
let copy = crate::ui_kit::button(ui, tr("ui.copy_details"), crate::ui_kit::Button::Normal);
|
||||
crate::scenario::publish_handle("dialog:copy_details", copy.rect.center());
|
||||
if copy.backing_on_hover_text(tr("ui.copy_details_tip")).clicked() {
|
||||
if copy.on_hover_text(tr("ui.copy_details_tip")).clicked() {
|
||||
ui.ctx().copy_text(error.clone());
|
||||
}
|
||||
}
|
||||
@@ -6316,11 +6199,6 @@ pub fn for_feature(app: &SolveApp, id: u64, marker: Option<usize>) -> Option<Dia
|
||||
{
|
||||
d.extra.insert("corner".into(), json!("g2"));
|
||||
}
|
||||
if let FeatureKind::Fillet { turn, .. } = &f.kind
|
||||
&& !turn.is_mitre()
|
||||
{
|
||||
d.extra.insert("turn".into(), json!("swept"));
|
||||
}
|
||||
// A fillet that reduces or tapers a radius too large for its edges.
|
||||
if let FeatureKind::Fillet { fit, .. } = &f.kind {
|
||||
use solidcraft_engine::doc::FilletFit;
|
||||
|
||||
@@ -1468,12 +1468,6 @@ fn dialog_profile_labels_name_the_sketch_in_coil_and_mirror() {
|
||||
h.app.start(command);
|
||||
h.app.dialog.as_mut().unwrap().preview_enabled = false;
|
||||
h.frames(3);
|
||||
// A field that takes several picks lists them, labels and all, behind its arrow (#3683).
|
||||
let (multi, label) = h.app.dialog.as_ref().map(|d| (d.inputs[0].multi, d.inputs[0].label)).unwrap();
|
||||
if multi {
|
||||
h.step(&json!({"click": {"handle": format!("dialog:list_toggle:{label}")}})).unwrap();
|
||||
h.frames(2);
|
||||
}
|
||||
let d = h.app.dialog.as_ref().unwrap();
|
||||
let input = &d.inputs[0];
|
||||
assert_eq!(input.items, vec![Sel::Profile { sketch, index: 0 }]);
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
//! body or face in the viewport, or onto a body's row in the Browser, applies at once; Apply
|
||||
//! (and OK) gives the picked objects the current look.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use egui::Color32;
|
||||
use serde_json::{Value, json};
|
||||
use solidcraft_engine::Sel;
|
||||
@@ -416,7 +415,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Ap, inputs: &mut [Sel
|
||||
});
|
||||
let mut enabled = k.pbr.is_some();
|
||||
let toggle = ui_kit::row(ui, app.tr("appearance.surface_response"), |ui| ui_kit::checkbox(ui, app.tr("appearance.pbr_opaque"), &mut enabled))
|
||||
.backing_on_hover_text(app.tr("appearance.pbr_help"));
|
||||
.on_hover_text(app.tr("appearance.pbr_help"));
|
||||
crate::scenario::publish_handle("appearance:pbr", toggle.rect.center());
|
||||
if toggle.changed() {
|
||||
detach_preset(k);
|
||||
@@ -462,7 +461,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Ap, inputs: &mut [Sel
|
||||
});
|
||||
}
|
||||
if ui_kit::button(ui, "Remove override", ui_kit::Button::Enabled(has_target))
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Restore the inherited component or physical material appearance"))
|
||||
.on_hover_text(crate::i18n::tr_label("Restore the inherited component or physical material appearance"))
|
||||
.clicked()
|
||||
&& let Some(p) = clear_params(k, &picked)
|
||||
{
|
||||
@@ -544,7 +543,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Ap, inputs: &mut [Sel
|
||||
}
|
||||
})
|
||||
.response
|
||||
.backing_on_hover_text(tip);
|
||||
.on_hover_text(tip);
|
||||
});
|
||||
// A swatch dropped on the model or the Browser.
|
||||
let released = ui.input(|i| i.pointer.any_released());
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
//! component shows where it goes, and with Animate the joint plays its motion.
|
||||
|
||||
use crate::fonts::RichTextExt as _;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{choice_row, expr_row, text_row};
|
||||
use egui::{Color32, Pos2, RichText, Stroke, vec2};
|
||||
use serde_json::{Value, json};
|
||||
@@ -738,7 +737,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Asm, inputs: &mut [Se
|
||||
crate::ui_kit::status_line(ui, &why, crate::ui_kit::StatusTone::Warning);
|
||||
if !bodies.is_empty()
|
||||
&& crate::ui_kit::button(ui, crate::i18n::tr("cmd.component_from_bodies"), crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr("joint.from_bodies_hint"))
|
||||
.on_hover_text(crate::i18n::tr("joint.from_bodies_hint"))
|
||||
.clicked()
|
||||
{
|
||||
// A refusal shows on the status line; the picks stay either way.
|
||||
@@ -774,7 +773,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Asm, inputs: &mut [Se
|
||||
form_row(ui, "Animate", |ui| {
|
||||
let label = crate::i18n::tr(if f.animate { "ui.joint_stop" } else { "ui.joint_play" });
|
||||
if crate::ui_kit::button(ui, label, crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Play the joint's motion in the view"))
|
||||
.on_hover_text(crate::i18n::tr_label("Play the joint's motion in the view"))
|
||||
.clicked()
|
||||
{
|
||||
f.animate = !f.animate;
|
||||
@@ -1035,7 +1034,7 @@ fn find_limits_row(app: &mut SolveApp, ui: &mut egui::Ui, f: &mut JointForm, id:
|
||||
}
|
||||
});
|
||||
} else if crate::ui_kit::button(ui, crate::i18n::tr("joint.find_limits"), crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr("joint.find_limits_hint"))
|
||||
.on_hover_text(crate::i18n::tr("joint.find_limits_hint"))
|
||||
.clicked()
|
||||
{
|
||||
find_limits(app, f, id, inputs);
|
||||
@@ -1262,7 +1261,7 @@ fn interference_rows(app: &SolveApp, ui: &mut egui::Ui, r: &Value) {
|
||||
for u in unchecked {
|
||||
form_row(ui, &format!("{} · {}", u["a"].as_str().unwrap_or(""), u["b"].as_str().unwrap_or("")), |ui| {
|
||||
ui.label(RichText::new(crate::i18n::tr("dialog.could_not_be_checked")).color(t.warning))
|
||||
.backing_on_hover_text(u["reason"].as_str().unwrap_or(""));
|
||||
.on_hover_text(u["reason"].as_str().unwrap_or(""));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1728,7 +1727,7 @@ pub(crate) fn timeline_joint_tiles(app: &mut SolveApp, ui: &mut egui::Ui, p: &eg
|
||||
if suppressed {
|
||||
p.line_segment([br.left_bottom() + vec2(4.0, -4.0), br.right_top() + vec2(-4.0, 4.0)], Stroke::new(1.5, t.text_dim));
|
||||
}
|
||||
let resp = resp.backing_on_hover_text(format!("{name} ({kind:?} joint)\nDouble-click to edit · right-click for more"));
|
||||
let resp = resp.on_hover_text(format!("{name} ({kind:?} joint)\nDouble-click to edit · right-click for more"));
|
||||
if resp.double_clicked() {
|
||||
open = edit_joint(app, id);
|
||||
} else if resp.clicked() {
|
||||
@@ -1791,7 +1790,7 @@ pub(crate) fn timeline_joint_rows(app: &mut SolveApp, ui: &mut egui::Ui, ids: Op
|
||||
egui::FontId::proportional(crate::theme::Tokens::get().font_body),
|
||||
if suppressed { t.text_dim } else { t.text },
|
||||
);
|
||||
let response = response.backing_on_hover_text(format!("{name} ({kind:?} joint)\nDouble-click to edit · right-click for more"));
|
||||
let response = response.on_hover_text(format!("{name} ({kind:?} joint)\nDouble-click to edit · right-click for more"));
|
||||
if response.double_clicked() {
|
||||
open = edit_joint(app, id);
|
||||
} else if response.clicked() {
|
||||
@@ -1863,7 +1862,7 @@ pub fn browser_joints(app: &mut SolveApp, ui: &mut egui::Ui, depth: usize) {
|
||||
},
|
||||
);
|
||||
if let Some(resp) = &r.resp {
|
||||
resp.clone().backing_on_hover_text(format!("{kind:?} joint"));
|
||||
resp.clone().on_hover_text(format!("{kind:?} joint"));
|
||||
}
|
||||
if r.eye {
|
||||
let _ = app.run("browser.visibility", json!({ "joints": [id], "visible": !visible }));
|
||||
@@ -1952,7 +1951,7 @@ pub fn component_joints(app: &mut SolveApp, ui: &mut egui::Ui, path: &[u64], key
|
||||
},
|
||||
);
|
||||
if let Some(resp) = &r.resp {
|
||||
resp.clone().backing_on_hover_text(format!("{:?} joint", j.kind));
|
||||
resp.clone().on_hover_text(format!("{:?} joint", j.kind));
|
||||
}
|
||||
if r.eye {
|
||||
let _ = app.run("browser.visibility", json!({ "joints": [id], "visible": !visible }));
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
//! where it touches) or a flat face. Picking the profile on a part chooses the joint that part
|
||||
//! turns on. Play turns the cam a full turn so the follower shows its motion before OK.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use egui::RichText;
|
||||
use serde_json::{Value, json};
|
||||
use solidcraft_engine::Sel;
|
||||
@@ -134,7 +133,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, f: &mut CamForm, inputs: &[Se
|
||||
form_row(ui, "Animate", |ui| {
|
||||
let label = crate::i18n::tr(if f.animate { "ui.joint_stop" } else { "ui.joint_play" });
|
||||
let r = crate::ui_kit::button(ui, label, crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Play the joint's motion in the view"));
|
||||
.on_hover_text(crate::i18n::tr_label("Play the joint's motion in the view"));
|
||||
crate::scenario::publish_handle("dialog:Animate", r.rect.center());
|
||||
if r.clicked() {
|
||||
f.animate = !f.animate;
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
//! face also picks the joint it turns on. Play turns the driving joint so the coupling shows its
|
||||
//! motion before OK.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{StatusTone, choice_row, expr_row, status_line};
|
||||
use egui::RichText;
|
||||
use serde_json::{Value, json};
|
||||
@@ -207,7 +206,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, f: &mut CouplingForm, inputs:
|
||||
form_row(ui, "Animate", |ui| {
|
||||
let label = crate::i18n::tr(if f.animate { "ui.joint_stop" } else { "ui.joint_play" });
|
||||
let r = crate::ui_kit::button(ui, label, crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Play the joint's motion in the view"));
|
||||
.on_hover_text(crate::i18n::tr_label("Play the joint's motion in the view"));
|
||||
crate::scenario::publish_handle("dialog:Animate", r.rect.center());
|
||||
if r.clicked() {
|
||||
f.animate = !f.animate;
|
||||
|
||||
@@ -134,17 +134,13 @@ fn fillet_corner_tip() -> String {
|
||||
/// radius and narrow it only where the faces run out.
|
||||
const FILLET_FITS: [(&str, &str); 3] = [("ui.fillet_fit_exact", "exact"), ("ui.fillet_fit_reduce", "reduce"), ("ui.fillet_fit_taper", "taper")];
|
||||
|
||||
/// How two rounds turn where they meet at a sharp corner edge (`turn`): in a mitre (the
|
||||
/// default) or swept round the edge.
|
||||
const FILLET_TURNS: [(&str, &str); 2] = [("ui.fillet_turn_mitre", "mitre"), ("ui.fillet_turn_swept", "swept")];
|
||||
|
||||
/// Which fillet options apply together, exactly as `solid.fillet` takes them (`fillet` in
|
||||
/// crates/engine/src/cmd/features.rs):
|
||||
///
|
||||
/// | Type | Face limits (`fit`) | Corners (`corner`) | Setback (`setbacks`) | Turns (`turn`) |
|
||||
/// |---------------|-------------------------|-------------------------------------|----------------------|---------------------------------|
|
||||
/// | Constant | exact, reduce or taper | tangent; curvature with exact only | with curvature only | mitre; swept without taper, g2 |
|
||||
/// | any other | exact (not sent) | tangent (not sent) | none | mitre (not sent) |
|
||||
/// | Type | Face limits (`fit`) | Corners (`corner`) | Setback (`setbacks`) |
|
||||
/// |---------------|-------------------------|-------------------------------------|----------------------|
|
||||
/// | Constant | exact, reduce or taper | tangent; curvature with exact only | with curvature only |
|
||||
/// | any other | exact (not sent) | tangent (not sent) | none |
|
||||
///
|
||||
/// The dialog shows an option's row only where it applies and sends the option only then, and a
|
||||
/// choice that rules another out puts that one back to its default ([`settle_fillet_options`]).
|
||||
@@ -154,8 +150,6 @@ pub(super) fn fillet_option_applies(extra: &serde_json::Map<String, Value>, key:
|
||||
match key {
|
||||
"fit" => constant,
|
||||
"corner" | "setbacks" => constant && exact,
|
||||
// A swept turn takes an exact or reduced radius and rolling-ball corners.
|
||||
"turn" => constant && extra.get("fit").and_then(Value::as_str) != Some("taper") && extra.get("corner").and_then(Value::as_str) != Some("g2"),
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
@@ -165,29 +159,15 @@ pub(super) fn fillet_option_applies(extra: &serde_json::Map<String, Value>, key:
|
||||
/// takes the exact radius. A type other than Constant clears both ([`choose_fillet_type`]).
|
||||
fn settle_fillet_options(extra: &mut serde_json::Map<String, Value>, changed: &str, setback: &mut Option<String>) {
|
||||
let fitted = extra.get("fit").and_then(Value::as_str).is_some_and(|fit| fit != "exact");
|
||||
let tapered = extra.get("fit").and_then(Value::as_str) == Some("taper");
|
||||
let patch = extra.get("corner").and_then(Value::as_str) == Some("g2");
|
||||
let swept = extra.get("turn").and_then(Value::as_str) == Some("swept");
|
||||
match changed {
|
||||
"fit" if fitted => {
|
||||
extra.remove("corner");
|
||||
extra.remove("setbacks");
|
||||
*setback = None;
|
||||
if tapered {
|
||||
extra.remove("turn");
|
||||
}
|
||||
}
|
||||
"corner" if patch => {
|
||||
extra.remove("fit");
|
||||
extra.remove("turn");
|
||||
}
|
||||
"turn" if swept => {
|
||||
extra.remove("corner");
|
||||
extra.remove("setbacks");
|
||||
*setback = None;
|
||||
if tapered {
|
||||
extra.remove("fit");
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
@@ -238,7 +218,7 @@ fn fillet_corner_rows(
|
||||
let hint = crate::i18n::format("ui.fillet_setback_hint", &[("factor", &factor)]);
|
||||
ui_kit::checked_row(ui, "ui.fillet_setback", &mut text, &hint, warning.as_deref())
|
||||
});
|
||||
row.response.backing_on_hover_text(crate::i18n::format("ui.fillet_setback_tip", &[("factor", &factor)]));
|
||||
row.response.on_hover_text(crate::i18n::format("ui.fillet_setback_tip", &[("factor", &factor)]));
|
||||
let (accepted, field) = row.inner;
|
||||
enter |= accepted;
|
||||
if text != shown {
|
||||
@@ -257,7 +237,7 @@ fn fillet_fit_rows(app: &SolveApp, ui: &mut egui::Ui, extra: &mut serde_json::Ma
|
||||
let t = Tokens::get();
|
||||
let before = extra.get("fit").cloned();
|
||||
let row = ui.scope(|ui| form_row(ui, "ui.fillet_fit", |ui| extra_choice(ui, extra, "fi_fit", "fit", &FILLET_FITS)));
|
||||
row.response.backing_on_hover_text(tr("ui.fillet_fit_tip"));
|
||||
row.response.on_hover_text(tr("ui.fillet_fit_tip"));
|
||||
let fit = row.inner;
|
||||
if extra.get("fit") != before.as_ref() {
|
||||
settle_fillet_options(extra, "fit", setback);
|
||||
@@ -276,17 +256,6 @@ fn fillet_fit_rows(app: &SolveApp, ui: &mut egui::Ui, extra: &mut serde_json::Ma
|
||||
}
|
||||
}
|
||||
|
||||
/// A Constant radius fillet's Turns row (`turn`): how two rounds turn where they meet at a sharp
|
||||
/// corner edge.
|
||||
fn fillet_turn_row(ui: &mut egui::Ui, extra: &mut serde_json::Map<String, Value>, setback: &mut Option<String>) {
|
||||
let before = extra.get("turn").cloned();
|
||||
let row = ui.scope(|ui| form_row(ui, "ui.fillet_turn", |ui| extra_choice(ui, extra, "fi_turn", "turn", &FILLET_TURNS)));
|
||||
row.response.on_hover_text(tr("ui.fillet_turn_tip"));
|
||||
if extra.get("turn") != before.as_ref() {
|
||||
settle_fillet_options(extra, "turn", setback);
|
||||
}
|
||||
}
|
||||
|
||||
/// The most instances a solid pattern makes in one direction (the document's own limit).
|
||||
const MAX_PATTERN_INSTANCES: i64 = 1000;
|
||||
|
||||
@@ -324,7 +293,6 @@ fn choose_fillet_type(extra: &mut serde_json::Map<String, Value>, index: usize,
|
||||
extra.remove("fit");
|
||||
extra.remove("corner");
|
||||
extra.remove("setbacks");
|
||||
extra.remove("turn");
|
||||
}
|
||||
if index == 2 {
|
||||
extra.entry("radius2").or_insert_with(|| json!("1 mm"));
|
||||
@@ -354,14 +322,14 @@ pub(super) fn rows(app: &mut SolveApp, ctx: &egui::Context, d: &mut Dialog, ui:
|
||||
};
|
||||
tr(key).to_owned()
|
||||
};
|
||||
ui_kit::text(ui, &prompt, ui_kit::Text::Hint("tool")).backing_on_hover_text(&prompt);
|
||||
ui_kit::text(ui, &prompt, ui_kit::Text::Hint("tool")).on_hover_text(&prompt);
|
||||
if matches!(&d.kind, Kind::SketchModify(k) if k.previews()) {
|
||||
let label = d.active_input().map(|input| tr(input.label)).unwrap_or_else(|| tr("Objects"));
|
||||
let step = crate::i18n::format(
|
||||
"dialog.selection_step",
|
||||
&[("step", &(d.active + 1).to_string()), ("total", &d.inputs.len().to_string()), ("input", label)],
|
||||
);
|
||||
ui_kit::text(ui, &step, ui_kit::Text::Hint("step")).backing_on_hover_text(tr("dialog.selection_guidance"));
|
||||
ui_kit::text(ui, &step, ui_kit::Text::Hint("step")).on_hover_text(tr("dialog.selection_guidance"));
|
||||
}
|
||||
}
|
||||
let manage_hint = match &d.kind {
|
||||
@@ -572,11 +540,10 @@ pub(super) fn rows(app: &mut SolveApp, ctx: &egui::Context, d: &mut Dialog, ui:
|
||||
}
|
||||
response
|
||||
})
|
||||
.backing_on_hover_text(tr("ui.fillet_type_choices_tip"));
|
||||
.on_hover_text(tr("ui.fillet_type_choices_tip"));
|
||||
if rtype == 0 {
|
||||
enter |= fillet_corner_rows(ui, &app.session, &mut d.extra, &d.inputs, radius, setback);
|
||||
fillet_fit_rows(app, ui, &mut d.extra, setback);
|
||||
fillet_turn_row(ui, &mut d.extra, setback);
|
||||
}
|
||||
}
|
||||
if *chamfer && *ctype == 1 {
|
||||
@@ -591,7 +558,7 @@ pub(super) fn rows(app: &mut SolveApp, ctx: &egui::Context, d: &mut Dialog, ui:
|
||||
ui_kit::section(ui, "fillet_options", "Options", true, |ui| {
|
||||
ui.scope(|ui| ui_kit::checkbox_grid(ui, &mut [("Tangent Chain", chain), ("Preview", &mut d.preview_enabled)], 2))
|
||||
.response
|
||||
.backing_on_hover_text(tr("ui.fillet_options_tip"));
|
||||
.on_hover_text(tr("ui.fillet_options_tip"));
|
||||
});
|
||||
// The radii along the edge, for the two types that take them.
|
||||
if !*chamfer && matches!(rtype, 2 | 4) {
|
||||
@@ -612,12 +579,12 @@ pub(super) fn rows(app: &mut SolveApp, ctx: &egui::Context, d: &mut Dialog, ui:
|
||||
form_row(ui, "Mid Radius", |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui_kit::fraction_field(ui, position)
|
||||
.backing_on_hover_text(tr("Position along the edge, 0 at the start end, 1 at the other"));
|
||||
.on_hover_text(tr("Position along the edge, 0 at the start end, 1 at the other"));
|
||||
let width = (ui.available_width() - t.space_24 - t.space_4).max(0.0);
|
||||
ui.allocate_ui_with_layout(vec2(width, t.space_24), egui::Layout::left_to_right(egui::Align::Center), |ui| {
|
||||
enter |= field(ui, r);
|
||||
});
|
||||
if ui_kit::button(ui, "×", ui_kit::Button::Small).backing_on_hover_text(tr("Remove this point")).clicked() {
|
||||
if ui_kit::button(ui, "×", ui_kit::Button::Small).on_hover_text(tr("Remove this point")).clicked() {
|
||||
remove = Some(k);
|
||||
}
|
||||
});
|
||||
@@ -1039,7 +1006,7 @@ fn additional_rows(app: &mut SolveApp, d: &mut Dialog, ui: &mut egui::Ui) -> boo
|
||||
ui.label(format!("{:.2}, {:.2}, {:.2}", p.x, p.y, p.z));
|
||||
// A cylinder's place is its Face pick, cleared there.
|
||||
if *cmd != "solid.cylinder"
|
||||
&& ui_kit::button(ui, "×", ui_kit::Button::Small).backing_on_hover_text(tr("Place at the origin instead")).clicked()
|
||||
&& ui_kit::button(ui, "×", ui_kit::Button::Small).on_hover_text(tr("Place at the origin instead")).clicked()
|
||||
{
|
||||
*at = None;
|
||||
}
|
||||
@@ -1314,46 +1281,13 @@ mod tests {
|
||||
assert!(scenario::handle_at("dialog:ui.fillet_fit").is_none(), "a fitted radius is for Constant radius only");
|
||||
}
|
||||
|
||||
/// Turns sends `turn: swept` with a Constant radius only, and a choice it rules out (a
|
||||
/// narrowed radius, a curvature corner) puts the other back: Swept and those never go
|
||||
/// together.
|
||||
#[test]
|
||||
fn turns_maps_to_turn_and_rules_out_what_a_swept_corner_does_not_take() {
|
||||
let mut h = fillet_harness();
|
||||
set_edges(&mut h, 3);
|
||||
assert!(scenario::handle_at("dialog:ui.fillet_turn").is_some());
|
||||
assert!(parameters(&h).get("turn").is_none(), "Mitre is the default, not sent");
|
||||
choose(&mut h, "ui.fillet_turn", "ui.fillet_turn_swept");
|
||||
assert_eq!(parameters(&h)["turn"], json!("swept"));
|
||||
choose(&mut h, "ui.fillet_fit", "ui.fillet_fit_reduce");
|
||||
assert_eq!((parameters(&h)["turn"].clone(), parameters(&h)["fit"].clone()), (json!("swept"), json!("reduce")));
|
||||
choose(&mut h, "ui.fillet_fit", "ui.fillet_fit_taper");
|
||||
assert!(parameters(&h).get("turn").is_none(), "a narrowed radius puts Turns back to Mitre");
|
||||
choose(&mut h, "ui.fillet_turn", "ui.fillet_turn_swept");
|
||||
assert!(parameters(&h).get("fit").is_none(), "Swept puts Face limits back to Exact radius");
|
||||
choose(&mut h, "ui.corners", Continuity::G2.label_id());
|
||||
assert!(parameters(&h).get("turn").is_none(), "a curvature corner puts Turns back to Mitre");
|
||||
choose(&mut h, "ui.fillet_turn", "ui.fillet_turn_swept");
|
||||
assert!(parameters(&h).get("corner").is_none(), "Swept puts Corners back to Tangent");
|
||||
choose(&mut h, "ui.fillet_turn", "ui.fillet_turn_mitre");
|
||||
assert!(parameters(&h).get("turn").is_none(), "Mitre is not sent");
|
||||
choose(&mut h, "ui.fillet_turn", "ui.fillet_turn_swept");
|
||||
choose(&mut h, "Type", "Chord length");
|
||||
assert!(parameters(&h).get("turn").is_none() && scenario::handle_at("dialog:ui.fillet_turn").is_none(), "Turns is for Constant radius only");
|
||||
}
|
||||
|
||||
/// The dialog follows the option model (`fillet_option_applies`): through every type, fit and
|
||||
/// corner choice, in either order, each option it shows is one the others allow, and the
|
||||
/// command it builds is never refused for its options (`solid.fillet` runs it on a copy of
|
||||
/// the design). A choice that rules another out resets that one, visibly.
|
||||
#[test]
|
||||
fn no_reachable_fillet_option_state_is_refused_for_its_options() {
|
||||
let refused_for_options = |e: &str| {
|
||||
e.contains("take a constant radius")
|
||||
|| e.contains("is built for")
|
||||
|| e.contains("are built for")
|
||||
|| e.contains(solidcraft_engine::doc::SWEPT_TAKES)
|
||||
};
|
||||
let refused_for_options = |e: &str| e.contains("take a constant radius") || e.contains("is built for") || e.contains("are built for");
|
||||
// Each distinct command is run once.
|
||||
let ran = std::cell::RefCell::new(std::collections::BTreeSet::new());
|
||||
let check = |h: &Harness, what: &str| {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
//! its middle goes, its size in millimetres or as a factor, and an angle) with a live preview,
|
||||
//! and OK adds it (#2605, #3443).
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use crate::SolveApp;
|
||||
@@ -47,7 +46,7 @@ pub fn title(p: &Place) -> &'static str {
|
||||
pub fn rows(ui: &mut egui::Ui, p: &mut Place) {
|
||||
let name = std::path::Path::new(&p.path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| p.path.clone());
|
||||
form_row(ui, "File", |ui| {
|
||||
ui.label(name).backing_on_hover_text(&p.path);
|
||||
ui.label(name).on_hover_text(&p.path);
|
||||
});
|
||||
for (label, v, handle) in [("X", &mut p.x, "dialog:insert:x"), ("Y", &mut p.y, "dialog:insert:y")] {
|
||||
form_row(ui, label, |ui| {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
//! The first local appearance-library consumer, inside the existing Appearance panel.
|
||||
use crate::dialogs_appearance::selected_params;
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::dialogs_appearance::selected_params;
|
||||
use crate::{SolveApp, dialogs_appearance::Ap, selection::SelInput, ui_kit};
|
||||
use serde_json::json;
|
||||
use solidcraft_engine::io::catalog::Catalog;
|
||||
@@ -222,7 +221,7 @@ fn import_rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Ap, inputs: &[SelI
|
||||
}
|
||||
let button =
|
||||
ui_kit::list_picker(ui, &entry.id, entry.definition.name(), k.local.selected.as_deref() == Some(entry.id.as_str()))
|
||||
.backing_on_hover_text(format!(
|
||||
.on_hover_text(format!(
|
||||
"{} · {} · {}",
|
||||
entry.id,
|
||||
entry.provenance.license,
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
//! show while open (a study's pose, an explosion) is display only: pending occurrence moves,
|
||||
//! computed on a scratch copy of the design and put back when the dialog closes.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{choice_row, expr_row, text_row};
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
@@ -206,7 +205,7 @@ fn transport(ui: &mut egui::Ui, what: Transport, tip: &str) -> egui::Response {
|
||||
p.add(bar(c.x + 6.0));
|
||||
}
|
||||
}
|
||||
resp.backing_on_hover_text(crate::i18n::tr_label(tip))
|
||||
resp.on_hover_text(crate::i18n::tr_label(tip))
|
||||
}
|
||||
|
||||
/// Study `key` as the Motion Study dialog edits it: (id, name, steps, keys as tracks with values
|
||||
@@ -474,7 +473,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Mo, inputs: &mut [Sel
|
||||
let _ = app.run("contact.edit", json!({"set": n, "suppressed": !off}));
|
||||
}
|
||||
if crate::ui_kit::button(ui, crate::i18n::tr_label("×"), crate::ui_kit::Button::Small)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Delete the set"))
|
||||
.on_hover_text(crate::i18n::tr_label("Delete the set"))
|
||||
.clicked()
|
||||
{
|
||||
let _ = app.run("contact.edit", json!({"set": n, "delete": true}));
|
||||
@@ -642,7 +641,7 @@ fn motion_study_rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Mo, inputs:
|
||||
let width = (ui.available_width() - t.control_height - t.space_8).max(0.0);
|
||||
ui.allocate_ui(vec2(width, t.control_height), |ui| combo(ui, &format!("ms_joint{ti}"), &refs, &mut pos));
|
||||
if crate::ui_kit::button(ui, crate::i18n::tr_label("×"), crate::ui_kit::Button::Small)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Remove the track"))
|
||||
.on_hover_text(crate::i18n::tr_label("Remove the track"))
|
||||
.clicked()
|
||||
{
|
||||
remove = Some(ti);
|
||||
@@ -672,7 +671,7 @@ fn motion_study_rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Mo, inputs:
|
||||
ui.vertical(|ui| {
|
||||
ui.horizontal(|ui| {
|
||||
if crate::ui_kit::button(ui, crate::i18n::tr_label("Key here"), crate::ui_kit::Button::Small)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Add a key at this step with the joint's value now"))
|
||||
.on_hover_text(crate::i18n::tr_label("Add a key at this step with the joint's value now"))
|
||||
.clicked()
|
||||
&& !tr.points.iter().any(|(s, _)| *s == now)
|
||||
{
|
||||
@@ -700,7 +699,7 @@ fn motion_study_rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Mo, inputs:
|
||||
ui.vertical(|ui| {
|
||||
ui.horizontal(|ui| {
|
||||
if crate::ui_kit::button(ui, crate::i18n::tr_label("Add Key"), crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Key a joint's value at this step"))
|
||||
.on_hover_text(crate::i18n::tr_label("Key a joint's value at this step"))
|
||||
.clicked()
|
||||
&& let Some((ji, _, kind)) = moving.first()
|
||||
{
|
||||
@@ -708,7 +707,7 @@ fn motion_study_rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Mo, inputs:
|
||||
tracks.push(Track { joint: *ji, index: 0, points: vec![(now, format!("0 {unit}"))] });
|
||||
}
|
||||
export = crate::ui_kit::button(ui, crate::i18n::tr_label("Export Animation…"), crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Save the study as an animated GIF, seen as the viewport shows it"))
|
||||
.on_hover_text(crate::i18n::tr_label("Save the study as an animated GIF, seen as the viewport shows it"))
|
||||
.clicked();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
//! over a program the user added removes it.
|
||||
|
||||
use crate::selection::SelectionExt as _;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::choice_row;
|
||||
use std::collections::HashMap;
|
||||
|
||||
@@ -451,12 +450,12 @@ fn slicer_combo(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut SaveMesh) {
|
||||
crate::scenario::publish_handle(&format!("dialog:Slicer:{}", e.slicer.name), rect.center());
|
||||
if e.user {
|
||||
let hint = crate::i18n::format("ui.slicer_delete_tip", &[("program", e.slicer.command.first().map_or("", String::as_str))]);
|
||||
resp.clone().backing_on_hover_text(if elided { format!("{}\n{hint}", e.slicer.name) } else { hint });
|
||||
resp.clone().on_hover_text(if elided { format!("{}\n{hint}", e.slicer.name) } else { hint });
|
||||
if resp.hovered() && ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Delete)) {
|
||||
delete = Some(e.key.clone());
|
||||
}
|
||||
} else if elided {
|
||||
resp.clone().backing_on_hover_text(&e.slicer.name);
|
||||
resp.clone().on_hover_text(&e.slicer.name);
|
||||
}
|
||||
if resp.clicked() {
|
||||
chosen = Some(e.key.clone());
|
||||
@@ -496,14 +495,14 @@ fn slicer_combo(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut SaveMesh) {
|
||||
Tokens::get().text,
|
||||
);
|
||||
crate::scenario::publish_handle("dialog:Slicer:Custom", rect.center());
|
||||
if resp.backing_on_hover_text(crate::i18n::tr("ui.custom_program_tip")).clicked() {
|
||||
if resp.on_hover_text(crate::i18n::tr("ui.custom_program_tip")).clicked() {
|
||||
pick_custom = true;
|
||||
ui.close();
|
||||
}
|
||||
});
|
||||
ui.style_mut().wrap_mode = wrap;
|
||||
if let Some(name) = name {
|
||||
r.clone().backing_on_hover_text(name);
|
||||
r.clone().on_hover_text(name);
|
||||
}
|
||||
if let Some(e) = current {
|
||||
let tex = icon(&mut app.slicer_menu, &ctx, e);
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
//! its bend lines, the bend table and DXF export).
|
||||
|
||||
use crate::dialogs::put;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{choice_row, expr_row, hint_row};
|
||||
use egui::{Align2, Color32, FontId, Pos2, Rect, RichText, Stroke, pos2, vec2};
|
||||
use serde_json::{Map, Value, json};
|
||||
@@ -262,7 +261,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Sm, inputs: &mut [Sel
|
||||
// Further bends: each a flange on the far edge of the one before it.
|
||||
form_row(ui, "Further Bends", |ui| {
|
||||
let add = crate::ui_kit::button(ui, "Add bend", crate::ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("Another bend on the far edge of the last flange"));
|
||||
.on_hover_text(crate::i18n::tr_label("Another bend on the far edge of the last flange"));
|
||||
if add.clicked() && then.len() < 16 {
|
||||
then.push(("45 deg".into(), "20 mm".into(), false));
|
||||
}
|
||||
@@ -297,7 +296,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut Sm, inputs: &mut [Sel
|
||||
if points.len() > 1 || own.iter().any(|o| !(o.1.trim().is_empty() && o.2.trim().is_empty())) {
|
||||
form_row(ui, "Per Edge", |ui| {
|
||||
ui.label(RichText::new(crate::i18n::tr_label("angle, height")).weak())
|
||||
.backing_on_hover_text("An edge's own angle and height. Empty: the values above.");
|
||||
.on_hover_text("An edge's own angle and height. Empty: the values above.");
|
||||
});
|
||||
for (n, p) in points.iter().enumerate() {
|
||||
let slot = own_slot(own, *p);
|
||||
|
||||
@@ -406,14 +406,6 @@ fn picked_list_removes_one_item_and_field_still_activates_input() {
|
||||
d.inputs[0].items.push(Sel::SketchCurve { id: second.clone(), sketch: None });
|
||||
h.app.dialog = Some(d);
|
||||
h.frames(4);
|
||||
assert!(crate::scenario::handle_at("dialog:list:Entities:0:remove").is_none(), "the list starts folded, as in every dialog");
|
||||
h.step(&json!({"click":{"handle":"dialog:list_toggle:Entities"}})).unwrap();
|
||||
h.frames(2);
|
||||
// Hovering a row lights its curve in the sketch.
|
||||
let row = crate::scenario::handle_at("dialog:list:Entities:1:remove").unwrap();
|
||||
h.call("ui.move", json!({"x": row.x, "y": row.y}));
|
||||
h.frames(2);
|
||||
assert!(matches!(&h.app.viewport.hover, Some(crate::viewport::Hit::SketchCurve { id, .. }) if *id == second), "{:?}", h.app.viewport.hover);
|
||||
h.step(&json!({"click":{"handle":"dialog:list:Entities:0:remove"}})).unwrap();
|
||||
assert_eq!(h.app.dialog.as_ref().unwrap().inputs[0].items, vec![Sel::SketchCurve { id: second, sketch: None }]);
|
||||
h.step(&json!({"click":{"handle":"dialog:Base point"}})).unwrap();
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
//! Everything acts through commands: `sketch.dimension_text`, `sketch.delete`,
|
||||
//! `sketch.toggle_driven`, `parameters.change`.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{Container, Surface};
|
||||
use solidcraft_engine::geom::prelude::*;
|
||||
use std::cell::RefCell;
|
||||
@@ -1015,12 +1014,11 @@ fn edit_box(app: &mut SolveApp, ctx: &egui::Context) {
|
||||
let anchor = edit_anchor(at, e.live.is_some(), drawable, popup_width);
|
||||
// Background: under Preferences and Report a bug (#9016), like canvas value boxes.
|
||||
Container::new(ctx, Surface::Canvas).area(egui::Id::new("sc_dim_edit_area")).fixed_pos(anchor).order(egui::Order::Background).show(ctx, |ui| {
|
||||
let frame = Container::popup_frame(ui.style()).fill(Tokens::get().dialog_body).inner_margin(Tokens::get().space_4);
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
Container::popup_frame(ui.style()).fill(Tokens::get().dialog_body).inner_margin(Tokens::get().space_4).show(ui, |ui| {
|
||||
crate::ui_kit::scope(ui, |ui| {
|
||||
ui.set_max_width(popup_width);
|
||||
crate::ui_kit::text(ui, &crate::i18n::format("dialog.dimension_name", &[("name", &e.param)]), crate::ui_kit::Text::Inline)
|
||||
.backing_on_hover_text(crate::i18n::tr("dialog.dimension_insert_hint"));
|
||||
.on_hover_text(crate::i18n::tr("dialog.dimension_insert_hint"));
|
||||
if !e.owned {
|
||||
// The whole value is selected before the field reads its state, every frame
|
||||
// until the person takes it over, so typing replaces it (#11204). Only on the
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
//! Closing a design with unsaved changes asks first, and so does quitting: one "save changes?"
|
||||
//! per design with unsaved changes ([`request_quit`]).
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{Container, Surface};
|
||||
use egui::{FontId, Rect, Sense, pos2, vec2};
|
||||
use serde_json::{Value, json};
|
||||
@@ -573,10 +572,11 @@ pub fn close(app: &mut SolveApp, i: usize, force: bool) {
|
||||
let next = if i + 1 < n { i + 1 } else { i - 1 };
|
||||
switch(app, next);
|
||||
}
|
||||
if let Some(slot) = app.docs.slots.remove(i)
|
||||
&& let Some(a) = slot.autosave
|
||||
{
|
||||
a.discard();
|
||||
if let Some(slot) = app.docs.slots.remove(i) {
|
||||
slot.session.stop_computing();
|
||||
if let Some(a) = slot.autosave {
|
||||
a.discard();
|
||||
}
|
||||
}
|
||||
if app.docs.active > i {
|
||||
app.docs.active -= 1;
|
||||
@@ -948,9 +948,9 @@ pub fn tabs(app: &mut SolveApp, ui: &mut egui::Ui, r: Rect, x0: f32, x1: f32) {
|
||||
if resp.secondary_clicked() {
|
||||
menu = Some((i, ui.ctx().pointer_interact_pos().unwrap_or(tr.left_bottom())));
|
||||
}
|
||||
if xresp.backing_on_hover_text("Close").clicked() {
|
||||
if xresp.on_hover_text("Close").clicked() {
|
||||
shut = Some(i);
|
||||
} else if (if held.is_some() { resp } else { resp.backing_on_hover_text(tip) }).clicked() {
|
||||
} else if (if held.is_some() { resp } else { resp.on_hover_text(tip) }).clicked() {
|
||||
pick = Some(i);
|
||||
}
|
||||
}
|
||||
@@ -977,7 +977,7 @@ pub fn tabs(app: &mut SolveApp, ui: &mut egui::Ui, r: Rect, x0: f32, x1: f32) {
|
||||
t.app_bar_text,
|
||||
);
|
||||
let id = egui::Id::new("sc_doc_more");
|
||||
if mresp.clone().backing_on_hover_text(crate::i18n::tr_label("All open designs")).clicked() {
|
||||
if mresp.clone().on_hover_text(crate::i18n::tr_label("All open designs")).clicked() {
|
||||
ui.ctx().data_mut(|d| d.insert_temp(id, !d.get_temp::<bool>(id).unwrap_or(false)));
|
||||
}
|
||||
if ui.ctx().data(|d| d.get_temp::<bool>(id).unwrap_or(false)) {
|
||||
@@ -1059,7 +1059,7 @@ pub fn tabs(app: &mut SolveApp, ui: &mut egui::Ui, r: Rect, x0: f32, x1: f32) {
|
||||
// A file loading into the window keeps the tabs as they are (dragging still moves it).
|
||||
let idle = !app.file_load.busy();
|
||||
crate::scenario::publish_handle("tab:new", pr.center());
|
||||
if presp.backing_on_hover_text(app.tr("ui.start_page")).clicked() && idle {
|
||||
if presp.on_hover_text(app.tr("ui.start_page")).clicked() && idle {
|
||||
app.home.show(app.session.revision);
|
||||
}
|
||||
match (shut, pick) {
|
||||
|
||||
@@ -1227,8 +1227,7 @@ pub fn show(app: &mut SolveApp, ctx: &egui::Context) {
|
||||
Container::new(ctx, Surface::InputShield).area(id).order(egui::Order::Middle).fixed_pos(cover.min).interactable(true).show(ctx, |ui| {
|
||||
ui.set_min_size(cover.size());
|
||||
ui.interact(cover, egui::Id::new("file_loading_block"), egui::Sense::click_and_drag());
|
||||
let shield = Container::new(ctx, Surface::InputShield);
|
||||
shield.paint_background(ui.painter(), shield.frame(ctx, egui::Color32::from_black_alpha(70), crate::frame::Side::Left), cover);
|
||||
ui.painter().rect_filled(cover, 0.0, egui::Color32::from_black_alpha(70));
|
||||
});
|
||||
// Anchored at its top: the card grows downwards (the saved preview) and Cancel stays put.
|
||||
let top = egui::pos2(centre.x, (centre.y - 120.0).max(cover.top() + 8.0));
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
//! (#2548): a graph of the last frames' times with the triangles drawn over it, a histogram of
|
||||
//! frame times, and what the GPU drew. Click the readout to show or hide the details.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use std::collections::VecDeque;
|
||||
|
||||
use egui::{Align2, Color32, FontId, Rect, Sense, Stroke, pos2, vec2};
|
||||
@@ -193,7 +192,7 @@ pub(crate) fn paint(app: &mut SolveApp, ui: &egui::Ui, painter: &egui::Painter,
|
||||
r = r.translate(vec2(0.0, nav.top() - 6.0 - r.bottom()));
|
||||
}
|
||||
let id = egui::Id::new("sc_frame_rate");
|
||||
let clicked = ui.interact(r, id, Sense::click()).backing_on_hover_text(tr("perf.click_for_details")).clicked();
|
||||
let clicked = ui.interact(r, id, Sense::click()).on_hover_text(tr("perf.click_for_details")).clicked();
|
||||
if clicked {
|
||||
app.preferences.frame_rate_details = !app.preferences.frame_rate_details;
|
||||
}
|
||||
|
||||
+16
-312
@@ -662,122 +662,18 @@ mod tests {
|
||||
#[test]
|
||||
fn blur_radius_schedule_and_hostile_values() {
|
||||
use crate::blur::{schedule, validate_radius};
|
||||
for radius in [f32::NAN, f32::INFINITY, -1.0, 60.01] {
|
||||
for radius in [f32::NAN, f32::INFINITY, -1.0, 40.01] {
|
||||
assert!(validate_radius(radius).is_err());
|
||||
assert!(schedule(radius).is_none());
|
||||
}
|
||||
assert!(schedule(0.0).is_none());
|
||||
for (radius, steps) in [(1.0, 2), (8.0, 2), (9.0, 3), (18.0, 3), (19.0, 4), (30.0, 4), (31.0, 5), (40.0, 5), (60.0, 5)] {
|
||||
for (radius, steps) in [(1.0, 2), (8.0, 2), (9.0, 3), (18.0, 3), (19.0, 4), (30.0, 4), (31.0, 5), (40.0, 5)] {
|
||||
let (actual, offset) = schedule(radius).unwrap();
|
||||
assert_eq!(actual, steps);
|
||||
assert!(offset.is_finite() && offset > 0.0);
|
||||
let variance = (35.0 / 18.0) * (4.0_f32.powi(steps as i32) - 1.0);
|
||||
assert!((offset * variance.sqrt() - radius / 2.0).abs() < 0.0001);
|
||||
}
|
||||
for cap in 2..=5 {
|
||||
let (steps, offset) = crate::blur::schedule_capped(40.0, cap).unwrap();
|
||||
assert_eq!(steps, cap);
|
||||
let variance = (35.0 / 18.0) * (4.0_f32.powi(steps as i32) - 1.0);
|
||||
assert!((offset * variance.sqrt() - 20.0).abs() < 0.0001, "tier cap must preserve target radius");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn blur_guard_threshold_idle_minimum_and_session_undo() {
|
||||
let mut guard = crate::blur::Guard::default();
|
||||
let radius = 40.0;
|
||||
for _ in 0..59 {
|
||||
guard.observe(radius, 23.0, true);
|
||||
}
|
||||
assert_eq!((guard.cap, guard.streak, guard.notice), (5, 59, false));
|
||||
guard.observe(radius, 23.0, false); // idle, unavailable, hidden or no actual paint
|
||||
assert_eq!((guard.cap, guard.streak), (5, 0));
|
||||
for _ in 0..59 {
|
||||
guard.observe(radius, 23.0, true);
|
||||
}
|
||||
guard.observe(radius, 22.0, true); // strictly over budget
|
||||
assert_eq!((guard.cap, guard.streak), (5, 0));
|
||||
for _ in 0..59 {
|
||||
guard.observe(radius, 23.0, true);
|
||||
}
|
||||
assert_eq!(guard.cap, 5);
|
||||
guard.observe(radius, 23.0, true);
|
||||
assert_eq!((guard.cap, guard.notice), (4, true));
|
||||
guard.notice = false; // Dismiss does not stop later reductions or reannounce.
|
||||
for _ in 0..180 {
|
||||
guard.observe(radius, 23.0, true);
|
||||
}
|
||||
assert_eq!((guard.cap, guard.streak, guard.notice), (2, 0, false));
|
||||
assert_eq!(crate::blur::schedule_capped(radius, guard.cap).unwrap().0, 2);
|
||||
assert_eq!(radius, 40.0, "quality guard never turns radius down or off");
|
||||
guard.undo();
|
||||
assert_eq!((guard.cap, guard.notice, guard.opted_out), (5, false, true));
|
||||
guard.reset(); // theme/radius changes do not revoke the session opt-out
|
||||
for _ in 0..120 {
|
||||
guard.observe(18.0, 23.0, true);
|
||||
}
|
||||
assert_eq!(guard.cap, 5);
|
||||
for radius in [0.0, 1.0, 8.0] {
|
||||
let mut guard = crate::blur::Guard::default();
|
||||
for _ in 0..120 {
|
||||
guard.observe(radius, 23.0, true);
|
||||
}
|
||||
assert_eq!((guard.cap, guard.notice), (5, false));
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[test]
|
||||
fn blur_guard_requires_consecutive_visible_actual_paints() {
|
||||
let ctx = egui::Context::default();
|
||||
let mut session = crate::blur::Session::default();
|
||||
let mut time = 0.0;
|
||||
let mut feed =
|
||||
|session: &mut crate::blur::Session, rendered: bool, continuous: bool, visible: bool, available: bool, revision: u64, radius: f32| {
|
||||
time += 0.023;
|
||||
let mut raw = egui::RawInput { time: Some(time), ..Default::default() };
|
||||
raw.viewports.entry(egui::ViewportId::ROOT).or_default().occluded = Some(!visible);
|
||||
let _ = ctx.run_ui(raw, |ui| {
|
||||
ui.ctx().request_repaint(); // Deterministic harness only; product never does this for sampling.
|
||||
let paint = rendered.then(|| crate::blur::PaintedFrame {
|
||||
frame: ui.ctx().cumulative_frame_nr().saturating_sub(1),
|
||||
interval_ms: Some(23.0),
|
||||
continuous,
|
||||
});
|
||||
session.sample(ui.ctx(), revision, radius, available, paint);
|
||||
session.sample(ui.ctx(), revision, radius, available, paint); // egui re-pass duplicate
|
||||
});
|
||||
};
|
||||
feed(&mut session, false, true, true, true, 1, 40.0);
|
||||
feed(&mut session, false, true, true, true, 1, 40.0);
|
||||
for _ in 0..59 {
|
||||
feed(&mut session, true, true, true, true, 1, 40.0);
|
||||
}
|
||||
assert_eq!((session.guard.cap, session.guard.streak), (5, 59));
|
||||
for (rendered, continuous, visible, available) in
|
||||
[(false, true, true, true), (true, false, true, true), (true, true, false, true), (true, true, true, false)]
|
||||
{
|
||||
feed(&mut session, rendered, continuous, visible, available, 1, 40.0);
|
||||
assert_eq!((session.guard.cap, session.guard.streak), (5, 0));
|
||||
feed(&mut session, true, true, true, true, 1, 40.0);
|
||||
assert_eq!(session.guard.streak, 1);
|
||||
}
|
||||
feed(&mut session, true, true, true, true, 2, 40.0); // theme contents changed
|
||||
assert_eq!(session.guard.streak, 0);
|
||||
feed(&mut session, true, true, true, true, 2, 18.0); // radius changed
|
||||
assert_eq!(session.guard.streak, 0);
|
||||
for _ in 0..59 {
|
||||
feed(&mut session, true, true, true, true, 2, 18.0);
|
||||
}
|
||||
assert_eq!((session.guard.cap, session.guard.streak), (5, 59));
|
||||
feed(&mut session, true, true, true, true, 2, 18.0);
|
||||
assert_eq!((session.guard.cap, session.guard.notice), (2, true));
|
||||
session.guard.undo();
|
||||
feed(&mut session, true, true, true, true, 3, 40.0);
|
||||
for _ in 0..100 {
|
||||
feed(&mut session, true, true, true, true, 3, 40.0);
|
||||
}
|
||||
assert_eq!((session.guard.cap, session.guard.opted_out), (5, true));
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
@@ -811,11 +707,6 @@ mod tests {
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
impl BlurFixture {
|
||||
fn radius(&mut self, radius: f32) {
|
||||
// Explicit PR5 rendering harness activation, independent of theme declarations.
|
||||
self.app.blur_session.harness_radius = Some(radius);
|
||||
self.app.blur.set_radius(radius).unwrap();
|
||||
}
|
||||
fn new(srgb: bool, policy: crate::blur::FixturePolicy) -> Option<Self> {
|
||||
use super::*;
|
||||
let Some((adapter, device, queue)) = offscreen_device() else {
|
||||
@@ -840,11 +731,6 @@ mod tests {
|
||||
app.viewport.draw_stats = Some(view.stats());
|
||||
renderer.write().callback_resources.insert(view);
|
||||
app.blur = crate::blur::fixture_state(&adapter, &device, &queue, &renderer, format, policy);
|
||||
assert_eq!(
|
||||
app.blur.software_adapter(),
|
||||
adapter.get_info().device_type == wgpu::DeviceType::Cpu,
|
||||
"fixture must retain real adapter identity"
|
||||
);
|
||||
if policy == crate::blur::FixturePolicy::Rendering {
|
||||
assert_eq!(app.blur.capability(), crate::blur::Capability::Available, "blur fixture requires real rendering capabilities");
|
||||
}
|
||||
@@ -1006,15 +892,11 @@ mod tests {
|
||||
}
|
||||
let unavailable = Capability::Unavailable("software adapter (gpu-software)");
|
||||
assert_eq!(f.app.blur.capability(), unavailable);
|
||||
f.radius(18.0);
|
||||
f.app.blur.set_radius(18.0).unwrap();
|
||||
for _ in 0..6 {
|
||||
f.frame();
|
||||
assert_eq!(f.app.blur.radius(), 18.0, "each prepared fallback frame retains the requested radius");
|
||||
}
|
||||
assert_eq!(f.app.blur.capability(), unavailable);
|
||||
assert_eq!(f.app.blur.radius(), 18.0, "production fallback preserves the actual requested radius through prepare_blur");
|
||||
assert_eq!(f.app.blur_session.harness_radius, Some(18.0));
|
||||
assert_eq!(crate::prefs::blur_availability(&f.app), crate::theme_options::Availability::Unavailable("prefs.blur_software"));
|
||||
let counts = f.app.blur.counters();
|
||||
assert_eq!((counts.textures_created, counts.buffers_created, counts.bind_groups_created, counts.pipelines_created), (0, 0, 0, 0));
|
||||
assert_eq!((counts.markers_emitted, counts.markers_drawn), (0, 0));
|
||||
@@ -1023,152 +905,6 @@ mod tests {
|
||||
assert!(f.renderer.read().frame_compositor.is_none());
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[test]
|
||||
fn blur_offered_zero_has_no_effect_work() {
|
||||
let Some(mut f) = BlurFixture::new(false, crate::blur::FixturePolicy::Production) else { return };
|
||||
assert!(f.app.blur_session.harness_radius.is_none(), "zero must come from the declared theme option");
|
||||
crate::prefs::control(
|
||||
&mut f.app,
|
||||
&serde_json::json!({"theme_import":{
|
||||
"format":"solidcraft-theme/1", "name":"Zero blur", "base":"dark",
|
||||
"options":[{"id":"blur","type":"range","default":0}]
|
||||
}}),
|
||||
)
|
||||
.unwrap();
|
||||
for _ in 0..6 {
|
||||
f.frame();
|
||||
}
|
||||
assert!(crate::theme::blur_intent(&f.ctx).offered);
|
||||
assert_eq!(crate::theme::blur_intent(&f.ctx).radius, 0.0);
|
||||
assert_eq!(f.app.blur.radius(), 0.0);
|
||||
assert!(f.app.blur_session.harness_radius.is_none());
|
||||
let counters = serde_json::to_value(f.app.blur.counters()).unwrap();
|
||||
for (name, count) in counters.as_object().unwrap() {
|
||||
assert_eq!(count, 0, "{name}");
|
||||
}
|
||||
assert!(f.renderer.read().frame_compositor.is_none());
|
||||
assert!(f.app.blur.painted_frame().is_none());
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[test]
|
||||
fn blur_search_picker_popup_and_tooltips_keep_native_backing() {
|
||||
use crate::ui_kit::{SearchChoice, SearchPicker};
|
||||
let Some(mut f) = BlurFixture::new(false, crate::blur::FixturePolicy::Rendering) else { return };
|
||||
f.radius(18.0);
|
||||
let heading = "Long provider heading ".repeat(4);
|
||||
let note = "Long discovery note ".repeat(20);
|
||||
for target in ["choice", "group", "heading", "note"] {
|
||||
let ctx = crate::fonts::test_context();
|
||||
ctx.global_style_mut(|s| {
|
||||
s.visuals.window_fill = egui::Color32::from_rgba_unmultiplied(40, 60, 80, 180);
|
||||
s.interaction.tooltip_delay = 0.0;
|
||||
s.interaction.show_tooltips_only_when_still = false;
|
||||
s.animation_time = 0.0;
|
||||
});
|
||||
let choices = [
|
||||
SearchChoice { value: "one", label: "One", tip: "First choice detail", group: Some(&heading) },
|
||||
SearchChoice { value: "two", label: "Two", tip: "Second choice detail", group: (target != "heading").then_some("Other") },
|
||||
];
|
||||
let mut widget = egui::Id::NULL;
|
||||
let mut time = 0.0;
|
||||
let mut frame = |events| {
|
||||
// Native tooltips suppress movement just after a click for 100 ms.
|
||||
// Advance deterministic input time beyond that grace period; never
|
||||
// depend on the machine's speed to make a hover eligible.
|
||||
time += 0.25;
|
||||
crate::scenario::clear_handles();
|
||||
crate::test_support::frame(
|
||||
&ctx,
|
||||
egui::RawInput {
|
||||
screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(800.0, 600.0))),
|
||||
events,
|
||||
time: Some(time),
|
||||
focused: true,
|
||||
..Default::default()
|
||||
},
|
||||
|ui| {
|
||||
let _blur = f.app.blur.begin(ui.ctx(), true);
|
||||
ui.set_width(300.0);
|
||||
crate::ui_kit::scope(ui, |ui| {
|
||||
let result = crate::ui_kit::search_picker(
|
||||
ui,
|
||||
SearchPicker {
|
||||
id: "blur_picker",
|
||||
handles: "blur:picker",
|
||||
current: "One",
|
||||
current_value: "one",
|
||||
hint: "Search",
|
||||
choices: &choices,
|
||||
custom: false,
|
||||
note: Some(¬e),
|
||||
open_group: None,
|
||||
enabled: true,
|
||||
},
|
||||
);
|
||||
widget = result.response.id;
|
||||
assert!(result.inner.is_none(), "hovering must not pick a value");
|
||||
});
|
||||
},
|
||||
)
|
||||
};
|
||||
frame(vec![]);
|
||||
let at = crate::scenario::handle_at("blur:picker").unwrap();
|
||||
frame(crate::test_support::pointer(at, true));
|
||||
frame(crate::test_support::pointer(at, false));
|
||||
let mut output = frame(vec![]);
|
||||
let at = match target {
|
||||
"choice" => crate::scenario::handle_at("blur:picker:one").unwrap(),
|
||||
"group" => crate::scenario::handle_at(&format!("blur:picker:group:{heading}")).unwrap(),
|
||||
_ => output
|
||||
.shapes
|
||||
.iter()
|
||||
.find_map(|s| match &s.shape {
|
||||
egui::Shape::Text(t) if t.galley.job.text.starts_with(if target == "note" { "Long discovery" } else { "Long provider" }) => {
|
||||
Some(t.pos + t.galley.rect.center().to_vec2())
|
||||
}
|
||||
_ => None,
|
||||
})
|
||||
.expect("picker heading or note has visible text"),
|
||||
};
|
||||
for _ in 0..4 {
|
||||
output = frame(vec![egui::Event::PointerMoved(at)]);
|
||||
}
|
||||
let mut leaves = Vec::new();
|
||||
for clipped in &output.shapes {
|
||||
crate::test_support::each_shape(&clipped.shape, &mut |shape| leaves.push(shape.clone()));
|
||||
}
|
||||
let markers: Vec<_> = leaves
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter_map(|(i, shape)| match shape {
|
||||
egui::Shape::Callback(cb) => Some((i, cb.rect)),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
assert_eq!(markers.len(), 2, "{target}: popup and tooltip both have backing markers");
|
||||
let popup = ctx.read_response(widget.with("popup")).unwrap().rect;
|
||||
assert_eq!(markers[0].1, popup, "the marker covers popup padding and scrollbars");
|
||||
assert!(
|
||||
leaves
|
||||
.iter()
|
||||
.skip(markers[0].0 + 1)
|
||||
.find(|shape| !matches!(shape, egui::Shape::Noop))
|
||||
.is_some_and(|shape| matches!(shape, egui::Shape::Rect(_))),
|
||||
"backing precedes native popup chrome"
|
||||
);
|
||||
assert!(ctx.memory(|m| m.has_focus(egui::Id::new("blur_picker").with("search"))), "native search focus survives hover");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
fn assert_backdrop_passes(before: crate::blur::Counters, after: crate::blur::Counters, steps: usize) {
|
||||
let markers = after.markers_drawn - before.markers_drawn;
|
||||
assert!(markers > 0, "the fixture must paint a visible backing boundary");
|
||||
assert_eq!(after.blur_passes - before.blur_passes, 2 * steps as u64 * markers, "each backing boundary filters the preceding UI");
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[test]
|
||||
fn blur_full_egui_composition() {
|
||||
@@ -1191,7 +927,7 @@ mod tests {
|
||||
f.app.blur.set_surface_alpha(Some(180));
|
||||
f.app.cam = original_camera;
|
||||
f.app.preferences.viewport_background = original_background;
|
||||
f.radius(0.0);
|
||||
f.app.blur.set_radius(0.0).unwrap();
|
||||
for _ in 0..3 {
|
||||
f.frame();
|
||||
}
|
||||
@@ -1203,27 +939,19 @@ mod tests {
|
||||
for radius in [8.0, 18.0, 40.0] {
|
||||
f.app.cam = original_camera;
|
||||
f.app.preferences.viewport_background = original_background;
|
||||
f.radius(radius);
|
||||
f.app.blur.set_radius(radius).unwrap();
|
||||
for _ in 0..3 {
|
||||
f.frame();
|
||||
}
|
||||
let before = f.app.blur.counters();
|
||||
assert_eq!(
|
||||
crate::prefs::blur_availability(&f.app),
|
||||
crate::theme_options::Availability::Available,
|
||||
"positive rendering fixtures must pass the shared app-aware capability policy"
|
||||
);
|
||||
assert_eq!(f.app.blur.radius(), radius);
|
||||
assert!(f.app.blur.painted_frame().is_some(), "guard evidence comes from actual submitted visible marker work");
|
||||
let source = f.pixels(true);
|
||||
let resting = f.pixels(false);
|
||||
f.frame();
|
||||
let after = f.app.blur.counters();
|
||||
assert_eq!(before.source_passes, after.source_passes, "resting source");
|
||||
assert_backdrop_passes(before, after, crate::blur::schedule(radius).unwrap().0);
|
||||
assert_eq!(before.blur_passes, after.blur_passes, "resting chain");
|
||||
assert!(after.cache_hits > before.cache_hits);
|
||||
assert!(after.markers_drawn > before.markers_drawn);
|
||||
assert_eq!(f.pixels(true), source);
|
||||
assert_eq!(f.pixels(false), resting, "resting ordered composition is stable");
|
||||
// Change panels only: the immutable source must be byte-identical.
|
||||
f.app.blur.set_surface_alpha(Some(120));
|
||||
f.frame();
|
||||
@@ -1247,7 +975,7 @@ mod tests {
|
||||
f.frame();
|
||||
let after = f.app.blur.counters();
|
||||
assert_eq!(after.source_passes, before.source_passes + 1);
|
||||
assert_backdrop_passes(before, after, crate::blur::schedule(radius).unwrap().0);
|
||||
assert_eq!(after.blur_passes - before.blur_passes, 2 * crate::blur::schedule(radius).unwrap().0 as u64);
|
||||
f.app.cam = original_camera;
|
||||
f.frame();
|
||||
f.app.preferences.viewport_background = Some([3, 37, 93]);
|
||||
@@ -1259,21 +987,7 @@ mod tests {
|
||||
f.app.preferences.viewport_background = original_background;
|
||||
f.frame();
|
||||
}
|
||||
let before = f.app.blur.counters();
|
||||
f.app.blur_session.guard.cap = 3; // Explicit deterministic quality input in this GPU fixture.
|
||||
f.frame();
|
||||
let reduced = f.app.blur.counters();
|
||||
assert_eq!(f.app.blur.radius(), 40.0);
|
||||
assert_eq!(reduced.source_passes, before.source_passes + 1, "tier change invalidates the source cache");
|
||||
assert_backdrop_passes(before, reduced, 3);
|
||||
f.frame();
|
||||
let cached = f.app.blur.counters();
|
||||
assert_eq!(cached.source_passes, reduced.source_passes, "reduced tier has its own stable source cache");
|
||||
assert_backdrop_passes(reduced, cached, 3);
|
||||
f.app.blur_session.guard.cap = 5;
|
||||
f.frame();
|
||||
assert_backdrop_passes(cached, f.app.blur.counters(), 5);
|
||||
f.radius(0.0);
|
||||
f.app.blur.set_radius(0.0).unwrap();
|
||||
for _ in 0..2 {
|
||||
f.frame();
|
||||
}
|
||||
@@ -1312,7 +1026,7 @@ mod tests {
|
||||
f.app.blur.set_surface_alpha(Some(180));
|
||||
let mut rows = Vec::new();
|
||||
for radius in [0.0, 18.0, 0.0] {
|
||||
f.radius(radius);
|
||||
f.app.blur.set_radius(radius).unwrap();
|
||||
for _ in 0..6 {
|
||||
f.frame();
|
||||
}
|
||||
@@ -1321,17 +1035,7 @@ mod tests {
|
||||
times.sort_by(f64::total_cmp);
|
||||
let after = f.app.blur.counters();
|
||||
assert_eq!(after.source_passes, before.source_passes);
|
||||
if radius == 0.0 {
|
||||
assert_eq!(after.blur_passes, before.blur_passes);
|
||||
assert_eq!(after.markers_drawn, before.markers_drawn);
|
||||
} else {
|
||||
assert_backdrop_passes(before, after, crate::blur::schedule(radius).unwrap().0);
|
||||
assert_eq!(after.cache_hits - before.cache_hits, 30, "all resting sources are cached");
|
||||
}
|
||||
assert_eq!(after.textures_created, before.textures_created);
|
||||
assert_eq!(after.buffers_created, before.buffers_created);
|
||||
assert_eq!(after.bind_groups_created, before.bind_groups_created);
|
||||
assert_eq!(after.pipelines_created, before.pipelines_created);
|
||||
assert_eq!(after.blur_passes, before.blur_passes);
|
||||
rows.push(serde_json::json!({"radius_px":radius, "samples":times.len(), "min_ms":times[0],
|
||||
"median_ms":(times[14] + times[15]) / 2.0, "max_ms":times[29], "before":before, "after":after}));
|
||||
}
|
||||
@@ -1347,7 +1051,7 @@ mod tests {
|
||||
fn blur_suspend_releases_targets() {
|
||||
let Some(mut f) = BlurFixture::new(false, crate::blur::FixturePolicy::Rendering) else { return };
|
||||
f.app.blur.set_surface_alpha(Some(180));
|
||||
f.radius(18.0);
|
||||
f.app.blur.set_radius(18.0).unwrap();
|
||||
for _ in 0..3 {
|
||||
f.frame();
|
||||
}
|
||||
@@ -1356,7 +1060,7 @@ mod tests {
|
||||
assert_eq!(f.app.blur.counters().live_bytes, 0);
|
||||
f.frame();
|
||||
assert!(f.app.blur.counters().live_textures > 0);
|
||||
f.radius(0.0);
|
||||
f.app.blur.set_radius(0.0).unwrap();
|
||||
assert_eq!(f.app.blur.counters().live_textures, 0);
|
||||
assert_eq!(f.app.blur.counters().live_bind_groups, 0);
|
||||
assert_eq!(f.app.blur.counters().live_pipelines, 0);
|
||||
@@ -1367,7 +1071,7 @@ mod tests {
|
||||
#[test]
|
||||
fn blur_late_layer_transform_moves_source_and_invalidates_cache() {
|
||||
let Some(mut f) = BlurFixture::new(false, crate::blur::FixturePolicy::Rendering) else { return };
|
||||
f.radius(18.0);
|
||||
f.app.blur.set_radius(18.0).unwrap();
|
||||
f.app.blur.set_surface_alpha(Some(180));
|
||||
for _ in 0..6 {
|
||||
f.frame();
|
||||
@@ -1387,12 +1091,12 @@ mod tests {
|
||||
assert_eq!(f.app.blur.source_geometry().unwrap(), local.map(|r| transform.mul_rect(r)), "viewport, clip and background all transform once");
|
||||
let after = f.app.blur.counters();
|
||||
assert_eq!(after.source_passes, before.source_passes + 1);
|
||||
assert_backdrop_passes(before, after, 3);
|
||||
assert_eq!(after.blur_passes, before.blur_passes + 6);
|
||||
assert_eq!(after.textures_created, before.textures_created, "placement changes reuse storage");
|
||||
assert_eq!(&f.pixels(true)[offset..offset + 4], &outside, "old location is outside the transformed clip");
|
||||
f.frame();
|
||||
assert_eq!(f.app.blur.counters().source_passes, after.source_passes, "unchanged transformed placement is cached");
|
||||
assert_backdrop_passes(after, f.app.blur.counters(), 3);
|
||||
assert_eq!(f.app.blur.counters().blur_passes, after.blur_passes);
|
||||
// A forced miss must still paint at the transformed location, not merely hash it.
|
||||
f.app.cam.yaw += 0.1;
|
||||
f.frame();
|
||||
|
||||
@@ -725,6 +725,33 @@ fn a_design_closed_while_its_history_computes_holds_up_nothing() {
|
||||
assert_eq!(h.app.dialog.as_ref().and_then(|d| d.command()), Some("solid.extrude"));
|
||||
}
|
||||
|
||||
/// Closing a design or replacing it stops the kernel work still computing for it; showing another
|
||||
/// tab doesn't, since that design is still there to come back to.
|
||||
#[test]
|
||||
fn closing_a_design_stops_what_it_has_computing_and_a_tab_switch_does_not() {
|
||||
let mut h = block_boss_hole();
|
||||
let first = h.app.session.stop_token();
|
||||
let copy = h.app.session.ahead();
|
||||
crate::documents::new_tab(&mut h.app);
|
||||
assert!(!first.is_stopped(), "only another tab shown");
|
||||
let second = h.app.session.stop_token();
|
||||
assert!(!second.is_stopped());
|
||||
crate::documents::close(&mut h.app, 0, true);
|
||||
assert!(first.is_stopped(), "the first design closed");
|
||||
assert!(!second.is_stopped(), "this design goes on");
|
||||
assert!(
|
||||
copy.replies(&[("solid.box".to_string(), json!({"length": 1, "width": 1, "height": 1}))]).iter().all(Result::is_err),
|
||||
"its job gets nowhere"
|
||||
);
|
||||
h.app.run("solid.box", json!({"length": 10, "width": 10, "height": 10})).unwrap();
|
||||
h.app.run("file.new", json!({})).unwrap();
|
||||
assert!(second.is_stopped(), "replaced in its tab");
|
||||
assert!(!h.app.session.stop_token().is_stopped());
|
||||
h.app.run("solid.box", json!({"length": 10, "width": 10, "height": 10})).unwrap();
|
||||
crate::documents::close(&mut h.app, 0, true);
|
||||
assert!(!h.app.session.stop_token().is_stopped(), "the blank design that took the last tab's place");
|
||||
}
|
||||
|
||||
/// A design's history command stays with its tab: another tab doesn't wait for it and doesn't get
|
||||
/// its result, even once it is in. Shown again, the design picks it up.
|
||||
#[test]
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
//! centre that drags it across the model (snapping as a pick would) and takes it out when
|
||||
//! clicked, and a pick elsewhere on a face that already has a hole moves the hole there.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use solidcraft_engine::geom::prelude::*;
|
||||
use std::cell::RefCell;
|
||||
use std::sync::Arc;
|
||||
@@ -306,7 +305,7 @@ pub(crate) fn show(app: &mut SolveApp, ui: &mut egui::Ui, painter: &egui::Painte
|
||||
crate::icons::markers::hole_handle(painter, c, if hot { t.accent } else { t.manipulator }, hot);
|
||||
crate::scenario::publish_handle(&format!("hole:{n}"), c);
|
||||
if !r.dragged() {
|
||||
r.backing_on_hover_text(crate::i18n::tr_label("Drag to move the hole; click to remove it"));
|
||||
r.on_hover_text(crate::i18n::tr_label("Drag to move the hole; click to remove it"));
|
||||
}
|
||||
}
|
||||
if let Some((i, to)) = moved
|
||||
|
||||
@@ -645,8 +645,7 @@ pub(crate) fn show(app: &mut SolveApp, ui: &mut egui::Ui, painter: &egui::Painte
|
||||
let at = (p + vec2(20.0, 22.0)).clamp(proj.rect.min, proj.rect.max - vec2(260.0, 82.0).min(proj.rect.size()));
|
||||
let host = Container::new(ui.ctx(), Surface::Canvas);
|
||||
host.area(egui::Id::new("joint_move_readout")).interactable(false).fixed_pos(at).order(egui::Order::Foreground).show(ui.ctx(), |ui| {
|
||||
let frame = host.frame(ui.ctx(), tk.overlay, crate::frame::Side::Right).inner_margin(tk.space_8);
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
host.frame(ui.ctx(), tk.overlay, crate::frame::Side::Right).inner_margin(tk.space_8).show(ui, |ui| {
|
||||
let value = if d.axis.angular {
|
||||
format!(
|
||||
"{}{:.precision$}°",
|
||||
@@ -679,8 +678,7 @@ pub(crate) fn show(app: &mut SolveApp, ui: &mut egui::Ui, painter: &egui::Painte
|
||||
let host = Container::new(ui.ctx(), Surface::Canvas);
|
||||
let mut done = false;
|
||||
host.area(egui::Id::new("joint_move_help")).fixed_pos(proj.rect.left_bottom() + vec2(16.0, -148.0)).show(ui.ctx(), |ui| {
|
||||
let frame = host.frame(ui.ctx(), tk.overlay, crate::frame::Side::Right).inner_margin(tk.space_8);
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
host.frame(ui.ctx(), tk.overlay, crate::frame::Side::Right).inner_margin(tk.space_8).show(ui, |ui| {
|
||||
ui.label(app.tr("joint_move.help"));
|
||||
if mode.axes.iter().any(|a| a.angular) {
|
||||
ui.label(app.tr("joint_move.precision"));
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
//! already uses is reported and only taken over on request; keys the app itself handles (Esc, S,
|
||||
//! V, Delete, Ctrl+Z…) can't be bound. Changes are kept between runs.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use serde_json::{Value, json};
|
||||
@@ -656,7 +655,7 @@ pub fn page(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
}
|
||||
let export = ui_kit::icon_label_button(ui, app.tr("prefs.profile_export"), "export_tray", true, false)
|
||||
.backing_on_hover_text(app.tr_label("Keys, S box favorites and the toolbar, as a file"));
|
||||
.on_hover_text(app.tr_label("Keys, S box favorites and the toolbar, as a file"));
|
||||
crate::scenario::publish_target("keymap:export", export.rect);
|
||||
if export.clicked() {
|
||||
action = Some((String::new(), "export"));
|
||||
@@ -673,7 +672,7 @@ pub fn page(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
ui_kit::text(ui, app.tr_label("Read-only list: shortcuts can't be changed here."), ui_kit::Text::Note("shortcut_read_only"));
|
||||
}
|
||||
ui_kit::checkbox(ui, app.tr("ui.sketch_keys_only"), &mut app.preferences.sketch_keys_only)
|
||||
.backing_on_hover_text(app.tr("ui.sketch_keys_only_tip"));
|
||||
.on_hover_text(app.tr("ui.sketch_keys_only_tip"));
|
||||
if let Some(chosen) = outcome(app, ui) {
|
||||
action = Some((String::new(), chosen));
|
||||
}
|
||||
@@ -911,7 +910,7 @@ fn shortcut_row(
|
||||
let name =
|
||||
egui::Rect::from_min_size(rect.min + egui::vec2(0.0, t.space_4), egui::vec2(if beside { name_width } else { width }, label_height));
|
||||
ui.painter().galley(egui::pos2(name.left(), name.center().y - label_galley.size().y / 2.0), label_galley, t.form_ink);
|
||||
let response = ui.interact(name, ui.id().with("command"), egui::Sense::hover()).backing_on_hover_text(command.id);
|
||||
let response = ui.interact(name, ui.id().with("command"), egui::Sense::hover()).on_hover_text(command.id);
|
||||
response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, ui.is_enabled(), format!("{label} ({})", command.id)));
|
||||
let top = if beside { name.top() } else { name.bottom() + t.space_4 };
|
||||
let total = widths.iter().sum::<f32>() + widths.len().saturating_sub(1) as f32 * t.space_8;
|
||||
@@ -938,7 +937,7 @@ fn shortcut_row(
|
||||
ui_kit::quiet_icon_button_at(ui, r, "plus", app.tr_label("Click, then press the new key"))
|
||||
};
|
||||
if editing {
|
||||
let capture = capture.backing_on_hover_text(app.tr_label("Click, then press the new key"));
|
||||
let capture = capture.on_hover_text(app.tr_label("Click, then press the new key"));
|
||||
let name = if *slot == 0 { command.id.to_owned() } else { format!("{}:{slot}", command.id) };
|
||||
crate::scenario::publish_target(&format!("keymap:capture:{name}"), capture.rect);
|
||||
if ui.is_rect_visible(capture.rect) {
|
||||
|
||||
@@ -455,8 +455,6 @@ pub struct Services {
|
||||
/// frame, so it only reads a value kept up to date elsewhere. None, or `None` from it: the
|
||||
/// window toolkit's theme.
|
||||
pub desktop_dark: Option<Box<dyn Fn() -> Option<bool>>>,
|
||||
/// Lazy background observation; `needed` arms polling, the return is cached only.
|
||||
pub reduce_transparency: Option<Box<dyn Fn(bool) -> Option<bool>>>,
|
||||
/// Adapter names and descriptive labels from the desktop renderer's chosen backends.
|
||||
pub graphics_adapters: Vec<(String, String)>,
|
||||
/// HTTPS GET for the update check (`update`); None: never check (browser, tests).
|
||||
@@ -515,7 +513,6 @@ pub struct SolveApp {
|
||||
/// Common panel foundation, internal opt-in; stays on the app across document tabs.
|
||||
pub(crate) panel_runtime: Option<panel_runtime::AppPanelRuntime>,
|
||||
pub blur: blur::State,
|
||||
pub(crate) blur_session: blur::Session,
|
||||
pub(crate) viewport_status: ui_kit::StatusPresentation,
|
||||
pub(crate) viewport_status_fixture: viewport_status_fixture::Fixture,
|
||||
/// Compact browser embed: retain model panels and joint controls without application chrome.
|
||||
@@ -793,7 +790,6 @@ impl SolveApp {
|
||||
panel_runtime: None,
|
||||
viewport_status: Default::default(),
|
||||
blur: Default::default(),
|
||||
blur_session: Default::default(),
|
||||
viewport_status_fixture: Default::default(),
|
||||
session,
|
||||
ui: UiState::default(),
|
||||
@@ -2964,7 +2960,6 @@ impl SolveApp {
|
||||
|
||||
/// Lay out the whole window.
|
||||
pub fn ui(&mut self, ui: &mut egui::Ui) {
|
||||
prefs::prepare_blur(self, ui.ctx());
|
||||
let blur_source = !self.home.open && !render_workspace::result_active(self);
|
||||
let _blur_scope = self.blur.begin(ui.ctx(), blur_source);
|
||||
value_step::set_enabled(ui.ctx(), self.preferences.step_values);
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
use crate::navigation::NavCaps;
|
||||
use crate::navigation_bar::{self, Edge, Idle, Kind, Labels, MenuDisplay, NavigationBar, Position, Slot};
|
||||
use crate::theme::Tokens;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use crate::ui_kit::{self, Container, Surface};
|
||||
use crate::{SolveApp, viewport::NavMode};
|
||||
use egui::{Align2, Rect, pos2, vec2};
|
||||
@@ -532,7 +531,7 @@ fn display_menu(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
item.selected = app.ui.perspective == perspective;
|
||||
item.enabled = !projection_locked(app);
|
||||
let response = item.show(ui);
|
||||
let response = if projection_locked(app) { response.backing_on_hover_text(app.tr("nav.perspective.sketch")) } else { response };
|
||||
let response = if projection_locked(app) { response.on_hover_text(app.tr("nav.perspective.sketch")) } else { response };
|
||||
crate::scenario::publish_target(if perspective { "view:projection" } else { "view:orthographic" }, response.rect);
|
||||
if response.clicked() && app.ui.perspective != perspective {
|
||||
toggle_projection(app);
|
||||
@@ -557,7 +556,7 @@ fn display_menu(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
// The View angles readout under the orientation gizmo (#6032).
|
||||
let mut angles = NavigationMenuRow::new("view_angles", app.tr("ui.view_angles"), "select");
|
||||
angles.selected = app.preferences.show_view_angles;
|
||||
let response = angles.show(ui).backing_on_hover_text(app.tr("ui.view_angles_help"));
|
||||
let response = angles.show(ui).on_hover_text(app.tr("ui.view_angles_help"));
|
||||
crate::scenario::publish_target("view:view_angles", response.rect);
|
||||
if response.clicked() {
|
||||
let _ = app.run("view.angle_readout", json!({"enabled": !app.preferences.show_view_angles}));
|
||||
|
||||
@@ -173,7 +173,7 @@ fn navigate(app: &mut SolveApp, action: Option<&str>, dir: Option<Vec3>) {
|
||||
|
||||
fn control(app: &mut SolveApp, ui: &mut egui::Ui, bounds: Rect, action: &str, tooltip: &str) -> bool {
|
||||
crate::scenario::publish_handle(&format!("navigation_cube:control:{action}"), bounds.center());
|
||||
let response = ui.interact(bounds, ui.id().with(("navigation_cube", action)), Sense::click()).backing_on_hover_text(tooltip);
|
||||
let response = ui.interact(bounds, ui.id().with(("navigation_cube", action)), Sense::click()).on_hover_text(tooltip);
|
||||
let hover = response.hovered();
|
||||
if response.clicked() {
|
||||
navigate(app, Some(action), None);
|
||||
@@ -253,11 +253,7 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui, rect: Rect) {
|
||||
if let Some(face) = hovered.and_then(|i| faces.get(i)) {
|
||||
ui.ctx().set_cursor_icon(egui::CursorIcon::PointingHand);
|
||||
ui.interact(Rect::from_center_size(hover.unwrap_or(face.centre), vec2(2.0, 2.0)), ui.id().with("navigation_cube_tip"), Sense::hover())
|
||||
.backing_on_hover_text(format!(
|
||||
"{} view. Drag to orbit{}.",
|
||||
face.label,
|
||||
if app.preferences.free_orbit { "" } else { "; hold Shift to snap" }
|
||||
));
|
||||
.on_hover_text(format!("{} view. Drag to orbit{}.", face.label, if app.preferences.free_orbit { "" } else { "; hold Shift to snap" }));
|
||||
if ui.input(|i| i.pointer.primary_clicked()) {
|
||||
navigate(app, None, Some(face.direction));
|
||||
}
|
||||
|
||||
@@ -171,8 +171,7 @@ pub(crate) fn show(app: &SolveApp, ctx: &egui::Context) {
|
||||
.fixed_pos(at)
|
||||
.interactable(false)
|
||||
.show(ctx, |ui| {
|
||||
let frame = Container::popup_frame(ui.style()).fill(t.panel);
|
||||
Container::show_backing(ui, frame, |ui| {
|
||||
Container::popup_frame(ui.style()).fill(t.panel).show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.spinner();
|
||||
ui.label(egui::RichText::new(format!("Loading parts {done}/{total}")).color(t.text));
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use solidcraft_engine::panels::*;
|
||||
|
||||
/// Content receives this value separately from state/model/command services. All
|
||||
@@ -268,7 +267,7 @@ impl PanelHost for EguiPanelHost<'_> {
|
||||
let ink = if presentation.attention { tokens.form_primary } else { tokens.form_ink };
|
||||
let mut response = ui.label(egui::RichText::new(&presentation.title).color(ink));
|
||||
if let Some(status) = &presentation.status {
|
||||
response = response.backing_on_hover_text(status);
|
||||
response = response.on_hover_text(status);
|
||||
}
|
||||
response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Label, true, &presentation.title));
|
||||
}
|
||||
@@ -286,7 +285,7 @@ impl PanelHost for EguiPanelHost<'_> {
|
||||
.inner;
|
||||
let clicked = response.clicked();
|
||||
if let Some(reason) = &action.disabled_reason {
|
||||
response.backing_on_disabled_hover_text(reason);
|
||||
response.on_disabled_hover_text(reason);
|
||||
}
|
||||
if clicked
|
||||
&& failure.is_none()
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
//! [`complete`] adds suggestions (parameters, functions, units) under any expression box: the
|
||||
//! names come from `parameters.complete`, cached per document revision by [`publish`].
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use std::sync::Arc;
|
||||
|
||||
use serde_json::{Value, json};
|
||||
@@ -274,7 +273,7 @@ pub fn show(app: &mut SolveApp, ctx: &egui::Context) {
|
||||
});
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if ui_kit::icon_label_button(ui, "Import…", "import_tray", true, false)
|
||||
.backing_on_hover_text(crate::i18n::tr_label("CSV or JSON: updates existing parameters, adds new ones"))
|
||||
.on_hover_text(crate::i18n::tr_label("CSV or JSON: updates existing parameters, adds new ones"))
|
||||
.clicked()
|
||||
{
|
||||
app.pick_open_command("parameters.import", json!({}), IMPORT_TYPES);
|
||||
@@ -602,7 +601,7 @@ fn table(app: &mut SolveApp, ui: &mut egui::Ui, d: &mut ParamsDialog, rows: &[&R
|
||||
}
|
||||
});
|
||||
row.cell(|ui| {
|
||||
ui_kit::text(ui, &shown, ui_kit::Text::Value(&format!("value:{}", r.name), error)).backing_on_hover_text(&shown);
|
||||
ui_kit::text(ui, &shown, ui_kit::Text::Value(&format!("value:{}", r.name), error)).on_hover_text(&shown);
|
||||
});
|
||||
row.cell(|ui| {
|
||||
let mut comment = d.comments.get(&r.name).cloned().unwrap_or_else(|| r.comment.clone());
|
||||
@@ -701,7 +700,7 @@ fn apply_held(app: &mut SolveApp, d: &mut ParamsDialog, rows: &[Row]) -> bool {
|
||||
/// back on applies what was waiting.
|
||||
fn apply_live_checkbox(app: &mut SolveApp, ui: &mut egui::Ui, d: &mut ParamsDialog, rows: &[Row]) {
|
||||
let response = ui_kit::checkbox(ui, crate::i18n::tr("parameters.apply_live"), &mut app.preferences.parameters_apply_live)
|
||||
.backing_on_hover_text(crate::i18n::tr("parameters.apply_live_tip"));
|
||||
.on_hover_text(crate::i18n::tr("parameters.apply_live_tip"));
|
||||
crate::scenario::publish_handle("params:apply_live", response.rect.center());
|
||||
if response.changed() && app.preferences.parameters_apply_live {
|
||||
apply_held(app, d, rows);
|
||||
@@ -755,7 +754,7 @@ fn add_row(app: &mut SolveApp, ui: &mut egui::Ui, table: &mut ui_kit::Table<'_>,
|
||||
left |= !completed && response.lost_focus();
|
||||
});
|
||||
row.cell(|ui| {
|
||||
ui_kit::text(ui, &value, ui_kit::Text::Value("new_value", invalid)).backing_on_hover_text(&value);
|
||||
ui_kit::text(ui, &value, ui_kit::Text::Value("new_value", invalid)).on_hover_text(&value);
|
||||
});
|
||||
row.cell(|ui| {
|
||||
let response = ui_kit::cell_editor(ui, comment_id, &mut d.new_comment, "Comment", false);
|
||||
|
||||
@@ -24,7 +24,6 @@ mod look;
|
||||
mod rest;
|
||||
mod snap_fit;
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use egui::{Pos2, vec2};
|
||||
use look::{
|
||||
CrossStyle, DIM, DIM_S, MARKER_ACTIVE, MARKER_HOT, RING_ACTIVE, RING_OPEN, RING_PX, RingStyle, angle_label, compass, crosshair, footprint, ring,
|
||||
@@ -251,7 +250,7 @@ pub(crate) fn show(app: &mut SolveApp, ui: &mut egui::Ui, painter: &egui::Painte
|
||||
let (hovered, dragging) = (r.hovered(), r.dragged());
|
||||
// The tip while pointing, not while dragging: the hand is busy and the footprint says it all.
|
||||
if hovered && !dragging {
|
||||
r.clone().backing_on_hover_text(crate::i18n::tr_label(sp.move_tip));
|
||||
r.clone().on_hover_text(crate::i18n::tr_label(sp.move_tip));
|
||||
}
|
||||
// The handle not in use steps back while the other one works (the ring's drag is last frame's).
|
||||
let turning = ui.data(|m| m.get_temp::<bool>(id("turning"))).unwrap_or(false);
|
||||
@@ -341,7 +340,7 @@ pub(crate) fn show(app: &mut SolveApp, ui: &mut egui::Ui, painter: &egui::Painte
|
||||
compass(painter, &on, &dirs, style.active);
|
||||
}
|
||||
if hovered && !dragging {
|
||||
r.clone().backing_on_hover_text(crate::i18n::tr_label(turn.tip));
|
||||
r.clone().on_hover_text(crate::i18n::tr_label(turn.tip));
|
||||
}
|
||||
if hovered || dragging {
|
||||
ui.ctx().set_cursor_icon(if dragging { egui::CursorIcon::Grabbing } else { egui::CursorIcon::Grab });
|
||||
|
||||
@@ -11,7 +11,6 @@ use egui::RichText;
|
||||
use serde::Deserialize;
|
||||
|
||||
use crate::SolveApp;
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
|
||||
/// How many turned-off ids a preferences file may name.
|
||||
pub const MAX_DISABLED: usize = 256;
|
||||
@@ -213,7 +212,7 @@ fn page_in_dir(app: &mut SolveApp, ui: &mut egui::Ui, dir: Option<&Path>) {
|
||||
if !searching {
|
||||
ui.horizontal(|ui| {
|
||||
let button = crate::ui_kit::icon_label_button(ui, crate::i18n::tr("prefs.plugins_show_folder"), "folder", true, false)
|
||||
.backing_on_hover_text(crate::i18n::format("ui.plugins_note", &[("path", &path)]));
|
||||
.on_hover_text(crate::i18n::format("ui.plugins_note", &[("path", &path)]));
|
||||
crate::scenario::publish_target("prefs:plugins:folder", button.rect);
|
||||
if button.clicked() {
|
||||
if let Err(e) = std::fs::create_dir_all(dir) {
|
||||
|
||||
+25
-300
@@ -1,7 +1,6 @@
|
||||
//! Grouped preferences composed with the shared UI kit. Changes apply immediately; Cancel
|
||||
//! restores the opening snapshot, Apply keeps editing, and Defaults affects the current page.
|
||||
|
||||
use crate::ui_kit::BackingTooltipExt as _;
|
||||
use solidcraft_engine::geom::prelude::*;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
@@ -986,7 +985,7 @@ macro_rules! preference_settings {
|
||||
(@page $page:expr) => { Some($page) };
|
||||
(@control $app:ident, $ui:ident, $field:ident, check($label:literal $(, $help:literal)?)) => {
|
||||
ui_kit::checkbox($ui, crate::i18n::tr_label($label), &mut $app.preferences.$field)
|
||||
$(.backing_on_hover_text(crate::i18n::tr_label($help)))?
|
||||
$(.on_hover_text(crate::i18n::tr_label($help)))?
|
||||
};
|
||||
(@control $app:ident, $ui:ident, $field:ident, check_tr($label:literal)) => {
|
||||
ui_kit::checkbox($ui, crate::i18n::tr($label), &mut $app.preferences.$field)
|
||||
@@ -2020,8 +2019,8 @@ fn theme_row(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
});
|
||||
});
|
||||
} else {
|
||||
let tile = ui_kit::theme_import_tile(ui, app.tr_label("Import…"), app.tr("prefs.theme_file"))
|
||||
.backing_on_hover_text(app.tr("prefs.theme_import_hint"));
|
||||
let tile =
|
||||
ui_kit::theme_import_tile(ui, app.tr_label("Import…"), app.tr("prefs.theme_file")).on_hover_text(app.tr("prefs.theme_import_hint"));
|
||||
import_tile = Some(tile.rect);
|
||||
if tile.clicked() {
|
||||
action = Some("import");
|
||||
@@ -2050,7 +2049,7 @@ fn theme_row(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
] {
|
||||
if let Some(rect) = crate::scenario::rect_of(&format!("prefs:carousel:{}", crate::i18n::tr(label))) {
|
||||
crate::scenario::publish_target(handle, rect);
|
||||
ui.interact(rect, ui.make_persistent_id((handle, "help")), egui::Sense::hover()).backing_on_hover_text(app.tr(help));
|
||||
ui.interact(rect, ui.make_persistent_id((handle, "help")), egui::Sense::hover()).on_hover_text(app.tr(help));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2133,7 +2132,7 @@ fn follow_row(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
if !path.is_empty() {
|
||||
let name = std::path::Path::new(&path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default();
|
||||
ui_kit::settings_inline_note(ui, &name);
|
||||
ui_kit::help_icon(ui, app.tr(if launch { "prefs.theme_follow_launch" } else { "prefs.theme_follow_note" })).backing_on_hover_text(&path);
|
||||
ui_kit::help_icon(ui, app.tr(if launch { "prefs.theme_follow_launch" } else { "prefs.theme_follow_note" })).on_hover_text(&path);
|
||||
}
|
||||
});
|
||||
if let Some(error) = error.filter(|_| !path.is_empty()) {
|
||||
@@ -2716,7 +2715,7 @@ pub fn show(app: &mut SolveApp, ctx: &egui::Context) {
|
||||
Some((Tokens::get().space_24 * 2.0, crate::settings_profiles::sidebar)),
|
||||
|ui| {
|
||||
let defaults = ui_kit::button(ui, crate::i18n::tr("prefs.restore_page_defaults"), ui_kit::Button::Ghost)
|
||||
.backing_on_hover_text(crate::i18n::tr("ui.reset_the_settings_on_this_page"));
|
||||
.on_hover_text(crate::i18n::tr("ui.reset_the_settings_on_this_page"));
|
||||
crate::scenario::publish_target("prefs:defaults", defaults.rect);
|
||||
if defaults.clicked() {
|
||||
button = Some("defaults");
|
||||
@@ -2893,7 +2892,7 @@ fn nav_bridge(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
(None, true) => Some((app.tr("ui.nav_bridge_waiting").to_owned(), true)),
|
||||
};
|
||||
ui.with_layout(egui::Layout::left_to_right(egui::Align::Min).with_main_wrap(true), |ui| {
|
||||
ui_kit::checkbox(ui, &label, &mut app.preferences.nav_bridge_enabled).backing_on_hover_text(&tip);
|
||||
ui_kit::checkbox(ui, &label, &mut app.preferences.nav_bridge_enabled).on_hover_text(&tip);
|
||||
if let Some((status, waiting)) = &status {
|
||||
ui_kit::settings_state_badge(ui, status, if *waiting { ui_kit::SettingsBadgeTone::Warning } else { ui_kit::SettingsBadgeTone::Success });
|
||||
}
|
||||
@@ -3463,69 +3462,6 @@ fn active_theme_file(app: &SolveApp) -> Option<&crate::theme_files::ThemeFile> {
|
||||
.or_else(|| crate::theme_files::find(&app.preferences.theme, &app.preferences.custom_themes))
|
||||
}
|
||||
|
||||
/// The single runtime decision used by controls, ui.prefs and renderer activation. It never
|
||||
/// changes saved intent or caches accessibility/hardware state in palette tokens.
|
||||
pub(crate) fn blur_availability(app: &SolveApp) -> crate::theme_options::Availability {
|
||||
blur_availability_for(app, active_theme_file(app).is_some_and(crate::theme_options::declares_blur))
|
||||
}
|
||||
|
||||
fn blur_availability_for(app: &SolveApp, offered: bool) -> crate::theme_options::Availability {
|
||||
use crate::theme_options::Availability::{Available, Unavailable};
|
||||
let reduced = app.services.reduce_transparency.as_ref().and_then(|read| read(offered));
|
||||
if !offered && app.blur_session.harness_radius.is_none() {
|
||||
return Available;
|
||||
}
|
||||
if let Some(reason) = app.blur_session.harness_unavailable {
|
||||
return Unavailable(reason);
|
||||
}
|
||||
// State owns CPU policy, including the explicit cfg(test) rendering fixture. The
|
||||
// adapter identity stays real; production CPU capability can never be Available.
|
||||
let capability = app.blur.capability();
|
||||
if app.blur.software_adapter() && capability != crate::blur::Capability::Available {
|
||||
return Unavailable("prefs.blur_software");
|
||||
}
|
||||
if cfg!(target_arch = "wasm32") {
|
||||
return Unavailable("prefs.blur_web");
|
||||
}
|
||||
if reduced == Some(true) {
|
||||
return Unavailable("prefs.blur_reduce_transparency");
|
||||
}
|
||||
if app.home.open || crate::render_workspace::result_active(app) {
|
||||
return Unavailable("prefs.blur_source");
|
||||
}
|
||||
match capability {
|
||||
crate::blur::Capability::Available => Available,
|
||||
crate::blur::Capability::Unavailable(_) => Unavailable("prefs.blur_device"),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn prepare_blur(app: &mut SolveApp, ctx: &egui::Context) {
|
||||
if ctx.viewport_id() != egui::ViewportId::ROOT {
|
||||
return;
|
||||
}
|
||||
let intent = crate::theme::blur_intent(ctx);
|
||||
let radius = app.blur_session.harness_radius.unwrap_or(intent.radius);
|
||||
// Disabled frames need only cached intent and atomic OS observation. Explicit UI/API
|
||||
// queries still report capabilities at radius zero; painting need not probe the GPU.
|
||||
let availability = if radius > 0.0 {
|
||||
blur_availability_for(app, intent.offered)
|
||||
} else {
|
||||
if let Some(read) = &app.services.reduce_transparency {
|
||||
read(intent.offered);
|
||||
}
|
||||
crate::theme_options::Availability::Available
|
||||
};
|
||||
// Resolve raw/default intent separately so temporary unavailability never drives the
|
||||
// renderer through radius=0 and clears a latched device/allocation failure.
|
||||
let available = availability == crate::theme_options::Availability::Available;
|
||||
app.blur_session.sample(ctx, intent.revision, radius, available, app.blur.painted_frame());
|
||||
app.blur.set_available(available);
|
||||
app.blur.set_tier_cap(app.blur_session.guard.cap);
|
||||
if let Err(error) = app.blur.set_radius(radius) {
|
||||
log::warn!("theme blur: {error}");
|
||||
}
|
||||
}
|
||||
|
||||
fn followed_theme<'a>(prefs: &Prefs, follow: &'a crate::theme_files::Follow) -> Option<&'a crate::theme_files::ThemeFile> {
|
||||
(!follow.path(&prefs.theme_follow).is_empty()).then(|| follow.theme()).flatten()
|
||||
}
|
||||
@@ -3593,7 +3529,6 @@ fn theme_option_rows<'a>(
|
||||
file: &'a crate::theme_files::ThemeFile,
|
||||
language: &str,
|
||||
providers: &[crate::theme_options::Provider],
|
||||
blur: crate::theme_options::Availability,
|
||||
) -> Vec<ui_kit::ThemeOptionRow<'a>> {
|
||||
use crate::theme_options::{Availability, offered, provider};
|
||||
let locale = crate::i18n::Locale::for_language(language);
|
||||
@@ -3603,7 +3538,6 @@ fn theme_option_rows<'a>(
|
||||
let provider = provider(&definition.id, providers);
|
||||
ui_kit::ThemeOptionRow {
|
||||
definition,
|
||||
blur: definition.id == "blur",
|
||||
label: provider
|
||||
.map(|p| locale.text(p.label).to_owned())
|
||||
.unwrap_or_else(|| theme_option_text(&definition.label, language, &definition.id)),
|
||||
@@ -3614,50 +3548,22 @@ fn theme_option_rows<'a>(
|
||||
}
|
||||
_ => Vec::new(),
|
||||
},
|
||||
reason: match crate::theme_options::availability(file, &definition.id, providers, blur) {
|
||||
reason: provider.and_then(|p| match (p.availability)() {
|
||||
Availability::Available => None,
|
||||
Availability::Unavailable(reason) => Some(locale.text(reason).to_owned()),
|
||||
},
|
||||
}),
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn theme_options_row(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
let availability = blur_availability(app);
|
||||
let Some(file) = active_theme_file(app).cloned() else { return };
|
||||
let (mut values, notices) = effective_theme_options(&app.preferences, &file);
|
||||
// Notices precede the empty-control return: newer requirements intentionally have no rows.
|
||||
let mut problems: Vec<_> = notices
|
||||
.iter()
|
||||
.map(|notice| {
|
||||
let raw = app.preferences.theme_options.get(&file.id).and_then(|v| v.get(¬ice.id));
|
||||
(notice.id.clone(), format!("{:?}:{raw:?}", notice.kind), crate::i18n::format("prefs.theme_option_invalid", &[("option", ¬ice.id)]))
|
||||
})
|
||||
.collect();
|
||||
if file.needs_newer() {
|
||||
problems.push(("newer".into(), file.requires.to_string(), app.tr("prefs.theme_options_newer").to_owned()));
|
||||
}
|
||||
for (id, identity, text) in problems {
|
||||
let key = theme_notice_key(&file.id, &id, &identity);
|
||||
if !app.blur_session.dismissed(key) && ui_kit::theme_option_notice(ui, &id, &text, false).1 {
|
||||
app.blur_session.dismiss(key);
|
||||
}
|
||||
}
|
||||
if app.blur_session.guard.notice {
|
||||
let (undo, dismiss) = ui_kit::theme_option_notice(ui, "guard", app.tr("prefs.blur_guard"), true);
|
||||
if undo {
|
||||
app.blur_session.guard.undo();
|
||||
ui.ctx().request_repaint();
|
||||
}
|
||||
if dismiss {
|
||||
app.blur_session.guard.notice = false;
|
||||
}
|
||||
}
|
||||
let rows = theme_option_rows(&file, crate::i18n::effective_language(&app.preferences.language), crate::theme_options::PROVIDERS, availability);
|
||||
let Some(file) = active_theme_file(app) else { return };
|
||||
let rows = theme_option_rows(file, crate::i18n::effective_language(&app.preferences.language), crate::theme_options::PROVIDERS);
|
||||
if rows.is_empty() {
|
||||
return;
|
||||
}
|
||||
let (mut values, _) = effective_theme_options(&app.preferences, file);
|
||||
let before = values.clone();
|
||||
let reset = ui_kit::settings_card(ui, |ui| ui_kit::theme_options_list(ui, &file.id, &file.name, &rows, &mut values)).inner;
|
||||
let changes: BTreeMap<_, _> = values.into_iter().filter(|(id, value)| before.get(id) != Some(value)).collect();
|
||||
@@ -3672,13 +3578,6 @@ fn theme_options_row(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
}
|
||||
|
||||
fn theme_notice_key(theme: &str, problem: &str, raw: &str) -> u64 {
|
||||
use std::hash::{Hash, Hasher};
|
||||
let mut hash = std::collections::hash_map::DefaultHasher::new();
|
||||
(theme, problem, raw).hash(&mut hash);
|
||||
hash.finish()
|
||||
}
|
||||
|
||||
/// Only explicitly supplied entries are checked. Stale saved entries survive unrelated changes.
|
||||
fn merge_theme_options(prefs: &mut Prefs, followed: Option<&crate::theme_files::ThemeFile>, update: &serde_json::Value) -> Result<(), String> {
|
||||
use crate::theme_files::{OptionKind, OptionValue};
|
||||
@@ -3745,14 +3644,13 @@ fn theme_options_reply(app: &SolveApp) -> solidcraft_engine::schema::ui_prefs::T
|
||||
.to_string()
|
||||
};
|
||||
let (values, notices) = effective_theme_options(&app.preferences, file);
|
||||
let blur = blur_availability(app);
|
||||
ThemeOptionsReply {
|
||||
theme_option_defs: crate::theme_files::ordered_options(file)
|
||||
.into_iter()
|
||||
.map(|o| {
|
||||
let standard = crate::theme_options::standard(&o.id);
|
||||
let provider = crate::theme_options::provider(&o.id, crate::theme_options::PROVIDERS);
|
||||
let availability = crate::theme_options::availability(file, &o.id, crate::theme_options::PROVIDERS, blur);
|
||||
let availability = provider.map(|p| (p.availability)());
|
||||
ThemeOptionDef {
|
||||
id: o.id.clone(),
|
||||
kind: match &o.kind {
|
||||
@@ -3771,10 +3669,11 @@ fn theme_options_reply(app: &SolveApp) -> solidcraft_engine::schema::ui_prefs::T
|
||||
advanced: o.advanced,
|
||||
section: o.section.clone(),
|
||||
standard,
|
||||
available: availability == crate::theme_options::Availability::Available,
|
||||
available: !standard || availability == Some(crate::theme_options::Availability::Available),
|
||||
reason: match availability {
|
||||
crate::theme_options::Availability::Unavailable(reason) => Some(app.tr(reason).to_owned()),
|
||||
crate::theme_options::Availability::Available => None,
|
||||
Some(crate::theme_options::Availability::Unavailable(reason)) => Some(app.tr(reason).to_owned()),
|
||||
None if standard => Some("not implemented".into()),
|
||||
_ => None,
|
||||
},
|
||||
}
|
||||
})
|
||||
@@ -6930,12 +6829,12 @@ mod tests {
|
||||
if count == 0 {
|
||||
let viewport = crate::scenario::rect_of("prefs:section:viewport_logo").unwrap();
|
||||
let mut unknown = theme_options_fixture(base, count);
|
||||
unknown["options"] = json!([]);
|
||||
unknown["options"] = json!([{"id":"blur","type":"range","default":0}]);
|
||||
h.call("ui.prefs", json!({"theme_import":unknown}));
|
||||
h.frames(2);
|
||||
assert!(crate::scenario::rect_of("prefs:theme_options_header").is_none());
|
||||
assert!(crate::scenario::rect_of(&format!("prefs:theme_options_badge:{id}")).is_none());
|
||||
assert_eq!(crate::scenario::rect_of("prefs:section:viewport_logo").unwrap(), viewport, "empty declarations add no gap or notice");
|
||||
assert_eq!(crate::scenario::rect_of("prefs:section:viewport_logo").unwrap(), viewport, "unknown providers add no gap or notice");
|
||||
}
|
||||
if count == 12 {
|
||||
assert!(crate::scenario::rect_of("prefs:theme_option:outline").is_none());
|
||||
@@ -7144,11 +7043,11 @@ mod tests {
|
||||
{"id":"opacity","type":"range","default":100}
|
||||
]}))
|
||||
.unwrap();
|
||||
let rows = theme_option_rows(&file, "de", crate::theme_options::PROVIDERS, Availability::Available);
|
||||
assert_eq!(rows.iter().map(|r| r.definition.id.as_str()).collect::<Vec<_>>(), ["opacity", "blur", "tab_colours", "tab_fade_ms", "custom"]);
|
||||
let rows = theme_option_rows(&file, "de", crate::theme_options::PROVIDERS);
|
||||
assert_eq!(rows.iter().map(|r| r.definition.id.as_str()).collect::<Vec<_>>(), ["opacity", "tab_colours", "tab_fade_ms", "custom"]);
|
||||
assert_eq!(rows[0].label, "Deckkraft");
|
||||
assert_eq!(rows[4].label, "Eigene");
|
||||
assert_eq!(theme_option_rows(&file, "ja", crate::theme_options::PROVIDERS, Availability::Available)[4].label, "Custom", "English fallback");
|
||||
assert_eq!(rows[3].label, "Eigene");
|
||||
assert_eq!(theme_option_rows(&file, "ja", crate::theme_options::PROVIDERS)[3].label, "Custom", "English fallback");
|
||||
let providers = [Provider {
|
||||
id: "blur",
|
||||
label: "prefs.theme_option_opacity",
|
||||
@@ -7156,7 +7055,7 @@ mod tests {
|
||||
availability: || Availability::Unavailable("prefs.theme_options_unavailable"),
|
||||
apply: |_, _| {},
|
||||
}];
|
||||
let rows = theme_option_rows(&file, "en", &providers, Availability::Available);
|
||||
let rows = theme_option_rows(&file, "en", &providers);
|
||||
assert_eq!(rows.iter().map(|r| r.definition.id.as_str()).collect::<Vec<_>>(), ["blur", "custom"]);
|
||||
assert_eq!(rows[0].reason.as_deref(), Some("Unavailable on this device"));
|
||||
// The internal fixture goes through the real kit. No fake provider is shipped.
|
||||
@@ -7192,179 +7091,6 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn blur_slider_reserves_readout_meter_and_disabled_reason() {
|
||||
use crate::theme_files::OptionValue;
|
||||
use crate::theme_options::Availability;
|
||||
let source: serde_json::Value = serde_json::from_str(include_str!("../tests/fixtures/theme-blur.json")).unwrap();
|
||||
let file = crate::theme_files::from_value(&source).unwrap();
|
||||
for dark in [false, true] {
|
||||
crate::theme::set_custom(None);
|
||||
crate::theme::set_dark(dark);
|
||||
for available in [Availability::Available, Availability::Unavailable("prefs.theme_options_unavailable")] {
|
||||
let rows = theme_option_rows(&file, "en", crate::theme_options::PROVIDERS, available);
|
||||
for radius in [0.0, 1.0, 8.0, 9.0, 18.0, 33.0, 40.0, 18.25] {
|
||||
let ctx = crate::fonts::test_context();
|
||||
let mut values = crate::theme_files::effective_values(&file, &BTreeMap::new()).0;
|
||||
values.insert("blur".into(), OptionValue::Num(radius));
|
||||
let before = values.clone();
|
||||
let mut output = egui::FullOutput::default();
|
||||
for _ in 0..2 {
|
||||
crate::scenario::clear_handles();
|
||||
output = crate::test_support::frame(
|
||||
&ctx,
|
||||
egui::RawInput {
|
||||
screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1200.0, 800.0))),
|
||||
..Default::default()
|
||||
},
|
||||
|ui| {
|
||||
ui_kit::scope(ui, |ui| {
|
||||
ui_kit::theme_options_list(ui, &file.id, &file.name, &rows, &mut values);
|
||||
})
|
||||
},
|
||||
);
|
||||
}
|
||||
assert_eq!(values, before, "drawing must preserve fractional intent");
|
||||
let meter = crate::scenario::rect_of("prefs:blur_cost").unwrap();
|
||||
let readout = crate::scenario::rect_of("prefs:theme_option_readout:blur").unwrap();
|
||||
let slider = crate::scenario::rect_of("dialog:slider_track:Blur behind panels").unwrap();
|
||||
assert!(slider.width() > 300.0, "standalone blur fills remaining row width");
|
||||
assert!(slider.right() <= readout.left() && readout.right() <= meter.left());
|
||||
assert_eq!(crate::scenario::rect_of("prefs:theme_option_reason:blur").is_some(), available != Availability::Available);
|
||||
let mut heights = Vec::new();
|
||||
for clipped in &output.shapes {
|
||||
crate::test_support::each_shape(&clipped.shape, &mut |shape| {
|
||||
if let egui::Shape::Rect(rect) = shape
|
||||
&& meter.contains_rect(rect.rect)
|
||||
{
|
||||
heights.push(rect.rect.height());
|
||||
}
|
||||
});
|
||||
}
|
||||
assert_eq!(heights, if radius == 0.0 { vec![2.0] } else { vec![4.0, 6.0, 8.0, 11.0, 14.0] });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn blur_availability_preserves_saved_intent_and_parent_state() {
|
||||
use crate::theme_options::{Availability, Provider};
|
||||
let mut h = crate::scenario::Harness::new();
|
||||
h.app.home.open = false;
|
||||
let source = json!({"format":"solidcraft-theme/1","name":"Blur parent","base":"dark","options":[
|
||||
{"id":"enabled","type":"bool","default":true}, {"id":"blur","type":"range","default":0,"parent":"enabled"},
|
||||
{"id":"amount","type":"range","default":5,"min":0,"max":10,"step":1,"parent":"enabled"}
|
||||
]});
|
||||
control(&mut h.app, &json!({"theme_import":source,"theme_options":{"blur-parent":{"blur":18.25,"amount":7.5}}})).unwrap();
|
||||
let file = active_theme_file(&h.app).unwrap().clone();
|
||||
assert_eq!(file.options.iter().find(|o| o.id == "blur").unwrap().parent, None, "reserved blur ignores authored parenting");
|
||||
assert_eq!(file.options.iter().find(|o| o.id == "amount").unwrap().parent.as_deref(), Some("enabled"));
|
||||
let saved = h.app.preferences.theme_options.clone();
|
||||
let values = effective_theme_options(&h.app.preferences, &file).0;
|
||||
for reason in ["prefs.blur_software", "prefs.blur_web", "prefs.blur_reduce_transparency"] {
|
||||
assert_eq!(crate::theme_options::blur_radius(&file, &values, Availability::Unavailable(reason)), 0.0);
|
||||
assert_eq!(crate::theme_options::blur_radius(&file, &values, Availability::Available), 18.25);
|
||||
}
|
||||
assert_eq!(h.app.preferences.theme_options, saved);
|
||||
let providers = [
|
||||
Provider { id: "enabled", label: "", help: "", availability: || Availability::Unavailable("prefs.blur_software"), apply: |_, _| {} },
|
||||
Provider {
|
||||
id: "blur",
|
||||
label: "prefs.theme_option_blur",
|
||||
help: "prefs.theme_option_blur_help",
|
||||
availability: || Availability::Available,
|
||||
apply: |_, _| {},
|
||||
},
|
||||
];
|
||||
assert_eq!(
|
||||
crate::theme_options::availability(&file, "amount", &providers, Availability::Available),
|
||||
Availability::Unavailable("prefs.blur_software")
|
||||
);
|
||||
assert_eq!(
|
||||
crate::theme_options::availability(&file, "blur", &providers, Availability::Available),
|
||||
Availability::Available,
|
||||
"standard blur remains independent of the unavailable custom parent"
|
||||
);
|
||||
let rows = theme_option_rows(&file, "en", &providers, Availability::Available);
|
||||
let parent = rows.iter().find(|r| r.definition.id == "enabled").unwrap();
|
||||
let child = rows.iter().find(|r| r.definition.id == "amount").unwrap();
|
||||
let blur = rows.iter().find(|r| r.definition.id == "blur").unwrap();
|
||||
assert!(parent.reason.is_some());
|
||||
assert_eq!(child.reason, parent.reason, "the genuine custom child inherits its parent's unavailable reason");
|
||||
assert!(blur.reason.is_none(), "the reserved blur control is unaffected by custom-parent availability");
|
||||
let reduced = std::rc::Rc::new(std::cell::Cell::new(true));
|
||||
let reading = reduced.clone();
|
||||
h.app.services.reduce_transparency = Some(Box::new(move |_| Some(reading.get())));
|
||||
assert_eq!(blur_availability(&h.app), Availability::Unavailable("prefs.blur_reduce_transparency"));
|
||||
let reply = control(&mut h.app, &json!({})).unwrap();
|
||||
assert_eq!(reply["theme_option_values"]["blur"], 18.25);
|
||||
h.frames(2);
|
||||
assert_eq!(h.app.blur.radius(), 18.25, "OS unavailability preserves requested intent");
|
||||
assert_eq!(h.app.preferences.theme_options, saved);
|
||||
assert_eq!(h.app.blur.counters().textures_created, 0);
|
||||
assert_eq!(h.app.blur.counters().markers_emitted, 0);
|
||||
reduced.set(false);
|
||||
assert_ne!(blur_availability(&h.app), Availability::Unavailable("prefs.blur_reduce_transparency"));
|
||||
h.frames(2);
|
||||
assert_eq!(h.app.blur.radius(), 18.25, "renderer retains raw intent even without a GPU");
|
||||
assert_eq!(h.app.blur.counters().textures_created, 0);
|
||||
control(&mut h.app, &json!({"theme_options":{"blur-parent":{"enabled":false}}})).unwrap();
|
||||
h.frames(2);
|
||||
assert_eq!(h.app.blur.radius(), 18.25, "an inactive custom parent cannot turn independent standard blur off");
|
||||
assert_eq!(crate::theme::blur_intent(&h.ctx).radius, 18.25);
|
||||
let reply = control(&mut h.app, &json!({})).unwrap();
|
||||
assert_eq!(reply["theme_option_values"]["enabled"], false);
|
||||
assert_eq!(reply["theme_option_values"]["amount"], 7.5, "an inactive custom child retains its saved value");
|
||||
assert_eq!(h.app.preferences.theme_options["blur-parent"]["blur"], 18.25);
|
||||
control(&mut h.app, &json!({"theme_options":{"blur-parent":{"enabled":true}}})).unwrap();
|
||||
h.frames(2);
|
||||
assert_eq!(h.app.blur.radius(), 18.25);
|
||||
assert_eq!(h.app.preferences.theme_options["blur-parent"]["amount"], 7.5);
|
||||
let counts = h.app.blur.counters();
|
||||
assert_eq!((counts.textures_created, counts.markers_emitted, counts.markers_drawn, counts.live_bytes), (0, 0, 0, 0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn blur_notices_dismiss_by_problem_identity_and_preserve_raw_json() {
|
||||
let mut h = crate::scenario::Harness::new();
|
||||
h.app.home.open = false;
|
||||
h.call("ui.resize", json!({"width":1600,"height":1100}));
|
||||
h.call("ui.prefs", json!({"theme_import":option_theme_file("Notice blur"),"open":"Interface"}));
|
||||
h.app.preferences.theme_options.insert("notice-blur".into(), BTreeMap::from([("blur".into(), json!({"future":18}))]));
|
||||
h.frames(3);
|
||||
assert!(crate::scenario::rect_of("prefs:theme_notice:blur").is_some());
|
||||
h.step(&json!({"click":{"handle":"prefs:theme_notice_dismiss:blur"}})).unwrap();
|
||||
h.frames(2);
|
||||
assert!(crate::scenario::rect_of("prefs:theme_notice:blur").is_none());
|
||||
assert_eq!(h.app.preferences.theme_options["notice-blur"]["blur"], json!({"future":18}));
|
||||
let reply = control(&mut h.app, &json!({})).unwrap();
|
||||
assert_eq!(reply["theme_option_notices"], json!([{"id":"blur","kind":"wrong_type"}]));
|
||||
h.app.preferences.theme_options.get_mut("notice-blur").unwrap().insert("blur".into(), json!({"future":19}));
|
||||
h.frames(2);
|
||||
assert!(crate::scenario::rect_of("prefs:theme_notice:blur").is_some(), "changed raw value must reappear");
|
||||
h.call(
|
||||
"ui.prefs",
|
||||
json!({"theme_import":{"format":"solidcraft-theme/1","name":"Future blur","base":"dark","requires":2,
|
||||
"options":[{"id":"blur","type":"range","default":18}]}}),
|
||||
);
|
||||
h.frames(2);
|
||||
assert!(crate::scenario::rect_of("prefs:theme_notice:newer").is_some());
|
||||
assert!(crate::scenario::rect_of("prefs:theme_options_header").is_none());
|
||||
h.step(&json!({"click":{"handle":"prefs:theme_notice_dismiss:newer"}})).unwrap();
|
||||
h.frames(2);
|
||||
assert!(crate::scenario::rect_of("prefs:theme_notice:newer").is_none());
|
||||
assert!(active_theme_file(&h.app).unwrap().options.is_empty(), "unsupported tables were discarded, never auto-restored");
|
||||
h.app.preferences.custom_themes.iter_mut().find(|f| f.id == "future-blur").unwrap().requires = 3;
|
||||
h.frames(2);
|
||||
assert!(crate::scenario::rect_of("prefs:theme_notice:newer").is_some());
|
||||
for identity in 0..80 {
|
||||
h.app.blur_session.dismiss(identity);
|
||||
}
|
||||
assert!(!h.app.blur_session.dismissed(0), "dismissal storage is bounded");
|
||||
assert!(h.app.blur_session.dismissed(79));
|
||||
}
|
||||
|
||||
fn option_theme_file(name: &str) -> serde_json::Value {
|
||||
json!({
|
||||
"format": "solidcraft-theme/1", "name": name, "base": "dark", "colors": {"panel": "#112233"},
|
||||
@@ -7846,8 +7572,7 @@ mod tests {
|
||||
assert_eq!(reply.options.theme_option_defs.iter().map(|o| o.id.as_str()).collect::<Vec<_>>(), ["blur", "enabled", "amount", "style"]);
|
||||
let defs = &reply.options.theme_option_defs;
|
||||
assert!(defs[0].standard && !defs[0].available);
|
||||
let crate::theme_options::Availability::Unavailable(reason) = blur_availability(&h.app) else { panic!("headless fixture has no GPU") };
|
||||
assert_eq!(defs[0].reason.as_deref(), Some(crate::i18n::Locale::for_language("de").text(reason)));
|
||||
assert_eq!(defs[0].reason.as_deref(), Some("not implemented"));
|
||||
assert_eq!((&defs[1].label, &defs[1].help), (&"Aktiv".to_string(), &"Farben verwenden".to_string()));
|
||||
assert!(defs[1].available && defs[1].reason.is_none());
|
||||
assert!(defs[2].advanced && defs[2].section.as_deref() == Some("Details"));
|
||||
|
||||
@@ -91,7 +91,7 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
),
|
||||
] {
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
let response = setting(app, ui).backing_on_hover_text(app.tr(help));
|
||||
let response = setting(app, ui).on_hover_text(app.tr(help));
|
||||
crate::scenario::publish_target(&format!("prefs:{target}"), response.rect);
|
||||
crate::scenario::publish_target(&format!("dialog:{legacy}"), response.rect);
|
||||
if !crate::prefs_search::suppress_chrome(ui) {
|
||||
@@ -139,7 +139,7 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
}
|
||||
});
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
let response = setting::offer_stand_up(app, ui).backing_on_hover_text(app.tr("prefs.stand_up_note"));
|
||||
let response = setting::offer_stand_up(app, ui).on_hover_text(app.tr("prefs.stand_up_note"));
|
||||
crate::scenario::publish_target("prefs:offer_stand_up", response.rect);
|
||||
if !crate::prefs_search::suppress_chrome(ui) {
|
||||
ui_kit::help_icon(ui, app.tr("prefs.stand_up_note"));
|
||||
@@ -176,7 +176,7 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
crate::scenario::publish_target("prefs:update_changed_links", response.rect);
|
||||
crate::scenario::publish_target("dialog:Update changed linked designs when a tab comes back", response.rect);
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
let response = setting::double_click_components(app, ui).backing_on_hover_text(app.tr("prefs.design_tools.double_click_help"));
|
||||
let response = setting::double_click_components(app, ui).on_hover_text(app.tr("prefs.design_tools.double_click_help"));
|
||||
crate::scenario::publish_target("prefs:double_click_components", response.rect);
|
||||
crate::scenario::publish_target("dialog:Double-click a component to activate it, or to edit a linked one in place", response.rect);
|
||||
if !crate::prefs_search::suppress_chrome(ui) {
|
||||
|
||||
@@ -104,7 +104,7 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
let (single, tip) = (app.tr("ui.slicer_single_instance").to_string(), app.tr("ui.slicer_single_instance_tip").to_string());
|
||||
let width = (ui.available_width() - t.space_16 - ui.spacing().item_spacing.x).max(0.0);
|
||||
ui.allocate_ui_with_layout(egui::vec2(width, t.control_height), egui::Layout::left_to_right(egui::Align::Center), |ui| {
|
||||
ui_kit::checkbox(ui, &single, &mut app.preferences.slicer_single_instance).backing_on_hover_text(&tip);
|
||||
ui_kit::checkbox(ui, &single, &mut app.preferences.slicer_single_instance).on_hover_text(&tip);
|
||||
});
|
||||
ui_kit::help_icon(ui, &tip);
|
||||
});
|
||||
@@ -135,7 +135,7 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui) {
|
||||
let badge = ui_kit::settings_state_badge(ui, &label, tone);
|
||||
crate::scenario::publish_rect("prefs:crash_count", badge.rect);
|
||||
if ui_kit::button(ui, app.tr("prefs.crash_reports"), ui_kit::Button::Normal)
|
||||
.backing_on_hover_text(app.tr("prefs.crash_reports_note"))
|
||||
.on_hover_text(app.tr("prefs.crash_reports_note"))
|
||||
.clicked()
|
||||
{
|
||||
crate::crash_ui::open(app);
|
||||
@@ -192,7 +192,7 @@ fn file_size_rows(app: &mut SolveApp, ui: &mut egui::Ui, labels: f32) {
|
||||
ui_kit::number_field(ui, value, default..=top, 1.0, "")
|
||||
})
|
||||
.inner
|
||||
.backing_on_hover_text(&help);
|
||||
.on_hover_text(&help);
|
||||
crate::scenario::publish_rect(handle, field.rect);
|
||||
let size = limits::describe(value.saturating_mul(limits::MB));
|
||||
let note = if *value >= 1024 { format!("{unit} ({size})") } else { unit.to_owned() };
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user