DWG reader: keep plot style, xref block and dimension context data; read RTEXT

src/ACadSharp/Entities/Entity.cs

@@ -76,6 +76,17 @@ public virtual LineType LineType
 	[DxfCodeValue(370)]
 	public LineWeightType LineWeight { get; set; } = LineWeightType.ByLayer;
 
+	/// <summary>
+	/// Plot style source of the entity (named plot style drawings), as stored in DWG: 0 = by layer,
+	/// 1 = by block, 3 = the style in <see cref="PlotStyleHandle"/>.
+	/// </summary>
+	public byte PlotStyleFlags { get; set; }
+
+	/// <summary>
+	/// Handle of the entity's plot style name (an entry of the ACAD_PLOTSTYLENAME dictionary) when <see cref="PlotStyleFlags"/> is 3.
+	/// </summary>
+	public ulong PlotStyleHandle { get; set; }
+
 	/// <inheritdoc/>
 	[DxfCodeValue(DxfReferenceType.Handle, 347)]
 	public Material Material

src/ACadSharp/Entities/UnknownEntity.cs

@@ -46,6 +46,32 @@ public override string SubclassMarker
 			}
 		}
 
+		/// <summary>
+		/// Remote text (Express Tools RTEXT) data, when this unknown entity is one and could be read.
+		/// </summary>
+		public RemoteText RText { get; set; }
+
+		/// <summary>
+		/// Data of an Express Tools RTEXT object: text from a file or from a DIESEL expression.
+		/// </summary>
+		public class RemoteText
+		{
+			/// <summary>Insertion point.</summary>
+			public XYZ InsertPoint { get; set; }
+			/// <summary>Extrusion direction.</summary>
+			public XYZ Normal { get; set; } = XYZ.AxisZ;
+			/// <summary>Rotation, radians.</summary>
+			public double Rotation { get; set; }
+			/// <summary>Text height.</summary>
+			public double Height { get; set; }
+			/// <summary>Flags: 1 = contents is a DIESEL expression, otherwise a file name.</summary>
+			public short Flags { get; set; }
+			/// <summary>DIESEL expression or file name.</summary>
+			public string Contents { get; set; }
+			/// <summary>Handle of the text style.</summary>
+			public ulong StyleHandle { get; set; }
+		}
+
 		/// <summary>
 		/// Dxf class linked to this entity.
 		/// </summary>

src/ACadSharp/IO/DWG/DwgStreamReaders/DwgObjectReader.Objects.cs

@@ -29,6 +29,15 @@ private void readAnnotScaleObjectContextData(CadAnnotScaleObjectContextDataTempl
 		template.ScaleHandle = this.handleReference();
 	}
 
+	private CadTemplate readDimensionObjectContextData()
+	{
+		var template = new CadDimensionObjectContextDataTemplate(new DimensionObjectContextData());
+		this.readAnnotScaleObjectContextData(template);
+		//H 2 dimension block for this scale; the data fields are not read
+		template.BlockHandle = this.handleReference();
+		return template;
+	}
+
 	private CadTemplate readBlkRefObjectContextData()
 	{
 		BlockReferenceObjectContextData contextData = new BlockReferenceObjectContextData();

src/ACadSharp/IO/DWG/DwgStreamReaders/DwgObjectReader.cs

@@ -2000,10 +2000,11 @@ private void readEntityMode(CadEntityTemplate template)
 
 			//R2000 +:
 			//Plotstyle flags	BB	00 = bylayer, 01 = byblock, 11 = plotstyle handle present at end of object
-			if (this._objectReader.Read2Bits() == 3)
+			template.CadObject.PlotStyleFlags = this._objectReader.Read2Bits();
+			if (template.CadObject.PlotStyleFlags == 3)
 			{
 				//PLOTSTYLE (hard pointer) present if plotstyle flags were 11
-				long plotstyleFlags = (long)this.handleReference();
+				template.CadObject.PlotStyleHandle = this.handleReference();
 			}
 
 			//R2007 +:
@@ -2714,12 +2715,10 @@ private CadTemplate readLayer()
 			var color = this._mergedReaders.ReadCmColor();
 			layer.Color = color.IsByBlock || color.IsByLayer ? Color.Default : color;
 
-			//TODO: This is not the Layer control handle
-			template.LayerControlHandle = this.handleReference();
-			//Handle refs H Layer control (soft pointer)
-			//[Reactors(soft pointer)]
-			//xdicobjhandle(hard owner)
-			//External reference block handle(hard pointer)
+			//Handle refs H Layer control (soft pointer), [Reactors (soft pointer)] and xdicobjhandle
+			//(hard owner) are read with the common data; this one is the
+			//External reference block handle (hard pointer): the xref a dependent layer comes from
+			layer.XrefBlockHandle = this.handleReference();
 
 			//R2000+:
 			if (this.R2000Plus)
@@ -5091,7 +5090,7 @@ private void readPlotSettings(PlotSettings plot)
 				plot.ShadePlotDPI = this._objectReader.ReadBitShort();
 
 				//6 plot view handle(hard pointer)
-				ulong plotViewHandle = this.handleReference();
+				plot.PlotViewHandle = this.handleReference();
 			}
 
 			//R2007 +:
@@ -6182,6 +6181,11 @@ private CadTemplate readUnlistedType(short classNumber)
 					break;
 			}
 
+			if (template == null && c.DxfName.EndsWith("DIMOBJECTCONTEXTDATA_CLASS"))
+			{
+				template = this.readDimensionObjectContextData();
+			}
+
 			if (template == null && c.IsAnEntity)
 			{
 				template = this.readUnknownEntity(c);
@@ -7290,6 +7294,26 @@ private CadTemplate readUnknownEntity(DxfClass dxfClass)
 
 			this.readCommonEntityData(template);
 
+			if (dxfClass?.DxfName == "RTEXT")
+			{
+				try
+				{
+					var rt = new UnknownEntity.RemoteText();
+					rt.InsertPoint = this._objectReader.Read3BitDouble();
+					rt.Normal = this._objectReader.Read3BitDouble();
+					rt.Rotation = this._objectReader.ReadBitDouble();
+					rt.Height = this._objectReader.ReadBitDouble();
+					rt.Flags = this._objectReader.ReadBitShort();
+					rt.Contents = this._textReader.ReadVariableText();
+					rt.StyleHandle = this.handleReference();
+					entity.RText = rt;
+				}
+				catch (System.Exception ex)
+				{
+					this._builder.Notify($"RTEXT could not be read: {ex.Message}", NotificationType.Warning);
+				}
+			}
+
 			return template;
 		}
 

src/ACadSharp/IO/DWG/DwgStreamWriters/DwgObjectWriter.Objects.cs

@@ -51,6 +51,7 @@ private bool skipEntry(NonGraphicalObject entry, out bool notify)
 			case AecCleanupGroup:
 			case AecBinRecord:
 			case DimensionAssociation:
+			case DimensionObjectContextData:
 			case UnknownNonGraphicalObject:
 			case VisualStyle:
 			case ProxyObject:

src/ACadSharp/IO/DXF/DxfStreamWriter/DxfObjectsSectionWriter.cs

@@ -741,6 +741,7 @@ private bool isObjectSupported(CadObject co)
 			case AecCleanupGroup:
 			case AecBinRecord:
 			case DimensionAssociation:
+			case DimensionObjectContextData:
 			case Material:
 			case MultiLeaderObjectContextData:
 			case VisualStyle:

src/ACadSharp/IO/Templates/CadDimensionObjectContextDataTemplate.cs

@@ -0,0 +1,21 @@
+using ACadSharp.Objects;
+using ACadSharp.Tables;
+
+namespace ACadSharp.IO.Templates;
+
+internal class CadDimensionObjectContextDataTemplate : CadAnnotScaleObjectContextDataTemplate
+{
+	public ulong? BlockHandle { get; set; }
+
+	public CadDimensionObjectContextDataTemplate(DimensionObjectContextData cadObject) : base(cadObject) { }
+
+	protected override void build(CadDocumentBuilder builder)
+	{
+		base.build(builder);
+
+		if (builder.TryGetCadObject(this.BlockHandle, out BlockRecord block))
+		{
+			((DimensionObjectContextData)this.CadObject).Block = block;
+		}
+	}
+}

src/ACadSharp/IO/Templates/CadLayerTemplate.cs

@@ -5,8 +5,6 @@ namespace ACadSharp.IO.Templates
 {
 	internal class CadLayerTemplate : CadTableEntryTemplate<Layer>
 	{
-		public ulong LayerControlHandle { get; set; }
-
 		public ulong PlotStyleHandle { get; set; }
 
 		public ulong MaterialHandle { get; set; }
@@ -28,7 +26,11 @@ protected override void build(CadDocumentBuilder builder)
 
 			base.build(builder);
 
-			//this.CadObject.PlotStyleName = builder.GetCadObject(PlotStyleHandle);
+			// DWG keeps the layer's plot style (ACAD_PLOTSTYLENAME entry) as a handle; the DXF reader sets it directly.
+			if (this.PlotStyleHandle != 0)
+			{
+				this.CadObject.PlotStyleName = this.PlotStyleHandle;
+			}
 
 			if (builder.TryGetCadObject(this.MaterialHandle, out Material material))
 			{

src/ACadSharp/Objects/DimensionObjectContextData.cs

@@ -0,0 +1,16 @@
+using ACadSharp.Tables;
+
+namespace ACadSharp.Objects;
+
+/// <summary>
+/// Annotation scale representation of a dimension (ACDB_*DIMOBJECTCONTEXTDATA_CLASS): the dimension's
+/// geometry block for one annotation scale. Only the block is read.
+/// </summary>
+public class DimensionObjectContextData : AnnotScaleObjectContextData
+{
+	/// <summary>Anonymous block holding the dimension's graphics at <see cref="AnnotScaleObjectContextData.Scale"/>.</summary>
+	public BlockRecord Block { get; set; }
+
+	/// <inheritdoc/>
+	public override string ObjectName => "ACDB_DIMOBJECTCONTEXTDATA_CLASS";
+}

src/ACadSharp/Objects/PlotSettings.cs

@@ -141,6 +141,12 @@ public double NumeratorScale
 	[DxfCodeValue(6)]
 	public string PlotViewName { get; set; }
 
+	/// <summary>
+	/// Handle of the named view plotted when the plot type is View (DWG R2004+ store the view this way
+	/// instead of by <see cref="PlotViewName"/>); 0 when none.
+	/// </summary>
+	public ulong PlotViewHandle { get; set; }
+
 	/// <summary>
 	/// Gets the scale factor.
 	/// </summary>

src/ACadSharp/Tables/Layer.cs

@@ -129,6 +129,12 @@ public bool PlotFlag
 	[DxfCodeValue(DxfReferenceType.Unprocess, 390)]
 	public ulong PlotStyleName { get; internal set; } = 0;
 
+	/// <summary>
+	/// Handle of the xref block record an xref-dependent layer comes from (0 when not dependent).
+	/// The layer's "XREF|" name prefix can be stale after the xref is renamed; this link is not.
+	/// </summary>
+	public ulong XrefBlockHandle { get; set; }
+
 	/// <inheritdoc/>
 	public override string SubclassMarker => DxfSubclassMarker.Layer;