Merge pull request DomCR#659 from DomCR/issue-627_dxfReader-assign-entities

issue 627

Author: DomCR

src/ACadSharp/ACadSharp.csproj

@@ -17,7 +17,7 @@
 	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<Version>1.1.20</Version>
+		<Version>1.1.21</Version>
 		<PackageOutputPath>../nupkg</PackageOutputPath>
 	</PropertyGroup>
 

src/ACadSharp/Entities/Viewport.cs

@@ -393,6 +393,7 @@ public override CadObject Clone()
 			Viewport clone = (Viewport)base.Clone();
 
 			clone.VisualStyle = (VisualStyle)this.VisualStyle?.Clone();
+			clone._scale = (Scale)this.Scale?.Clone();
 
 			return clone;
 		}
@@ -440,7 +441,7 @@ public List<Entity> SelectEntities(bool includePartial = true)
 
 			return entities;
 		}
-
+		
 		internal override void AssignDocument(CadDocument doc)
 		{
 			base.AssignDocument(doc);
@@ -456,7 +457,7 @@ internal override void UnassignDocument()
 
 			base.UnassignDocument();
 
-			this._scale = (Scale)this.Scale.Clone();
+			this._scale = (Scale)this.Scale?.Clone();
 		}
 
 		private void scalesOnRemove(object sender, CollectionChangedEventArgs e)

src/ACadSharp/IO/DXF/DxfDocumentBuilder.cs

@@ -86,7 +86,7 @@ private void assignOwner(CadTemplate template)
 						//Entries of the dictionary are assigned in the template
 						break;
 					case CadBlockRecordTemplate record when template.CadObject is Entity entity:
-						record.OwnedObjectsHandlers.Add(entity.Handle);
+						//The entries should be assigned in the blocks or entities section
 						break;
 					case CadPolyLineTemplate pline when template.CadObject is Vertex v:
 						pline.VertexHandles.Add(v.Handle);

src/ACadSharp/IO/DXF/DxfReader.cs

@@ -494,6 +494,8 @@ private IDxfStreamReader getReader()
 
 			if (!tmpReader.Find(DxfFileToken.HeaderSection))
 			{
+				this.triggerNotification($"Header section not found, using a generic reader.", NotificationType.Warning);
+
 				this._version = ACadVersion.Unknown;
 				tmpReader.Start();
 				return tmpReader;
@@ -537,6 +539,11 @@ private IDxfStreamReader getReader()
 				tmpReader.ReadNext();
 			}
 
+			if(this._version == ACadVersion.Unknown)
+			{
+				this.triggerNotification($"Dxf version not found, using a generic reader.", NotificationType.Warning);
+			}
+
 			return this.createReader(isBinary, isAC1009Format);
 		}
 

src/ACadSharp/IO/DXF/DxfStreamReader/DxfBlockSectionReader.cs

@@ -115,14 +115,15 @@ private void readBlock()
 				record.BlockEntity = blckEntity;
 				recordTemplate = new CadBlockRecordTemplate(record);
 
+				this._builder.AddTemplate(recordTemplate);
 				this._builder.BlockRecords.Add(record);
 
 				if (recordTemplate.CadObject.Name.Equals(BlockRecord.ModelSpaceName, StringComparison.OrdinalIgnoreCase))
 				{
 					this._builder.ModelSpaceTemplate = recordTemplate;
 				}
 			}
-			else
+			else if (!this._builder.TryGetObjectTemplate<CadBlockRecordTemplate>(record.Handle, out recordTemplate))
 			{
 				recordTemplate = new CadBlockRecordTemplate(record);
 			}
@@ -151,7 +152,15 @@ private void readBlock()
 
 				//Add the object and the template to the builder
 				this._builder.AddTemplate(entityTemplate);
-				recordTemplate.OwnedObjectsHandlers.Add(entityTemplate.CadObject.Handle);
+
+				if (entityTemplate.OwnerHandle == null)
+				{
+					recordTemplate.OwnedObjectsHandlers.Add(entityTemplate.CadObject.Handle);
+				}
+				else if (this._builder.TryGetObjectTemplate(entityTemplate.OwnerHandle, out CadBlockRecordTemplate owner))
+				{
+					owner.OwnedObjectsHandlers.Add(entityTemplate.CadObject.Handle);
+				}
 			}
 
 			this.readBlockEnd(record.BlockEnd);

src/ACadSharp/IO/DXF/DxfStreamReader/DxfEntitiesSectionReader.cs

@@ -1,4 +1,5 @@
-using ACadSharp.IO.Templates;
+using ACadSharp.Entities;
+using ACadSharp.IO.Templates;
 using System;
 
 namespace ACadSharp.IO.DXF
@@ -41,10 +42,19 @@ public override void Read()
 				//Add the object and the template to the builder
 				this._builder.AddTemplate(template);
 
+				if(template.CadObject.Handle == 51790)
+				{
+
+				}
+
 				if (template.OwnerHandle == null)
 				{
 					this._builder.ModelSpaceEntities.Add(template.CadObject.Handle);
 				}
+				else if (this._builder.TryGetObjectTemplate(template.OwnerHandle, out CadBlockRecordTemplate owner))
+				{
+					owner.OwnedObjectsHandlers.Add(template.CadObject.Handle);
+				}
 			}
 		}
 	}

src/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs

@@ -494,6 +494,7 @@ private bool readTextEntity(CadEntityTemplate template, DxfMap map, string subcl
 				case 1 or 3 when tmp.CadObject is MText mtext:
 					mtext.Value += this._reader.ValueAsString;
 					return true;
+				case 50 when tmp.CadObject is MText://Read only for MText
 				case 70:
 				case 74:
 				case 101: