From ceed60449808510acd8b77a5f97e603f351ae413 Mon Sep 17 00:00:00 2001 From: dudedagger42 <76926918+dudedagger42@users.noreply.github.com> Date: Sun, 25 Oct 2026 17:42:51 +0000 Subject: [PATCH] Mesh export: a quality choice, so small round features get enough sides (#4747) (#4773) Every STL, OBJ and 3MF export meshed each body with a chord tolerance of 2e-4 of its size, with no way to ask for finer: a 3 mm hole in a 200 mm part came out with about 14 sides. file.export and file.save_mesh take `quality`: standard (as before, the default), fine (5e-5) or finest (1e-5), and Save As Mesh has a Quality row, remembered like its format. Co-authored-by: Claude Opus 5.5 --- assets/locales/cs.json | 4 ++ assets/locales/da.json | 4 ++ assets/locales/de.json | 4 ++ assets/locales/en.json | 4 ++ assets/locales/es.json | 4 ++ assets/locales/fr.json | 4 ++ assets/locales/gl.json | 4 ++ assets/locales/hu.json | 4 ++ assets/locales/id.json | 4 ++ assets/locales/it.json | 4 ++ assets/locales/ja.json | 4 ++ assets/locales/ko.json | 4 ++ assets/locales/ms.json | 4 ++ assets/locales/nl.json | 4 ++ assets/locales/pl.json | 4 ++ assets/locales/pt-BR.json | 4 ++ assets/locales/ro.json | 4 ++ assets/locales/ru.json | 4 ++ assets/locales/sv.json | 4 ++ assets/locales/tr.json | 4 ++ assets/locales/uk.json | 4 ++ assets/locales/vi.json | 4 ++ assets/locales/zh-TW.json | 4 ++ assets/locales/zh.json | 4 ++ crates/engine/src/cmd/file.rs | 60 +++++++++++++++++++++--- crates/io/src/lib.rs | 61 ++++++++++++++++++++++--- crates/ui-egui/src/dialogs_save_mesh.rs | 13 +++++- crates/ui-egui/src/prefs.rs | 2 + 28 files changed, 219 insertions(+), 13 deletions(-) diff --git a/assets/locales/cs.json b/assets/locales/cs.json index 2b515fa4a..9fc909d55 100644 --- a/assets/locales/cs.json +++ b/assets/locales/cs.json @@ -1759,6 +1759,8 @@ "ui.filter_commands_or_keys": "Filtrovat příkazy nebo klávesy", "ui.findInTimeline": "Najít na časové ose", "ui.findInWindow": "Najít v okně", + "ui.fine": "Jemná", + "ui.finest": "Nejjemnější", "ui.finish_sketch": "Dokončit náčrt", "ui.fit": "Přizpůsobit", "ui.fix_unfix": "Zafixovat/uvolnit", @@ -1986,6 +1988,7 @@ "ui.project_face_edges_sketch": "Promítat hrany plochy do nových náčrtů", "ui.properties": "Vlastnosti", "ui.pull_direction": "Směr vyjímání", + "ui.quality": "Kvalita", "ui.quantity": "Počet", "ui.quantity_2": "Počet 2", "ui.quit": "Ukončit", @@ -2080,6 +2083,7 @@ "ui.spline": "Splajn", "ui.split_body": "Rozdělit těleso", "ui.stand_up_tip": "Když se soubor STEP nebo IGES otevře s osou Z nahoru, nabídnout otočení o čtvrt otáčky kolem X", + "ui.standard": "Standardní", "ui.start": "Start", "ui.start_over": "Začít znovu", "ui.start_page": "Úvodní stránka", diff --git a/assets/locales/da.json b/assets/locales/da.json index d6cfd05aa..374701217 100644 --- a/assets/locales/da.json +++ b/assets/locales/da.json @@ -1592,6 +1592,8 @@ "ui.filter_commands_or_keys": "Filtrér kommandoer eller taster", "ui.findInTimeline": "Find i tidslinje", "ui.findInWindow": "Find i vindue", + "ui.fine": "Fin", + "ui.finest": "Fineste", "ui.finish_sketch": "Afslut skitse", "ui.fit": "Tilpas", "ui.fix_unfix": "Lås fast/frigør", @@ -1816,6 +1818,7 @@ "ui.project_face_edges_sketch": "Projektér fladekanter til nye skitser", "ui.properties": "Egenskaber", "ui.pull_direction": "Udtræksretning", + "ui.quality": "Kvalitet", "ui.quantity": "Antal", "ui.quantity_2": "Antal 2", "ui.quit": "Afslut", @@ -1910,6 +1913,7 @@ "ui.spline": "Spline", "ui.split_body": "Opdel emne", "ui.stand_up_tip": "Når en STEP- eller IGES-fil åbnes med Z opad, tilbydes en kvart omdrejning om X", + "ui.standard": "Standard", "ui.start": "Start", "ui.start_over": "Start forfra", "ui.start_page": "Startside", diff --git a/assets/locales/de.json b/assets/locales/de.json index 997e90262..783e43648 100644 --- a/assets/locales/de.json +++ b/assets/locales/de.json @@ -1847,6 +1847,8 @@ "ui.filter_commands_or_keys": "Befehle oder Tasten filtern", "ui.findInTimeline": "In der Zeitleiste suchen", "ui.findInWindow": "Im Fenster suchen", + "ui.fine": "Fein", + "ui.finest": "Sehr fein", "ui.finish_sketch": "Skizze beenden", "ui.fit": "Einpassen", "ui.fix_unfix": "Fixieren/Lösen", @@ -2075,6 +2077,7 @@ "ui.project_face_edges_sketch": "Flächenkanten in neue Skizzen projizieren", "ui.properties": "Eigenschaften", "ui.pull_direction": "Entformungsrichtung", + "ui.quality": "Qualität", "ui.quantity": "Anzahl", "ui.quantity_2": "Anzahl 2", "ui.quit": "Beenden", @@ -2176,6 +2179,7 @@ "ui.spline": "Spline", "ui.split_body": "Körper trennen", "ui.stand_up_tip": "Nach dem Öffnen einer STEP- oder IGES-Datei mit Z nach oben eine Vierteldrehung um X anbieten", + "ui.standard": "Standard", "ui.start": "Start", "ui.start_over": "Von vorn beginnen", "ui.start_page": "Startseite", diff --git a/assets/locales/en.json b/assets/locales/en.json index 73f6a97d6..aec612a4b 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -2687,6 +2687,8 @@ "ui.filter_commands_or_keys": "Filter commands or keys", "ui.findInTimeline": "Find in Timeline", "ui.findInWindow": "Find in Window", + "ui.fine": "Fine", + "ui.finest": "Finest", "ui.finish_sketch": "Finish Sketch", "ui.fit": "Fit", "ui.fix_unfix": "Fix/Unfix", @@ -2933,6 +2935,7 @@ "ui.project_face_edges_sketch": "Project face edges into new sketches", "ui.properties": "Properties", "ui.pull_direction": "Pull direction", + "ui.quality": "Quality", "ui.quantity": "Quantity", "ui.quantity_2": "Quantity 2", "ui.quit": "Quit", @@ -3039,6 +3042,7 @@ "ui.spline": "Spline", "ui.split_body": "Split Body", "ui.stand_up_tip": "After a STEP or IGES file opens with Z up, offer a quarter turn about X", + "ui.standard": "Standard", "ui.start": "Start", "ui.start_over": "Start over", "ui.start_page": "Start page", diff --git a/assets/locales/es.json b/assets/locales/es.json index f4ab9b846..285f77249 100644 --- a/assets/locales/es.json +++ b/assets/locales/es.json @@ -2240,6 +2240,8 @@ "ui.filter_commands_or_keys": "Filtrar comandos o teclas", "ui.findInTimeline": "Buscar en la línea de tiempo", "ui.findInWindow": "Buscar en la ventana", + "ui.fine": "Fina", + "ui.finest": "Muy fina", "ui.finish_sketch": "Finalizar boceto", "ui.fit": "Ajustar", "ui.fix_unfix": "Fijar/liberar", @@ -2464,6 +2466,7 @@ "ui.project_face_edges_sketch": "Proyectar aristas de caras en bocetos nuevos", "ui.properties": "Propiedades", "ui.pull_direction": "Dirección de tracción", + "ui.quality": "Calidad", "ui.quantity": "Cantidad", "ui.quantity_2": "Cantidad 2", "ui.quit": "Salir", @@ -2558,6 +2561,7 @@ "ui.spline": "Spline", "ui.split_body": "Dividir cuerpo", "ui.stand_up_tip": "Tras abrir un archivo STEP o IGES con Z hacia arriba, ofrecer un cuarto de vuelta alrededor de X", + "ui.standard": "Estándar", "ui.start": "Iniciar", "ui.start_over": "Volver a empezar", "ui.start_page": "Página de inicio", diff --git a/assets/locales/fr.json b/assets/locales/fr.json index c323c3e5e..caa5c017b 100644 --- a/assets/locales/fr.json +++ b/assets/locales/fr.json @@ -1606,6 +1606,8 @@ "ui.filter_commands_or_keys": "Filtrer les commandes ou les touches", "ui.findInTimeline": "Trouver dans la chronologie", "ui.findInWindow": "Trouver dans la fenêtre", + "ui.fine": "Fine", + "ui.finest": "Très fine", "ui.finish_sketch": "Terminer l'esquisse", "ui.fit": "Cadrer", "ui.fix_unfix": "Fixer/Libérer", @@ -1830,6 +1832,7 @@ "ui.project_face_edges_sketch": "Projeter les arêtes de la face dans les nouvelles esquisses", "ui.properties": "Propriétés", "ui.pull_direction": "Direction de démoulage", + "ui.quality": "Qualité", "ui.quantity": "Quantité", "ui.quantity_2": "Quantité 2", "ui.quit": "Quitter", @@ -1924,6 +1927,7 @@ "ui.spline": "Spline", "ui.split_body": "Scinder le corps", "ui.stand_up_tip": "Après l'ouverture d'un fichier STEP ou IGES avec Z vers le haut, proposer un quart de tour autour de X", + "ui.standard": "Standard", "ui.start": "Début", "ui.start_over": "Recommencer", "ui.start_page": "Page d’accueil", diff --git a/assets/locales/gl.json b/assets/locales/gl.json index 965754b64..7546fdd80 100644 --- a/assets/locales/gl.json +++ b/assets/locales/gl.json @@ -1592,6 +1592,8 @@ "ui.filter_commands_or_keys": "Filtrar ordes ou teclas", "ui.findInTimeline": "Buscar na liña de tempo", "ui.findInWindow": "Buscar na xanela", + "ui.fine": "Fina", + "ui.finest": "Moi fina", "ui.finish_sketch": "Rematar o bosquexo", "ui.fit": "Axustar", "ui.fix_unfix": "Fixar/Liberar", @@ -1816,6 +1818,7 @@ "ui.project_face_edges_sketch": "Proxectar as arestas da cara en bosquexos novos", "ui.properties": "Propiedades", "ui.pull_direction": "Dirección de extracción", + "ui.quality": "Calidade", "ui.quantity": "Cantidade", "ui.quantity_2": "Cantidade 2", "ui.quit": "Saír", @@ -1910,6 +1913,7 @@ "ui.spline": "Spline", "ui.split_body": "Dividir o corpo", "ui.stand_up_tip": "Despois de abrir un ficheiro STEP ou IGES con Z cara arriba, ofrecer un cuarto de volta arredor de X", + "ui.standard": "Estándar", "ui.start": "Inicio", "ui.start_over": "Volver comezar", "ui.start_page": "Páxina de inicio", diff --git a/assets/locales/hu.json b/assets/locales/hu.json index cb190dca2..996aa5552 100644 --- a/assets/locales/hu.json +++ b/assets/locales/hu.json @@ -1534,6 +1534,8 @@ "ui.filter_commands_or_keys": "Parancsok vagy billentyűk szűrése", "ui.findInTimeline": "Keresés az idővonalon", "ui.findInWindow": "Keresés az ablakban", + "ui.fine": "Finom", + "ui.finest": "Legfinomabb", "ui.finish_sketch": "Vázlat befejezése", "ui.fit": "Illesztés", "ui.fix_unfix": "Rögzítés/feloldás", @@ -1758,6 +1760,7 @@ "ui.project_face_edges_sketch": "Lapélek vetítése új vázlatokba", "ui.properties": "Tulajdonságok", "ui.pull_direction": "Húzási irány", + "ui.quality": "Minőség", "ui.quantity": "Mennyiség", "ui.quantity_2": "2. mennyiség", "ui.quit": "Kilépés", @@ -1852,6 +1855,7 @@ "ui.spline": "Spline", "ui.split_body": "Test felosztása", "ui.stand_up_tip": "Miután egy STEP vagy IGES fájl Z felfelé tájolással megnyílik, negyedfordulat felajánlása az X körül", + "ui.standard": "Normál", "ui.start": "Kezdés", "ui.start_over": "Újrakezdés", "ui.start_page": "Kezdőoldal", diff --git a/assets/locales/id.json b/assets/locales/id.json index 29577da26..7020c8878 100644 --- a/assets/locales/id.json +++ b/assets/locales/id.json @@ -1534,6 +1534,8 @@ "ui.filter_commands_or_keys": "Filter perintah atau tombol", "ui.findInTimeline": "Cari di Linimasa", "ui.findInWindow": "Cari di Jendela", + "ui.fine": "Halus", + "ui.finest": "Sangat halus", "ui.finish_sketch": "Selesai Sketsa", "ui.fit": "Pas", "ui.fix_unfix": "Kunci/Lepas Kunci", @@ -1758,6 +1760,7 @@ "ui.project_face_edges_sketch": "Proyeksikan tepi muka ke sketsa baru", "ui.properties": "Properti", "ui.pull_direction": "Arah tarik", + "ui.quality": "Kualitas", "ui.quantity": "Jumlah", "ui.quantity_2": "Jumlah 2", "ui.quit": "Keluar", @@ -1852,6 +1855,7 @@ "ui.spline": "Spline", "ui.split_body": "Belah Bodi", "ui.stand_up_tip": "Setelah file STEP atau IGES terbuka dengan Z ke atas, tawarkan putaran seperempat terhadap X", + "ui.standard": "Standar", "ui.start": "Mulai", "ui.start_over": "Mulai ulang", "ui.start_page": "Halaman awal", diff --git a/assets/locales/it.json b/assets/locales/it.json index 849eff42b..de7a5ea0c 100644 --- a/assets/locales/it.json +++ b/assets/locales/it.json @@ -1608,6 +1608,8 @@ "ui.filter_commands_or_keys": "Filtra comandi o tasti", "ui.findInTimeline": "Trova nella sequenza temporale", "ui.findInWindow": "Trova nella finestra", + "ui.fine": "Fine", + "ui.finest": "Finissima", "ui.finish_sketch": "Termina schizzo", "ui.fit": "Adatta", "ui.fix_unfix": "Fissa/Libera", @@ -1833,6 +1835,7 @@ "ui.project_face_edges_sketch": "Proietta gli spigoli delle facce nei nuovi schizzi", "ui.properties": "Proprietà", "ui.pull_direction": "Direzione di estrazione", + "ui.quality": "Qualità", "ui.quantity": "Quantità", "ui.quantity_2": "Quantità 2", "ui.quit": "Esci", @@ -1927,6 +1930,7 @@ "ui.spline": "Spline", "ui.split_body": "Dividi corpo", "ui.stand_up_tip": "Dopo l'apertura di un file STEP o IGES con asse Z verticale, proponi un quarto di giro attorno a X", + "ui.standard": "Standard", "ui.start": "Inizio", "ui.start_over": "Ricomincia", "ui.start_page": "Pagina iniziale", diff --git a/assets/locales/ja.json b/assets/locales/ja.json index 835940e1b..e779379c2 100644 --- a/assets/locales/ja.json +++ b/assets/locales/ja.json @@ -2687,6 +2687,8 @@ "ui.filter_commands_or_keys": "コマンドまたはキーを検索", "ui.findInTimeline": "タイムラインで検索", "ui.findInWindow": "ウィンドウで検索", + "ui.fine": "細かい", + "ui.finest": "最も細かい", "ui.finish_sketch": "スケッチを終了", "ui.fit": "フィット", "ui.fix_unfix": "固定/固定解除", @@ -2933,6 +2935,7 @@ "ui.project_face_edges_sketch": "新規スケッチに面のエッジを自動投影", "ui.properties": "プロパティ", "ui.pull_direction": "抜き方向", + "ui.quality": "品質", "ui.quantity": "数量", "ui.quantity_2": "数量 2", "ui.quit": "終了", @@ -3039,6 +3042,7 @@ "ui.spline": "スプライン", "ui.split_body": "ボディを分割", "ui.stand_up_tip": "Z軸上向きで開いたSTEPまたはIGESファイルに対し、X軸周りに90度回転させるか確認します", + "ui.standard": "標準", "ui.start": "開始", "ui.start_over": "最初からやり直す", "ui.start_page": "スタートページ", diff --git a/assets/locales/ko.json b/assets/locales/ko.json index 1d938767e..d3e2d0ee4 100644 --- a/assets/locales/ko.json +++ b/assets/locales/ko.json @@ -2013,6 +2013,8 @@ "ui.filter_commands_or_keys": "명령 또는 키 필터", "ui.findInTimeline": "타임라인에서 찾기", "ui.findInWindow": "창에서 찾기", + "ui.fine": "세밀", + "ui.finest": "가장 세밀", "ui.finish_sketch": "스케치 종료", "ui.fit": "맞춤", "ui.fix_unfix": "고정/고정 해제", @@ -2244,6 +2246,7 @@ "ui.project_face_edges_sketch": "면 모서리를 새 스케치로 투영", "ui.properties": "속성", "ui.pull_direction": "빼기 방향", + "ui.quality": "품질", "ui.quantity": "수량", "ui.quantity_2": "수량 2", "ui.quit": "종료", @@ -2344,6 +2347,7 @@ "ui.spline": "스플라인", "ui.split_body": "바디 분할", "ui.stand_up_tip": "STEP 또는 IGES 파일이 Z 위쪽으로 열린 후 X축 기준 90도 회전을 제안", + "ui.standard": "표준", "ui.start": "시작", "ui.start_over": "처음부터 다시", "ui.start_page": "시작 페이지", diff --git a/assets/locales/ms.json b/assets/locales/ms.json index 8452d8d2b..68eba7791 100644 --- a/assets/locales/ms.json +++ b/assets/locales/ms.json @@ -1592,6 +1592,8 @@ "ui.filter_commands_or_keys": "Tapis arahan atau kekunci", "ui.findInTimeline": "Cari dalam Garis Masa", "ui.findInWindow": "Cari dalam Tetingkap", + "ui.fine": "Halus", + "ui.finest": "Paling halus", "ui.finish_sketch": "Tamatkan Lakaran", "ui.fit": "Muatkan", "ui.fix_unfix": "Tetap/Lepas", @@ -1816,6 +1818,7 @@ "ui.project_face_edges_sketch": "Unjur tepi muka ke dalam lakaran baharu", "ui.properties": "Sifat", "ui.pull_direction": "Arah tarikan", + "ui.quality": "Kualiti", "ui.quantity": "Kuantiti", "ui.quantity_2": "Kuantiti 2", "ui.quit": "Keluar", @@ -1910,6 +1913,7 @@ "ui.spline": "Splin", "ui.split_body": "Belah Jasad", "ui.stand_up_tip": "Selepas buka STEP atau IGES dengan Z ke atas, cadangkan suku putaran pada X", + "ui.standard": "Standard", "ui.start": "Mula", "ui.start_over": "Mula semula", "ui.start_page": "Halaman mula", diff --git a/assets/locales/nl.json b/assets/locales/nl.json index 89c8c28f9..8eece0790 100644 --- a/assets/locales/nl.json +++ b/assets/locales/nl.json @@ -1534,6 +1534,8 @@ "ui.filter_commands_or_keys": "Opdrachten of toetsen filteren", "ui.findInTimeline": "Zoeken in tijdlijn", "ui.findInWindow": "Zoeken in venster", + "ui.fine": "Fijn", + "ui.finest": "Zeer fijn", "ui.finish_sketch": "Schets voltooien", "ui.fit": "Passend", "ui.fix_unfix": "Vastzetten/losmaken", @@ -1758,6 +1760,7 @@ "ui.project_face_edges_sketch": "Vlakranden projecteren in nieuwe schetsen", "ui.properties": "Eigenschappen", "ui.pull_direction": "Trekrichting", + "ui.quality": "Kwaliteit", "ui.quantity": "Aantal", "ui.quantity_2": "Aantal 2", "ui.quit": "Afsluiten", @@ -1852,6 +1855,7 @@ "ui.spline": "Spline", "ui.split_body": "Lichaam splitsen", "ui.stand_up_tip": "Zet na het openen van een STEP- of IGES-bestand met Z omhoog een kwartslag om X aan", + "ui.standard": "Standaard", "ui.start": "Start", "ui.start_over": "Opnieuw beginnen", "ui.start_page": "Startpagina", diff --git a/assets/locales/pl.json b/assets/locales/pl.json index 605c5e099..4f584aebe 100644 --- a/assets/locales/pl.json +++ b/assets/locales/pl.json @@ -1778,6 +1778,8 @@ "ui.filter_commands_or_keys": "Filtruj polecenia lub klawisze", "ui.findInTimeline": "Znajdź na osi czasu", "ui.findInWindow": "Znajdź w oknie", + "ui.fine": "Dokładna", + "ui.finest": "Najdokładniejsza", "ui.finish_sketch": "Zakończ szkic", "ui.fit": "Dopasuj", "ui.fix_unfix": "Ustal/zwolnij", @@ -2009,6 +2011,7 @@ "ui.project_face_edges_sketch": "Rzutuj krawędzie ściany do nowych szkiców", "ui.properties": "Właściwości", "ui.pull_direction": "Kierunek wyjmowania", + "ui.quality": "Jakość", "ui.quantity": "Liczba", "ui.quantity_2": "Liczba 2", "ui.quit": "Zakończ", @@ -2103,6 +2106,7 @@ "ui.spline": "Splajn", "ui.split_body": "Podziel bryłę", "ui.stand_up_tip": "Gdy plik STEP lub IGES otworzy się z osią Z w górę, proponuj obrót o ćwierć obrotu wokół osi X", + "ui.standard": "Standardowa", "ui.start": "Start", "ui.start_over": "Zacznij od nowa", "ui.start_page": "Strona startowa", diff --git a/assets/locales/pt-BR.json b/assets/locales/pt-BR.json index 4e9b5dac9..4f5ce7273 100644 --- a/assets/locales/pt-BR.json +++ b/assets/locales/pt-BR.json @@ -1599,6 +1599,8 @@ "ui.filter_commands_or_keys": "Filtrar comandos ou teclas", "ui.findInTimeline": "Localizar na linha do tempo", "ui.findInWindow": "Localizar na janela", + "ui.fine": "Fina", + "ui.finest": "Muito fina", "ui.finish_sketch": "Concluir esboço", "ui.fit": "Ajustar", "ui.fix_unfix": "Fixar/Liberar", @@ -1823,6 +1825,7 @@ "ui.project_face_edges_sketch": "Projetar arestas da face em novos esboços", "ui.properties": "Propriedades", "ui.pull_direction": "Direção de extração", + "ui.quality": "Qualidade", "ui.quantity": "Quantidade", "ui.quantity_2": "Quantidade 2", "ui.quit": "Sair", @@ -1917,6 +1920,7 @@ "ui.spline": "Spline", "ui.split_body": "Dividir corpo", "ui.stand_up_tip": "Depois que um arquivo STEP ou IGES abrir com Z para cima, oferecer um quarto de volta em torno de X", + "ui.standard": "Padrão", "ui.start": "Início", "ui.start_over": "Recomeçar", "ui.start_page": "Página inicial", diff --git a/assets/locales/ro.json b/assets/locales/ro.json index 28291ec38..936723da0 100644 --- a/assets/locales/ro.json +++ b/assets/locales/ro.json @@ -1534,6 +1534,8 @@ "ui.filter_commands_or_keys": "Filtrează comenzi sau taste", "ui.findInTimeline": "Găsește în cronologie", "ui.findInWindow": "Găsește în fereastră", + "ui.fine": "Fină", + "ui.finest": "Foarte fină", "ui.finish_sketch": "Finalizează schița", "ui.fit": "Potrivire", "ui.fix_unfix": "Fixează/Defixează", @@ -1758,6 +1760,7 @@ "ui.project_face_edges_sketch": "Proiectează muchiile feței în schițe noi", "ui.properties": "Proprietăți", "ui.pull_direction": "Direcția de extragere", + "ui.quality": "Calitate", "ui.quantity": "Cantitate", "ui.quantity_2": "Cantitatea 2", "ui.quit": "Ieșire", @@ -1852,6 +1855,7 @@ "ui.spline": "Spline", "ui.split_body": "Împarte corpul", "ui.stand_up_tip": "După ce un fișier STEP sau IGES se deschide cu Z în sus, oferă un sfert de rotație în jurul lui X", + "ui.standard": "Standard", "ui.start": "Început", "ui.start_over": "Reîncepe", "ui.start_page": "Pagina de start", diff --git a/assets/locales/ru.json b/assets/locales/ru.json index 22219473d..3455bffdd 100644 --- a/assets/locales/ru.json +++ b/assets/locales/ru.json @@ -1591,6 +1591,8 @@ "ui.filter_commands_or_keys": "Фильтр команд или клавиш", "ui.findInTimeline": "Найти на шкале", "ui.findInWindow": "Найти в окне", + "ui.fine": "Высокое", + "ui.finest": "Максимальное", "ui.finish_sketch": "Завершить эскиз", "ui.fit": "Вписать", "ui.fix_unfix": "Зафиксировать/Освободить", @@ -1815,6 +1817,7 @@ "ui.project_face_edges_sketch": "Проецировать рёбра граней в новые эскизы", "ui.properties": "Свойства", "ui.pull_direction": "Направление вытягивания", + "ui.quality": "Качество", "ui.quantity": "Количество", "ui.quantity_2": "Количество 2", "ui.quit": "Выход", @@ -1909,6 +1912,7 @@ "ui.spline": "Сплайн", "ui.split_body": "Разделить тело", "ui.stand_up_tip": "Если файл STEP или IGES открывается с Z вверх, предложить поворот на четверть оборота вокруг X", + "ui.standard": "Стандартное", "ui.start": "Старт", "ui.start_over": "Начать заново", "ui.start_page": "Начальная страница", diff --git a/assets/locales/sv.json b/assets/locales/sv.json index 01fdfcb24..0f1277dfe 100644 --- a/assets/locales/sv.json +++ b/assets/locales/sv.json @@ -1534,6 +1534,8 @@ "ui.filter_commands_or_keys": "Filtrera kommandon eller tangenter", "ui.findInTimeline": "Sök i tidslinjen", "ui.findInWindow": "Sök i fönstret", + "ui.fine": "Fin", + "ui.finest": "Finast", "ui.finish_sketch": "Avsluta skiss", "ui.fit": "Anpassa", "ui.fix_unfix": "Fäst/Lös", @@ -1758,6 +1760,7 @@ "ui.project_face_edges_sketch": "Projicera ytkanter i nya skisser", "ui.properties": "Egenskaper", "ui.pull_direction": "Dragriktning", + "ui.quality": "Kvalitet", "ui.quantity": "Antal", "ui.quantity_2": "Antal 2", "ui.quit": "Avsluta", @@ -1852,6 +1855,7 @@ "ui.spline": "Spline", "ui.split_body": "Dela kropp", "ui.stand_up_tip": "När en STEP- eller IGES-fil öppnas med Z uppåt, erbjud ett kvartsvarv runt X", + "ui.standard": "Standard", "ui.start": "Start", "ui.start_over": "Börja om", "ui.start_page": "Startsida", diff --git a/assets/locales/tr.json b/assets/locales/tr.json index 9ed6e685e..fb6b8b4f4 100644 --- a/assets/locales/tr.json +++ b/assets/locales/tr.json @@ -1591,6 +1591,8 @@ "ui.filter_commands_or_keys": "Komutları veya tuşları filtrele", "ui.findInTimeline": "Zaman çizelgesinde bul", "ui.findInWindow": "Pencerede bul", + "ui.fine": "İnce", + "ui.finest": "En ince", "ui.finish_sketch": "Eskizi bitir", "ui.fit": "Sığdır", "ui.fix_unfix": "Sabitle/Çöz", @@ -1815,6 +1817,7 @@ "ui.project_face_edges_sketch": "Yüz kenarlarını yeni eskizlere yansıt", "ui.properties": "Özellikler", "ui.pull_direction": "Kalıptan çıkarma yönü", + "ui.quality": "Kalite", "ui.quantity": "Adet", "ui.quantity_2": "Adet 2", "ui.quit": "Çıkış", @@ -1909,6 +1912,7 @@ "ui.spline": "Spline", "ui.split_body": "Gövdeyi böl", "ui.stand_up_tip": "Bir STEP veya IGES dosyası Z yukarı olarak açıldığında X etrafında çeyrek tur döndürmeyi öner", + "ui.standard": "Standart", "ui.start": "Başlangıç", "ui.start_over": "Baştan başla", "ui.start_page": "Başlangıç sayfası", diff --git a/assets/locales/uk.json b/assets/locales/uk.json index fff4e5325..6ef021cf8 100644 --- a/assets/locales/uk.json +++ b/assets/locales/uk.json @@ -1592,6 +1592,8 @@ "ui.filter_commands_or_keys": "Фільтрувати команди або клавіші", "ui.findInTimeline": "Знайти в часовому ланцюжку", "ui.findInWindow": "Знайти у вікні", + "ui.fine": "Висока", + "ui.finest": "Максимальна", "ui.finish_sketch": "Завершити ескіз", "ui.fit": "Вписати", "ui.fix_unfix": "Закріпити/розкріпити", @@ -1816,6 +1818,7 @@ "ui.project_face_edges_sketch": "Проєктувати ребра граней у нові ескізи", "ui.properties": "Властивості", "ui.pull_direction": "Напрямок витягування", + "ui.quality": "Якість", "ui.quantity": "Кількість", "ui.quantity_2": "Кількість 2", "ui.quit": "Вихід", @@ -1910,6 +1913,7 @@ "ui.spline": "Сплайн", "ui.split_body": "Розділити тіло", "ui.stand_up_tip": "Після відкриття файлу STEP або IGES з напрямком Z вгору пропонувати поворот на чверть оберту навколо X", + "ui.standard": "Стандартна", "ui.start": "Початок", "ui.start_over": "Почати спочатку", "ui.start_page": "Початкова сторінка", diff --git a/assets/locales/vi.json b/assets/locales/vi.json index a38e024a1..f3dccfd23 100644 --- a/assets/locales/vi.json +++ b/assets/locales/vi.json @@ -1592,6 +1592,8 @@ "ui.filter_commands_or_keys": "Lọc lệnh hoặc phím tắt", "ui.findInTimeline": "Tìm trong lịch sử thiết kế", "ui.findInWindow": "Tìm trong cửa sổ", + "ui.fine": "Mịn", + "ui.finest": "Mịn nhất", "ui.finish_sketch": "Hoàn tất phác thảo", "ui.fit": "Vừa vặn (Fit)", "ui.fix_unfix": "Cố định/Uncố định", @@ -1816,6 +1818,7 @@ "ui.project_face_edges_sketch": "Chiếu các cạnh bề mặt vào phác thảo mới", "ui.properties": "Thuộc tính cơ lý", "ui.pull_direction": "Hướng kéo", + "ui.quality": "Chất lượng", "ui.quantity": "Số lượng", "ui.quantity_2": "Số lượng 2", "ui.quit": "Thoát ứng dụng", @@ -1910,6 +1913,7 @@ "ui.spline": "Đường cong Spline", "ui.split_body": "Chia tách khối", "ui.stand_up_tip": "Sau khi mở tệp STEP hoặc IGES với trục Z hướng lên, đề xuất xoay 90° quanh trục X", + "ui.standard": "Tiêu chuẩn", "ui.start": "Bắt đầu", "ui.start_over": "Bắt đầu lại", "ui.start_page": "Trang bắt đầu", diff --git a/assets/locales/zh-TW.json b/assets/locales/zh-TW.json index d607d5519..7cb674cb0 100644 --- a/assets/locales/zh-TW.json +++ b/assets/locales/zh-TW.json @@ -1534,6 +1534,8 @@ "ui.filter_commands_or_keys": "篩選命令或按鍵", "ui.findInTimeline": "在時間軸中查詢", "ui.findInWindow": "在視窗中查詢", + "ui.fine": "精細", + "ui.finest": "最精細", "ui.finish_sketch": "完成草圖", "ui.fit": "適合", "ui.fix_unfix": "固定/取消固定", @@ -1758,6 +1760,7 @@ "ui.project_face_edges_sketch": "將面的邊投影到新草圖", "ui.properties": "屬性", "ui.pull_direction": "拔模方向", + "ui.quality": "品質", "ui.quantity": "數量", "ui.quantity_2": "數量 2", "ui.quit": "結束", @@ -1852,6 +1855,7 @@ "ui.spline": "雲形線", "ui.split_body": "分割實體", "ui.stand_up_tip": "當 Z 朝上的 STEP 或 IGES 檔案開啟後,提示繞 X 軸旋轉四分之一週", + "ui.standard": "標準", "ui.start": "開始", "ui.start_over": "重新開始", "ui.start_page": "起始頁面", diff --git a/assets/locales/zh.json b/assets/locales/zh.json index 14592e6c3..e91602585 100644 --- a/assets/locales/zh.json +++ b/assets/locales/zh.json @@ -2687,6 +2687,8 @@ "ui.filter_commands_or_keys": "筛选命令或按键", "ui.findInTimeline": "在时间线中查找", "ui.findInWindow": "在窗口中查找", + "ui.fine": "精细", + "ui.finest": "最精细", "ui.finish_sketch": "完成草图", "ui.fit": "适合", "ui.fix_unfix": "固定/取消固定", @@ -2933,6 +2935,7 @@ "ui.project_face_edges_sketch": "将面的边投影到新草图", "ui.properties": "属性", "ui.pull_direction": "拔模方向", + "ui.quality": "质量", "ui.quantity": "数量", "ui.quantity_2": "数量 2", "ui.quit": "退出", @@ -3039,6 +3042,7 @@ "ui.spline": "样条曲线", "ui.split_body": "分割实体", "ui.stand_up_tip": "当 Z 朝上的 STEP 或 IGES 文件打开后,提示绕 X 轴旋转四分之一周", + "ui.standard": "标准", "ui.start": "开始", "ui.start_over": "重新开始", "ui.start_page": "起始页", diff --git a/crates/engine/src/cmd/file.rs b/crates/engine/src/cmd/file.rs index d2c93d43c..430a109cf 100644 --- a/crates/engine/src/cmd/file.rs +++ b/crates/engine/src/cmd/file.rs @@ -48,12 +48,12 @@ pub static COMMANDS: &[CommandSpec] = &[ CommandSpec::new("file.export", "Export", export) .icon("export") .noundo() - .params("path; format?: stl|stla|obj|step|3mf|3mf-tagged|urdf|json (default from extension; 3mf-tagged: 3MF whose triangles carry their B-rep face, at full precision, for meshing and analysis tools; docs/formats/3mf-face-tags.md; urdf: the whole assembly as a robot, with STL meshes written next to it; docs/urdf.md); bodies?: [names] (JSON and URDF export the complete design); urdf only: mesh_prefix? (before each mesh file name, e.g. package://robot/meshes/), effort? (default 1000), velocity? (default 10)"), + .params("path; format?: stl|stla|obj|step|3mf|3mf-tagged|urdf|json (default from extension; 3mf-tagged: 3MF whose triangles carry their B-rep face, at full precision, for meshing and analysis tools; docs/formats/3mf-face-tags.md; urdf: the whole assembly as a robot, with STL meshes written next to it; docs/urdf.md); bodies?: [names] (JSON and URDF export the complete design); urdf only: mesh_prefix? (before each mesh file name, e.g. package://robot/meshes/), effort? (default 1000), velocity? (default 10); quality?: standard|fine|finest (STL, OBJ and 3MF: how closely the mesh follows curved faces, a chord tolerance of 2e-4, 5e-5 or 1e-5 of each body's size; default standard)"), CommandSpec::new("file.save_mesh", "Save As Mesh", save_mesh) .at("INSERT", "FILES") .icon("mesh_export") .noundo() - .params("path; format?: stl|3mf|3mf-tagged (default from the extension, else stl; 3mf-tagged: docs/formats/3mf-face-tags.md); bodies?: [names] (default: all); ascii?: bool (STL); slicer?: id, name or program path from file.slicers (open the saved file there)"), + .params("path; format?: stl|3mf|3mf-tagged (default from the extension, else stl; 3mf-tagged: docs/formats/3mf-face-tags.md); bodies?: [names] (default: all); ascii?: bool (STL); slicer?: id, name or program path from file.slicers (open the saved file there); quality?: standard|fine|finest (STL, OBJ and 3MF: how closely the mesh follows curved faces, a chord tolerance of 2e-4, 5e-5 or 1e-5 of each body's size; default standard)"), CommandSpec::new("file.slicers", "Installed Slicers", slicers).icon("export") .noundo() .params("→ the slicers found on this machine: [{id, name, icon?}]; pass an id or name as file.save_mesh's `slicer`"), @@ -535,7 +535,18 @@ fn save_as(s: &mut Session, p: &Value) -> Result { ) } -fn export_to(s: &Session, path: &str, format: Format, bodies: &[String]) -> Result { +/// A mesh export's `quality`: standard (as every export was) unless asked for (#4747). +fn mesh_quality(p: &Value, cmd: &str) -> Result { + match p.get("quality") { + None | Some(Value::Null) => Ok(solidcraft_io::MeshQuality::default()), + Some(v) => v + .as_str() + .and_then(solidcraft_io::MeshQuality::from_name) + .ok_or_else(|| bad(cmd, format!("`quality` must be standard, fine or finest, not {v}"))), + } +} + +fn export_to(s: &Session, path: &str, format: Format, bodies: &[String], quality: solidcraft_io::MeshQuality) -> Result { let name = std::path::Path::new(path).file_stem().map(|x| x.to_string_lossy().to_string()).unwrap_or_else(|| s.doc.name.clone()); // A design with components exports as a STEP assembly; otherwise bodies as placed. let bytes = if format == Format::Design { @@ -548,7 +559,7 @@ fn export_to(s: &Session, path: &str, format: Format, bodies: &[String]) -> Resu } else { // Bodies carry the colour they are shown in (appearance, material or imported), and the // file the design's properties where the format has a place for them. - solidcraft_io::export_with_metadata(&s.doc.painted(&s.world_state()), bodies, format, &name, &s.doc.metadata)? + solidcraft_io::export_with_quality(&s.doc.painted(&s.world_state()), bodies, format, &name, &s.doc.metadata, quality)? }; solidcraft_io::vfs::write(path, &bytes).map_err(|e| EngineError::Other(format!("{path}: {e}")))?; Ok(json!({"path": path, "bytes": bytes.len(), "format": format!("{format:?}")})) @@ -560,7 +571,8 @@ fn export(s: &mut Session, p: &Value) -> Result { if format == Format::Urdf { return export_urdf(s, path, p); } - export_to(s, path, format, &string_list(p, "bodies")) + let quality = mesh_quality(p, "file.export")?; + export_to(s, path, format, &string_list(p, "bodies"), quality) } /// The assembly as a URDF and its meshes next to it (docs/urdf.md). Every path is checked before @@ -641,7 +653,8 @@ fn save_mesh(s: &mut Session, p: &Value) -> Result { crate::slicers::resolve(spec).ok_or_else(|| bad(cmd, format!("no slicer `{spec}` (see file.slicers, or give the path of a program)")))?, ), }; - let mut out = export_to(s, path, format, &string_list(p, "bodies"))?; + let quality = mesh_quality(p, cmd)?; + let mut out = export_to(s, path, format, &string_list(p, "bodies"), quality)?; if let (Some(slicer), Some(obj)) = (slicer, out.as_object_mut()) { // The file is saved either way; a slicer that won't start is reported, not fatal. match slicer.open(path) { @@ -715,6 +728,41 @@ mod urdf_tests; mod tests { use super::*; + /// #4747: a mesh export's `quality` follows curved faces more closely. A 3 mm hole in a + /// 200 mm plate gets more triangles at fine and more again at finest, in STL and 3MF alike + /// (Save As Mesh too); standard is what the export always gave; anything else is refused. + #[test] + fn a_mesh_export_follows_round_faces_more_closely_at_a_finer_quality() { + let dir = std::env::temp_dir().join(format!("solidcraft-mesh-quality-{}", std::process::id())); + std::fs::create_dir_all(&dir).unwrap(); + let mut s = Session::default(); + s.execute("solid.box", &json!({"length": 200, "width": 100, "height": 5})).unwrap(); + s.execute("solid.cylinder", &json!({"base": [100, 50, -1], "radius": 1.5, "height": 7, "operation": "cut"})).unwrap(); + let stl_triangles = |b: &[u8]| u32::from_le_bytes([b[80], b[81], b[82], b[83]]); + let mut counts = Vec::new(); + for quality in [None, Some("standard"), Some("fine"), Some("finest")] { + let path = dir.join(format!("plate-{}.stl", quality.unwrap_or("default"))).to_string_lossy().to_string(); + let mut p = json!({"path": path}); + if let Some(q) = quality { + p["quality"] = json!(q); + } + s.execute("file.export", &p).unwrap(); + counts.push(stl_triangles(&std::fs::read(&path).unwrap())); + } + assert_eq!(counts[0], counts[1], "standard is the default: {counts:?}"); + assert!(counts[2] > counts[1] && counts[3] > counts[2], "finer, more triangles: {counts:?}"); + let finest_3mf = dir.join("plate.3mf").to_string_lossy().to_string(); + let standard_3mf = dir.join("plate-standard.3mf").to_string_lossy().to_string(); + s.execute("file.save_mesh", &json!({"path": finest_3mf, "quality": "finest"})).unwrap(); + s.execute("file.save_mesh", &json!({"path": standard_3mf})).unwrap(); + assert!(std::fs::metadata(&finest_3mf).unwrap().len() > std::fs::metadata(&standard_3mf).unwrap().len()); + for bad in [json!("ultra"), json!(3), json!(true)] { + let e = s.execute("file.export", &json!({"path": dir.join("bad.stl").to_string_lossy(), "quality": bad})).unwrap_err().to_string(); + assert!(e.contains("`quality` must be standard, fine or finest"), "{bad}: {e}"); + } + let _ = std::fs::remove_dir_all(&dir); + } + /// #3044: a save run on a scratch copy of the session (on a worker, so the window keeps /// drawing) and taken up with `adopt_save` leaves the session as saving it directly does: /// the design named after its first file, its file, and nothing unsaved; undo keeps the name. diff --git a/crates/io/src/lib.rs b/crates/io/src/lib.rs index cb5c42f0b..a4abc38a4 100644 --- a/crates/io/src/lib.rs +++ b/crates/io/src/lib.rs @@ -352,9 +352,46 @@ impl Format { } } +/// How closely an exported mesh follows curved faces: its chord tolerance as a share of each +/// body's size. Standard is what every mesh export used; Fine and Finest give the small round +/// features of a large part more sides (#4747). +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum MeshQuality { + #[default] + Standard, + Fine, + Finest, +} + +impl MeshQuality { + /// By the name commands take: `standard`, `fine` or `finest`. + pub fn from_name(name: &str) -> Option { + match name.trim().to_ascii_lowercase().as_str() { + "standard" => Some(Self::Standard), + "fine" => Some(Self::Fine), + "finest" => Some(Self::Finest), + _ => None, + } + } + + /// The chord tolerance as a share of the body's size. + fn share(self) -> f64 { + match self { + Self::Standard => 2e-4, + Self::Fine => 5e-5, + Self::Finest => 1e-5, + } + } +} + /// Fine export mesh for a body (chord tolerance 2e-4 of its size). pub fn export_mesh(b: &solidcraft_kernel::Body) -> Result { - Ok(b.tessellate((b.size() * 2e-4).max(1e-3))?) + export_mesh_at(b, MeshQuality::Standard) +} + +/// [`export_mesh`] at `quality` (never finer than 1 µm). +pub fn export_mesh_at(b: &solidcraft_kernel::Body, quality: MeshQuality) -> Result { + Ok(b.tessellate((b.size() * quality.share()).max(1e-3))?) } /// Distance within which an exported mesh's vertices are welded (STL and 3MF alike). @@ -492,6 +529,18 @@ fn threemf_metadata(meta: &Metadata) -> Vec<(&'static str, &str)> { /// STEP and IGES headers (author, organization; STEP also the description) and 3MF model /// metadata (project as the title, author as the designer, description, licence). pub fn export_with_metadata(state: &ModelState, bodies: &[String], format: Format, name: &str, meta: &Metadata) -> Result> { + export_with_quality(state, bodies, format, name, meta, MeshQuality::Standard) +} + +/// [`export_with_metadata`], meshing STL, OBJ and 3MF at `quality`. +pub fn export_with_quality( + state: &ModelState, + bodies: &[String], + format: Format, + name: &str, + meta: &Metadata, + quality: MeshQuality, +) -> Result> { let sel: Vec<&solidcraft_doc::ModelBody> = state.bodies.iter().filter(|b| bodies.is_empty() || bodies.contains(&b.name)).collect(); if sel.is_empty() { return Err(IoError::Empty); @@ -503,7 +552,7 @@ pub fn export_with_metadata(state: &ModelState, bodies: &[String], format: Forma let meshes: Vec = sel .iter() .map(|b| { - let m = export_mesh(&b.body)?; + let m = export_mesh_at(&b.body, quality)?; let (positions, triangles) = weld(&m.positions, &m.triangles, weld_eps(&b.body)); Ok(Mesh { positions, triangles, ..Mesh::default() }) }) @@ -511,7 +560,7 @@ pub fn export_with_metadata(state: &ModelState, bodies: &[String], format: Forma if format == Format::StlBinary { stl_binary(&meshes, name) } else { stl_ascii(&meshes, name).into_bytes() } } Format::Obj => { - let meshes: Vec<(String, Mesh)> = sel.iter().map(|b| Ok((b.name.clone(), export_mesh(&b.body)?))).collect::>()?; + let meshes: Vec<(String, Mesh)> = sel.iter().map(|b| Ok((b.name.clone(), export_mesh_at(&b.body, quality)?))).collect::>()?; obj(&meshes).into_bytes() } Format::Step => { @@ -525,7 +574,7 @@ pub fn export_with_metadata(state: &ModelState, bodies: &[String], format: Forma solidcraft_kernel::iges_export_bodies(&bs, &step_header(format!("{name}.igs"), meta))?.into_bytes() } Format::ThreeMf | Format::ThreeMfTagged => { - let objs: Vec = sel.iter().map(|b| mesh_object(b, format == Format::ThreeMfTagged)).collect::>()?; + let objs: Vec = sel.iter().map(|b| mesh_object(b, format == Format::ThreeMfTagged, quality)).collect::>()?; write_3mf_with(&objs, &threemf_metadata(meta))? } Format::Design => return Err(IoError::Format("solidcraft (save the document instead)".into())), @@ -535,8 +584,8 @@ pub fn export_with_metadata(state: &ModelState, bodies: &[String], format: Forma /// A body as a 3MF mesh: welded watertight (T-junctions split), coloured, and with `tagged` /// each triangle keeps the B-rep face it came from. -fn mesh_object(b: &solidcraft_doc::ModelBody, tagged: bool) -> Result { - let m = export_mesh(&b.body)?; +fn mesh_object(b: &solidcraft_doc::ModelBody, tagged: bool, quality: MeshQuality) -> Result { + let m = export_mesh_at(&b.body, quality)?; let eps = weld_eps(&b.body); // Faces with colours of their own tag their triangles. let paint = b.body.paint(); diff --git a/crates/ui-egui/src/dialogs_save_mesh.rs b/crates/ui-egui/src/dialogs_save_mesh.rs index 1352edcad..b53b33177 100644 --- a/crates/ui-egui/src/dialogs_save_mesh.rs +++ b/crates/ui-egui/src/dialogs_save_mesh.rs @@ -23,6 +23,8 @@ use crate::theme::Tokens; /// The formats, as shown and as `file.save_mesh` names them. /// (label, `format` parameter, file extension). const FORMATS: [(&str, &str, &str); 3] = [("STL", "stl", "stl"), ("3MF", "3mf", "3mf"), ("3MF with face tags", "3mf-tagged", "3mf")]; +/// How closely the mesh follows curved faces (#4747): the label and `file.save_mesh`'s `quality`. +const QUALITIES: [(&str, &str); 3] = [("Standard", "standard"), ("Fine", "fine"), ("Finest", "finest")]; /// Edge of a slicer's icon in the list. const ICON: f32 = 16.0; /// Most programs the user can keep in the list. @@ -32,6 +34,8 @@ const MAX_CUSTOM: usize = 24; #[derive(Clone, Debug, PartialEq)] pub struct SaveMesh { format: usize, + /// Index into [`QUALITIES`]. + quality: usize, send: bool, /// The chosen slicer: an installed one's id, or the path of one the user added. slicer: String, @@ -91,7 +95,8 @@ pub fn start(app: &SolveApp, id: &str) -> Option<(Kind, Vec)> { } let p = &app.preferences; let format = FORMATS.iter().position(|f| f.1 == p.save_mesh_format).unwrap_or(0); - let kind = Kind::SaveMesh(SaveMesh { format, send: p.save_mesh_send, slicer: p.save_mesh_slicer.clone(), stale: true }); + let quality = QUALITIES.iter().position(|q| q.1 == p.save_mesh_quality).unwrap_or(0); + let kind = Kind::SaveMesh(SaveMesh { format, quality, send: p.save_mesh_send, slicer: p.save_mesh_slicer.clone(), stale: true }); Some((kind, vec![SelInput::new("Bodies", BODIES, true)])) } @@ -171,6 +176,7 @@ pub fn rows(app: &mut SolveApp, ui: &mut egui::Ui, k: &mut SaveMesh) -> bool { k.send &= !entries.is_empty(); } choice_row(ui, "Format", "sm_format", &mut k.format, &FORMATS.map(|f| f.0)); + choice_row(ui, "Quality", "sm_quality", &mut k.quality, &QUALITIES.map(|q| q.0)); // A browser has no installed programs to send a file to. if app.services.pick_program.is_none() { @@ -294,6 +300,10 @@ fn add_custom(app: &mut SolveApp, path: &str) -> Result<(), String> { pub fn commands(k: &SaveMesh, inputs: &[SelInput]) -> Result, String> { let format = FORMATS.get(k.format).map_or("stl", |f| f.1); let mut p = json!({ "format": format }); + // Standard is the command's own default, so it is left out. + if let Some((_, quality)) = QUALITIES.get(k.quality).filter(|_| k.quality > 0) { + p["quality"] = json!(quality); + } let names = crate::selection::items(inputs, 0).body_names(); if names.is_empty() { return Err(crate::i18n::tr("ui.save_mesh_pick_bodies").into()); @@ -326,6 +336,7 @@ pub fn run(app: &mut SolveApp, k: &SaveMesh, inputs: &[SelInput]) -> Result<(), let name = crate::selection::items(inputs, 0).body_names().first().cloned().unwrap_or_else(|| app.session.doc.name.clone()); let p = &mut app.preferences; p.save_mesh_format = format.into(); + p.save_mesh_quality = QUALITIES.get(k.quality).map_or("standard", |q| q.1).into(); p.save_mesh_send = k.send; if !k.slicer.is_empty() { p.save_mesh_slicer = k.slicer.clone(); diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs index b89af3175..a36f29f34 100644 --- a/crates/ui-egui/src/prefs.rs +++ b/crates/ui-egui/src/prefs.rs @@ -626,6 +626,8 @@ preference_settings! { view_dxf_tolerance: f64 = 0.01; save_mesh_send: bool = false; save_mesh_slicer: String = String::new(); + /// Save as mesh: the last quality (`standard`, `fine` or `finest`, #4747). + save_mesh_quality: String = "standard".into(); custom_slicers: Vec = Vec::new(); /// AI features (docs/agent-chat.md): the master switch. Off: no AI button, shortcut, menu /// entry or panel, and nothing is looked for or started.