entities setup

DomCR · Jun 21, 2023 · 8eeb068 · 8eeb068
1 parent 6db2c29
commit 8eeb068
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 4 deletions.
diff --git a/ACadSharp.Tests/IO/IOTestsBase.cs b/ACadSharp.Tests/IO/IOTestsBase.cs
@@ -124,6 +124,11 @@ public IOTestsBase(ITestOutputHelper output)
 
 		protected void onNotification(object sender, NotificationEventArgs e)
 		{
+			if(e.NotificationType == NotificationType.Error)
+			{
+				throw e.Exception;
+			}
+
 			_output.WriteLine(e.Message);
 		}
 

diff --git a/ACadSharp/Entities/Arc.cs b/ACadSharp/Entities/Arc.cs
@@ -21,6 +21,9 @@ public class Arc : Circle
 		/// <inheritdoc/>
 		public override string ObjectName => DxfFileToken.EntityArc;
 
+		/// <inheritdoc/>
+		public override string SubclassMarker => DxfSubclassMarker.Arc;
+
 		/// <summary>
 		/// The start angle in radians.
 		/// </summary>

diff --git a/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs b/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs
@@ -10,6 +10,8 @@ namespace ACadSharp.IO.DXF
 {
 	internal abstract class DxfSectionReaderBase
 	{
+		public delegate bool ReadEntityDelegate<T>(CadEntityTemplate<T> template, DxfClassMap map) where T : Entity, new();
+
 		/// <summary>
 		/// Object reactors, list of handles
 		/// </summary>
@@ -155,8 +157,7 @@ protected CadEntityTemplate readEntity()
 					template = new CadTextEntityTemplate(new AttributeDefinition());
 					break;
 				case DxfFileToken.EntityArc:
-					template = new CadArcTemplate(new Arc());
-					break;
+					return this.readEntityCodes(new CadEntityTemplate<Arc>(), readArc);
 				case DxfFileToken.EntityCircle:
 					template = new CadEntityTemplate(new Circle());
 					break;
@@ -356,6 +357,47 @@ protected CadEntityTemplate readEntity()
 			return template;
 		}
 
+		protected CadEntityTemplate readEntityCodes<T>(CadEntityTemplate<T> template, ReadEntityDelegate<T> readEntity)
+			where T : Entity, new()
+		{
+			this._reader.ReadNext();
+
+			DxfMap map = DxfMap.Create<T>();
+
+			Debug.Assert(template.CadObject.SubclassMarker != DxfSubclassMarker.Entity);
+
+			while (this._reader.DxfCode != DxfCode.Start)
+			{
+				if (!readEntity(template, map.SubClasses[template.CadObject.SubclassMarker]))
+				{
+					this.readCommonEntityCodes(template, out bool isExtendedData, map);
+					if (isExtendedData)
+						continue;
+				}
+
+				if (this._reader.DxfCode != DxfCode.Start)
+					this._reader.ReadNext();
+			}
+
+			return template;
+		}
+
+		protected void readCommonEntityCodes(CadEntityTemplate template, out bool isExtendedData, DxfMap map = null)
+		{
+			DxfClassMap entityMap = map.SubClasses[DxfSubclassMarker.Entity];
+
+			isExtendedData = false;
+			if (!this.tryAssignCurrentValue(template.CadObject, entityMap))
+			{
+				this.readCommonCodes(template, out isExtendedData, map);
+			}
+		}
+
+		private bool readArc(CadEntityTemplate<Arc> template, DxfClassMap map)
+		{
+			throw new NotImplementedException();
+		}
+
 		protected void readMapped<T>(CadObject cadObject, CadTemplate template)
 			where T : CadObject
 		{
@@ -917,7 +959,7 @@ protected bool tryAssignCurrentValue(CadObject cadObject, DxfClassMap map)
 				}
 				else
 				{
-					this._builder.Notify("", NotificationType.Error, ex);
+					this._builder.Notify("An error occurred while assiging a property using mapper", NotificationType.Error, ex);
 				}
 			}
 

diff --git a/ACadSharp/IO/Templates/CadArcTemplate.cs b/ACadSharp/IO/Templates/CadArcTemplate.cs
@@ -1,20 +1,24 @@
 using System;
 using ACadSharp.Entities;
 using ACadSharp.IO.DXF;
-using ACadSharp.Tables;
 
 namespace ACadSharp.IO.Templates
 {
+	[Obsolete]
 	internal class CadArcTemplate : CadEntityTemplate
 	{
 
+		public CadArcTemplate() : base(new Arc()) { }
+
 		public CadArcTemplate(Entity entity) : base(entity) { }
 
 
         public override void Build(CadDocumentBuilder builder)
 		{
 			base.Build(builder);
 
+			return;
+
             if (builder is DxfDocumentBuilder && this.CadObject is Arc arc)
             {
                 arc.StartAngle *= MathUtils.DegToRad;

diff --git a/ACadSharp/IO/Templates/CadEntityTemplate.cs b/ACadSharp/IO/Templates/CadEntityTemplate.cs
@@ -153,4 +153,16 @@ private void applyLineType(CadDocumentBuilder builder)
 			}
 		}
 	}
+
+	internal class CadEntityTemplate<T> : CadEntityTemplate
+			where T : Entity, new()
+	{
+		public new T CadObject { get { return (T)base.CadObject; } set { base.CadObject = value; } }
+
+		public CadEntityTemplate() : base(new T()) { }
+
+		public CadEntityTemplate(T entity) : base(entity)
+		{
+		}
+	}
 }