Merge pull request #133 from DomCR/issue-127_DxfReader-header-set

Issue 127 dxf reader header set
jankozik · May 18, 2023 · 2805cb9 · 2805cb9
2 parents a786f0d + 7a7b4f1
commit 2805cb9
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 3 deletions.
diff --git a/ACadSharp/Blocks/Block.cs b/ACadSharp/Blocks/Block.cs
@@ -33,8 +33,8 @@ public class Block : Entity, INamedCadObject
 		[DxfCodeValue(2, 3)]
 		public string Name
 		{
-			get { return BlockOwner.Name; }
-			set { BlockOwner.Name = value; }
+			get { return this.BlockOwner.Name; }
+			set { this.BlockOwner.Name = value; }
 		}
 
 		/// <summary>

diff --git a/ACadSharp/IO/CadDocumentBuilder.cs b/ACadSharp/IO/CadDocumentBuilder.cs
@@ -91,6 +91,13 @@ public bool TryGetCadObject<T>(ulong? handle, out T value) where T : CadObject
 			return false;
 		}
 
+		public bool TryGetTableEntry<T>(string name, out T entry)
+			where T : TableEntry
+		{
+			entry = cadObjects.Values.OfType<T>().FirstOrDefault(e => e.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
+			return entry != null;
+		}
+
 		public T GetObjectTemplate<T>(ulong handle) where T : CadTemplate
 		{
 			if (this.templates.TryGetValue(handle, out CadTemplate builder))

diff --git a/ACadSharp/IO/DXF/DxfReader.cs b/ACadSharp/IO/DXF/DxfReader.cs
@@ -177,7 +177,9 @@ public override CadHeader ReadHeader()
 
 				if (this._reader.LastValueAsString == null || !headerMap.TryGetValue(currVar, out var data))
 				{
+#if TEST
 					this.triggerNotification($"Header variable not implemented {currVar}", NotificationType.NotImplemented);
+#endif
 					this._reader.ReadNext();
 					continue;
 				}

diff --git a/ACadSharp/IO/DXF/DxfStreamReader/DxfBlockSectionReader.cs b/ACadSharp/IO/DXF/DxfStreamReader/DxfBlockSectionReader.cs
@@ -3,9 +3,11 @@
 using ACadSharp.Exceptions;
 using ACadSharp.IO.Templates;
 using ACadSharp.Tables;
+using CSMath;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Net;
 
 namespace ACadSharp.IO.DXF
 {
@@ -65,6 +67,7 @@ private void readBlock()
 			}
 			else
 			{
+				blckEntity = new Block();
 				this._builder.Notify($"Block Record {ownerHandle} not found for Block {handle} | {name}", NotificationType.Warning);
 			}
 
@@ -81,7 +84,8 @@ private void readBlock()
 
 			Debug.Assert(this._reader.LastValueAsString == DxfSubclassMarker.BlockBegin);
 
-			this.readMapped<Block>(blckEntity, template);
+			//this.readMapped<Block>(blckEntity, template);
+			this.readBlockBegin(blckEntity);
 
 			if (record == null && this._builder.DocumentToBuild.BlockRecords.TryGetValue(blckEntity.Name, out record))
 			{
@@ -124,6 +128,54 @@ private void readBlock()
 			this._builder.AddTemplate(template);
 		}
 
+		private void readBlockBegin(Block blckEntity)
+		{
+			this._reader.ReadNext();
+
+			while (this._reader.LastDxfCode != DxfCode.Start
+				&& this._reader.LastDxfCode != DxfCode.Subclass)
+			{
+				switch (this._reader.LastCode)
+				{
+					case 1:
+						blckEntity.XrefPath = this._reader.LastValueAsString;
+						break;
+					case 4:
+						blckEntity.Comments = this._reader.LastValueAsString;
+						break;
+					case 2:
+					case 3:
+						if (blckEntity.Owner == null && this._builder.TryGetTableEntry(this._reader.LastValueAsString, out BlockRecord record))
+						{
+							record.BlockEntity = blckEntity;
+							this._builder.Notify($"Block record find by name {blckEntity.Name}", NotificationType.None);
+						}
+						else if (blckEntity.Owner == null)
+						{
+							throw new DxfException($"Could not find the block record for {blckEntity.Name} and handle {blckEntity.Handle}");
+						}
+						break;
+					case 70:
+						blckEntity.Flags = (BlockTypeFlags)this._reader.LastValueAsShort;
+						break;
+					case 10:
+						blckEntity.BasePoint = new XYZ(this._reader.LastValueAsDouble, blckEntity.BasePoint.Y, blckEntity.BasePoint.Z);
+						break;
+					case 20:
+						blckEntity.BasePoint = new XYZ(blckEntity.BasePoint.X, this._reader.LastValueAsDouble, blckEntity.BasePoint.Z);
+						break;
+					case 30:
+						blckEntity.BasePoint = new XYZ(blckEntity.BasePoint.X, blckEntity.BasePoint.Y, this._reader.LastValueAsDouble);
+						break;
+					default:
+						this._builder.Notify($"Unhandeled dxf code : {this._reader.LastCode} with value : {this._reader.LastValue} for subclass {DxfSubclassMarker.BlockBegin}");
+						break;
+				}
+
+				this._reader.ReadNext();
+			}
+		}
+
 		private void readBlockEnd(BlockEnd block)
 		{
 			CadEntityTemplate template = new CadEntityTemplate(block);