Entities ownership for dxf

ACadSharp/IO/DXF/DxfDocumentBuilder.cs

@@ -1,12 +1,16 @@
 using ACadSharp.IO.Templates;
+using ACadSharp.Tables;
 using System.Collections.Generic;
 
 namespace ACadSharp.IO.DXF
 {
 	internal class DxfDocumentBuilder : CadDocumentBuilder
 	{
-		public DxfDocumentBuilder(CadDocument document, NotificationEventHandler notification = null) : base(document, notification)
+		public DxfDocumentBuilder(CadDocument document, NotificationEventHandler notification = null) : base(document, notification) { }
+
+		public override void BuildDocument()
 		{
+			base.BuildDocument();
 		}
 	}
 }

ACadSharp/IO/DXF/DxfEntitiesSectionReader.cs

@@ -1,5 +1,7 @@
-using ACadSharp.Exceptions;
+using ACadSharp.Entities;
+using ACadSharp.Exceptions;
 using ACadSharp.IO.Templates;
+using ACadSharp.Tables;
 using System;
 
 namespace ACadSharp.IO.DXF
@@ -24,40 +26,32 @@ public override void Read()
 				if (template == null)
 					continue;
 
-				//Add the object and the template to the builder
-				this._builder.Templates[template.CadObject.Handle] = template;
-			}
-		}
-	}
-
-	internal class DxfObjectsSectionReader : DxfSectionReaderBase
-	{
-		public DxfObjectsSectionReader(IDxfStreamReader reader, DxfDocumentBuilder builder, NotificationEventHandler notification = null)
-			: base(reader, builder, notification)
-		{
-		}
-
-		public override void Read()
-		{
-			//Advance to the first value in the section
-			this._reader.ReadNext();
-
-			//Loop until the section ends
-			while (this._reader.LastValueAsString != DxfFileToken.EndSection)
-			{
-				CadTemplate template = this.readObject();
-
-				if (template == null)
-					continue;
+				if (this._builder.TryGetCadObject(template.OwnerHandle.Value, out CadObject co))
+				{
+					switch (co)
+					{
+						case BlockRecord record:
+							record.Entities.Add(template.CadObject);
+							break;
+						case Polyline pline when template.CadObject is Vertex v:
+							pline.Vertices.Add(v);
+							break;
+						case Insert insert when template.CadObject is AttributeEntity att:
+							insert.Attributes.Add(att);
+							break;
+						default:
+							this._notification?.Invoke(null, new NotificationEventArgs($"The owner of entity {template.CadObject.Handle} is a {co.GetType().FullName} with handle {co.Handle}"));
+							break;
+					}
+				}
+				else
+				{
+					this._notification?.Invoke(null, new NotificationEventArgs($"Block record owner {template.OwnerHandle} not found for entity {template.CadObject.Handle}"));
+				}
 
 				//Add the object and the template to the builder
 				this._builder.Templates[template.CadObject.Handle] = template;
 			}
 		}
-
-		private CadTemplate readObject()
-		{
-			throw new NotImplementedException();
-		}
 	}
 }

ACadSharp/IO/DXF/DxfObjectsSectionReader.cs

@@ -0,0 +1,36 @@
+using ACadSharp.IO.Templates;
+using System;
+
+namespace ACadSharp.IO.DXF
+{
+	internal class DxfObjectsSectionReader : DxfSectionReaderBase
+	{
+		public DxfObjectsSectionReader(IDxfStreamReader reader, DxfDocumentBuilder builder, NotificationEventHandler notification = null)
+			: base(reader, builder, notification)
+		{
+		}
+
+		public override void Read()
+		{
+			//Advance to the first value in the section
+			this._reader.ReadNext();
+
+			//Loop until the section ends
+			while (this._reader.LastValueAsString != DxfFileToken.EndSection)
+			{
+				CadTemplate template = this.readObject();
+
+				if (template == null)
+					continue;
+
+				//Add the object and the template to the builder
+				this._builder.Templates[template.CadObject.Handle] = template;
+			}
+		}
+
+		private CadTemplate readObject()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}