Dwg writer entities

ACadSharp.Tests/Common/Factory.cs

@@ -58,7 +58,7 @@ private static CadObject createObject(Type type, Type original, bool randomize)
 				return null;
 			}
 
-			if (type == typeof(XRecrod)
+			if (type == typeof(XRecord)
 				|| type == typeof(PlotSettings)
 				|| type == typeof(Material)
 				|| type == typeof(MLStyle)

ACadSharp.Tests/IO/DWG/DwgWriterTests.cs

@@ -11,17 +11,27 @@ namespace ACadSharp.Tests.IO.DWG
 {
 	public class DwgWriterTests : IOTestsBase
 	{
+		public static TheoryData<Entity> Entities { get; }
+
 		public DwgWriterTests(ITestOutputHelper output) : base(output) { }
 
+		static DwgWriterTests()
+		{
+			Entities = new TheoryData<Entity>
+			{
+				EntityFactory.Create<Point>(),
+				EntityFactory.Create<Line>(),
+			};
+		}
+
 		[Theory]
 		[MemberData(nameof(Versions))]
 		public void WriteEmptyTest(ACadVersion version)
 		{
+			string path = Path.Combine(_samplesOutFolder, $"out_empty_sample_{version}.dwg");
 			CadDocument doc = new CadDocument();
 			doc.Header.Version = version;
 
-			string path = Path.Combine(_samplesOutFolder, $"out_empty_sample_{version}.dwg");
-
 			using (var wr = new DwgWriter(path, doc))
 			{
 				if (isSupportedVersion(version))
@@ -43,19 +53,27 @@ public void WriteEmptyTest(ACadVersion version)
 			//this.checkDwgDocumentInAutocad(Path.GetFullPath(path));
 		}
 
+		[Theory]
+		[MemberData(nameof(Entities))]
+		public void WriteSingleEntityFile(Entity entity)
+		{
+
+		}
+
 		[Theory]
 		[MemberData(nameof(Versions))]
 		public void WriteTest(ACadVersion version)
 		{
 			CadDocument doc = new CadDocument();
 			doc.Header.Version = version;
 
-			addEntities(doc);
+			this.addEntities(doc);
 
 			string path = Path.Combine(_samplesOutFolder, $"out_sample_{version}.dwg");
 
 			using (var wr = new DwgWriter(path, doc))
 			{
+				wr.OnNotification += this.onNotification;
 				if (isSupportedVersion(version))
 				{
 					wr.Write();

ACadSharp.Tests/IO/IOTests.cs

@@ -24,6 +24,19 @@ public void EmptyDwgToDxf()
 			this.writeDxfFile(pathOut, doc, true);
 		}
 
+		[Theory]
+		[MemberData(nameof(DwgFilePaths))]
+		public void DwgToDwg(string test)
+		{
+			CadDocument doc = DwgReader.Read(test);
+
+			string file = Path.GetFileNameWithoutExtension(test);
+			string pathOut = Path.Combine(_samplesOutFolder, $"{file}_out.dwg");
+
+			//accoreconsole always fails because cannot recover the file
+			this.writeDwgFile(pathOut, doc, false);
+		}
+
 		[Theory]
 		[MemberData(nameof(DwgFilePaths))]
 		public void DwgToDxf(string test)
@@ -48,7 +61,28 @@ public void DxfToDxf(string test)
 
 		[Theory]
 		[MemberData(nameof(DwgFilePaths))]
-		public void DwgEntitiesToNewFile(string test)
+		public void DwgEntitiesToDwgFile(string test)
+		{
+			CadDocument doc = DwgReader.Read(test);
+
+			CadDocument transfer = new CadDocument();
+			transfer.Header.Version = doc.Header.Version;
+
+			List<Entity> entities = new List<Entity>(doc.Entities);
+			foreach (var item in entities)
+			{
+				Entity e = doc.Entities.Remove(item);
+				transfer.Entities.Add(e);
+			}
+
+			string file = Path.GetFileNameWithoutExtension(test);
+			string pathOut = Path.Combine(_samplesOutFolder, $"{file}_moved_out.dwg");
+			this.writeDwgFile(pathOut, transfer, false);
+		}
+
+		[Theory]
+		[MemberData(nameof(DwgFilePaths))]
+		public void DwgEntitiesToDxfFile(string test)
 		{
 			CadDocument doc = DwgReader.Read(test);
 
@@ -67,6 +101,33 @@ public void DwgEntitiesToNewFile(string test)
 			this.writeDxfFile(pathOut, transfer, true);
 		}
 
+		private void writeCadFile(string file, CadWriterBase writer, bool check)
+		{
+			using (writer)
+			{
+				writer.OnNotification += this.onNotification;
+				writer.Write();
+			}
+
+			if (check)
+				this.checkDxfDocumentInAutocad(Path.GetFullPath(file));
+		}
+
+		private void writeDwgFile(string file, CadDocument doc, bool check)
+		{
+			if (doc.Header.Version < ACadVersion.AC1014 || doc.Header.Version > ACadVersion.AC1018)
+				return;
+
+			using (DwgWriter writer = new DwgWriter(file, doc))
+			{
+				writer.OnNotification += this.onNotification;
+				writer.Write();
+			}
+
+			if (check)
+				this.checkDwgDocumentInAutocad(Path.GetFullPath(file));
+		}
+
 		private void writeDxfFile(string file, CadDocument doc, bool check)
 		{
 			using (DxfWriter writer = new DxfWriter(file, doc, false))
@@ -78,5 +139,17 @@ private void writeDxfFile(string file, CadDocument doc, bool check)
 			if (check)
 				this.checkDxfDocumentInAutocad(Path.GetFullPath(file));
 		}
+
+		private void writeDwgFile(string file, CadDocument doc)
+		{
+			if (doc.Header.Version > ACadVersion.AC1018)
+				return;
+
+			using (DwgWriter writer = new DwgWriter(file, doc))
+			{
+				writer.OnNotification += this.onNotification;
+				writer.Write();
+			}
+		}
 	}
 }

ACadSharp.Tests/IO/LocalSampleTests.cs

@@ -36,7 +36,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))

ACadSharp/CadObjectCollection.cs

@@ -23,6 +23,14 @@ public class CadObjectCollection<T> : IObservableCollection<T>
 		/// </summary>
 		public int Count { get { return this._entries.Count; } }
 
+		public T this[int index]
+		{
+			get
+			{
+				return this._entries.ElementAtOrDefault(index);
+			}
+		}
+
 		protected readonly HashSet<T> _entries = new HashSet<T>();
 
 		public CadObjectCollection(CadObject owner)

ACadSharp/Entities/Dimension.cs

@@ -167,13 +167,13 @@ public DimensionStyle Style
 
 		private readonly DimensionType _flags;
 
+		private DimensionStyle _style = DimensionStyle.Default;
+
 		protected Dimension(DimensionType type)
 		{
 			this._flags = type;
 		}
 
-		private DimensionStyle _style = DimensionStyle.Default;
-
 		public override CadObject Clone()
 		{
 			Dimension clone = (Dimension)base.Clone();

ACadSharp/Entities/Insert.cs

@@ -19,7 +19,20 @@ namespace ACadSharp.Entities
 	public class Insert : Entity
 	{
 		/// <inheritdoc/>
-		public override ObjectType ObjectType => ObjectType.INSERT;
+		public override ObjectType ObjectType
+		{
+			get
+			{
+				if (this.RowCount > 1 || this.ColumnCount > 1)
+				{
+					return ObjectType.MINSERT;
+				}
+				else
+				{
+					return ObjectType.INSERT;
+				}
+			}
+		}
 
 		/// <inheritdoc/>
 		public override string ObjectName => DxfFileToken.EntityInsert;

ACadSharp/Entities/Leader.cs

@@ -1,6 +1,7 @@
 using ACadSharp.Attributes;
 using ACadSharp.Tables;
 using CSMath;
+using System;
 using System.Collections.Generic;
 
 namespace ACadSharp.Entities
@@ -29,7 +30,26 @@ public class Leader : Entity
 		/// Dimension Style
 		/// </summary>
 		[DxfCodeValue(3)]
-		public DimensionStyle Style { get; set; } = DimensionStyle.Default;
+		public DimensionStyle Style
+		{
+			get { return this._style; }
+			set
+			{
+				if (value == null)
+				{
+					throw new ArgumentNullException(nameof(value));
+				}
+
+				if (this.Document != null)
+				{
+					this._style = this.updateTable(value, this.Document.DimensionStyles);
+				}
+				else
+				{
+					this._style = value;
+				}
+			}
+		}
 
 		/// <summary>
 		/// Arrowhead flag
@@ -112,6 +132,36 @@ public class Leader : Entity
 		[DxfCodeValue(213, 223, 233)]
 		public XYZ AnnotationOffset { get; set; } = XYZ.Zero;
 
+		private DimensionStyle _style = DimensionStyle.Default;
+
+		internal override void AssignDocument(CadDocument doc)
+		{
+			base.AssignDocument(doc);
+
+			this._style = this.updateTable(this.Style, doc.DimensionStyles);
+
+			doc.DimensionStyles.OnRemove += this.tableOnRemove;
+		}
+
+		internal override void UnassignDocument()
+		{
+			this.Document.DimensionStyles.OnRemove -= this.tableOnRemove;
+
+			base.UnassignDocument();
+
+			this.Style = (DimensionStyle)this.Style.Clone();
+		}
+
+		protected override void tableOnRemove(object sender, CollectionChangedEventArgs e)
+		{
+			base.tableOnRemove(sender, e);
+
+			if (e.Item.Equals(this.Style))
+			{
+				this.Style = this.Document.DimensionStyles[DimensionStyle.DefaultName];
+			}
+		}
+
 		public override CadObject Clone()
 		{
 			Leader clone = (Leader)base.Clone();

ACadSharp/Entities/PolyFaceMesh.cs

@@ -24,12 +24,12 @@ public class PolyfaceMesh : Polyline
 		/// <inheritdoc/>
 		public override string SubclassMarker => DxfSubclassMarker.PolyfaceMesh;
 
-		public SeqendCollection<VertexFaceRecord> Faces { get; }
+		public CadObjectCollection<VertexFaceRecord> Faces { get; }
 
 		public PolyfaceMesh()
 		{
 			this.Vertices.OnAdd += this.verticesOnAdd;
-			this.Faces = new SeqendCollection<VertexFaceRecord>(this);
+			this.Faces = new CadObjectCollection<VertexFaceRecord>(this);
 		}
 
 		public override IEnumerable<Entity> Explode()
@@ -45,5 +45,17 @@ private void verticesOnAdd(object sender, CollectionChangedEventArgs e)
 				throw new ArgumentException($"Wrong vertex type {e.Item.SubclassMarker} for {this.SubclassMarker}");
 			}
 		}
+
+		internal override void AssignDocument(CadDocument doc)
+		{
+			base.AssignDocument(doc);
+			doc.RegisterCollection(this.Faces);
+		}
+
+		internal override void UnassignDocument()
+		{
+			this.Document.UnregisterCollection(this.Faces);
+			base.UnassignDocument();
+		}
 	}
 }

ACadSharp/Entities/PolyfaceMesh.cs

@@ -24,12 +24,12 @@ public class PolyfaceMesh : Polyline
 		/// <inheritdoc/>
 		public override string SubclassMarker => DxfSubclassMarker.PolyfaceMesh;
 
-		public SeqendCollection<VertexFaceRecord> Faces { get; }
+		public CadObjectCollection<VertexFaceRecord> Faces { get; }
 
 		public PolyfaceMesh()
 		{
 			this.Vertices.OnAdd += this.verticesOnAdd;
-			this.Faces = new SeqendCollection<VertexFaceRecord>(this);
+			this.Faces = new CadObjectCollection<VertexFaceRecord>(this);
 		}
 
 		public override IEnumerable<Entity> Explode()
@@ -45,5 +45,17 @@ private void verticesOnAdd(object sender, CollectionChangedEventArgs e)
 				throw new ArgumentException($"Wrong vertex type {e.Item.SubclassMarker} for {this.SubclassMarker}");
 			}
 		}
+
+		internal override void AssignDocument(CadDocument doc)
+		{
+			base.AssignDocument(doc);
+			doc.RegisterCollection(this.Faces);
+		}
+
+		internal override void UnassignDocument()
+		{
+			this.Document.UnregisterCollection(this.Faces);
+			base.UnassignDocument();
+		}
 	}
 }

ACadSharp/Entities/Shape.cs

@@ -39,7 +39,7 @@ public class Shape : Entity
 		/// Size
 		/// </summary>
 		[DxfCodeValue(40)]
-		public double Size { get; set; } = 0.0;
+		public double Size { get; set; } = 1.0;
 
 		/// <summary>
 		/// Shape name

ACadSharp/Entities/Spline.cs

@@ -1,6 +1,5 @@
 using ACadSharp.Attributes;
 using CSMath;
-using System;
 using System.Collections.Generic;
 
 namespace ACadSharp.Entities
@@ -44,7 +43,7 @@ public class Spline : Entity
 		/// Degree of the spline curve
 		/// </summary>
 		[DxfCodeValue(71)]
-		public double Degree { get; set; }
+		public int Degree { get; set; }
 
 		/// <summary>
 		/// Number of knots