Merge pull request DomCR#323 from nanoLogika/20240322_mme_writeMultiL…

…eader 20240322 mme write multi leader
nanoLogika · Jul 16, 2024 · 3d6943f · 3d6943f
2 parents deeb27e + 05e17eb
commit 3d6943f
Show file tree

Hide file tree

Showing 19 changed files with 1,302 additions and 152 deletions.
diff --git a/ACadSharp/DxfFileToken.cs b/ACadSharp/DxfFileToken.cs
@@ -74,8 +74,7 @@ public static class DxfFileToken
 		public const string EntityLine = "LINE";
 		public const string EntityLwPolyline = "LWPOLYLINE";
 		public const string EntityMesh = "MESH";
-		public const string EntityMLeader = "MLEADER";
-		public const string EntityMLeaderStyle = "MLEADERSTYLE";
+		public const string EntityMultiLeader = "MULTILEADER";
 		public const string EntityMLine = "MLINE";
 		public const string EntityMText = "MTEXT";
 		public const string EntityOleFrame = "OLEFRAME";
@@ -114,6 +113,7 @@ public static class DxfFileToken
 		public const string ObjectPlotSettings = "PLOTSETTINGS";
 		public const string ObjectPlaceholder = "ACDBPLACEHOLDER";
 		public const string ObjectLayout = "LAYOUT";
+		public const string ObjectMLeaderStyle = "MLEADERSTYLE";
 		public const string ObjectImageDefinition = "IMAGEDEF";
 		public const string ObjectImageDefinitionReactor = "IMAGEDEF_REACTOR";
 		public const string ObjectMLineStyle = "MLINESTYLE";

diff --git a/ACadSharp/DxfSubclassMarker.cs b/ACadSharp/DxfSubclassMarker.cs
@@ -43,7 +43,7 @@ public static class DxfSubclassMarker
 		public const string Vertex = "AcDbVertex";
 		public const string Polyline = "AcDb2dPolyline";
 		public const string Leader = "AcDbLeader";
-		public const string MLeader = "AcDbMLeader";
+		public const string MultiLeader = "AcDbMLeader";
 		public const string MLeaderStyle = "AcDbMLeaderStyle";
 		public const string MultiLeaderAnnotContext = "AcDbMultiLeaderAnnotContext";
 		public const string LwPolyline = "AcDbPolyline";

diff --git a/ACadSharp/Entities/MultiLeader.cs b/ACadSharp/Entities/MultiLeader.cs
diff --git a/ACadSharp/IO/DWG/DwgStreamReaders/DwgObjectReader.cs b/ACadSharp/IO/DWG/DwgStreamReaders/DwgObjectReader.cs
@@ -2913,7 +2913,7 @@ private CadTemplate readMultiLeader()
 			//  43  Block Content Rotation
 			mLeader.BlockContentRotation = this._objectReader.ReadBitDouble();
 			//  176 Block Content Connection Type
-			mLeader.BlockContentConnection = (BlockContentConnectionType)_objectReader.ReadBitShort();
+			mLeader.BlockContentConnection = (BlockContentConnectionType)this._objectReader.ReadBitShort();
 			//  293 Enable Annotation Scale/Is annotative
 			mLeader.EnableAnnotationScale = this._objectReader.ReadBit();
 
@@ -2935,7 +2935,7 @@ private CadTemplate readMultiLeader()
 			}
 
 			//	BL Number of Block Labels 
-			int blockLabelCount = this._objectReader.ReadBitShort();
+			int blockLabelCount = this._objectReader.ReadBitLong();
 			for (int bl = 0; bl < blockLabelCount; bl++)
 			{
 				//  330 Block Attribute definition handle (hard pointer)
@@ -2994,7 +2994,7 @@ private MultiLeaderAnnotContext readMultiLeaderAnnotContext(CadMLeaderTemplate t
 
 			//	Common
 			//	BD	40	Overall scale
-			annotContext.ScaleFactor = _objectReader.ReadBitDouble();
+			annotContext.ScaleFactor = this._objectReader.ReadBitDouble();
 			//	3BD	10	Content base point
 			annotContext.ContentBasePoint = this._objectReader.Read3BitDouble();
 			//	BD	41	Text height
@@ -3218,13 +3218,13 @@ private LeaderLine readLeaderLine(CadMLeaderTemplate template)
 				leaderLine.SegmentIndex = this._objectReader.ReadBitLong();
 
 				//	Start/end point pairs
-				//	3BD	11	Start Point
-				//	3BD	12	End point
 				int startEndPointCount = this._objectReader.ReadBitLong();
 				for (int sep = 0; sep < startEndPointCount; sep++)
 				{
 					leaderLine.StartEndPoints.Add(new StartEndPointPair(
+						//	3BD	11	Start Point
 						this._objectReader.Read3BitDouble(),
+						//	3BD	12	End point
 						this._objectReader.Read3BitDouble()));
 				}
 			}
@@ -3316,7 +3316,7 @@ private CadTemplate readMultiLeaderStyle()
 				mLeaderStyle.TextAngle = (TextAngleType)this._objectReader.ReadBitShort();
 
 			}   //	END IF IsNewFormat OR DXF file
-				//	BS	176	Text alignment type
+			//	BS	176	Text alignment type
 			mLeaderStyle.TextAlignment = (TextAlignmentType)this._objectReader.ReadBitShort();
 			//	CMC	93	Text color
 			mLeaderStyle.TextColor = this._mergedReaders.ReadCmColor();
@@ -3329,8 +3329,8 @@ private CadTemplate readMultiLeaderStyle()
 			 //	B	297	Always align text left
 				mLeaderStyle.TextAlignAlwaysLeft = this._objectReader.ReadBit();
 			}//	END IF IsNewFormat OR DXF file
-			 //	BD	46	Align space
-			mLeaderStyle.AlignSpace = _objectReader.ReadBitDouble();
+			//	BD	46	Align space
+			mLeaderStyle.AlignSpace = this._objectReader.ReadBitDouble();
 			//	H	343	Block handle (hard pointer)
 			template.BlockContentHandle = this.handleReference();
 			//	CMC	94	Block color

diff --git a/ACadSharp/IO/DWG/DwgStreamWriters/DwgObjectWriter.Common.cs b/ACadSharp/IO/DWG/DwgStreamWriters/DwgObjectWriter.Common.cs
@@ -2,7 +2,6 @@
 using ACadSharp.Entities;
 using ACadSharp.Tables;
 using CSUtilities.Converters;
-using System;
 using System.IO;
 
 namespace ACadSharp.IO.DWG