Merge pull request #356 from DomCR/create-default-elements-fix

DomCR · web-flow · commit 7cbc513b67ef · 2024-06-07T12:50:01.000+02:00
Create default elements fix
diff --git a/ACadSharp.Tests/IO/LocalSampleTests.cs b/ACadSharp.Tests/IO/LocalSampleTests.cs
@@ -32,7 +32,7 @@ public void ReadUserDwg(string test)
 
 			CadDocument doc = DwgReader.Read(test, this._dwgConfiguration, this.onNotification);
 
-			//return;
+			return;
 
 			string outPath = Path.Combine(Path.GetDirectoryName(test), $"{Path.GetFileNameWithoutExtension(test)}.out.dxf");
 			using (DxfWriter writer = new DxfWriter(outPath, doc, false))
diff --git a/ACadSharp/CadDocument.cs b/ACadSharp/CadDocument.cs
@@ -344,7 +344,8 @@ private bool updateCollection(string dictName, bool createDictionary, out CadDic
 			}
 			else if (createDictionary)
 			{
-				this.RootDictionary.Add(new CadDictionary(dictName));
+				dictionary = new CadDictionary(dictName);
+				this.RootDictionary.Add(dictionary);
 			}
 
 			return dictionary != null;
@@ -360,10 +361,14 @@ private void addCadObject(CadObject cadObject)
 			if (cadObject.Handle == 0 || this._cadObjects.ContainsKey(cadObject.Handle))
 			{
 				var nextHandle = this._cadObjects.Keys.Max() + 1;
-
-				this.Header.HandleSeed = nextHandle + 1;
+				if (nextHandle < this.Header.HandleSeed)
+				{
+					nextHandle = this.Header.HandleSeed;
+				}
 
 				cadObject.Handle = nextHandle;
+
+				this.Header.HandleSeed = nextHandle + 1;
 			}
 
 			this._cadObjects.Add(cadObject.Handle, cadObject);
diff --git a/ACadSharp/Entities/CadImageBase.cs b/ACadSharp/Entities/CadImageBase.cs
@@ -200,20 +200,12 @@ internal override void AssignDocument(CadDocument doc)
 
 			this._definition = this.updateCollection(this.Definition, doc.ImageDefinitions);
 
-			// The definitions entry is optional, some documents do not have it.
-			if (this.Document.ImageDefinitions != null)
-			{
-				this.Document.ImageDefinitions.OnRemove += this.imageDefinitionsOnRemove;
-			}
+			this.Document.ImageDefinitions.OnRemove += this.imageDefinitionsOnRemove;
 		}
 
 		internal override void UnassignDocument()
 		{
-			// The definitions entry is optional, some documents do not have it.
-			if (this.Document.ImageDefinitions != null)
-			{
-				this.Document.ImageDefinitions.OnRemove -= this.imageDefinitionsOnRemove;
-			}
+			this.Document.ImageDefinitions.OnRemove -= this.imageDefinitionsOnRemove;
 
 			base.UnassignDocument();
 
diff --git a/ACadSharp/IO/CadDocumentBuilder.cs b/ACadSharp/IO/CadDocumentBuilder.cs
@@ -52,13 +52,6 @@ public CadDocumentBuilder(CadDocument document)
 
 		public virtual void BuildDocument()
 		{
-			foreach (ICadDictionaryTemplate dictionaryTemplate in dictionaryTemplates.Values)
-			{
-				dictionaryTemplate.Build(this);
-			}
-
-			this.DocumentToBuild.UpdateCollections(false);
-		
 			foreach (CadTemplate template in this.templates.Values)
 			{
 				template.Build(this);
@@ -215,5 +208,15 @@ public void AddDictionaryTemplate(ICadDictionaryTemplate dictionaryTemplate)
 			this.dictionaryTemplates[dictionaryTemplate.CadObject.Handle] = dictionaryTemplate;
 			this.cadObjects[dictionaryTemplate.CadObject.Handle] = dictionaryTemplate.CadObject;
 		}
+
+		protected void buildDictionaries()
+		{
+			foreach (ICadDictionaryTemplate dictionaryTemplate in dictionaryTemplates.Values)
+			{
+				dictionaryTemplate.Build(this);
+			}
+
+			this.DocumentToBuild.UpdateCollections(true);
+		}
 	}
 }
diff --git a/ACadSharp/IO/DWG/DwgDocumentBuilder.cs b/ACadSharp/IO/DWG/DwgDocumentBuilder.cs
@@ -1,8 +1,5 @@
 ﻿using ACadSharp.Entities;
 using ACadSharp.IO.Templates;
-using ACadSharp.Tables;
-using ACadSharp.Tables.Collections;
-using System;
 using System.Collections.Generic;
 
 namespace ACadSharp.IO.DWG
@@ -41,6 +38,8 @@ public override void BuildDocument()
 
 			this.BuildTables();
 
+			this.buildDictionaries();
+
 			base.BuildDocument();
 		}
 	}
diff --git a/ACadSharp/IO/DWG/DwgStreamReaders/DwgObjectReader.cs b/ACadSharp/IO/DWG/DwgStreamReaders/DwgObjectReader.cs
@@ -5287,6 +5287,7 @@ private CadTemplate readXRecord()
 				switch (groupCode)
 				{
 					case GroupCodeValueType.String:
+					case GroupCodeValueType.ExtendedDataString:
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadTextUnicode()));
 						break;
 					case GroupCodeValueType.Point3D:
@@ -5298,17 +5299,20 @@ private CadTemplate readXRecord()
 								)));
 						break;
 					case GroupCodeValueType.Double:
+					case GroupCodeValueType.ExtendedDataDouble:
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadDouble()));
 						break;
+					case GroupCodeValueType.Byte:
+						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadByte()));
+						break;
 					case GroupCodeValueType.Int16:
+					case GroupCodeValueType.ExtendedDataInt16:
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadShort()));
 						break;
 					case GroupCodeValueType.Int32:
+					case GroupCodeValueType.ExtendedDataInt32:
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadRawLong()));
 						break;
-					case GroupCodeValueType.Byte:
-						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadByte()));
-						break;
 					case GroupCodeValueType.Int64:
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadRawULong()));
 						break;
@@ -5319,9 +5323,11 @@ private CadTemplate readXRecord()
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadByte() > 0));
 						break;
 					case GroupCodeValueType.Chunk:
+					case GroupCodeValueType.ExtendedDataChunk:
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadBytes(this._objectReader.ReadByte())));
 						break;
 					case GroupCodeValueType.ObjectId:
+					case GroupCodeValueType.ExtendedDataHandle:
 						xRecord.Entries.Add(new XRecord.Entry(code, this._objectReader.ReadRawULong()));
 						break;
 					default:
diff --git a/ACadSharp/IO/DXF/DxfDocumentBuilder.cs b/ACadSharp/IO/DXF/DxfDocumentBuilder.cs
@@ -24,6 +24,8 @@ public DxfDocumentBuilder(CadDocument document, DxfReaderConfiguration configura
 
 		public override void BuildDocument()
 		{
+			this.buildDictionaries();
+
 			this.RegisterTables();
 
 			this.BuildTables();

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,8 @@ private bool updateCollection(string dictName, bool createDictionary, out CadDic`
`344`	`344`	`}`
`345`	`345`	`else if (createDictionary)`
`346`	`346`	`{`
`347`		`- this.RootDictionary.Add(new CadDictionary(dictName));`
	`347`	`+ dictionary = new CadDictionary(dictName);`
	`348`	`+ this.RootDictionary.Add(dictionary);`
`348`	`349`	`}`
`349`	`350`
`350`	`351`	`return dictionary != null;`
`@@ -360,10 +361,14 @@ private void addCadObject(CadObject cadObject)`
`360`	`361`	`if (cadObject.Handle == 0 \|\| this._cadObjects.ContainsKey(cadObject.Handle))`
`361`	`362`	`{`
`362`	`363`	`var nextHandle = this._cadObjects.Keys.Max() + 1;`
`363`		`-`
`364`		`- this.Header.HandleSeed = nextHandle + 1;`
	`364`	`+ if (nextHandle < this.Header.HandleSeed)`
	`365`	`+ {`
	`366`	`+ nextHandle = this.Header.HandleSeed;`
	`367`	`+ }`
`365`	`368`
`366`	`369`	`cadObject.Handle = nextHandle;`
	`370`	`+`
	`371`	`+ this.Header.HandleSeed = nextHandle + 1;`
`367`	`372`	`}`
`368`	`373`
`369`	`374`	`this._cadObjects.Add(cadObject.Handle, cadObject);`
Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,6 @@ public CadDocumentBuilder(CadDocument document)`
`52`	`52`
`53`	`53`	`public virtual void BuildDocument()`
`54`	`54`	`{`
`55`		`- foreach (ICadDictionaryTemplate dictionaryTemplate in dictionaryTemplates.Values)`
`56`		`- {`
`57`		`- dictionaryTemplate.Build(this);`
`58`		`- }`
`59`		`-`
`60`		`- this.DocumentToBuild.UpdateCollections(false);`
`61`		`-`
`62`	`55`	`foreach (CadTemplate template in this.templates.Values)`
`63`	`56`	`{`
`64`	`57`	`template.Build(this);`
`@@ -215,5 +208,15 @@ public void AddDictionaryTemplate(ICadDictionaryTemplate dictionaryTemplate)`
`215`	`208`	`this.dictionaryTemplates[dictionaryTemplate.CadObject.Handle] = dictionaryTemplate;`
`216`	`209`	`this.cadObjects[dictionaryTemplate.CadObject.Handle] = dictionaryTemplate.CadObject;`
`217`	`210`	`}`
	`211`	`+`
	`212`	`+ protected void buildDictionaries()`
	`213`	`+ {`
	`214`	`+ foreach (ICadDictionaryTemplate dictionaryTemplate in dictionaryTemplates.Values)`
	`215`	`+ {`
	`216`	`+ dictionaryTemplate.Build(this);`
	`217`	`+ }`
	`218`	`+`
	`219`	`+ this.DocumentToBuild.UpdateCollections(true);`
	`220`	`+ }`
`218`	`221`	`}`
`219`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`using ACadSharp.Entities;`
`2`	`2`	`using ACadSharp.IO.Templates;`
`3`		`-using ACadSharp.Tables;`
`4`		`-using ACadSharp.Tables.Collections;`
`5`		`-using System;`
`6`	`3`	`using System.Collections.Generic;`
`7`	`4`
`8`	`5`	`namespace ACadSharp.IO.DWG`
`@@ -41,6 +38,8 @@ public override void BuildDocument()`
`41`	`38`
`42`	`39`	`this.BuildTables();`
`43`	`40`
	`41`	`+ this.buildDictionaries();`
	`42`	`+`
`44`	`43`	`base.BuildDocument();`
`45`	`44`	`}`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ public DxfDocumentBuilder(CadDocument document, DxfReaderConfiguration configura`
`24`	`24`
`25`	`25`	`public override void BuildDocument()`
`26`	`26`	`{`
	`27`	`+ this.buildDictionaries();`
	`28`	`+`
`27`	`29`	`this.RegisterTables();`
`28`	`30`
`29`	`31`	`this.BuildTables();`