Merge pull request #494 from DomCR/Issue-487_DBCOLOR

Issue 487 dbcolor

src/ACadSharp.Tests/IO/ColorTests.cs

@@ -6,6 +6,7 @@
 using Xunit;
 using Xunit.Abstractions;
 using ACadSharp.Tests.TestModels;
+using ACadSharp.Objects;
 
 namespace ACadSharp.Tests.IO
 {
@@ -15,7 +16,7 @@ public class ColorTests : IOTestsBase
 
 		static ColorTests()
 		{
-			loadSamples("color_samples", "dwg", ColorSamplesFilePaths);
+			loadSamples("color_samples", "*", ColorSamplesFilePaths);
 		}
 
 		public ColorTests(ITestOutputHelper output) : base(output)
@@ -26,19 +27,13 @@ public ColorTests(ITestOutputHelper output) : base(output)
 		[MemberData(nameof(ColorSamplesFilePaths))]
 		public void ColorDwg(FileModel test)
 		{
-			CadDocument doc = DwgReader.Read(test.Path);
+			bool isDxf = Path.GetExtension(test.FileName).Equals(".dxf");
+			CadDocument doc = this.readDocument(test);
 
-			//CECOLOR R 155 : G 66 : B 236
-			Color currentEntityColor = doc.Header.CurrentEntityColor;
-			Assert.Equal(155, currentEntityColor.R);
-			Assert.Equal(66, currentEntityColor.G);
-			Assert.Equal(236, currentEntityColor.B);
-
-			//Layer: color_125_33_79
-			Color layerColor = doc.Layers["color_125_33_79"].Color;
-			Assert.Equal(125, layerColor.R);
-			Assert.Equal(33, layerColor.G);
-			Assert.Equal(79, layerColor.B);
+			if (doc.Header.Version <= ACadVersion.AC1015)
+			{
+				return;
+			}
 
 			//Entity Line: R 52 : G 201 : B 24
 			Line line = doc.Entities.OfType<Line>().FirstOrDefault();
@@ -48,6 +43,24 @@ public void ColorDwg(FileModel test)
 			Assert.Equal(201, lcolor.G);
 			Assert.Equal(24, lcolor.B);
 
+			//Layer: color_125_33_79
+			Color layerColor = doc.Layers["color_125_33_79"].Color;
+			Assert.Equal(125, layerColor.R);
+			Assert.Equal(33, layerColor.G);
+			Assert.Equal(79, layerColor.B);
+
+			if (isDxf)
+			{
+				//True color for dimension style is not supported in dxf
+				return;
+			}
+
+			//CECOLOR R 155 : G 66 : B 236
+			Color currentEntityColor = doc.Header.CurrentEntityColor;
+			Assert.Equal(155, currentEntityColor.R);
+			Assert.Equal(66, currentEntityColor.G);
+			Assert.Equal(236, currentEntityColor.B);
+
 			//DimStyle: custom_dim_style
 			DimensionStyle dimStyle = doc.DimensionStyles["custom_dim_style"];
 			//DimensionLines: 44,136,27
@@ -74,8 +87,29 @@ public void ColorDwg(FileModel test)
 				Assert.Equal(117, fillColor.G);
 				Assert.Equal(66, fillColor.B);
 			}
+		}
+
+		[Theory]
+		[MemberData(nameof(ColorSamplesFilePaths))]
+		public void BookColor(FileModel test)
+		{
+			CadDocument doc = this.readDocument(test);
+
+			Circle circle = doc.GetCadObject<Circle>(649);
+
+			Assert.True(doc.Colors.ContainsKey("RAL CLASSIC$RAL 1006"));
+
+			if (doc.Header.Version <= ACadVersion.AC1015)
+			{
+				return;
+			}
+
+			Assert.NotNull(circle.BookColor);
+
+			BookColor color = circle.BookColor;
 
-			DwgWriter.Write(new MemoryStream(), doc);
+			Assert.Equal("RAL 1006", color.ColorName);
+			Assert.Equal("RAL CLASSIC", color.BookName);
 		}
 	}
 }

src/ACadSharp.Tests/IO/IOTestsBase.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using Xunit;
 using Xunit.Abstractions;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace ACadSharp.Tests.IO
 {
@@ -135,5 +136,20 @@ protected bool isSupportedVersion(ACadVersion version)
 					return false;
 			}
 		}
+
+		protected CadDocument readDocument(FileModel test)
+		{
+			CadDocument doc;
+			if (Path.GetExtension(test.FileName).Equals(".dxf"))
+			{
+				doc = DxfReader.Read(test.Path, this.onNotification);
+			}
+			else
+			{
+				doc = DwgReader.Read(test.Path, this.onNotification);
+			}
+
+			return doc;
+		}
 	}
 }

src/ACadSharp.Tests/IO/LocalSampleTests.cs

@@ -1,7 +1,9 @@
-using ACadSharp.IO;
+using ACadSharp.Entities;
+using ACadSharp.IO;
 using ACadSharp.Tests.TestModels;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -34,6 +36,10 @@ public void ReadUserDwg(FileModel test)
 				return;
 
 			CadDocument doc = DwgReader.Read(test.Path, this._dwgConfiguration, this.onNotification);
+
+			var trees = doc.Entities.Where(e => e is Insert insert 
+				&& insert.Block.Name == "TREE_1"
+				&& e.Layer.Name.Equals("VEGETATION", System.StringComparison.OrdinalIgnoreCase));
 		}
 
 		[Theory]

src/ACadSharp.Tests/IO/ViewportTests.cs

@@ -18,15 +18,7 @@ public ViewportTests(ITestOutputHelper output) : base(output)
 		[MemberData(nameof(DxfAsciiFiles))]
 		public void ScaleInViewport(FileModel test)
 		{
-			CadDocument doc;
-			if (Path.GetExtension(test.FileName).Equals(".dxf"))
-			{
-				doc = DxfReader.Read(test.Path);
-			}
-			else
-			{
-				doc = DwgReader.Read(test.Path);
-			}
+			CadDocument doc = this.readDocument(test);
 
 			ACadSharp.Tables.BlockRecord paper = doc.PaperSpace;
 			foreach (Viewport v in paper.Viewports)

src/ACadSharp.Tests/IO/WriterSingleObjectTests.cs

@@ -409,6 +409,20 @@ public void AddCustomScale()
 				this.Document.Scales.Add(new Scale("Hello"));
 			}
 
+			public void AddCustomBookColor()
+			{
+				//var color = new BookColor("RAL CLASSIC$RAL 1006");
+				var color = new BookColor("TEST BOOK$MY COLOR");
+				color.Color = new(226, 144, 0);
+
+				Line line = new Line(XYZ.Zero, new XYZ(100, 100, 0));
+				line.Color = Color.ByBlock;
+				line.BookColor = color;
+
+				this.Document.Colors.Add(color);
+				this.Document.Entities.Add(line);
+			}
+
 			public void AddBlockWithAttributes()
 			{
 				BlockRecord record = new("my_block");
@@ -497,6 +511,7 @@ static WriterSingleObjectTests()
 			Data.Add(new(nameof(SingleCaseGenerator.ChangedEncoding)));
 			Data.Add(new(nameof(SingleCaseGenerator.AddBlockWithAttributes)));
 			Data.Add(new(nameof(SingleCaseGenerator.AddCustomScale)));
+			Data.Add(new(nameof(SingleCaseGenerator.AddCustomBookColor)));
 		}
 
 		protected string getPath(string name, string ext, ACadVersion version)

src/ACadSharp/CadDocument.cs

@@ -81,6 +81,14 @@ public class CadDocument : IHandledCadObject
 		/// </summary>
 		public VPortsTable VPorts { get; private set; }
 
+		/// <summary>
+		/// The collection of all book colors in the drawing.
+		/// </summary>
+		/// <remarks>
+		/// The collection is null if the <see cref="CadDictionary.AcadColor"/> doesn't exist in the root dictionary.
+		/// </remarks>
+		public ColorCollection Colors { get; private set; }
+
 		/// <summary>
 		/// The collection of all layouts in the drawing.
 		/// </summary>
@@ -114,8 +122,11 @@ public class CadDocument : IHandledCadObject
 		public MLineStyleCollection MLineStyles { get; private set; }
 
 		/// <summary>
-		/// 
+		/// The collection of all images in the drawing. 
 		/// </summary>
+		/// <remarks>
+		/// The collection is null if the <see cref="CadDictionary.AcadImageDict"/> doesn't exist in the root dictionary.
+		/// </remarks>
 		public ImageDefinitionCollection ImageDefinitions { get; private set; }
 
 		/// <summary>
@@ -340,6 +351,11 @@ public void UpdateCollections(bool createDictionaries)
 			{
 				this.ImageDefinitions = new ImageDefinitionCollection(imageDefinitions);
 			}
+
+			if (this.updateCollection(CadDictionary.AcadColor, createDictionaries, out CadDictionary colors))
+			{
+				this.Colors = new ColorCollection(colors);
+			}
 		}
 
 		private bool updateCollection(string dictName, bool createDictionary, out CadDictionary dictionary)

src/ACadSharp/CadObject.cs

@@ -3,6 +3,7 @@
 using ACadSharp.Objects.Collections;
 using ACadSharp.Tables;
 using ACadSharp.Tables.Collections;
+using System;
 using System.Collections.Generic;
 
 namespace ACadSharp

src/ACadSharp/Classes/DxfClassCollection.cs

@@ -387,6 +387,19 @@ public static void UpdateDxfClasses(CadDocument doc)
 				ProxyFlags = ProxyFlags.R13FormatProxy,
 				WasZombie = false,
 			});
+
+			//AcDbColor
+			doc.Classes.AddOrUpdate(new DxfClass
+			{
+				CppClassName = DxfSubclassMarker.DbColor,
+				ClassNumber = (short)(500 + doc.Classes.Count),
+				DwgVersion = ACadVersion.AC1015,
+				DxfName = DxfFileToken.ObjectDBColor,
+				ItemClassId = 499,
+				MaintenanceVersion = 14,
+				ProxyFlags = ProxyFlags.None,
+				WasZombie = false,
+			});
 		}
 
 		/// <summary>

src/ACadSharp/Color.cs

@@ -386,7 +386,7 @@ private Color(uint trueColor)
 				throw new ArgumentOutOfRangeException(nameof(trueColor), "True color must be a 24 bit color.");
 
 			// Shift to set the 30th bit indicating a true color.
-			this._color = (uint)(trueColor | _trueColorFlag);   //Is this correct?
+			this._color = (uint)(trueColor | _trueColorFlag);
 		}
 
 		/// <summary>

src/ACadSharp/DxfFileToken.cs

@@ -111,6 +111,7 @@ public static class DxfFileToken
 		public const string ObjectDictionaryWithDefault = "ACDBDICTIONARYWDFLT";
 		public const string ObjectAcdbPlaceHolder = "ACDBPLACEHOLDER";
 		public const string ObjectDictionaryVar = "DICTIONARYVAR";
+		public const string ObjectDBColor = "DBCOLOR";
 		public const string ObjectPlotSettings = "PLOTSETTINGS";
 		public const string ObjectPlaceholder = "ACDBPLACEHOLDER";
 		public const string ObjectLayout = "LAYOUT";

src/ACadSharp/DxfPropertyBase.cs

@@ -95,10 +95,7 @@ public void SetValue<TCadObject>(int code, TCadObject obj, object value)
 					case 420:
 						byte[] b = LittleEndianConverter.Instance.GetBytes((int)value);
 						// true color
-						this._property.SetValue(obj, new Color(b[0], b[1], b[2]));
-						break;
-					case 430:
-						// dictionary color
+						this._property.SetValue(obj, new Color(b[2], b[1], b[0]));
 						break;
 				}
 			}

src/ACadSharp/DxfSubclassMarker.cs

@@ -84,5 +84,6 @@ public static class DxfSubclassMarker
 		public const string Scale = "AcDbScale";
 		public const string EvalGraph = "AcDbEvalGraph";
 		public const string BlockVisibilityParameter = "AcDbBlockVisibilityParameter";
+		public const string DbColor = "AcDbColor";
 	}
 }

src/ACadSharp/Entities/Entity.cs

@@ -39,7 +39,7 @@ public Layer Layer
 		}
 
 		/// <inheritdoc/>
-		[DxfCodeValue(62, 420, 430)]
+		[DxfCodeValue(62, 420)]
 		public Color Color { get; set; } = Color.ByLayer;
 
 		/// <inheritdoc/>
@@ -85,10 +85,32 @@ public LineType LineType
 		[DxfCodeValue(DxfReferenceType.Handle, 347)]
 		public Material Material { get; set; }
 
+		/// <summary>
+		/// Book color for this entity.
+		/// </summary> 
+		[DxfCodeValue(DxfReferenceType.Name, 430)]
+		public BookColor BookColor
+		{
+			get { return this._bookColor; }
+			set
+			{
+				if (this.Document != null)
+				{
+					this._bookColor = this.updateCollection(value, this.Document.Colors);
+				}
+				else
+				{
+					this._bookColor = value;
+				}
+			}
+		}
+
 		private Layer _layer = Layer.Default;
 
 		private LineType _lineType = LineType.ByLayer;
 
+		private BookColor _bookColor = null;
+
 		/// <inheritdoc/>
 		public Entity() : base() { }
 

src/ACadSharp/Entities/MLine.cs

@@ -1,6 +1,7 @@
 using ACadSharp.Attributes;
 using ACadSharp.Objects;
 using CSMath;
+using System;
 using System.Collections.Generic;
 using System.Linq;