From ba4f7864fffce89f37d0bd7bf66aabaa9de907be Mon Sep 17 00:00:00 2001 From: raykholo Date: Wed, 21 Oct 2026 23:09:57 +0000 Subject: [PATCH] Export Current View as DXF includes shown sketches (#3708) (#3780) * claim: #3708 * Export Current View as DXF includes shown sketches (#3708) The view export refused a design with only a sketch and left shown sketches out when bodies were present. It now draws the sketches the viewport shows (profile curves only: no construction geometry, points, dimensions or constraints) on a SKETCH layer, one entity per curve. Finished sketches are hidden behind bodies through the body-edge occlusion; the active sketch is drawn on top, as in the viewport. Sketch points use the same projection, budgets and cancellation. The export is refused only when there is neither a visible body nor a shown sketch curve; the dialog and the command share that check (cmd::view_dxf_exportable). --------- Co-authored-by: bherbruck Co-authored-by: Claude Sonnet 5.5 --- ROADMAP.md | 2 +- 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 | 1 - assets/locales/id.json | 1 - assets/locales/it.json | 4 +- assets/locales/ja.json | 4 +- assets/locales/ko.json | 4 +- assets/locales/ms.json | 4 +- assets/locales/nl.json | 1 - assets/locales/pl.json | 4 +- assets/locales/pt-BR.json | 2 +- assets/locales/ro.json | 1 - assets/locales/ru.json | 1 - assets/locales/sv.json | 1 - assets/locales/tr.json | 1 - assets/locales/uk.json | 4 +- assets/locales/vi.json | 4 +- assets/locales/zh-TW.json | 1 - assets/locales/zh.json | 4 +- crates/engine/src/cmd/mod.rs | 1 + crates/engine/src/cmd/view_dxf.rs | 38 +++++++-- crates/engine/src/cmd/view_dxf_meshes.rs | 3 - crates/engine/src/cmd/view_dxf_projection.rs | 13 ++- crates/engine/src/cmd/view_dxf_scene.rs | 77 +++++++++++++++-- crates/engine/src/cmd/view_dxf_sketch.rs | 89 ++++++++++++++++++++ crates/engine/src/cmd/view_dxf_tests.rs | 61 ++++++++++++++ crates/ui-egui/src/dialogs_view_dxf.rs | 4 +- docs/view-dxf.md | 17 +++- 34 files changed, 313 insertions(+), 62 deletions(-) create mode 100644 crates/engine/src/cmd/view_dxf_sketch.rs diff --git a/ROADMAP.md b/ROADMAP.md index 592b07a55..6d0f80da5 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -70,7 +70,7 @@ pointer movement orbits without a mouse button, and vertical scrolling zooms. Ot retain their saved two-finger scroll preference; camera motion is available through `view.navigate` and modifier-aware `ui.move` automation. -M11 precursor: File → Export Current View as DXF exports shown placed bodies from the current +M11 precursor: File → Export Current View as DXF exports shown placed bodies and sketches from the current camera as a 2D millimetre drawing, with hidden edges omitted or dashed. Vector occlusion splits partly hidden edges and includes curved silhouettes. Repeated part meshes and triangle hierarchies are shared; bounded desktop preparation and occlusion use up to eight workers. diff --git a/assets/locales/cs.json b/assets/locales/cs.json index bbd15354e..ad5a50c04 100644 --- a/assets/locales/cs.json +++ b/assets/locales/cs.json @@ -233,7 +233,7 @@ "No crash reports.": "Žádná hlášení o pádech.", "No matching appearance presets.": "Žádné odpovídající předvolby vzhledu.", "No matching appearances": "Žádné odpovídající vzhledy", - "No visible bodies to export.": "Žádná viditelná tělesa k exportu.", + "No visible bodies or sketches to export.": "Žádná viditelná tělesa ani náčrty k exportu.", "None": "Žádné", "Not available yet": "Zatím není k dispozici", "Notch": "Zářez", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Promítání geometrie (3/5)", "dxf.progress.write": "Zápis DXF (5/5)", "dxf.tolerance": "Tolerance křivek", - "dxf.tolerance_help": "Pouze viditelná tělesa. Křivky jsou nahrazeny úsečkami. Menší tolerance dává jemnější křivky, ale zabere více času a paměti.", + "dxf.tolerance_help": "Pouze viditelná tělesa a zobrazené náčrty. Křivky jsou nahrazeny úsečkami. Menší tolerance dává jemnější křivky, ale zabere více času a paměti.", "file_load.built": "Dosud sestaveno: {built} z {total} prvků.", "file_load.converting": "Převod tělesa {done} z {total}", "file_load.inserting": "Vkládání geometrie", diff --git a/assets/locales/da.json b/assets/locales/da.json index 74781809a..9f15c4899 100644 --- a/assets/locales/da.json +++ b/assets/locales/da.json @@ -233,7 +233,7 @@ "No crash reports.": "Ingen nedbrudsrapporter.", "No matching appearance presets.": "Ingen matchende udseendeforudindstillinger.", "No matching appearances": "Ingen matchende udseender", - "No visible bodies to export.": "Der er ingen synlige emner at eksportere.", + "No visible bodies or sketches to export.": "Der er ingen synlige emner eller skitser at eksportere.", "None": "Ingen", "Not available yet": "Endnu ikke tilgængelig", "Notch": "Udskæring", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Projicerer geometri (3/5)", "dxf.progress.write": "Skriver DXF (5/5)", "dxf.tolerance": "Kurvetolerance", - "dxf.tolerance_help": "Kun synlige emner. Kurver består af rette linjestykker. En mindre tolerance giver finere kurver og kræver mere tid og hukommelse.", + "dxf.tolerance_help": "Kun synlige emner og viste skitser. Kurver består af rette linjestykker. En mindre tolerance giver finere kurver og kræver mere tid og hukommelse.", "file_load.built": "Bygget indtil videre: {built} af {total} features.", "file_load.converting": "Konverterer solid {done} af {total}", "file_load.inserting": "Indsætter geometri", diff --git a/assets/locales/de.json b/assets/locales/de.json index b242a26d9..64375c539 100644 --- a/assets/locales/de.json +++ b/assets/locales/de.json @@ -233,7 +233,7 @@ "No crash reports.": "Keine Absturzberichte.", "No matching appearance presets.": "Keine passenden Erscheinungsbildvorlagen.", "No matching appearances": "Keine passenden Erscheinungsbilder", - "No visible bodies to export.": "Keine sichtbaren Körper zum Exportieren.", + "No visible bodies or sketches to export.": "Keine sichtbaren Körper oder Skizzen zum Exportieren.", "None": "Keine", "Not available yet": "Noch nicht verfügbar", "Notch": "Ausklinkung", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Geometrie projizieren (3/5)", "dxf.progress.write": "DXF schreiben (5/5)", "dxf.tolerance": "Kurventoleranz", - "dxf.tolerance_help": "Nur sichtbare Körper. Kurven werden durch gerade Segmente angenähert. Eine kleinere Toleranz liefert feinere Kurven und benötigt mehr Zeit und Speicher.", + "dxf.tolerance_help": "Nur sichtbare Körper und angezeigte Skizzen. Kurven werden durch gerade Segmente angenähert. Eine kleinere Toleranz liefert feinere Kurven und benötigt mehr Zeit und Speicher.", "file_load.built": "Bisher erstellt: {built} von {total} Merkmalen.", "file_load.converting": "Volumenkörper {done} von {total} wird konvertiert", "file_load.inserting": "Geometrie wird eingefügt", diff --git a/assets/locales/en.json b/assets/locales/en.json index 8124c4930..719566cbf 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -240,7 +240,7 @@ "No crash reports.": "No crash reports.", "No matching appearance presets.": "No matching appearance presets.", "No matching appearances": "No matching appearances", - "No visible bodies to export.": "No visible bodies to export.", + "No visible bodies or sketches to export.": "No visible bodies or sketches to export.", "Nominal diameter": "Nominal diameter", "None": "None", "Not available yet": "Not available yet", @@ -856,7 +856,7 @@ "dxf.progress.projection": "Projecting geometry (3/5)", "dxf.progress.write": "Writing DXF (5/5)", "dxf.tolerance": "Curve tolerance", - "dxf.tolerance_help": "Visible bodies only. Curves use straight segments. Smaller tolerance gives finer curves and uses more time and memory.", + "dxf.tolerance_help": "Visible bodies and shown sketches only. Curves use straight segments. Smaller tolerance gives finer curves and uses more time and memory.", "file_load.built": "Built so far: {built} of {total} features.", "file_load.converting": "Converting solid {done} of {total}", "file_load.inserting": "Inserting geometry", diff --git a/assets/locales/es.json b/assets/locales/es.json index 77c44315d..938aa72f6 100644 --- a/assets/locales/es.json +++ b/assets/locales/es.json @@ -233,7 +233,7 @@ "No crash reports.": "No hay informes de fallos.", "No matching appearance presets.": "No hay preajustes de apariencia coincidentes.", "No matching appearances": "No hay apariencias coincidentes", - "No visible bodies to export.": "No hay cuerpos visibles para exportar.", + "No visible bodies or sketches to export.": "No hay cuerpos ni bocetos visibles para exportar.", "None": "Ninguno", "Not available yet": "Todavía no disponible", "Notch": "Muesca", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Proyectando geometría (3/5)", "dxf.progress.write": "Escribiendo DXF (5/5)", "dxf.tolerance": "Tolerancia de curva", - "dxf.tolerance_help": "Solo cuerpos visibles. Las curvas usan segmentos rectos. Una tolerancia menor da curvas más finas y consume más tiempo y memoria.", + "dxf.tolerance_help": "Solo cuerpos visibles y bocetos mostrados. Las curvas usan segmentos rectos. Una tolerancia menor da curvas más finas y consume más tiempo y memoria.", "file_load.built": "Construido hasta ahora: {built} de {total} operaciones.", "file_load.converting": "Convirtiendo sólido {done} de {total}", "file_load.inserting": "Insertando geometría", diff --git a/assets/locales/fr.json b/assets/locales/fr.json index 9f54fcfbe..27318a26c 100644 --- a/assets/locales/fr.json +++ b/assets/locales/fr.json @@ -233,7 +233,7 @@ "No crash reports.": "Aucun rapport de plantage.", "No matching appearance presets.": "Aucun préréglage d’apparence correspondant.", "No matching appearances": "Aucune apparence correspondante", - "No visible bodies to export.": "Aucun corps visible à exporter.", + "No visible bodies or sketches to export.": "Aucun corps ni esquisse visible à exporter.", "None": "Aucun", "Not available yet": "Pas encore disponible", "Notch": "Encoche", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Projection de la géométrie (3/5)", "dxf.progress.write": "Écriture du DXF (5/5)", "dxf.tolerance": "Tolérance des courbes", - "dxf.tolerance_help": "Corps visibles uniquement. Les courbes sont approchées par des segments de droite. Une tolérance plus faible donne des courbes plus fines, au prix de plus de temps et de mémoire.", + "dxf.tolerance_help": "Corps visibles et esquisses affichées uniquement. Les courbes sont approchées par des segments de droite. Une tolérance plus faible donne des courbes plus fines, au prix de plus de temps et de mémoire.", "file_load.built": "Construit jusqu’ici : {built} entités sur {total}.", "file_load.converting": "Conversion du solide {done} sur {total}", "file_load.inserting": "Insertion de la géométrie", diff --git a/assets/locales/gl.json b/assets/locales/gl.json index a4a3d36d3..3af7f3cd2 100644 --- a/assets/locales/gl.json +++ b/assets/locales/gl.json @@ -233,7 +233,7 @@ "No crash reports.": "Non hai informes de fallos.", "No matching appearance presets.": "Non hai preaxustes de aparencia coincidentes.", "No matching appearances": "Non hai aparencias coincidentes", - "No visible bodies to export.": "Non hai corpos visibles para exportar.", + "No visible bodies or sketches to export.": "Non hai corpos nin bosquexos visibles para exportar.", "None": "Ningún", "Not available yet": "Aínda non dispoñible", "Notch": "Entalle", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Proxectando a xeometría (3/5)", "dxf.progress.write": "Escribindo o DXF (5/5)", "dxf.tolerance": "Tolerancia da curva", - "dxf.tolerance_help": "Só os corpos visibles. As curvas usan segmentos rectos. Unha tolerancia menor dá curvas máis finas e usa máis tempo e memoria.", + "dxf.tolerance_help": "Só os corpos visibles e os bosquexos amosados. As curvas usan segmentos rectos. Unha tolerancia menor dá curvas máis finas e usa máis tempo e memoria.", "file_load.built": "Construído ata agora: {built} de {total} operacións.", "file_load.converting": "Convertendo o sólido {done} de {total}", "file_load.inserting": "Inserindo a xeometría", diff --git a/assets/locales/hu.json b/assets/locales/hu.json index f7ac25b92..bd712ad81 100644 --- a/assets/locales/hu.json +++ b/assets/locales/hu.json @@ -233,7 +233,6 @@ "No crash reports.": "Nincsenek összeomlási jelentések.", "No matching appearance presets.": "Nincs egyező megjelenés-előbeállítás.", "No matching appearances": "Nincs egyező megjelenés", - "No visible bodies to export.": "Nincs exportálható látható test.", "None": "Nincs", "Not available yet": "Még nem érhető el", "Notch": "Bevágás", diff --git a/assets/locales/id.json b/assets/locales/id.json index 7b8c2d9cc..46e1ca73e 100644 --- a/assets/locales/id.json +++ b/assets/locales/id.json @@ -233,7 +233,6 @@ "No crash reports.": "Tidak ada laporan crash.", "No matching appearance presets.": "Tidak ada preset tampilan yang cocok.", "No matching appearances": "Tidak ada tampilan yang cocok", - "No visible bodies to export.": "Tidak ada bodi terlihat untuk diekspor.", "None": "Tidak ada", "Not available yet": "Belum tersedia", "Notch": "Takik", diff --git a/assets/locales/it.json b/assets/locales/it.json index 360991eb3..854570f34 100644 --- a/assets/locales/it.json +++ b/assets/locales/it.json @@ -234,7 +234,7 @@ "No crash reports.": "Nessun rapporto di arresto anomalo.", "No matching appearance presets.": "Nessun predefinito di aspetto corrispondente.", "No matching appearances": "Nessun aspetto corrispondente", - "No visible bodies to export.": "Nessun corpo visibile da esportare.", + "No visible bodies or sketches to export.": "Nessun corpo o schizzo visibile da esportare.", "Nominal diameter": "Diametro nominale", "None": "Nessuno", "Not available yet": "Non ancora disponibile", @@ -835,7 +835,7 @@ "dxf.progress.projection": "Proiezione della geometria (3/5)", "dxf.progress.write": "Scrittura DXF (5/5)", "dxf.tolerance": "Tolleranza delle curve", - "dxf.tolerance_help": "Solo corpi visibili. Le curve usano segmenti rettilinei. Una tolleranza minore produce curve più precise e richiede più tempo e memoria.", + "dxf.tolerance_help": "Solo corpi visibili e schizzi mostrati. Le curve usano segmenti rettilinei. Una tolleranza minore produce curve più precise e richiede più tempo e memoria.", "file_load.built": "Costruite finora: {built} di {total} feature.", "file_load.converting": "Conversione del solido {done} di {total}", "file_load.inserting": "Inserimento della geometria", diff --git a/assets/locales/ja.json b/assets/locales/ja.json index 18ee80029..cfd220b2b 100644 --- a/assets/locales/ja.json +++ b/assets/locales/ja.json @@ -240,7 +240,7 @@ "No crash reports.": "クラッシュレポートはありません。", "No matching appearance presets.": "一致する外観プリセットはありません。", "No matching appearances": "一致する外観がありません", - "No visible bodies to export.": "出力する表示中のボディがありません。", + "No visible bodies or sketches to export.": "出力する表示中のボディまたはスケッチがありません。", "Nominal diameter": "呼び径", "None": "なし", "Not available yet": "まだ利用できません", @@ -856,7 +856,7 @@ "dxf.progress.projection": "形状を投影中 (3/5)", "dxf.progress.write": "DXFを書き込み中 (5/5)", "dxf.tolerance": "曲線の許容誤差", - "dxf.tolerance_help": "表示中のボディを出力し、曲線は線分で近似します。許容誤差を小さくすると曲線が滑らかになりますが、処理時間とメモリ使用量が増えます。", + "dxf.tolerance_help": "表示中のボディとスケッチを出力し、曲線は線分で近似します。許容誤差を小さくすると曲線が滑らかになりますが、処理時間とメモリ使用量が増えます。", "file_load.built": "構築済み: 全{total}フィーチャー中{built}件。", "file_load.converting": "ソリッドを変換中: {done}/{total}", "file_load.inserting": "ジオメトリを挿入中", diff --git a/assets/locales/ko.json b/assets/locales/ko.json index 9f5d16bb7..8530af89b 100644 --- a/assets/locales/ko.json +++ b/assets/locales/ko.json @@ -233,7 +233,7 @@ "No crash reports.": "충돌 보고서가 없습니다.", "No matching appearance presets.": "일치하는 외관 프리셋이 없습니다.", "No matching appearances": "일치하는 외관 없음", - "No visible bodies to export.": "표시된 바디가 없어 내보낼 수 없습니다.", + "No visible bodies or sketches to export.": "표시된 바디나 스케치가 없어 내보낼 수 없습니다.", "None": "없음", "Not available yet": "아직 사용할 수 없음", "Notch": "노치", @@ -832,7 +832,7 @@ "dxf.progress.projection": "형상 투영 중 (3/5)", "dxf.progress.write": "DXF 쓰는 중 (5/5)", "dxf.tolerance": "곡선 허용 오차", - "dxf.tolerance_help": "표시된 바디만 내보내며 곡선은 직선 구간으로 근사합니다. 허용 오차가 작을수록 곡선이 매끄러워지지만 처리 시간과 메모리 사용량이 늘어납니다.", + "dxf.tolerance_help": "표시된 바디와 스케치만 내보내며 곡선은 직선 구간으로 근사합니다. 허용 오차가 작을수록 곡선이 매끄러워지지만 처리 시간과 메모리 사용량이 늘어납니다.", "file_load.built": "지금까지 빌드됨: 피처 {total}개 중 {built}개.", "file_load.converting": "솔리드 변환 중 {done}/{total}", "file_load.inserting": "기하 삽입 중", diff --git a/assets/locales/ms.json b/assets/locales/ms.json index e94a45751..a299a44a8 100644 --- a/assets/locales/ms.json +++ b/assets/locales/ms.json @@ -233,7 +233,7 @@ "No crash reports.": "Tiada laporan ranap.", "No matching appearance presets.": "Tiada pratetap penampilan yang sepadan.", "No matching appearances": "Tiada penampilan yang sepadan", - "No visible bodies to export.": "Tiada jasad kelihatan untuk dieksport.", + "No visible bodies or sketches to export.": "Tiada jasad atau lakaran kelihatan untuk dieksport.", "None": "Tiada", "Not available yet": "Belum tersedia", "Notch": "Takuk", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Mengunjurkan geometri (3/5)", "dxf.progress.write": "Menulis DXF (5/5)", "dxf.tolerance": "Toleransi lengkung", - "dxf.tolerance_help": "Jasad kelihatan sahaja. Lengkung guna segmen lurus. Toleransi kecil lebih halus tetapi guna lebih masa dan memori.", + "dxf.tolerance_help": "Jasad kelihatan dan lakaran yang ditunjukkan sahaja. Lengkung guna segmen lurus. Toleransi kecil lebih halus tetapi guna lebih masa dan memori.", "file_load.built": "Dibina setakat ini: {built} daripada {total} ciri.", "file_load.converting": "Menukar pepejal {done} daripada {total}", "file_load.inserting": "Menyisip geometri", diff --git a/assets/locales/nl.json b/assets/locales/nl.json index 4ad7d7000..cbb087dbb 100644 --- a/assets/locales/nl.json +++ b/assets/locales/nl.json @@ -233,7 +233,6 @@ "No crash reports.": "Geen crashrapporten.", "No matching appearance presets.": "Geen overeenkomende uiterlijkvoorinstellingen.", "No matching appearances": "Geen overeenkomende uiterlijken", - "No visible bodies to export.": "Geen zichtbare lichamen om te exporteren.", "None": "Geen", "Not available yet": "Nog niet beschikbaar", "Notch": "Inkeping", diff --git a/assets/locales/pl.json b/assets/locales/pl.json index 2acada1e9..ce10bfb73 100644 --- a/assets/locales/pl.json +++ b/assets/locales/pl.json @@ -233,7 +233,7 @@ "No crash reports.": "Brak raportów o awariach.", "No matching appearance presets.": "Brak pasujących ustawień wyglądu.", "No matching appearances": "Brak pasujących wyglądów", - "No visible bodies to export.": "Brak widocznych brył do wyeksportowania.", + "No visible bodies or sketches to export.": "Brak widocznych brył lub szkiców do wyeksportowania.", "None": "Brak", "Not available yet": "Jeszcze niedostępne", "Notch": "Wycięcie", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Rzutowanie geometrii (3/5)", "dxf.progress.write": "Zapisywanie DXF (5/5)", "dxf.tolerance": "Tolerancja krzywych", - "dxf.tolerance_help": "Tylko widoczne bryły. Krzywe są przybliżane odcinkami. Mniejsza tolerancja daje dokładniejsze krzywe, ale zajmuje więcej czasu i pamięci.", + "dxf.tolerance_help": "Tylko widoczne bryły i pokazane szkice. Krzywe są przybliżane odcinkami. Mniejsza tolerancja daje dokładniejsze krzywe, ale zajmuje więcej czasu i pamięci.", "file_load.built": "Dotąd zbudowano: {built} z {total} elementów.", "file_load.converting": "Konwertowanie bryły {done} z {total}", "file_load.inserting": "Wstawianie geometrii", diff --git a/assets/locales/pt-BR.json b/assets/locales/pt-BR.json index 964727458..a50d42098 100644 --- a/assets/locales/pt-BR.json +++ b/assets/locales/pt-BR.json @@ -233,7 +233,7 @@ "No crash reports.": "Nenhum relatório de falha.", "No matching appearance presets.": "Nenhuma predefinição de aparência correspondente.", "No matching appearances": "Nenhuma aparência correspondente", - "No visible bodies to export.": "Nenhum corpo visível para exportar.", + "No visible bodies or sketches to export.": "Nenhum corpo ou esboço visível para exportar.", "None": "Nenhum", "Not available yet": "Ainda não disponível", "Notch": "Entalhe", diff --git a/assets/locales/ro.json b/assets/locales/ro.json index 4c535f3b4..654e79cca 100644 --- a/assets/locales/ro.json +++ b/assets/locales/ro.json @@ -233,7 +233,6 @@ "No crash reports.": "Niciun raport de blocare.", "No matching appearance presets.": "Niciun preset de aspect corespunzător.", "No matching appearances": "Niciun aspect corespunzător", - "No visible bodies to export.": "Niciun corp vizibil de exportat.", "None": "Niciunul", "Not available yet": "Indisponibil deocamdată", "Notch": "Crestătură", diff --git a/assets/locales/ru.json b/assets/locales/ru.json index d2156fa15..eed32d1cd 100644 --- a/assets/locales/ru.json +++ b/assets/locales/ru.json @@ -233,7 +233,6 @@ "No crash reports.": "Нет отчётов о сбоях.", "No matching appearance presets.": "Нет подходящих наборов внешнего вида.", "No matching appearances": "Нет подходящих внешних видов", - "No visible bodies to export.": "Нет видимых тел для экспорта.", "None": "Нет", "Not available yet": "Пока недоступно", "Notch": "Вырез", diff --git a/assets/locales/sv.json b/assets/locales/sv.json index e6b07be92..ad7f24add 100644 --- a/assets/locales/sv.json +++ b/assets/locales/sv.json @@ -233,7 +233,6 @@ "No crash reports.": "Inga kraschrapporter.", "No matching appearance presets.": "Inga matchande utseendeförinställningar.", "No matching appearances": "Inga matchande utseenden", - "No visible bodies to export.": "Inga synliga kroppar att exportera.", "None": "Ingen", "Not available yet": "Inte tillgänglig ännu", "Notch": "Urtag", diff --git a/assets/locales/tr.json b/assets/locales/tr.json index 2b41a5d58..2879a141f 100644 --- a/assets/locales/tr.json +++ b/assets/locales/tr.json @@ -233,7 +233,6 @@ "No crash reports.": "Çökme raporu yok.", "No matching appearance presets.": "Eşleşen görünüm ön ayarı yok.", "No matching appearances": "Eşleşen görünüm yok", - "No visible bodies to export.": "Dışa aktarılacak görünür gövde yok.", "None": "Hiçbiri", "Not available yet": "Henüz kullanılamıyor", "Notch": "Çentik", diff --git a/assets/locales/uk.json b/assets/locales/uk.json index 1879b9de1..d7f2dacdd 100644 --- a/assets/locales/uk.json +++ b/assets/locales/uk.json @@ -233,7 +233,7 @@ "No crash reports.": "Немає звітів про збої.", "No matching appearance presets.": "Немає відповідних наборів вигляду.", "No matching appearances": "Немає відповідних виглядів", - "No visible bodies to export.": "Немає видимих тіл для експорту.", + "No visible bodies or sketches to export.": "Немає видимих тіл або ескізів для експорту.", "None": "Немає", "Not available yet": "Ще недоступно", "Notch": "Виріз", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Проєктування геометрії (3/5)", "dxf.progress.write": "Запис DXF (5/5)", "dxf.tolerance": "Допуск кривої", - "dxf.tolerance_help": "Лише видимі тіла. Криві подаються відрізками. Менший допуск дає точніші криві, але потребує більше часу й пам'яті.", + "dxf.tolerance_help": "Лише видимі тіла та показані ескізи. Криві подаються відрізками. Менший допуск дає точніші криві, але потребує більше часу й пам'яті.", "file_load.built": "Побудовано: {built} із {total} елементів.", "file_load.converting": "Перетворення тіла {done} із {total}", "file_load.inserting": "Вставлення геометрії", diff --git a/assets/locales/vi.json b/assets/locales/vi.json index 74b71bba4..b85d4d3e0 100644 --- a/assets/locales/vi.json +++ b/assets/locales/vi.json @@ -233,7 +233,7 @@ "No crash reports.": "Không có báo cáo sự cố.", "No matching appearance presets.": "Không có cài đặt sẵn vật liệu bề mặt phù hợp.", "No matching appearances": "Không có màu sắc/vật liệu phù hợp", - "No visible bodies to export.": "Không có thân khối hiển thị nào để xuất.", + "No visible bodies or sketches to export.": "Không có thân khối hoặc phác thảo hiển thị nào để xuất.", "None": "Không có", "Not available yet": "Chưa khả dụng", "Notch": "Rãnh khía chữ V", @@ -832,7 +832,7 @@ "dxf.progress.projection": "Đang chiếu hình học (3/5)", "dxf.progress.write": "Đang ghi tệp DXF (5/5)", "dxf.tolerance": "Dung sai đường cong", - "dxf.tolerance_help": "Chỉ áp dụng cho các thân khối hiển thị. Đường cong sử dụng các đoạn thẳng. Dung sai nhỏ hơn cho đường cong mịn hơn nhưng tốn nhiều thời gian và bộ nhớ hơn.", + "dxf.tolerance_help": "Chỉ áp dụng cho các thân khối và phác thảo hiển thị. Đường cong sử dụng các đoạn thẳng. Dung sai nhỏ hơn cho đường cong mịn hơn nhưng tốn nhiều thời gian và bộ nhớ hơn.", "file_load.built": "Đã dựng được: {built} trên {total} tính năng.", "file_load.converting": "Đang chuyển đổi khối đặc {done} trên {total}", "file_load.inserting": "Đang chèn hình học", diff --git a/assets/locales/zh-TW.json b/assets/locales/zh-TW.json index 13d847e07..2528f3417 100644 --- a/assets/locales/zh-TW.json +++ b/assets/locales/zh-TW.json @@ -233,7 +233,6 @@ "No crash reports.": "沒有當機報告。", "No matching appearance presets.": "沒有符合的外觀預設。", "No matching appearances": "沒有符合的外觀", - "No visible bodies to export.": "沒有可匯出的可見實體。", "None": "無", "Not available yet": "暫不可用", "Notch": "缺口", diff --git a/assets/locales/zh.json b/assets/locales/zh.json index a44b405ce..2fe7801b3 100644 --- a/assets/locales/zh.json +++ b/assets/locales/zh.json @@ -240,7 +240,7 @@ "No crash reports.": "没有崩溃报告。", "No matching appearance presets.": "没有匹配的外观预设。", "No matching appearances": "没有匹配的外观", - "No visible bodies to export.": "没有可导出的可见实体。", + "No visible bodies or sketches to export.": "没有可导出的可见实体或草图。", "Nominal diameter": "公称直径", "None": "无", "Not available yet": "暂不可用", @@ -856,7 +856,7 @@ "dxf.progress.projection": "正在投影几何体 (3/5)", "dxf.progress.write": "正在写入 DXF (5/5)", "dxf.tolerance": "曲线公差", - "dxf.tolerance_help": "仅导出可见实体。曲线使用直线段近似。公差越小,曲线越精细,但需要更多时间和内存。", + "dxf.tolerance_help": "仅导出可见实体和显示的草图。曲线使用直线段近似。公差越小,曲线越精细,但需要更多时间和内存。", "file_load.built": "已构建:{built}/{total} 个特征。", "file_load.converting": "正在转换实体 {done}/{total}", "file_load.inserting": "正在插入几何体", diff --git a/crates/engine/src/cmd/mod.rs b/crates/engine/src/cmd/mod.rs index 1b692d75c..68a519c5b 100644 --- a/crates/engine/src/cmd/mod.rs +++ b/crates/engine/src/cmd/mod.rs @@ -40,6 +40,7 @@ pub(crate) use features::profiles as feature_profiles; pub(crate) use features::{EdgeRefForm, edge_ref_form, sketch_key}; pub use features::{auto_operation, extrude_reach}; pub use sketch_modify::trim_piece; +pub use view_dxf::sketch::exportable as view_dxf_exportable; mod component_link; mod config; mod file; diff --git a/crates/engine/src/cmd/view_dxf.rs b/crates/engine/src/cmd/view_dxf.rs index c62488411..2047a2833 100644 --- a/crates/engine/src/cmd/view_dxf.rs +++ b/crates/engine/src/cmd/view_dxf.rs @@ -1,5 +1,5 @@ -//! A drawing of the visible bodies from a supplied viewport camera. No screen pixels, grid, -//! selection highlights or tessellation diagonals are exported. +//! A drawing of the visible bodies and shown sketches from a supplied viewport camera. No +//! screen pixels, grid, selection highlights or tessellation diagonals are exported. #[path = "view_dxf_meshes.rs"] mod meshes; @@ -7,8 +7,11 @@ mod meshes; mod progress; #[path = "view_dxf_projection.rs"] mod projection; +#[path = "view_dxf_sketch.rs"] +pub(super) mod sketch; use serde_json::{Value, json}; +use solidcraft_geom::Vec2; use solidcraft_io::{DxfEntity, DxfLayer, DxfLinetype, DxfShape}; use solidcraft_render::Camera; @@ -20,7 +23,7 @@ const CMD: &str = "file.export_view_dxf"; pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new(CMD, "Export Current View as DXF", export) .icon("export") .noundo() - .params("camera: Camera (current view); hidden?: omit|dashed (default omit); tolerance?: 0.0001..1 mm (curve chord tolerance, default 0.01); path?: .dxf file (else returns dxf text). Visible placed bodies only; 2D LINE/LWPOLYLINE entities on VISIBLE/HIDDEN layers, mm; perspective projected onto the camera target plane; no viewport crop or overlays.")]; + .params("camera: Camera (current view); hidden?: omit|dashed (default omit); tolerance?: 0.0001..1 mm (curve chord tolerance, default 0.01); path?: .dxf file (else returns dxf text). Visible placed bodies and shown sketches' profile curves (no construction geometry, points, dimensions or constraints); 2D LINE/LWPOLYLINE entities on VISIBLE/HIDDEN layers (sketch curves on SKETCH), mm; finished sketches are hidden behind bodies, the active sketch is drawn on top; perspective projected onto the camera target plane; no viewport crop or overlays.")]; fn export(s: &mut Session, p: &Value) -> Result { let cam: Camera = @@ -39,6 +42,9 @@ fn export(s: &mut Session, p: &Value) -> Result { Some(Value::String(v)) if v == "dashed" => true, _ => return Err(bad(CMD, "hidden must be omit or dashed")), }; + if !sketch::exportable(s) { + return Err(bad(CMD, "no visible bodies or sketches to export")); + } let tolerance = match p.get("tolerance") { None => 0.01, Some(v) => v.as_f64().filter(|t| (0.0001..=1.0).contains(t)).ok_or_else(|| bad(CMD, "tolerance must be 0.0001..1 mm"))?, @@ -54,7 +60,7 @@ fn export(s: &mut Session, p: &Value) -> Result { progress::Stage::new("dxf_meshes", 1).check().map_err(|e| bad(CMD, e))?; let meshes = meshes::prepare(s, tolerance)?; let prepare_ms = started.elapsed().as_secs_f64() * 1000.; - let drawing = projection::drawing(&meshes, &cam).map_err(|e| bad(CMD, e))?; + let drawing = projection::drawing(&meshes, &sketch::parts(s, tolerance).map_err(|e| bad(CMD, e))?, &cam).map_err(|e| bad(CMD, e))?; let writing = progress::Stage::new("dxf_write", 1); writing.check().map_err(|e| bad(CMD, e))?; let mut visible = 0; @@ -73,14 +79,18 @@ fn export(s: &mut Session, p: &Value) -> Result { }; entities.push(DxfEntity { layer: layer.into(), shape: DxfShape::Line(line.a, line.b) }); } - let entities = projection::connect(entities); + let mut entities = projection::connect(entities); + let sketch = sketch_entities(drawing.sketch, dashed, &mut entities); let mut layers = vec![DxfLayer::new("VISIBLE", 7)]; if dashed { layers.push(DxfLayer { linetype: DxfLinetype::Hidden, ..DxfLayer::new("HIDDEN", 8) }); } + if sketch > 0 { + layers.push(DxfLayer::new("SKETCH", 5)); + } let text = solidcraft_io::write_dxf_drawing(&layers, &entities); writing.check().map_err(|e| bad(CMD, e))?; - let mut result = json!({"visible":visible,"hidden":hidden,"units":"mm","tolerance":tolerance,"projection":if cam.fov > 0.0 {"perspective"} else {"orthographic"}}); + let mut result = json!({"visible":visible,"hidden":hidden,"sketch":sketch,"units":"mm","tolerance":tolerance,"projection":if cam.fov > 0.0 {"perspective"} else {"orthographic"}}); result["stats"] = json!({"bodies":meshes.placements.len(),"shared_meshes":meshes.meshes.len(),"triangles":meshes.triangles, "mesh_bytes":meshes.bytes,"worker_limit":meshes::WORKERS,"segments":drawing.segments,"occlusion_work":drawing.work, "prepare_ms":prepare_ms,"projection_ms":drawing.projection_ms,"occlusion_ms":drawing.occlusion_ms}); @@ -94,6 +104,22 @@ fn export(s: &mut Session, p: &Value) -> Result { Ok(result) } +/// Sketch runs as entities: visible ones on SKETCH, hidden ones dashed on HIDDEN or omitted. +/// Returns the number of SKETCH entities. +fn sketch_entities(paths: Vec, dashed: bool, entities: &mut Vec) -> usize { + let mut count = 0; + for path in paths.into_iter().filter(|p| dashed || !p.hidden) { + let layer = if path.hidden { "HIDDEN" } else { "SKETCH" }; + count += usize::from(!path.hidden); + let shape = match <[Vec2; 2]>::try_from(path.points) { + Ok([a, b]) => DxfShape::Line(a, b), + Err(points) => DxfShape::Polyline { points }, + }; + entities.push(DxfEntity { layer: layer.into(), shape }); + } + count +} + #[cfg(test)] #[path = "view_dxf_tests.rs"] mod tests; diff --git a/crates/engine/src/cmd/view_dxf_meshes.rs b/crates/engine/src/cmd/view_dxf_meshes.rs index ec3f0e4d9..48cbfe6a8 100644 --- a/crates/engine/src/cmd/view_dxf_meshes.rs +++ b/crates/engine/src/cmd/view_dxf_meshes.rs @@ -123,9 +123,6 @@ pub(super) fn prepare(s: &Session, tolerance: f64) -> Result { let keep = groups.get(group).is_some_and(|g| g.first == index); items.push(Item { body, group, keep, transform }); } - if items.is_empty() { - return Err(bad(CMD, "no visible bodies to export")); - } let progress = Stage::new("dxf_meshes", items.len()); let bytes = AtomicUsize::new(0); let results = map_with_local_pools(&items, WORKERS, |item| { diff --git a/crates/engine/src/cmd/view_dxf_projection.rs b/crates/engine/src/cmd/view_dxf_projection.rs index bfb08025b..d4e0b7157 100644 --- a/crates/engine/src/cmd/view_dxf_projection.rs +++ b/crates/engine/src/cmd/view_dxf_projection.rs @@ -16,10 +16,19 @@ pub(super) struct Drawing { pub segments: usize, pub projection_ms: f64, pub occlusion_ms: f64, + /// Shown sketch curves: one path per visible or hidden run of each curve. + pub sketch: Vec, } -pub(super) fn drawing(meshes: &super::meshes::Scene, cam: &Camera) -> Result { - scene::drawing(meshes, cam) +/// A connected run of a projected sketch curve. +#[derive(Clone, Debug)] +pub(super) struct Path { + pub points: Vec, + pub hidden: bool, +} + +pub(super) fn drawing(meshes: &super::meshes::Scene, sketch: &[super::sketch::Part], cam: &Camera) -> Result { + scene::drawing(meshes, sketch, cam) } /// Keep the hidden curves connected: restarting a dash on every short chord would make a diff --git a/crates/engine/src/cmd/view_dxf_scene.rs b/crates/engine/src/cmd/view_dxf_scene.rs index 849dcb568..37f4afea9 100644 --- a/crates/engine/src/cmd/view_dxf_scene.rs +++ b/crates/engine/src/cmd/view_dxf_scene.rs @@ -12,7 +12,8 @@ use solidcraft_render::Camera; use super::super::meshes::{Placement, Scene, WORKERS, claim, transformed_bounds}; use super::super::progress::Stage; -use super::{Drawing, Line, bounds, clip, key, merge_lines, occluded, overlap, xy}; +use super::super::sketch::Part; +use super::{Drawing, Line, Path, bounds, clip, key, merge_lines, occluded, overlap, xy}; const TOO_COMPLEX: &str = "view exceeds export work budget; hide bodies or increase tolerance"; const MAX_LINES: usize = 1_000_000; @@ -405,12 +406,13 @@ impl Query<'_, '_> { } } -pub(super) fn drawing(scene: &Scene, cam: &Camera) -> Result { +pub(super) fn drawing(scene: &Scene, sketch: &[Part], cam: &Camera) -> Result { let start = Instant::now(); let scale = scene .placements .iter() .filter_map(|p| scene.meshes.get(p.mesh).map(|m| transformed_bounds(m, &p.transform))) + .chain(sketch.iter().map(|p| bounds(p.points.iter().copied()))) .fold(Aabb3::EMPTY, |b, p| b.union(&p)) .diagonal() .max(1.); @@ -510,7 +512,72 @@ pub(super) fn drawing(scene: &Scene, cam: &Camera) -> Result