Merge pull request #486 from DomCR/dynamic-blocks

Dynamic blocks

src/ACadSharp.Tests/IO/DynamicBlockTests.cs

@@ -0,0 +1,65 @@
+using ACadSharp.Entities;
+using ACadSharp.IO;
+using ACadSharp.Objects.Evaluations;
+using ACadSharp.Tables;
+using ACadSharp.Tests.TestModels;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace ACadSharp.Tests.IO
+{
+	public class DynamicBlockTests : IOTestsBase
+	{
+		public static TheoryData<FileModel> DwgDynamicBlocksPaths { get; } = new();
+
+		static DynamicBlockTests()
+		{
+			loadSamples("dynamic-blocks", "*", DwgDynamicBlocksPaths);
+		}
+
+		public DynamicBlockTests(ITestOutputHelper output) : base(output)
+		{
+		}
+
+		[Theory]
+		[MemberData(nameof(DwgDynamicBlocksPaths))]
+		public void DynamicBlocksTest(FileModel test)
+		{
+			CadDocument doc;
+
+			if (test.Extension == ".dxf")
+			{
+				DxfReaderConfiguration configuration = new();
+				configuration.KeepUnknownEntities = true;
+				configuration.KeepUnknownNonGraphicalObjects = true;
+
+				doc = DxfReader.Read(test.Path, configuration, this.onNotification);
+			}
+			else
+			{
+				DwgReaderConfiguration configuration = new DwgReaderConfiguration();
+				configuration.KeepUnknownEntities = true;
+				configuration.KeepUnknownNonGraphicalObjects = true;
+
+				doc = DwgReader.Read(test.Path, configuration, this.onNotification);
+			}
+
+			//"my-dynamic-block" handle = 570
+
+			BlockRecord blk = doc.BlockRecords["my-dynamic-block"];
+
+			Assert.True(blk.IsDynamic);
+
+			//Dictionary entry
+			EvaluationGraph eval = blk.XDictionary.GetEntry<EvaluationGraph>("ACAD_ENHANCEDBLOCK");
+
+			//Extended data related to the dynamic block
+			var a = blk.ExtendedData.Get(doc.AppIds["AcDbBlockRepETag"]);
+			var b = blk.ExtendedData.Get(doc.AppIds["AcDbDynamicBlockTrueName"]);
+			var c = blk.ExtendedData.Get(doc.AppIds["AcDbDynamicBlockGUID"]);
+
+			Insert basic = doc.GetCadObject<Insert>(788);
+			Insert modified = doc.GetCadObject<Insert>(889);
+		}
+	}
+}

src/ACadSharp.Tests/TestModels/FileModel.cs

@@ -1,12 +1,16 @@
-using Xunit.Abstractions;
+using ACadSharp.IO;
+using System.IO;
+using Xunit.Abstractions;
 
 namespace ACadSharp.Tests.TestModels
 {
 	public class FileModel : IXunitSerializable
 	{
-		public string FileName { get; set; }
+		public string Extension { get { return System.IO.Path.GetExtension(Path); } }
 
-		public string Path { get; set; }
+		public string FileName { get; private set; }
+
+		public string Path { get; private set; }
 
 		public bool IsDxf { get { return System.IO.Path.GetExtension(this.Path) == ".dxf"; } }
 

src/ACadSharp/Attributes/DxfCollectionCodeValueAttribute.cs

@@ -4,7 +4,7 @@
 namespace ACadSharp.Attributes
 {
 	[System.AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
-	sealed class DxfCollectionCodeValueAttribute : Attribute, ICodeValueAttribute
+	public sealed class DxfCollectionCodeValueAttribute : Attribute, ICodeValueAttribute
 	{
 		/// <inheritdoc/>
 		public DxfCode[] ValueCodes { get; }

src/ACadSharp/CadObject.cs

@@ -5,6 +5,7 @@
 using ACadSharp.Tables.Collections;
 using ACadSharp.XData;
 using System;
+using ACadSharp.XData;
 using System.Collections.Generic;
 
 namespace ACadSharp

src/ACadSharp/DxfFileToken.cs

@@ -127,6 +127,7 @@ public static class DxfFileToken
 		public const string ObjectXRecord = "XRECORD";
 		public const string ObjectMLeaderContextData = "CONTEXT_DATA";
 		public const string ObjectEvalGraph = "ACAD_EVALUATION_GRAPH";
+		public const string ObjectBlockLinearParameter = "BLOCKLINEARPARAMETER";
 		public const string ObjectBlockVisibilityParameter = "BLOCKVISIBILITYPARAMETER";
 		public const string ObjectTableContent = "TABLECONTENT";
 

src/ACadSharp/DxfSubclassMarker.cs

@@ -83,7 +83,16 @@ public static class DxfSubclassMarker
 		public const string PlotSettings = "AcDbPlotSettings";
 		public const string DictionaryVariables = "DictionaryVariables";
 		public const string Scale = "AcDbScale";
+
+		//Dynamic block constants
 		public const string EvalGraph = "AcDbEvalGraph";
+		public const string EvalGraphExpr = "AcDbEvalExpr";
+		public const string BlockElement = "AcDbBlockElement";
+		public const string BlockParameter = "AcDbBlockParameter";
+		public const string Block1PtParameter = "AcDbBlock1PtParameter";
+		public const string Block2PtParameter = "AcDbBlock2PtParameter";
+		public const string BlockLinearParameter = "AcDbBlockLinearParameter";
+
 		public const string BlockVisibilityParameter = "AcDbBlockVisibilityParameter";
 		public const string DbColor = "AcDbColor";
 		public const string TableContent = "AcDbTableContent";