Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

feat(cad): draw DWG and DXF in black and white or grayscale (#411)

KnifeLemon0a5d51426f11
diff --git a/docs/ENGINES.md b/docs/ENGINES.md
index c76957ad..ed9959e5 100644
--- a/docs/ENGINES.md
+++ b/docs/ENGINES.md
@@ -993,6 +993,13 @@ and writes the files; Filee's own renderer draws them with SkiaSharp (one drawin
follow the insert's layer). White and near-white (ACI 7, which AutoCAD shows white on black) draw black on the white
page. Line weights are plotted in millimetres ("Default" as a thin 0.18 mm line); line types become dash patterns
scaled by LTSCALE, the entity's scale and the block scale (shapes and text inside complex line types are omitted).
+- **Colours of the output** (preset, CAD drawing card, for PDF, SVG and image targets; #411): *As drawn* (above),
+ *Black and white* or *Grayscale*. Black and white draws every line, curve, text, dimension, hatch pattern line,
+ point, arrowhead, SOLID/TRACE and wide polyline in black, like a plot with monochrome.ctb. Filled hatches (solid,
+ gradient and the tint of a too dense pattern) are not filled black, which would hide whatever lies on a light
+ background colour: they become the gray of their brightness (Rec. 601 luma), so a light fill stays light and a black
+ one black. Grayscale gives every colour the gray of its brightness; lines and text are scaled to 0–160 so the
+ lightest (yellow) still prints as a mid gray. The page stays white. Applied while drawing, so PDF and SVG stay vector.
- **Layers**: off, frozen and non-plotting layers (including Defpoints) are not drawn, like a plot. A frozen layer
hides a whole block reference; an OFF one only its layer-0 contents.
- **Fonts**: drawings name SHX fonts, which are not available, so text uses the text style's TrueType font when it is
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.json
index 8738fcda..69864d05 100644
--- a/src/Filee.App/Assets/i18n/ar.json
+++ b/src/Filee.App/Assets/i18n/ar.json
@@ -626,6 +626,11 @@
"presets.cad_version": "إصدار AutoCAD",
"presets.cad_version.same": "مثل المصدر",
"presets.cad_version_hint": "تُفتح الإصدارات الأقدم في برامج AutoCAD وCAD الأقدم. قبل 2007 يُحفظ النص بصفحة الترميز التي تناسبه (الكورية، الصينية، اليابانية …) وأي حرف آخر كرمز \\U+. تُحذف الكائنات التي لا يدعمها الإصدار، مثل الأسهم التوضيحية المتعددة والشبكات. يُحفظ DWG بإصدار 2007 كإصدار 2004 الذي يفتحه AutoCAD 2007.",
+ "presets.cad_colors": "الألوان",
+ "presets.cad_colors.AsDrawn": "كما في الرسم",
+ "presets.cad_colors.BlackAndWhite": "أبيض وأسود",
+ "presets.cad_colors.Grayscale": "تدرّج رمادي",
+ "presets.cad_colors_hint": "يُستخدم عند تحويل رسم DWG أو DXF إلى PDF أو SVG أو صورة. يرسم «أبيض وأسود» كل الخطوط والنصوص بالأسود مثل الطباعة أحادية اللون، وتصبح المساحات المملوءة رمادية بحسب سطوعها حتى لا يتحول الملء الفاتح إلى كتلة سوداء. أما «تدرّج رمادي» فيحوّل كل لون إلى رمادي ويُغمّق الخطوط الفاتحة، كالأصفر، بما يكفي لقراءتها.",
"presets.group.image": "الصورة",
"presets.quality": "الجودة",
"presets.resize": "تغيير الحجم",
diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.json
index 154a2512..7e1f346a 100644
--- a/src/Filee.App/Assets/i18n/de.json
+++ b/src/Filee.App/Assets/i18n/de.json
@@ -626,6 +626,11 @@
"presets.cad_version": "AutoCAD-Version",
"presets.cad_version.same": "Wie die Quelldatei",
"presets.cad_version_hint": "Ältere Versionen lassen sich mit älteren AutoCAD- und CAD-Programmen öffnen. Vor Version 2007 wird Text in der passenden Codepage gespeichert (Koreanisch, Chinesisch, Japanisch …), andere Zeichen als \\U+-Code. Nicht unterstützte Objekte wie Multiführungslinien und Netze werden weggelassen. Eine DWG von 2007 wird als Version 2004 gespeichert, die AutoCAD 2007 öffnen kann.",
+ "presets.cad_colors": "Farben",
+ "presets.cad_colors.AsDrawn": "Wie gezeichnet",
+ "presets.cad_colors.BlackAndWhite": "Schwarzweiß",
+ "presets.cad_colors.Grayscale": "Graustufen",
+ "presets.cad_colors_hint": "Gilt, wenn eine DWG- oder DXF-Zeichnung zu PDF, SVG oder einem Bild wird. Schwarzweiß zeichnet alle Linien und Texte schwarz wie ein monochromer Plot; gefüllte Flächen werden zum Grau ihrer Helligkeit, damit eine helle Füllung kein schwarzer Block wird. Graustufen macht jede Farbe zu einem Grau und dunkelt helle Linien wie Gelb so weit ab, dass sie lesbar bleiben.",
"presets.group.image": "Bild",
"presets.quality": "Qualität",
"presets.resize": "Größe ändern",
diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.json
index 4cd5e0eb..4f44d65c 100644
--- a/src/Filee.App/Assets/i18n/en.json
+++ b/src/Filee.App/Assets/i18n/en.json
@@ -641,6 +641,11 @@
"presets.cad_version": "AutoCAD version",
"presets.cad_version.same": "Same as the source",
"presets.cad_version_hint": "Older versions open in older AutoCAD and CAD programs. Before 2007, text is saved in the code page that fits it (Korean, Chinese, Japanese …) and any other character as a \\U+ code. Objects the version doesn't have, such as multileaders and meshes, are left out. A 2007 DWG is saved as 2004, which AutoCAD 2007 opens.",
+ "presets.cad_colors": "Colours",
+ "presets.cad_colors.AsDrawn": "As drawn",
+ "presets.cad_colors.BlackAndWhite": "Black and white",
+ "presets.cad_colors.Grayscale": "Grayscale",
+ "presets.cad_colors_hint": "Used when a DWG or DXF drawing becomes a PDF, SVG or picture. Black and white draws every line and text in black, like a monochrome plot; filled areas turn the gray of their brightness, so a light fill doesn't become a black block. Grayscale turns each colour into a gray and darkens light lines, such as yellow, enough to read.",
"presets.group.image": "Image",
"presets.quality": "Quality",
"presets.resize": "Resize",
diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.json
index 02dab483..cc9930ec 100644
--- a/src/Filee.App/Assets/i18n/es.json
+++ b/src/Filee.App/Assets/i18n/es.json
@@ -626,6 +626,11 @@
"presets.cad_version": "Versión de AutoCAD",
"presets.cad_version.same": "Igual que el original",
"presets.cad_version_hint": "Las versiones antiguas se abren en AutoCAD y programas CAD antiguos. Antes de 2007, el texto se guarda en la página de códigos que le corresponde (coreano, chino, japonés…) y cualquier otro carácter como código \\U+. Los objetos que esa versión no tiene, como directrices múltiples y mallas, se omiten. Un DWG 2007 se guarda como 2004, que AutoCAD 2007 abre.",
+ "presets.cad_colors": "Colores",
+ "presets.cad_colors.AsDrawn": "Como en el dibujo",
+ "presets.cad_colors.BlackAndWhite": "Blanco y negro",
+ "presets.cad_colors.Grayscale": "Escala de grises",
+ "presets.cad_colors_hint": "Se usa cuando un dibujo DWG o DXF se convierte en PDF, SVG o imagen. Blanco y negro dibuja todas las líneas y textos en negro, como un trazado monocromo; las áreas rellenas pasan al gris de su luminosidad, para que un relleno claro no se convierta en un bloque negro. Escala de grises convierte cada color en un gris y oscurece las líneas claras, como el amarillo, lo bastante para leerlas.",
"presets.group.image": "Imagen",
"presets.quality": "Calidad",
"presets.resize": "Cambiar tamaño",
diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.json
index 36e31d0f..62795844 100644
--- a/src/Filee.App/Assets/i18n/fr.json
+++ b/src/Filee.App/Assets/i18n/fr.json
@@ -641,6 +641,11 @@
"presets.cad_version": "Version d'AutoCAD",
"presets.cad_version.same": "Comme l'original",
"presets.cad_version_hint": "Les versions anciennes s'ouvrent dans les anciens AutoCAD et logiciels de CAO. Avant 2007, le texte est enregistré dans la page de codes qui lui convient (coréen, chinois, japonais…) et tout autre caractère sous forme de code \\U+. Les objets que la version n'a pas, comme les multilignes de repère et les maillages, sont omis. Un DWG 2007 est enregistré en 2004, qu'AutoCAD 2007 ouvre.",
+ "presets.cad_colors": "Couleurs",
+ "presets.cad_colors.AsDrawn": "Comme dessiné",
+ "presets.cad_colors.BlackAndWhite": "Noir et blanc",
+ "presets.cad_colors.Grayscale": "Niveaux de gris",
+ "presets.cad_colors_hint": "Utilisé quand un dessin DWG ou DXF devient un PDF, un SVG ou une image. Noir et blanc trace toutes les lignes et tous les textes en noir, comme un tracé monochrome ; les zones remplies prennent le gris de leur luminosité, pour qu'un remplissage clair ne devienne pas un bloc noir. Niveaux de gris change chaque couleur en gris et fonce les lignes claires, comme le jaune, assez pour qu'elles se lisent.",
"presets.group.image": "Image",
"presets.quality": "Qualité",
"presets.resize": "Redimensionner",
diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.json
index 11dad241..be4c4f61 100644
--- a/src/Filee.App/Assets/i18n/hi.json
+++ b/src/Filee.App/Assets/i18n/hi.json
@@ -626,6 +626,11 @@
"presets.cad_version": "AutoCAD संस्करण",
"presets.cad_version.same": "स्रोत जैसा",
"presets.cad_version_hint": "पुराने संस्करण पुराने AutoCAD और CAD प्रोग्राम में खुलते हैं। 2007 से पहले, टेक्स्ट उसके अनुकूल कोड पेज (कोरियाई, चीनी, जापानी …) में सेव होता है और बाकी हर अक्षर \\U+ कोड के रूप में। जो ऑब्जेक्ट उस संस्करण में नहीं होते, जैसे मल्टीलीडर और मेश, छोड़ दिए जाते हैं। 2007 DWG को 2004 के रूप में सेव किया जाता है, जिसे AutoCAD 2007 खोलता है।",
+ "presets.cad_colors": "रंग",
+ "presets.cad_colors.AsDrawn": "जैसा बना है",
+ "presets.cad_colors.BlackAndWhite": "श्वेत-श्याम",
+ "presets.cad_colors.Grayscale": "ग्रेस्केल",
+ "presets.cad_colors_hint": "जब कोई DWG या DXF ड्रॉइंग PDF, SVG या चित्र बनती है, तब लागू होता है। श्वेत-श्याम हर रेखा और टेक्स्ट को काले रंग में बनाता है, जैसे मोनोक्रोम प्लॉट; भरे हुए क्षेत्र अपनी चमक के अनुसार धूसर हो जाते हैं, ताकि हल्का भराव काला ब्लॉक न बने। ग्रेस्केल हर रंग को धूसर में बदलता है और पीले जैसी हल्की रेखाओं को पढ़ने लायक गहरा कर देता है।",
"presets.group.image": "इमेज",
"presets.quality": "क्वालिटी",
"presets.resize": "आकार बदलें",
diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.json
index 5298e5df..e1b6269b 100644
--- a/src/Filee.App/Assets/i18n/ja.json
+++ b/src/Filee.App/Assets/i18n/ja.json
@@ -626,6 +626,11 @@
"presets.cad_version": "AutoCAD のバージョン",
"presets.cad_version.same": "元のファイルと同じ",
"presets.cad_version_hint": "古いバージョンは古い AutoCAD や CAD ソフトで開けます。2007 より前は、テキストを内容に合ったコードページ(韓国語、中国語、日本語 …)で保存し、それ以外の文字は \\U+ コードで保存します。そのバージョンにないオブジェクト(マルチ引出線、メッシュなど)は省きます。2007 の DWG は AutoCAD 2007 で開ける 2004 として保存します。",
+ "presets.cad_colors": "色",
+ "presets.cad_colors.AsDrawn": "図面のまま",
+ "presets.cad_colors.BlackAndWhite": "白黒",
+ "presets.cad_colors.Grayscale": "グレースケール",
+ "presets.cad_colors_hint": "DWG・DXF 図面を PDF、SVG、画像にするときに使います。白黒はモノクロ印刷のように線と文字をすべて黒で描き、塗りつぶしは明るさに応じたグレーにするので、明るい塗りが黒い塊になりません。グレースケールは各色をグレーにし、黄色などの明るい線は読める濃さまで暗くします。",
"presets.group.image": "画像",
"presets.quality": "品質",
"presets.resize": "サイズ変更",
diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.json
index bb6eb21d..718e2653 100644
--- a/src/Filee.App/Assets/i18n/ko.json
+++ b/src/Filee.App/Assets/i18n/ko.json
@@ -641,6 +641,11 @@
"presets.cad_version": "AutoCAD 버전",
"presets.cad_version.same": "원본과 같게",
"presets.cad_version_hint": "이전 버전은 이전 AutoCAD와 CAD 프로그램에서 열려요. 2007 이전 버전은 텍스트를 내용에 맞는 코드 페이지(한국어, 중국어, 일본어 …)로 저장하고, 그 밖의 문자는 \\U+ 코드로 저장해요. 그 버전에 없는 개체(다중 지시선, 메시 등)는 빠져요. 2007 DWG는 AutoCAD 2007에서 열리는 2004로 저장해요.",
+ "presets.cad_colors": "색",
+ "presets.cad_colors.AsDrawn": "도면 색 그대로",
+ "presets.cad_colors.BlackAndWhite": "흑백",
+ "presets.cad_colors.Grayscale": "회색조",
+ "presets.cad_colors_hint": "DWG·DXF 도면을 PDF, SVG, 그림으로 만들 때 쓰여요. 흑백은 모노크롬 출력처럼 모든 선과 글자를 검은색으로 그리고, 채워진 영역은 밝기에 맞는 회색으로 칠해서 밝은 채우기가 검은 덩어리가 되지 않아요. 회색조는 모든 색을 회색으로 바꾸고, 노란색처럼 밝은 선은 읽을 수 있을 만큼 진하게 해요.",
"presets.group.image": "이미지",
"presets.quality": "품질",
"presets.resize": "크기 조정",
diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.json
index 0716ee27..b3d0537f 100644
--- a/src/Filee.App/Assets/i18n/ne.json
+++ b/src/Filee.App/Assets/i18n/ne.json
@@ -626,6 +626,11 @@
"presets.cad_version": "AutoCAD संस्करण",
"presets.cad_version.same": "स्रोत जस्तै",
"presets.cad_version_hint": "पुराना संस्करण पुराना AutoCAD र CAD प्रोग्राममा खुल्छन्। 2007 भन्दा अघि, पाठ त्यसलाई मिल्ने कोड पेज (कोरियाली, चिनियाँ, जापानी …) मा सेभ हुन्छ र अरू कुनै पनि अक्षर \\U+ कोडको रूपमा। त्यो संस्करणमा नभएका वस्तुहरू, जस्तै मल्टिलिडर र मेस, छोडिन्छन्। 2007 DWG लाई 2004 को रूपमा सेभ गरिन्छ, जुन AutoCAD 2007 ले खोल्छ।",
+ "presets.cad_colors": "रङहरू",
+ "presets.cad_colors.AsDrawn": "रेखाचित्रमा जस्तै",
+ "presets.cad_colors.BlackAndWhite": "कालो र सेतो",
+ "presets.cad_colors.Grayscale": "ग्रेस्केल",
+ "presets.cad_colors_hint": "DWG वा DXF रेखाचित्र PDF, SVG वा चित्र बन्दा प्रयोग हुन्छ। कालो र सेतोले मोनोक्रोम प्लटजस्तै सबै रेखा र पाठ कालोमा बनाउँछ; भरिएका क्षेत्रहरू आफ्नो उज्यालोअनुसार खैरो हुन्छन्, ताकि हल्का भराइ कालो ब्लक नबनोस्। ग्रेस्केलले हरेक रङलाई खैरोमा बदल्छ र पहेँलोजस्ता हल्का रेखाहरूलाई पढ्न मिल्ने गरी गाढा बनाउँछ।",
"presets.group.image": "छवि",
"presets.quality": "गुणस्तर",
"presets.resize": "आकार बदल्नुहोस्",
diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.json
index 7ea3d913..e2f622a2 100644
--- a/src/Filee.App/Assets/i18n/pl.json
+++ b/src/Filee.App/Assets/i18n/pl.json
@@ -641,6 +641,11 @@
"presets.cad_version": "Wersja AutoCAD",
"presets.cad_version.same": "Jak w oryginale",
"presets.cad_version_hint": "Starsze wersje otwierają się w starszym AutoCAD i programach CAD. Przed 2007 tekst jest zapisywany w pasującej do niego stronie kodowej (koreański, chiński, japoński…), a każdy inny znak jako kod \\U+. Obiekty, których ta wersja nie ma, np. multiodnośniki i siatki, są pomijane. DWG 2007 jest zapisywany jako 2004, który AutoCAD 2007 otwiera.",
+ "presets.cad_colors": "Kolory",
+ "presets.cad_colors.AsDrawn": "Jak na rysunku",
+ "presets.cad_colors.BlackAndWhite": "Czarno-biały",
+ "presets.cad_colors.Grayscale": "Skala szarości",
+ "presets.cad_colors_hint": "Używane, gdy rysunek DWG lub DXF staje się plikiem PDF, SVG lub obrazem. Czarno-biały rysuje wszystkie linie i teksty na czarno, jak wydruk monochromatyczny; wypełnione obszary przyjmują szarość odpowiadającą ich jasności, więc jasne wypełnienie nie staje się czarnym blokiem. Skala szarości zamienia każdy kolor na szary i przyciemnia jasne linie, np. żółte, na tyle, by dało się je czytać.",
"presets.group.image": "Obraz",
"presets.quality": "Jakość",
"presets.resize": "Zmień rozmiar",
diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.json
index 140aa954..e4aba608 100644
--- a/src/Filee.App/Assets/i18n/pt-BR.json
+++ b/src/Filee.App/Assets/i18n/pt-BR.json
@@ -641,6 +641,11 @@
"presets.cad_version": "Versão do AutoCAD",
"presets.cad_version.same": "Igual ao original",
"presets.cad_version_hint": "Versões antigas abrem em AutoCAD e programas CAD antigos. Antes de 2007, o texto é salvo na página de código que combina com ele (coreano, chinês, japonês…) e qualquer outro caractere como código \\U+. Objetos que a versão não tem, como multilinhas de chamada e malhas, ficam de fora. Um DWG 2007 é salvo como 2004, que o AutoCAD 2007 abre.",
+ "presets.cad_colors": "Cores",
+ "presets.cad_colors.AsDrawn": "Como no desenho",
+ "presets.cad_colors.BlackAndWhite": "Preto e branco",
+ "presets.cad_colors.Grayscale": "Tons de cinza",
+ "presets.cad_colors_hint": "Usado quando um desenho DWG ou DXF vira PDF, SVG ou imagem. Preto e branco desenha todas as linhas e textos em preto, como uma plotagem monocromática; áreas preenchidas ficam no cinza do seu brilho, para que um preenchimento claro não vire um bloco preto. Tons de cinza transforma cada cor em cinza e escurece linhas claras, como o amarelo, o suficiente para ler.",
"presets.group.image": "Imagem",
"presets.quality": "Qualidade",
"presets.resize": "Redimensionar",
diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.json
index 05327916..b5dd6cdd 100644
--- a/src/Filee.App/Assets/i18n/pt-PT.json
+++ b/src/Filee.App/Assets/i18n/pt-PT.json
@@ -641,6 +641,11 @@
"presets.cad_version": "Versão do AutoCAD",
"presets.cad_version.same": "Igual à origem",
"presets.cad_version_hint": "As versões mais antigas abrem em versões mais antigas do AutoCAD e de outros programas CAD. Antes de 2007, o texto é guardado na página de códigos adequada (coreano, chinês, japonês…) e os restantes carateres como códigos \\U+. Os objetos que a versão não suporta, como linhas de chamada múltiplas e malhas, são omitidos. Um DWG de 2007 é guardado como DWG de 2004, que o AutoCAD 2007 consegue abrir.",
+ "presets.cad_colors": "Cores",
+ "presets.cad_colors.AsDrawn": "Como no desenho",
+ "presets.cad_colors.BlackAndWhite": "Preto e branco",
+ "presets.cad_colors.Grayscale": "Escala de cinzentos",
+ "presets.cad_colors_hint": "Usado quando um desenho DWG ou DXF se torna PDF, SVG ou imagem. Preto e branco desenha todas as linhas e textos a preto, como uma impressão monocromática; as áreas preenchidas ficam no cinzento da sua luminosidade, para que um preenchimento claro não se torne um bloco preto. Escala de cinzentos transforma cada cor num cinzento e escurece as linhas claras, como o amarelo, o suficiente para se lerem.",
"presets.group.image": "Imagem",
"presets.quality": "Qualidade",
"presets.resize": "Redimensionar",
diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.json
index c6b23149..35e415a0 100644
--- a/src/Filee.App/Assets/i18n/ru.json
+++ b/src/Filee.App/Assets/i18n/ru.json
@@ -641,6 +641,11 @@
"presets.cad_version": "Версия AutoCAD",
"presets.cad_version.same": "Как в исходном",
"presets.cad_version_hint": "Старые версии открываются в старых AutoCAD и программах САПР. До 2007 текст сохраняется в подходящей ему кодовой странице (корейской, китайской, японской…), а любой другой символ — кодом \\U+. Объекты, которых в этой версии нет, например мультивыноски и сети, не сохраняются. DWG 2007 сохраняется как 2004, который открывает AutoCAD 2007.",
+ "presets.cad_colors": "Цвета",
+ "presets.cad_colors.AsDrawn": "Как в чертеже",
+ "presets.cad_colors.BlackAndWhite": "Чёрно-белый",
+ "presets.cad_colors.Grayscale": "Оттенки серого",
+ "presets.cad_colors_hint": "Применяется, когда чертёж DWG или DXF становится PDF, SVG или изображением. Чёрно-белый рисует все линии и тексты чёрным, как монохромная печать; заливки становятся серыми по своей яркости, чтобы светлая заливка не превратилась в чёрный блок. Оттенки серого переводят каждый цвет в серый и затемняют светлые линии, например жёлтые, настолько, чтобы их можно было прочитать.",
"presets.group.image": "Изображение",
"presets.quality": "Качество",
"presets.resize": "Размер",
diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.json
index bd33fbba..76f4a0f0 100644
--- a/src/Filee.App/Assets/i18n/th.json
+++ b/src/Filee.App/Assets/i18n/th.json
@@ -626,6 +626,11 @@
"presets.cad_version": "เวอร์ชัน AutoCAD",
"presets.cad_version.same": "เหมือนต้นฉบับ",
"presets.cad_version_hint": "เวอร์ชันเก่าเปิดได้ใน AutoCAD และโปรแกรม CAD รุ่นเก่า ก่อน 2007 ข้อความจะถูกบันทึกในโค้ดเพจที่เหมาะกับข้อความนั้น (เกาหลี จีน ญี่ปุ่น …) และตัวอักษรอื่นเป็นรหัส \\U+ วัตถุที่เวอร์ชันนั้นไม่มี เช่น มัลติลีดเดอร์และเมช จะถูกละไว้ DWG 2007 จะบันทึกเป็น 2004 ซึ่ง AutoCAD 2007 เปิดได้",
+ "presets.cad_colors": "สี",
+ "presets.cad_colors.AsDrawn": "ตามแบบ",
+ "presets.cad_colors.BlackAndWhite": "ขาวดำ",
+ "presets.cad_colors.Grayscale": "ระดับสีเทา",
+ "presets.cad_colors_hint": "ใช้เมื่อแปลงแบบ DWG หรือ DXF เป็น PDF, SVG หรือรูปภาพ ขาวดำจะวาดเส้นและข้อความทั้งหมดเป็นสีดำเหมือนการพล็อตแบบโมโนโครม ส่วนพื้นที่ที่ระบายทึบจะเป็นสีเทาตามความสว่างของสีเดิม เพื่อไม่ให้พื้นสีอ่อนกลายเป็นก้อนสีดำ ระดับสีเทาจะเปลี่ยนทุกสีเป็นสีเทา และทำให้เส้นสีอ่อนอย่างสีเหลืองเข้มขึ้นพอให้อ่านได้",
"presets.group.image": "รูปภาพ",
"presets.quality": "คุณภาพ",
"presets.resize": "ปรับขนาด",
diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.json
index 0a0ddf6c..0b9c6254 100644
--- a/src/Filee.App/Assets/i18n/tr.json
+++ b/src/Filee.App/Assets/i18n/tr.json
@@ -626,6 +626,11 @@
"presets.cad_version": "AutoCAD sürümü",
"presets.cad_version.same": "Kaynakla aynı",
"presets.cad_version_hint": "Eski sürümler, eski AutoCAD ve CAD programlarında açılır. 2007 öncesinde metin, kendisine uygun kod sayfasıyla (Korece, Çince, Japonca…) kaydedilir; diğer karakterler \\U+ kodu olarak yazılır. Sürümün desteklemediği çoklu kılavuz ve ağ gibi nesneler çıkarılır. 2007 DWG, AutoCAD 2007'nin açabildiği 2004 olarak kaydedilir.",
+ "presets.cad_colors": "Renkler",
+ "presets.cad_colors.AsDrawn": "Çizimdeki gibi",
+ "presets.cad_colors.BlackAndWhite": "Siyah beyaz",
+ "presets.cad_colors.Grayscale": "Gri tonlama",
+ "presets.cad_colors_hint": "Bir DWG veya DXF çizimi PDF, SVG ya da resim olduğunda kullanılır. Siyah beyaz, tek renkli bir çizim çıktısı gibi tüm çizgileri ve yazıları siyah çizer; dolgulu alanlar parlaklıklarına göre griye döner, böylece açık renkli bir dolgu siyah bir bloğa dönüşmez. Gri tonlama her rengi griye çevirir ve sarı gibi açık çizgileri okunacak kadar koyulaştırır.",
"presets.group.image": "Görsel",
"presets.quality": "Kalite",
"presets.resize": "Yeniden boyutlandır",
diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.json
index 7f250fbd..4b0ebf24 100644
--- a/src/Filee.App/Assets/i18n/zh-CN.json
+++ b/src/Filee.App/Assets/i18n/zh-CN.json
@@ -641,6 +641,11 @@
"presets.cad_version": "AutoCAD 版本",
"presets.cad_version.same": "与源文件相同",
"presets.cad_version_hint": "旧版本可在旧版 AutoCAD 和 CAD 软件中打开。2007 之前,文字按适合它的代码页(韩文、中文、日文……)保存,其他字符保存为 \\U+ 代码。该版本没有的对象(多重引线、网格等)会被省略。2007 DWG 保存为 AutoCAD 2007 能打开的 2004。",
+ "presets.cad_colors": "颜色",
+ "presets.cad_colors.AsDrawn": "按图纸原色",
+ "presets.cad_colors.BlackAndWhite": "黑白",
+ "presets.cad_colors.Grayscale": "灰度",
+ "presets.cad_colors_hint": "DWG 或 DXF 图纸转换为 PDF、SVG 或图片时使用。黑白像单色打印一样把所有线条和文字画成黑色;填充区域按亮度变为灰色,浅色填充不会变成黑块。灰度把每种颜色转为灰色,并把黄色等浅色线条加深到能看清。",
"presets.group.image": "图片",
"presets.quality": "质量",
"presets.resize": "调整大小",
diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.json
index 2d8f1978..5375cda8 100644
--- a/src/Filee.App/Assets/i18n/zh-TW.json
+++ b/src/Filee.App/Assets/i18n/zh-TW.json
@@ -641,6 +641,11 @@
"presets.cad_version": "AutoCAD 版本",
"presets.cad_version.same": "與來源檔案相同",
"presets.cad_version_hint": "舊版本可在舊版 AutoCAD 與 CAD 軟體中開啟。2007 之前,文字以適合它的字碼頁(韓文、中文、日文……)儲存,其他字元儲存為 \\U+ 代碼。該版本沒有的物件(複線引線、網格等)會略過。2007 DWG 儲存為 AutoCAD 2007 能開啟的 2004。",
+ "presets.cad_colors": "顏色",
+ "presets.cad_colors.AsDrawn": "依圖面原色",
+ "presets.cad_colors.BlackAndWhite": "黑白",
+ "presets.cad_colors.Grayscale": "灰階",
+ "presets.cad_colors_hint": "DWG 或 DXF 圖面轉成 PDF、SVG 或圖片時使用。黑白會像單色出圖一樣把所有線條和文字畫成黑色;填滿區域依亮度變成灰色,淺色填滿不會變成黑塊。灰階會把每種顏色轉成灰色,並把黃色等淺色線條加深到看得清楚。",
"presets.group.image": "圖片",
"presets.quality": "品質",
"presets.resize": "調整大小",
diff --git a/src/Filee.App/ViewModels/PresetEditorViewModel.cs b/src/Filee.App/ViewModels/PresetEditorViewModel.cs
index 9e74a1fa..8c62e5bf 100644
--- a/src/Filee.App/ViewModels/PresetEditorViewModel.cs
+++ b/src/Filee.App/ViewModels/PresetEditorViewModel.cs
@@ -109,6 +109,7 @@ public sealed partial class PresetEditorViewModel : ObservableObject
// Version names stay as AutoCAD calls them, in every language.
CadVersions = Enum.GetValues<CadVersion>().Select(v => new Choice<CadVersion>(v,
v == Core.Presets.CadVersion.SameAsSource ? loc["presets.cad_version.same"] : "AutoCAD " + v.ToString()["AutoCad".Length..])).ToList();
+ CadColorChoices = Enum.GetValues<CadColors>().Select(v => new Choice<CadColors>(v, loc[$"presets.cad_colors.{v}"])).ToList();
// A speed set outside the editor (a hand-edited preset file) is offered too, instead of being lost.
AnimationSpeeds = [.. ImageOptions.AnimationSpeeds.Append(_edit.Image.PlaybackSpeed).Distinct().Order()
.Select(s => new Choice<double>(s, s == 1 ? loc["presets.animation_speed.original"] : SpeedLabel(s)))];
@@ -155,6 +156,7 @@ public sealed partial class PresetEditorViewModel : ObservableObject
_crossfade = _edit.Media.Crossfade;
_traceMode = TraceModes.First(m => m.Value == _edit.Trace.Mode);
_cadVersion = CadVersions.First(v => v.Value == _edit.Cad.Version);
+ _cadColors = CadColorChoices.FirstOrDefault(c => c.Value == _edit.Cad.Colors) ?? CadColorChoices[0];
_animationSpeed = AnimationSpeeds.First(s => s.Value == _edit.Image.PlaybackSpeed);
_traceColors = Math.Clamp(_edit.Trace.Colors, TracingOptions.MinColors, TracingOptions.MaxColors);
_traceDetail = Math.Clamp(_edit.Trace.Detail, 0, 100);
@@ -233,6 +235,9 @@ public sealed partial class PresetEditorViewModel : ObservableObject
/// <summary>The AutoCAD version a DWG or DXF is written in (CadOptions.Version, #489).</summary>
public IReadOnlyList<Choice<CadVersion>> CadVersions { get; }
+ /// <summary>The colours a drawing is drawn in: as drawn, black and white, grayscale (CadOptions.Colors, #411).</summary>
+ public IReadOnlyList<Choice<CadColors>> CadColorChoices { get; }
+
/// <summary>Playback speeds of animations, 0.25× to 4× (ImageOptions.AnimationSpeed).</summary>
public IReadOnlyList<Choice<double>> AnimationSpeeds { get; }
@@ -248,7 +253,7 @@ public sealed partial class PresetEditorViewModel : ObservableObject
nameof(ShowAudioChannels), nameof(ShowWav), nameof(VideoCodecs), nameof(VideoCodecChoice), nameof(ShowVideoCodec), nameof(ShowHardwareEncoding),
nameof(AudioCodecs), nameof(AudioCodecChoice), nameof(ShowAudioCodec),
nameof(ShowArchive), nameof(ShowArchiveOptions), nameof(ShowExtractNote),
- nameof(ShowSaveEveryFrame), nameof(ShowAnimationSpeed), nameof(ShowTrace), nameof(ShowCad), nameof(ShowExtractMotionPhoto), nameof(ShowSlideshow),
+ nameof(ShowSaveEveryFrame), nameof(ShowAnimationSpeed), nameof(ShowTrace), nameof(ShowCad), nameof(ShowCadColors), nameof(ShowExtractMotionPhoto), nameof(ShowSlideshow),
nameof(ShowLivePhotoChoice), nameof(LivePhotoKinds), nameof(LivePhotoChoice), nameof(IsLivePhoto), nameof(LivePhotoHint))]
private Choice<string> _target;
@@ -515,6 +520,7 @@ public sealed partial class PresetEditorViewModel : ObservableObject
[ObservableProperty] private int _traceColors;
[ObservableProperty] private Choice<CadVersion> _cadVersion;
+ [ObservableProperty] private Choice<CadColors> _cadColors;
[ObservableProperty] private int _traceDetail;
[ObservableProperty] private Choice<double> _animationSpeed;
@@ -539,6 +545,7 @@ public sealed partial class PresetEditorViewModel : ObservableObject
partial void OnArchiveLevelChanged(Choice<ArchiveLevel>? oldValue, Choice<ArchiveLevel> newValue) => Choices.Restore(oldValue, newValue, v => ArchiveLevel = v);
partial void OnTraceModeChanged(Choice<TracingMode>? oldValue, Choice<TracingMode> newValue) => Choices.Restore(oldValue, newValue, v => TraceMode = v);
partial void OnCadVersionChanged(Choice<CadVersion>? oldValue, Choice<CadVersion> newValue) => Choices.Restore(oldValue, newValue, v => CadVersion = v);
+ partial void OnCadColorsChanged(Choice<CadColors>? oldValue, Choice<CadColors> newValue) => Choices.Restore(oldValue, newValue, v => CadColors = v);
partial void OnCompressionLevelChanged(Choice<PdfCompression>? oldValue, Choice<PdfCompression> newValue) =>
Choices.Restore(oldValue, newValue, v => CompressionLevel = v);
partial void OnAnimationSpeedChanged(Choice<double>? oldValue, Choice<double> newValue) =>
@@ -644,6 +651,9 @@ public sealed partial class PresetEditorViewModel : ObservableObject
/// <summary>The AutoCAD version, for presets that write DWG or DXF.</summary>
public bool ShowCad => !IsTool && TargetId is "dxf" or "dwg";
+
+ /// <summary>The colours, for the targets a DWG or DXF is drawn into: PDF, SVG and pictures.</summary>
+ public bool ShowCadColors => !IsTool && (TargetId is "pdf" or "svg" || TargetCategory == FormatCategory.Image);
public bool ShowTraceColors => TraceMode.Value == TracingMode.Color;
public bool ShowPercent => Resize.Value == ResizeMode.Percent;
public bool ShowLongEdge => Resize.Value == ResizeMode.LongEdge;
@@ -773,8 +783,10 @@ public sealed partial class PresetEditorViewModel : ObservableObject
_original.Trace.Mode = TraceMode.Value;
_original.Trace.Colors = Math.Clamp(TraceColors, TracingOptions.MinColors, TracingOptions.MaxColors);
_original.Trace.Detail = Math.Clamp(TraceDetail, 0, 100);
- // Only where it is shown: a version chosen for DWG and left behind by a PNG target is not kept.
+ // Only where they are shown: a version chosen for DWG and left behind by a PNG target is not kept, nor
+ // black and white chosen for PDF and left behind by a DWG target.
_original.Cad.Version = ShowCad ? CadVersion.Value : default;
+ _original.Cad.Colors = ShowCadColors ? CadColors.Value : default;
var output = _original.Output;
// Asking keeps the location it had: a Filee that can't ask (or one from before it) saves there.
diff --git a/src/Filee.App/Views/PresetEditorView.axaml b/src/Filee.App/Views/PresetEditorView.axaml
index 99893395..76ddc1f0 100644
--- a/src/Filee.App/Views/PresetEditorView.axaml
+++ b/src/Filee.App/Views/PresetEditorView.axaml
@@ -453,6 +453,21 @@
</StackPanel>
</Border>
+ <!-- DWG / DXF drawn into a PDF, SVG or picture: as drawn, black and white or grayscale (#411). After the PDF card:
+ most PDFs and pictures aren't made from drawings. -->
+ <Border x:Name="CadColorsCard" Classes="card" IsVisible="{Binding ShowCadColors}" Padding="14">
+ <StackPanel Spacing="10">
+ <TextBlock Classes="h2" Text="{DynamicResource presets.group.cad}" />
+ <Grid ColumnDefinitions="*,12,*">
+ <StackPanel>
+ <TextBlock Classes="label" Text="{DynamicResource presets.cad_colors}" />
+ <ComboBox ItemsSource="{Binding CadColorChoices}" SelectedItem="{Binding CadColors}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.cad_colors}" />
+ </StackPanel>
+ </Grid>
+ <TextBlock Classes="caption" Text="{DynamicResource presets.cad_colors_hint}" TextWrapping="Wrap" />
+ </StackPanel>
+ </Border>
+
<!-- Output -->
<Border Classes="card" Padding="14">
<StackPanel Spacing="10">
diff --git a/src/Filee.Core/Presets/Preset.cs b/src/Filee.Core/Presets/Preset.cs
index a795927f..2c08eb44 100644
--- a/src/Filee.Core/Presets/Preset.cs
+++ b/src/Filee.Core/Presets/Preset.cs
@@ -99,7 +99,7 @@ public sealed class Preset
/// <summary>Options used when a raster image is traced into vector shapes (PNG → SVG, DXF ...).</summary>
public TracingOptions Trace { get; set; } = new();
- /// <summary>Options used when a DWG or DXF is written.</summary>
+ /// <summary>Options used when a DWG or DXF is written or drawn.</summary>
public CadOptions Cad { get; set; } = new();
/// <summary>Where and how output files are written.</summary>
@@ -940,13 +940,34 @@ public enum CadVersion
SameAsSource,
}
-/// <summary>Options for writing DWG and DXF.</summary>
+/// <summary>How a DWG or DXF drawn to PDF, SVG or a picture is coloured (#411), like a plot style in AutoCAD.</summary>
+public enum CadColors
+{
+ /// <summary>The drawing's own colours; only white lines turn black on the white page.</summary>
+ AsDrawn,
+ /// <summary>
+ /// Lines, text and arrowheads in black like monochrome.ctb; filled hatches in the gray of their brightness, so a
+ /// light fill doesn't become a black block.
+ /// </summary>
+ BlackAndWhite,
+ /// <summary>Every colour as the gray of its brightness, lines and text kept dark enough to read.</summary>
+ Grayscale,
+}
+
+/// <summary>Options for DWG and DXF: the version they are written in and the colours they are drawn in.</summary>
public sealed class CadOptions
{
/// <summary>A version from a newer Filee reads as <see cref="CadVersion.AutoCad2018"/>.</summary>
[JsonConverter(typeof(LenientEnumJsonConverter<CadVersion>))]
public CadVersion Version { get; set; }
+ /// <summary>
+ /// Colours of a drawing rendered to PDF, SVG or a picture. Filee 2.1.0 skips the property it doesn't know, and
+ /// a choice from a newer Filee reads as <see cref="CadColors.AsDrawn"/>.
+ /// </summary>
+ [JsonConverter(typeof(LenientEnumJsonConverter<CadColors>))]
+ public CadColors Colors { get; set; }
+
public CadOptions Clone() => (CadOptions)MemberwiseClone();
}
diff --git a/src/Filee.Engines/Cad/CadConverter.cs b/src/Filee.Engines/Cad/CadConverter.cs
index 0e9acab8..a2754701 100644
--- a/src/Filee.Engines/Cad/CadConverter.cs
+++ b/src/Filee.Engines/Cad/CadConverter.cs
@@ -18,7 +18,8 @@ namespace Filee.Engines.Cad;
/// Rendering draws model space as seen from the top (the active layout when model space is empty), fitted to the
/// page: PDF on an A3 sheet (A4 / Letter when the preset says so), SVG and images with the drawing's aspect ratio
/// on a white background. A PDF of a drawing with paper-space layouts has one page per layout instead, with model
-/// space shown through each layout's viewports. See docs/ENGINES.md for what is and is not drawn.
+/// space shown through each layout's viewports. Every rendered output takes the preset's colours (as drawn, black and
+/// white, grayscale: <see cref="CadPalette"/>). See docs/ENGINES.md for what is and is not drawn.
/// </remarks>
public sealed class CadConverter(ILogger? logger = null) : IConverter, IImageTransformer
{
@@ -85,6 +86,7 @@ public sealed class CadConverter(ILogger? logger = null) : IConverter, IImageTra
var output = step.Output.Allocate(step.To);
if (output is null)
return [];
+ var palette = new CadPalette(step.Preset.Cad.Colors);
switch (step.To)
{
case "pdf":
@@ -93,18 +95,18 @@ public sealed class CadConverter(ILogger? logger = null) : IConverter, IImageTra
// With empty model space the scene is the active layout's paper space, which must not show
// through the viewports.
if (sheets.Count > 0)
- CadRenderer.WritePdf(sheets, scene.Space == "model" ? scene : new CadScene(), step.Preset.Pdf,
+ CadRenderer.WritePdf(sheets, scene.Space == "model" ? scene : new CadScene(), step.Preset.Pdf, palette,
Path.GetFileNameWithoutExtension(step.InputPath), stream);
else
- CadRenderer.WritePdf(scene, step.Preset.Pdf, Path.GetFileNameWithoutExtension(step.InputPath), stream);
+ CadRenderer.WritePdf(scene, step.Preset.Pdf, palette, Path.GetFileNameWithoutExtension(step.InputPath), stream);
}
break;
case "svg":
using (var stream = File.Create(output))
- CadRenderer.WriteSvg(scene, stream);
+ CadRenderer.WriteSvg(scene, palette, stream);
break;
default:
- WriteImage(scene, step, output);
+ WriteImage(scene, step, palette, output);
break;
}
progress?.Report(1);
@@ -116,10 +118,10 @@ public sealed class CadConverter(ILogger? logger = null) : IConverter, IImageTra
/// A3-sized page that is about 2500 px on the long edge), then applies the image options like other image
/// conversions do (resize, grayscale, quality, DPI).
/// </summary>
- private static void WriteImage(CadScene scene, ConversionStep step, string output)
+ private static void WriteImage(CadScene scene, ConversionStep step, CadPalette palette, string output)
{
var dpi = Math.Clamp(step.Preset.Pdf.RenderDpi, 36, 1200);
- using var bitmap = CadRenderer.RenderBitmap(scene, dpi);
+ using var bitmap = CadRenderer.RenderBitmap(scene, dpi, palette);
using var data = bitmap.Encode(SKEncodedImageFormat.Png, 100);
using var image = new MagickImage(data.ToArray());
image.Density = new Density(dpi, dpi, DensityUnit.PixelsPerInch);
diff --git a/src/Filee.Engines/Cad/CadPalette.cs b/src/Filee.Engines/Cad/CadPalette.cs
new file mode 100644
index 00000000..b9073065
--- /dev/null
+++ b/src/Filee.Engines/Cad/CadPalette.cs
@@ -0,0 +1,48 @@
+// The colours a drawing is printed in (CadOptions.Colors, #411), applied while drawing so PDF, SVG and pictures
+// all get them: the scene keeps the drawing's own colours.
+
+using Filee.Core.Presets;
+using SkiaSharp;
+
+namespace Filee.Engines.Cad;
+
+/// <summary>Maps the drawing's colours to the colours printed, like a plot style table in AutoCAD.</summary>
+/// <remarks>
+/// <para>
+/// Ink is everything drawn with a pen: lines, curves, text, dimensions, hatch pattern lines, points and the small
+/// fills that are part of a line (arrowheads, SOLID / TRACE, wide polyline segments). Black and white prints all of it
+/// black, as monochrome.ctb does. Grayscale prints it as the gray of its brightness, scaled so the lightest colour is
+/// still a mid gray: yellow (the brightest pen colour) would otherwise be almost white, as unreadable as it is now.
+/// </para>
+/// <para>
+/// Areas are filled hatches (solid, gradient, and the tint of a pattern too dense to draw). monochrome.ctb fills them
+/// black, which turns a light background colour into a black block hiding the lines and text drawn over it. Both
+/// choices print an area as the gray of its brightness instead: a yellow or light blue fill stays light, a dark fill
+/// stays dark, a black one stays black. The page itself stays white.
+/// </para>
+/// </remarks>
+internal readonly record struct CadPalette(CadColors Colors)
+{
+ /// <summary>The lightest gray ink is printed in with <see cref="CadColors.Grayscale"/>.</summary>
+ private const double LightestInk = 160;
+
+ public SKColor Ink(SKColor color) => Colors switch
+ {
+ CadColors.BlackAndWhite => new SKColor(0, 0, 0, color.Alpha),
+ CadColors.Grayscale => Gray(Brightness(color) * LightestInk / 255, color.Alpha),
+ _ => color,
+ };
+
+ public SKColor Area(SKColor color) => Colors is CadColors.BlackAndWhite or CadColors.Grayscale
+ ? Gray(Brightness(color), color.Alpha)
+ : color;
+
+ /// <summary>Luma with the Rec. 601 weights, the usual grayscale conversion of sRGB values (0–255).</summary>
+ private static double Brightness(SKColor color) => 0.299 * color.Red + 0.587 * color.Green + 0.114 * color.Blue;
+
+ private static SKColor Gray(double level, byte alpha)
+ {
+ var value = (byte)Math.Clamp(Math.Round(level), 0, 255);
+ return new SKColor(value, value, value, alpha);
+ }
+}
diff --git a/src/Filee.Engines/Cad/CadRenderer.cs b/src/Filee.Engines/Cad/CadRenderer.cs
index 444d3279..1cc09741 100644
--- a/src/Filee.Engines/Cad/CadRenderer.cs
+++ b/src/Filee.Engines/Cad/CadRenderer.cs
@@ -134,7 +134,7 @@ internal static class CadRenderer
private const int MaxDashesPerFigure = 20_000;
/// <summary>Writes a one-page vector PDF.</summary>
- public static void WritePdf(CadScene scene, PdfOptions options, string title, Stream output)
+ public static void WritePdf(CadScene scene, PdfOptions options, CadPalette palette, string title, Stream output)
{
var page = PageLayout.ForPdf(scene.Extents, options);
var metadata = new SKDocumentPdfMetadata
@@ -148,7 +148,7 @@ internal static class CadRenderer
};
using var document = SKDocument.CreatePdf(output, metadata);
var canvas = document.BeginPage(page.Width, page.Height);
- Draw(canvas, scene, page, background: false);
+ Draw(canvas, scene, page, palette, background: false);
document.EndPage();
document.Close();
}
@@ -158,7 +158,7 @@ internal static class CadRenderer
/// drawing and viewport frames; inside each frame model space is drawn at the viewport's scale, clipped to it,
/// under the layout's own drawing (title block, notes).
/// </summary>
- public static void WritePdf(IReadOnlyList<LayoutSheet> sheets, CadScene model, PdfOptions options, string title, Stream output)
+ public static void WritePdf(IReadOnlyList<LayoutSheet> sheets, CadScene model, PdfOptions options, CadPalette palette, string title, Stream output)
{
var metadata = new SKDocumentPdfMetadata
{
@@ -182,22 +182,22 @@ internal static class CadRenderer
canvas.ClipRect(new SKRect(Math.Min(corner1.X, corner2.X), Math.Min(corner1.Y, corner2.Y),
Math.Max(corner1.X, corner2.X), Math.Max(corner1.Y, corner2.Y)));
var center = new Vec2((view.Frame.MinX + view.Frame.MaxX) / 2, (view.Frame.MinY + view.Frame.MaxY) / 2);
- Draw(canvas, model, page.Through(view.Scale, view.ViewCenter, center), background: false);
+ Draw(canvas, model, page.Through(view.Scale, view.ViewCenter, center), palette, background: false);
canvas.Restore();
}
- Draw(canvas, sheet.Paper, page, background: false);
+ Draw(canvas, sheet.Paper, page, palette, background: false);
document.EndPage();
}
document.Close();
}
/// <summary>Writes an SVG (pixel units at 96 dpi) with a white background.</summary>
- public static void WriteSvg(CadScene scene, Stream output)
+ public static void WriteSvg(CadScene scene, CadPalette palette, Stream output)
{
var page = PageLayout.ForImage(scene.Extents, 96 / 25.4);
// The SVG canvas writes its XML when disposed; the stream must stay open until then.
using (var canvas = SKSvgCanvas.Create(new SKRect(0, 0, page.Width, page.Height), output))
- Draw(canvas, scene, page, background: true);
+ Draw(canvas, scene, page, palette, background: true);
output.Flush();
}
@@ -205,7 +205,7 @@ internal static class CadRenderer
/// Renders a white-background bitmap at <paramref name="dpi"/> (for the virtual A3 page), limited to a
/// sensible pixel count.
/// </summary>
- public static SKBitmap RenderBitmap(CadScene scene, double dpi)
+ public static SKBitmap RenderBitmap(CadScene scene, double dpi, CadPalette palette)
{
const double MaxEdge = 12_000;
const double MaxPixels = 80_000_000;
@@ -216,13 +216,16 @@ internal static class CadRenderer
var bitmap = new SKBitmap(new SKImageInfo(Math.Max(1, (int)Math.Round(page.Width)), Math.Max(1, (int)Math.Round(page.Height)), SKColorType.Rgba8888, SKAlphaType.Premul));
using var canvas = new SKCanvas(bitmap);
- Draw(canvas, scene, page, background: true);
+ Draw(canvas, scene, page, palette, background: true);
canvas.Flush();
return bitmap;
}
- /// <summary>Draws every primitive in order. Consecutive strokes with the same pen are merged into one path.</summary>
- public static void Draw(SKCanvas canvas, CadScene scene, PageLayout page, bool background)
+ /// <summary>
+ /// Draws every primitive in order, in the colours of <paramref name="palette"/>. Consecutive strokes with the same
+ /// pen are merged into one path.
+ /// </summary>
+ public static void Draw(SKCanvas canvas, CadScene scene, PageLayout page, CadPalette palette, bool background)
{
if (background)
{
@@ -236,33 +239,33 @@ internal static class CadRenderer
switch (item)
{
case StrokePrimitive stroke:
- DrawStroke(batch, stroke, page);
+ DrawStroke(batch, stroke, page, palette.Ink(stroke.Color));
break;
case InfiniteLinePrimitive line:
- DrawInfinite(batch, line, page);
+ DrawInfinite(batch, line, page, palette.Ink(line.Color));
break;
case FillPrimitive fill:
batch.Flush();
- DrawFill(canvas, fill, page);
+ DrawFill(canvas, fill, page, palette);
break;
case HatchLinesPrimitive hatch:
batch.Flush();
- DrawHatchLines(canvas, hatch, page);
+ DrawHatchLines(canvas, hatch, page, palette.Ink(hatch.Color));
break;
case TextPrimitive text:
batch.Flush();
- DrawText(canvas, text, page);
+ DrawText(canvas, text, page, palette.Ink(text.Color));
break;
case PointPrimitive point:
batch.Flush();
- DrawPoint(canvas, point, page);
+ DrawPoint(canvas, point, page, palette.Ink(point.Color));
break;
}
}
batch.Flush();
}
- private static void DrawStroke(StrokeBatch batch, StrokePrimitive stroke, PageLayout page)
+ private static void DrawStroke(StrokeBatch batch, StrokePrimitive stroke, PageLayout page, SKColor color)
{
var penWidth = stroke.WidthMm * page.UnitsPerMm;
var wide = stroke.WorldWidth > 0 && stroke.WorldWidth * page.Scale > penWidth;
@@ -273,14 +276,14 @@ internal static class CadRenderer
var dashes = PageDashes(stroke.Dashes, page);
if (dashes is null)
{
- batch.Add(path, stroke.Color, (float)width, wide);
+ batch.Add(path, color, (float)width, wide);
return;
}
using var dashed = Dash(path, dashes);
- batch.Add(dashed ?? path, stroke.Color, (float)width, wide);
+ batch.Add(dashed ?? path, color, (float)width, wide);
}
- private static void DrawInfinite(StrokeBatch batch, InfiniteLinePrimitive line, PageLayout page)
+ private static void DrawInfinite(StrokeBatch batch, InfiniteLinePrimitive line, PageLayout page, SKColor color)
{
// Clip to the page: the lines only need to reach its corners.
var corners = new[] { page.FromPage(0, 0), page.FromPage(page.Width, 0), page.FromPage(0, page.Height), page.FromPage(page.Width, page.Height) };
@@ -290,15 +293,17 @@ internal static class CadRenderer
return;
var figure = new Figure(line.Origin + line.Direction * tMin);
figure.LineTo(line.Origin + line.Direction * tMax);
- DrawStroke(batch, new StrokePrimitive { Color = line.Color, WidthMm = line.WidthMm, Dashes = line.Dashes, Figures = { figure } }, page);
+ DrawStroke(batch, new StrokePrimitive { WidthMm = line.WidthMm, Dashes = line.Dashes, Figures = { figure } }, page, color);
}
- private static void DrawFill(SKCanvas canvas, FillPrimitive fill, PageLayout page)
+ private static void DrawFill(SKCanvas canvas, FillPrimitive fill, PageLayout page, CadPalette palette)
{
+ // A filled hatch is an area, anything else (arrowheads, SOLID, wide polylines) is ink: see CadPalette.
+ var color = fill.IsArea ? palette.Area(fill.Color) : palette.Ink(fill.Color);
using var path = new SKPath { FillType = SKPathFillType.EvenOdd };
foreach (var figure in fill.Figures)
AddFigure(path, figure, page, close: true);
- using var paint = new SKPaint { Color = fill.Color, Style = SKPaintStyle.Fill, IsAntialias = true };
+ using var paint = new SKPaint { Color = color, Style = SKPaintStyle.Fill, IsAntialias = true };
if (fill.GradientColor is { } second)
{
var bounds = path.Bounds;
@@ -308,12 +313,12 @@ internal static class CadRenderer
paint.Shader = SKShader.CreateLinearGradient(
new SKPoint(bounds.MidX - direction.X, bounds.MidY - direction.Y),
new SKPoint(bounds.MidX + direction.X, bounds.MidY + direction.Y),
- [fill.Color, second], SKShaderTileMode.Clamp);
+ [color, fill.IsArea ? palette.Area(second) : palette.Ink(second)], SKShaderTileMode.Clamp);
}
canvas.DrawPath(path, paint);
}
- private static void DrawHatchLines(SKCanvas canvas, HatchLinesPrimitive hatch, PageLayout page)
+ private static void DrawHatchLines(SKCanvas canvas, HatchLinesPrimitive hatch, PageLayout page, SKColor color)
{
using var clip = new SKPath { FillType = SKPathFillType.EvenOdd };
foreach (var figure in hatch.Boundary)
@@ -324,14 +329,14 @@ internal static class CadRenderer
lines.MoveTo(page.Point(a));
lines.LineTo(page.Point(b));
}
- using var paint = Pen(hatch.Color, (float)(hatch.WidthMm * page.UnitsPerMm), wide: false);
+ using var paint = Pen(color, (float)(hatch.WidthMm * page.UnitsPerMm), wide: false);
canvas.Save();
canvas.ClipPath(clip, SKClipOperation.Intersect, antialias: true);
canvas.DrawPath(lines, paint);
canvas.Restore();
}
- private static void DrawText(SKCanvas canvas, TextPrimitive text, PageLayout page)
+ private static void DrawText(SKCanvas canvas, TextPrimitive text, PageLayout page, SKColor color)
{
var origin = page.ToPage(text.Origin);
var x = page.VectorToPage(text.XAxis);
@@ -346,17 +351,17 @@ internal static class CadRenderer
(float)(x.Y / size), (float)(y.Y / size), (float)origin.Y,
0, 0, 1);
using var font = CadFonts.CreateFont(text.Typeface, (float)size);
- using var paint = new SKPaint { Color = text.Color, IsAntialias = true, Style = SKPaintStyle.Fill };
+ using var paint = new SKPaint { Color = color, IsAntialias = true, Style = SKPaintStyle.Fill };
canvas.Save();
canvas.Concat(in matrix);
canvas.DrawText(text.Text, 0, 0, font, paint);
canvas.Restore();
}
- private static void DrawPoint(SKCanvas canvas, PointPrimitive point, PageLayout page)
+ private static void DrawPoint(SKCanvas canvas, PointPrimitive point, PageLayout page, SKColor color)
{
var radius = (float)Math.Max(point.WidthMm * page.UnitsPerMm, 0.3 * page.UnitsPerMm) / 2;
- using var paint = new SKPaint { Color = point.Color, IsAntialias = true, Style = SKPaintStyle.Fill };
+ using var paint = new SKPaint { Color = color, IsAntialias = true, Style = SKPaintStyle.Fill };
canvas.DrawCircle(page.Point(point.Location), radius, paint);
}
diff --git a/src/Filee.Engines/Cad/CadScene.cs b/src/Filee.Engines/Cad/CadScene.cs
index 0cf13899..c51ac4bf 100644
--- a/src/Filee.Engines/Cad/CadScene.cs
+++ b/src/Filee.Engines/Cad/CadScene.cs
@@ -39,6 +39,12 @@ internal sealed class FillPrimitive : ScenePrimitive
public SKColor? GradientColor { get; init; }
public double GradientAngle { get; init; }
+
+ /// <summary>
+ /// A filled hatch (solid, gradient, or the tint of a pattern too dense to draw): an area, not ink like an
+ /// arrowhead or a wide polyline. Black-and-white and grayscale output shade it instead of filling it black.
+ /// </summary>
+ public bool IsArea { get; init; }
}
/// <summary>Pattern hatch lines, clipped by the hatch boundary when drawn.</summary>
diff --git a/src/Filee.Engines/Cad/CadSceneBuilder.Hatch.cs b/src/Filee.Engines/Cad/CadSceneBuilder.Hatch.cs
index 25db1e55..ce0f911e 100644
--- a/src/Filee.Engines/Cad/CadSceneBuilder.Hatch.cs
+++ b/src/Filee.Engines/Cad/CadSceneBuilder.Hatch.cs
@@ -41,7 +41,7 @@ internal sealed partial class CadSceneBuilder
color = ResolveColor(gradient.Colors[0].Color, layer, context);
second = gradient.Colors.Count > 1 ? ResolveColor(gradient.Colors[1].Color, layer, context) : Blend(color, SKColors.White, 0.8);
}
- var fill = new FillPrimitive { Color = color, GradientColor = second, GradientAngle = gradient?.Angle ?? 0 };
+ var fill = new FillPrimitive { Color = color, GradientColor = second, GradientAngle = gradient?.Angle ?? 0, IsArea = true };
fill.Figures.AddRange(boundary);
AddFill(fill);
return;
@@ -56,7 +56,7 @@ internal sealed partial class CadSceneBuilder
if (lines is null)
{
// Too dense (or no pattern data): a light tint of the hatch colour keeps the area recognisable.
- var tint = new FillPrimitive { Color = Blend(color, SKColors.White, 0.75) };
+ var tint = new FillPrimitive { Color = Blend(color, SKColors.White, 0.75), IsArea = true };
tint.Figures.AddRange(boundary);
AddFill(tint);
return;
diff --git a/tests/Filee.App.Tests/RenderTests.cs b/tests/Filee.App.Tests/RenderTests.cs
index bbe3de5b..303c4437 100644
--- a/tests/Filee.App.Tests/RenderTests.cs
+++ b/tests/Filee.App.Tests/RenderTests.cs
@@ -1974,6 +1974,7 @@ public class RenderTests
var preset = new Filee.Core.Presets.Preset { TargetFormat = "dwg", Name = "Old DWG" };
var vm = new PresetEditorViewModel(preset, AppHost.Get<ILocalizer>());
Assert.True(vm.ShowCad);
+ Assert.False(vm.ShowCadColors); // DWG to DWG draws nothing
Assert.Equal(["AutoCAD 2018", "AutoCAD 2013", "AutoCAD 2010", "AutoCAD 2007", "AutoCAD 2004", "AutoCAD 2000", "Same as the source"],
vm.CadVersions.Select(v => v.Label));
@@ -1989,6 +1990,63 @@ public class RenderTests
Assert.Equal(Filee.Core.Presets.CadVersion.AutoCad2018, preset.Cad.Version);
}
+ [AvaloniaTheory]
+ [InlineData("en", false)]
+ [InlineData("en", true)]
+ [InlineData("de", false)]
+ [InlineData("de", true)]
+ [InlineData("ar", false)]
+ [InlineData("ar", true)]
+ public void Preset_editor_offers_cad_colours_for_drawings_made_into_pdf_svg_and_pictures(string language, bool dark)
+ {
+ TestServices.EnsureInitialized(language);
+ var theme = AppHost.Get<ThemeService>();
+ var loc = AppHost.Get<ILocalizer>();
+ var preset = AppHost.Get<UserDataStore>().FindPreset("to-pdf")!.Clone();
+ var vm = new PresetEditorViewModel(preset, loc);
+ Assert.True(vm.ShowCadColors);
+ Assert.False(vm.ShowCad); // the AutoCAD version is for DWG and DXF
+ Assert.Equal(Filee.Core.Presets.CadColors.AsDrawn, vm.CadColors.Value);
+ Assert.Equal(Enum.GetValues<Filee.Core.Presets.CadColors>().Select(c => loc[$"presets.cad_colors.{c}"]), vm.CadColorChoices.Select(c => c.Label));
+
+ vm.CadColors = vm.CadColorChoices.Single(c => c.Value == Filee.Core.Presets.CadColors.BlackAndWhite);
+ if (dark)
+ theme.Apply(new ThemeSettings { Mode = ThemeMode.Dark }, language);
+ try
+ {
+ var window = new PresetEditorWindow { DataContext = vm, Height = 900 };
+ window.Show();
+ Pump();
+ var card = window.GetVisualDescendants().OfType<Border>().Single(b => b.Name == "CadColorsCard");
+ Assert.True(card.IsEffectivelyVisible);
+ card.BringIntoView();
+ Pump();
+ Save(window, $"preset-cad-colours-{language}{(dark ? "-dark" : "")}.png");
+ window.Close();
+ }
+ finally
+ {
+ if (dark)
+ theme.Apply(new ThemeSettings(), language);
+ }
+ Assert.True(vm.Apply());
+ Assert.Equal(Filee.Core.Presets.CadColors.BlackAndWhite, preset.Cad.Colors);
+ Assert.Equal(Filee.Core.Presets.CadColors.BlackAndWhite, new PresetEditorViewModel(preset, loc).CadColors.Value);
+
+ // SVG and pictures take it too; DWG and Markdown don't show it, and don't keep it.
+ foreach (var target in (string[])["svg", "png", "jpg", "tiff"])
+ {
+ vm.Target = vm.Targets.Single(t => t.Value == target);
+ Assert.True(vm.ShowCadColors, target);
+ }
+ vm.Target = vm.Targets.Single(t => t.Value == "dwg");
+ Assert.False(vm.ShowCadColors);
+ Assert.True(vm.Apply());
+ Assert.Equal(Filee.Core.Presets.CadColors.AsDrawn, preset.Cad.Colors);
+ vm.Target = vm.Targets.Single(t => t.Value == "md");
+ Assert.False(vm.ShowCadColors);
+ }
+
[AvaloniaFact]
public void Preset_editor_offers_save_as_zip_for_geospatial_targets_only()
{
diff --git a/tests/Filee.Core.Tests/CadOptionsTests.cs b/tests/Filee.Core.Tests/CadOptionsTests.cs
new file mode 100644
index 00000000..272c7cca
--- /dev/null
+++ b/tests/Filee.Core.Tests/CadOptionsTests.cs
@@ -0,0 +1,30 @@
+// The colours a CAD drawing is drawn in (#411) are a preset option: saved by name, as drawn when missing or unknown.
+
+using System.Text.Json;
+using Filee.Core.Presets;
+using Filee.Core.Settings;
+
+namespace Filee.Core.Tests;
+
+public class CadOptionsTests
+{
+ [Fact]
+ public void Cad_colours_are_saved_by_name_and_read_leniently()
+ {
+ var preset = new Preset { TargetFormat = "pdf", Cad = { Colors = CadColors.BlackAndWhite } };
+
+ var json = JsonSerializer.Serialize(preset, FileeJsonContext.Default.Preset);
+
+ Assert.Contains("\"colors\": \"BlackAndWhite\"", json);
+ Assert.Equal(CadColors.BlackAndWhite, JsonSerializer.Deserialize(json, FileeJsonContext.Default.Preset)!.Cad.Colors);
+ var copy = preset.Clone();
+ copy.Cad.Colors = CadColors.Grayscale;
+ Assert.Equal(CadColors.BlackAndWhite, preset.Cad.Colors); // the copy has its own options
+
+ // A preset saved before the option draws as drawn; so does a choice from a newer Filee.
+ var old = JsonSerializer.Deserialize("""{"targetFormat":"pdf","cad":{"version":"AutoCad2013"}}""", FileeJsonContext.Default.Preset)!;
+ var newer = JsonSerializer.Deserialize("""{"targetFormat":"pdf","cad":{"version":"AutoCad2013","colors":"Sepia"}}""", FileeJsonContext.Default.Preset)!;
+ Assert.Equal((CadVersion.AutoCad2013, CadColors.AsDrawn), (old.Cad.Version, old.Cad.Colors));
+ Assert.Equal((CadVersion.AutoCad2013, CadColors.AsDrawn), (newer.Cad.Version, newer.Cad.Colors));
+ }
+}
diff --git a/tests/Filee.Engines.Tests/CadColorTests.cs b/tests/Filee.Engines.Tests/CadColorTests.cs
new file mode 100644
index 00000000..d40bbf0a
--- /dev/null
+++ b/tests/Filee.Engines.Tests/CadColorTests.cs
@@ -0,0 +1,210 @@
+// The colours a DWG / DXF is drawn in (#411): as drawn, black and white like a monochrome plot, or grayscale. The
+// drawing is generated here with coloured lines, text, hatches, a dimension and a block; outputs are read back as
+// pixels (PNG) and colour operators (PDF).
+
+using ACadSharp;
+using ACadSharp.Entities;
+using ACadSharp.Tables;
+using CSMath;
+using Filee.Core.Conversion;
+using Filee.Core.Presets;
+using Filee.Engines.Cad;
+using ImageMagick;
+using PdfSharp.Pdf.Content;
+using PdfSharp.Pdf.Content.Objects;
+using PdfSharp.Pdf.IO;
+using SkiaSharp;
+
+namespace Filee.Engines.Tests;
+
+public class CadColorTests(EngineFixture fx) : IClassFixture<EngineFixture>
+{
+ /// <summary>A light blue true colour for a solid hatch: brightness 205.</summary>
+ private static readonly Color LightFill = new(173, 216, 230);
+
+ private async Task<string> ConvertAsync(string input, string target, CadColors colors)
+ {
+ var preset = new Preset { TargetFormat = target, Cad = { Colors = colors }, Pdf = { RenderDpi = 100 }, Output = { FileNamePattern = "{name}_" + colors } };
+ var job = await fx.ConvertAsync([input], preset);
+ Assert.True(job.State == JobState.Completed, string.Join("; ", job.Files.Select(f => $"{f.ErrorKey} {f.ErrorDetail}")));
+ return job.Outputs.Single();
+ }
+
+ /// <summary>
+ /// Lines in red, yellow (ACI 2) and a true colour; green text; a cyan pattern hatch; a light blue solid hatch; a
+ /// magenta dimension with arrowheads; a block whose BYBLOCK circle takes the insert's orange; a wide polyline.
+ /// </summary>
+ private static CadDocument Colourful()
+ {
+ var doc = new CadDocument();
+ var layer = new Layer("Colours") { Color = new Color(1) };
+ doc.Layers.Add(layer);
+
+ // 1 mm pens, so each line has a core of whole pixels to compare.
+ CadBuilder.Add(doc, layer, new Line(new XYZ(0, 0, 0), new XYZ(100, 0, 0)) { LineWeight = LineWeightType.W100 });
+ CadBuilder.Add(doc, layer, new Line(new XYZ(0, 10, 0), new XYZ(100, 10, 0)) { Color = new Color(2), LineWeight = LineWeightType.W100 });
+ CadBuilder.Add(doc, layer, new Line(new XYZ(0, 20, 0), new XYZ(100, 20, 0)) { Color = new Color(255, 160, 0), LineWeight = LineWeightType.W100 });
+ CadBuilder.Add(doc, layer, new TextEntity("MONO") { InsertPoint = new XYZ(0, 30, 0), Height = 8, Color = new Color(3) });
+
+ var pattern = new HatchPattern("ANSI31");
+ pattern.Lines.Add(new HatchPattern.Line { Angle = Math.PI / 4, BasePoint = XY.Zero, Offset = new XY(-Math.Sqrt(2), Math.Sqrt(2)) });
+ var patterned = new Hatch { IsSolid = false, Pattern = pattern, Color = new Color(4) };
+ patterned.Paths.Add(CadBuilder.Rectangle(110, 0, 20, 20));
+ CadBuilder.Add(doc, layer, patterned);
+ var solid = new Hatch { IsSolid = true, Color = LightFill };
+ solid.Paths.Add(CadBuilder.Rectangle(110, 30, 20, 20));
+ CadBuilder.Add(doc, layer, solid);
+
+ var dimension = new DimensionAligned
+ {
+ FirstPoint = new XYZ(0, 50, 0),
+ SecondPoint = new XYZ(100, 50, 0),
+ Style = new DimensionStyle("Filee") { TextHeight = 3, ArrowSize = 3 },
+ Color = new Color(6),
+ };
+ dimension.Offset = 6;
+ CadBuilder.Add(doc, layer, dimension);
+ dimension.UpdateBlock();
+
+ var block = new BlockRecord("RING");
+ block.Entities.Add(new Circle(new XYZ(0, 0, 0), 5) { Color = Color.ByBlock });
+ doc.BlockRecords.Add(block);
+ CadBuilder.Add(doc, layer, new Insert(block) { InsertPoint = new XYZ(60, 35, 0), Color = new Color(30) });
+ CadBuilder.Add(doc, layer, new LwPolyline(new LwPolyline.Vertex(0, -10), new LwPolyline.Vertex(100, -10)) { ConstantWidth = 1.5, Color = new Color(5) });
+ return doc;
+ }
+
+ private string Source() => CadBuilder.SaveDxf(Colourful(), fx.NewFolder(), "colours.dxf");
+
+ [Fact]
+ public async Task Black_and_white_draws_every_line_and_text_black_and_fills_in_gray()
+ {
+ var source = Source();
+ using var drawn = new MagickImage(await ConvertAsync(source, "png", CadColors.AsDrawn));
+ using var mono = new MagickImage(await ConvertAsync(source, "png", CadColors.BlackAndWhite));
+ Assert.Equal((drawn.Width, drawn.Height), (mono.Width, mono.Height));
+ var before = Rgb(drawn);
+ var after = Rgb(mono);
+
+ Assert.True(CountColoured(before) > 5000, "the drawing as drawn is in colour");
+ Assert.Equal(0, CountColoured(after));
+ // Where the yellow line was, the page is now black (yellow on white was the faintest line of all).
+ var yellow = Positions(before, (r, g, b) => r > 220 && g > 220 && b < 20);
+ Assert.True(yellow.Count > 200, $"{yellow.Count} yellow pixels");
+ Assert.All(yellow, i => Assert.True(after[i] < 60, $"pixel {i / 3} is {after[i]}"));
+ // Every other pen colour too: whatever a line, text, arrowhead or hatch line covers (nearly) whole is black or
+ // close to it (Skia smooths the edges of black text more than those of green text).
+ var ink = Positions(before, (r, g, b) => Math.Max(r, Math.Max(g, b)) - Math.Min(r, Math.Min(g, b)) > 230);
+ Assert.True(ink.Count > 2000, $"{ink.Count} pen pixels");
+ Assert.All(ink, i => Assert.True(after[i] < 100, $"pixel {i / 3} is {after[i]}"));
+ Assert.True(ink.Count(i => after[i] < 30) > ink.Count * 0.8, "pen colours turn black");
+ // The light blue solid hatch is a light gray area of its brightness, not a black block.
+ var fill = Positions(before, (r, g, b) => Math.Abs(r - 173) < 3 && Math.Abs(g - 216) < 3 && Math.Abs(b - 230) < 3);
+ Assert.True(fill.Count > 10_000, $"{fill.Count} fill pixels");
+ Assert.All(fill, i => Assert.InRange(after[i], 202, 208));
+ // The page stays white.
+ Assert.Equal((255, 255, 255), (after[0], after[1], after[2]));
+ }
+
+ [Fact]
+ public async Task Grayscale_keeps_shades_and_darkens_light_lines_enough_to_read()
+ {
+ var source = Source();
+ using var drawn = new MagickImage(await ConvertAsync(source, "png", CadColors.AsDrawn));
+ using var gray = new MagickImage(await ConvertAsync(source, "png", CadColors.Grayscale));
+ var before = Rgb(drawn);
+ var after = Rgb(gray);
+
+ Assert.Equal(0, CountColoured(after));
+ // Yellow (brightness 226) prints as a mid gray instead of nearly white.
+ var yellow = Positions(before, (r, g, b) => r > 220 && g > 220 && b < 20);
+ Assert.True(yellow.Count > 200);
+ Assert.All(yellow, i => Assert.InRange(after[i], 125, 160));
+ // Red stays darker than yellow: the shades keep their order.
+ var red = Positions(before, (r, g, b) => r > 245 && g < 10 && b < 10);
+ Assert.True(red.Count > 200);
+ Assert.All(red, i => Assert.True(after[i] < 60, $"red became {after[i]}"));
+ var fill = Positions(before, (r, g, b) => Math.Abs(r - 173) < 3 && Math.Abs(g - 216) < 3 && Math.Abs(b - 230) < 3);
+ Assert.All(fill, i => Assert.InRange(after[i], 202, 208));
+ }
+
+ [Theory]
+ [InlineData(CadColors.BlackAndWhite)]
+ [InlineData(CadColors.Grayscale)]
+ public async Task A_pdf_in_black_and_white_or_grayscale_uses_gray_colours_only(CadColors colors)
+ {
+ var source = Source();
+ Assert.Contains(PdfColors(await ConvertAsync(source, "pdf", CadColors.AsDrawn)), c => c[0] != c[1] || c[1] != c[2]);
+
+ var pdfColors = PdfColors(await ConvertAsync(source, "pdf", colors));
+
+ Assert.NotEmpty(pdfColors);
+ Assert.All(pdfColors, c => Assert.True(c[0] == c[1] && c[1] == c[2], $"colour {string.Join(" ", c)}"));
+ if (colors == CadColors.BlackAndWhite)
+ Assert.Contains(pdfColors, c => c[0] == 0);
+ }
+
+ [Fact]
+ public void The_palette_keeps_ink_dark_and_areas_by_brightness()
+ {
+ var yellow = new SKColor(255, 255, 0);
+ var black = SKColors.Black;
+
+ Assert.Equal(yellow, new CadPalette(CadColors.AsDrawn).Ink(yellow));
+ Assert.Equal(black, new CadPalette(CadColors.BlackAndWhite).Ink(yellow));
+ Assert.Equal(new SKColor(226, 226, 226), new CadPalette(CadColors.BlackAndWhite).Area(yellow));
+ Assert.Equal(black, new CadPalette(CadColors.BlackAndWhite).Area(black)); // a black fill stays black
+ Assert.Equal(new SKColor(142, 142, 142), new CadPalette(CadColors.Grayscale).Ink(yellow));
+ Assert.Equal(new SKColor(226, 226, 226), new CadPalette(CadColors.Grayscale).Area(yellow));
+ }
+
+ // ───────────────────────── Helpers ─────────────────────────
+
+ private static byte[] Rgb(MagickImage image)
+ {
+ using var pixels = image.GetPixels();
+ return pixels.ToByteArray(PixelMapping.RGB)!;
+ }
+
+ /// <summary>Pixels that are not a gray (allowing for rounding).</summary>
+ private static int CountColoured(byte[] rgb)
+ {
+ var count = 0;
+ for (var i = 0; i < rgb.Length; i += 3)
+ if (Math.Max(Math.Abs(rgb[i] - rgb[i + 1]), Math.Max(Math.Abs(rgb[i + 1] - rgb[i + 2]), Math.Abs(rgb[i] - rgb[i + 2]))) > 2)
+ count++;
+ return count;
+ }
+
+ /// <summary>Byte offsets of the pixels that match.</summary>
+ private static List<int> Positions(byte[] rgb, Func<int, int, int, bool> match)
+ {
+ var positions = new List<int>();
+ for (var i = 0; i < rgb.Length; i += 3)
+ if (match(rgb[i], rgb[i + 1], rgb[i + 2]))
+ positions.Add(i);
+ return positions;
+ }
+
+ /// <summary>Every RGB colour the page sets (rg / RG and three-component sc / scn), in PDF units 0–1.</summary>
+ private static List<double[]> PdfColors(string pdf)
+ {
+ using var document = PdfReader.Open(pdf, PdfDocumentOpenMode.Import);
+ var colors = new List<double[]>();
+ foreach (var page in document.Pages)
+ Collect(ContentReader.ReadContent(page), colors);
+ return colors;
+ }
+
+ private static void Collect(CSequence sequence, List<double[]> colors)
+ {
+ foreach (var item in sequence)
+ {
+ if (item is CSequence inner)
+ Collect(inner, colors);
+ else if (item is COperator { OpCode.OpCodeName: OpCodeName.rg or OpCodeName.RG or OpCodeName.sc or OpCodeName.SC or OpCodeName.scn or OpCodeName.SCN } op
+ && op.Operands.Count == 3)
+ colors.Add([.. op.Operands.Select(o => o switch { CReal r => Math.Round(r.Value, 3), CInteger n => (double)n.Value, _ => double.NaN })]);
+ }
+ }
+}