Merge pull request DomCR#753 from DomCR/CadDictionary-variables

AcDbVariableDictionary

Author: DomCR

src/ACadSharp.Tests/CadDocumentTests.cs

@@ -7,6 +7,7 @@
 using ACadSharp.Blocks;
 using System.Linq;
 using System.Diagnostics;
+using ACadSharp.Objects;
 
 namespace ACadSharp.Tests
 {
@@ -244,6 +245,36 @@ public void Get0HandleObject()
 			Assert.Null(cadObject);
 		}
 
+		[Fact]
+		public void GetCurrentTest()
+		{
+			CadDocument doc = new CadDocument();
+
+			Layer layer = doc.GetCurrent<Layer>();
+			Assert.NotNull(layer);
+			Assert.Equal(Layer.DefaultName, layer.Name);
+
+			LineType lineType = doc.GetCurrent<LineType>();
+			Assert.NotNull(lineType);
+			Assert.Equal(LineType.ByLayerName, lineType.Name);
+
+			TextStyle textStyle = doc.GetCurrent<TextStyle>();
+			Assert.NotNull(textStyle);
+			Assert.Equal(TextStyle.DefaultName, textStyle.Name);
+
+			DimensionStyle dimStyle = doc.GetCurrent<DimensionStyle>();
+			Assert.NotNull(dimStyle);
+			Assert.Equal(DimensionStyle.DefaultName, dimStyle.Name);
+
+			MLineStyle mlineStyle = doc.GetCurrent<MLineStyle>();
+			Assert.NotNull(mlineStyle);
+			Assert.Equal(MLineStyle.DefaultName, mlineStyle.Name);
+
+			MultiLeaderStyle multiLeaderStyle = doc.GetCurrent<MultiLeaderStyle>();
+			Assert.NotNull(multiLeaderStyle);
+			Assert.Equal(MultiLeaderStyle.DefaultName, multiLeaderStyle.Name);
+		}
+
 		[Fact]
 		public void NotAllowDuplicate()
 		{
@@ -337,5 +368,40 @@ public void RestoreHandlesTest()
 			Assert.Equal(line.Handle, l.Handle);
 			Assert.True(line.Handle < bigHandle);
 		}
+
+		[Fact]
+		public void SetCurrentTest()
+		{
+			CadDocument doc = new CadDocument();
+
+			string layerName = "my_layer";
+			doc.SetCurrent(new Layer(layerName));
+			Assert.True(doc.Layers.Contains(layerName));
+			Assert.Equal(layerName, doc.Header.CurrentLayerName);
+
+			string lineTypeName = "my_linetype";
+			doc.SetCurrent(new LineType(lineTypeName));
+			Assert.True(doc.LineTypes.Contains(lineTypeName));
+			Assert.Equal(lineTypeName, doc.Header.CurrentLineTypeName);
+
+			string textStyleName = "my_textstyle";
+			doc.SetCurrent(new TextStyle(textStyleName));
+			Assert.True(doc.TextStyles.Contains(textStyleName));
+			Assert.Equal(textStyleName, doc.Header.CurrentTextStyleName);
+
+			string dimStyleName = "my_dimstyle";
+			doc.SetCurrent(new DimensionStyle(dimStyleName));
+			Assert.True(doc.DimensionStyles.Contains(dimStyleName));
+			Assert.Equal(dimStyleName, doc.Header.CurrentDimensionStyleName);
+
+			string mlineStyleName = "my_mlinestyle";
+			doc.SetCurrent(new MLineStyle(mlineStyleName));
+			Assert.True(doc.MLineStyles.ContainsKey(mlineStyleName));
+			Assert.Equal(mlineStyleName, doc.Header.CurrentMLineStyleName);
+
+			string multiLeaderStyleName = "my_multileaderstyle";
+			doc.SetCurrent(new MultiLeaderStyle(multiLeaderStyleName));
+			Assert.True(doc.MLeaderStyles.ContainsKey(multiLeaderStyleName));
+		}
 	}
 }

src/ACadSharp.Tests/Header/CadHeaderTests.cs

@@ -39,38 +39,10 @@ public void CadHeaderCurrentCurrentTextStyleTest()
 			CadHeader header = new CadHeader(document);
 
 			Assert.NotNull(header.CurrentTextStyle);
-			Assert.True(header.CurrentTextStyle.Name == header.TextStyleName, "Name does not match");
+			Assert.True(header.CurrentTextStyle.Name == header.CurrentTextStyleName, "Name does not match");
 			Assert.True(header.CurrentTextStyle.Name == TextStyle.DefaultName, "Name does not match");
-			Assert.True(header.CurrentTextStyle.Handle == document.TextStyles[header.TextStyleName].Handle, "Handle does not match");
+			Assert.True(header.CurrentTextStyle.Handle == document.TextStyles[header.CurrentTextStyleName].Handle, "Handle does not match");
 			Assert.Equal(document.TextStyles, header.CurrentTextStyle.Owner);
 		}
-
-		[Fact]
-		public void CadHeaderCurrentCurrentMultiLeaderStyleTest()
-		{
-			CadDocument document = new CadDocument();
-			CadHeader header = new CadHeader(document);
-
-			Assert.NotNull(header.CurrentMultiLeaderStyle);
-			Assert.True(header.CurrentMultiLeaderStyle.Name == header.CurrentMultiLeaderStyleName, "Name does not match");
-			Assert.True(header.CurrentMultiLeaderStyle.Name == MultiLeaderStyle.DefaultName, "Name does not match");
-			Assert.True(header.CurrentMultiLeaderStyle.Handle == document.MLeaderStyles[header.CurrentMultiLeaderStyleName].Handle, "Handle does not match");
-			Assert.Equal(document.MLeaderStyles, header.CurrentMultiLeaderStyle.Owner);
-
-			Assert.True(((CadDictionary)document.RootDictionary[CadDictionary.VariableDictionary]).TryGetEntry(CadDictionary.CurrentMultiLeaderStyle, out DictionaryVariable currentMultiLeaderStyleNameVariable), "Dictionary variable for CMLEADERSTYLE does not exist.");
-			Assert.True(currentMultiLeaderStyleNameVariable.Value == MultiLeaderStyle.DefaultName, "Dictionary variable CMLEADERSTYLE='standard' does not match.");
-
-			string multiLeaderStyleName = "Test";
-			document.MLeaderStyles.Add(new MultiLeaderStyle(multiLeaderStyleName));
-			header.CurrentMultiLeaderStyleName = multiLeaderStyleName;
-			Assert.True(document.MLeaderStyles.TryGetValue(multiLeaderStyleName, out MultiLeaderStyle multiLeaderStyle), "MultiLeaderStyle for new name 'Test' not created.");
-			Assert.True(header.CurrentMultiLeaderStyle.Name == multiLeaderStyleName, "MultiLeaderStyle for new name 'Test' not set.");
-
-			Assert.True(currentMultiLeaderStyleNameVariable.Value == multiLeaderStyleName, "Dictionary variable CMLEADERSTYLE='Test' does not match.");
-
-			currentMultiLeaderStyleNameVariable.Value = MultiLeaderStyle.DefaultName;
-			Assert.True(header.CurrentMultiLeaderStyleName == MultiLeaderStyle.DefaultName, "CurrentMultiLeaderStyleName for new name 'Standard' doe not match.");
-			Assert.True(header.CurrentMultiLeaderStyle.Name == MultiLeaderStyle.DefaultName, "CurrentMultiLeaderStyle for new name 'Standard' not set.");
-		}
 	}
 }

src/ACadSharp.Tests/IO/CadReaderTestsBase.cs

@@ -99,7 +99,7 @@ public virtual void AssertDocumentHeader(FileModel test)
 			Assert.Equal(LineType.ByLayerName, header.CurrentLineTypeName, ignoreCase: true);
 
 			Assert.Equal(doc.TextStyles[TextStyle.DefaultName], header.CurrentTextStyle);
-			Assert.Equal(TextStyle.DefaultName, header.TextStyleName, ignoreCase: true);
+			Assert.Equal(TextStyle.DefaultName, header.CurrentTextStyleName, ignoreCase: true);
 		}
 
 		public void Dispose()

src/ACadSharp/CadDocument.cs

@@ -39,6 +39,14 @@ public class CadDocument : IHandledCadObject
 		/// </remarks>
 		public ColorCollection Colors { get; private set; }
 
+		/// <summary>
+		/// The collection of the system variables in the drawing.
+		/// </summary>
+		/// <remarks>
+		/// The collection is null if the <see cref="CadDictionary.VariableDictionary"/> doesn't exist in the root dictionary.
+		/// </remarks>
+		public DictionaryVariableCollection DictionaryVariables { get; private set; }
+
 		/// <summary>
 		/// The collection of all dimension styles in the drawing.
 		/// </summary>
@@ -75,14 +83,6 @@ public class CadDocument : IHandledCadObject
 		/// </remarks>
 		public ImageDefinitionCollection ImageDefinitions { get; private set; }
 
-		/// <summary>
-		/// The collection of all images in the drawing.
-		/// </summary>
-		/// <remarks>
-		/// The collection is null if the <see cref="CadDictionary.AcadImageDict"/> doesn't exist in the root dictionary.
-		/// </remarks>
-		public PdfDefinitionCollection PdfDefinitions { get; private set; }
-
 		/// <summary>
 		/// The collection of all layers in the drawing.
 		/// </summary>
@@ -127,6 +127,14 @@ public class CadDocument : IHandledCadObject
 		/// </summary>
 		public BlockRecord PaperSpace { get { return this.BlockRecords[BlockRecord.PaperSpaceName]; } }
 
+		/// <summary>
+		/// The collection of all images in the drawing.
+		/// </summary>
+		/// <remarks>
+		/// The collection is null if the <see cref="CadDictionary.AcadImageDict"/> doesn't exist in the root dictionary.
+		/// </remarks>
+		public PdfDefinitionCollection PdfDefinitions { get; private set; }
+
 		/// <summary>
 		/// Root dictionary of the document.
 		/// </summary>
@@ -206,28 +214,6 @@ internal CadDocument(bool createDefaults)
 			}
 		}
 
-		/// <summary>
-		/// Updates the <see cref="DxfClass"/> in the document and their instance count.
-		/// </summary>
-		/// <param name="reset">Resets the list and clears any unnecessary classes.</param>
-		public void UpdateDxfClasses(bool reset)
-		{
-			if (reset)
-			{
-				this.Classes.Clear();
-			}
-
-			DxfClassCollection.UpdateDxfClasses(this);
-
-			foreach (var item in this.Classes)
-			{
-				item.InstanceCount = this._cadObjects.Values
-					.OfType<CadObject>()
-					.Where(c => c.ObjectName == item.DxfName)
-					.Count();
-			}
-		}
-
 		/// <summary>
 		/// Create the default entries and objects for the <see cref="CadDocument"/>.
 		/// </summary>
@@ -317,6 +303,42 @@ public T GetCadObject<T>(ulong handle)
 			return null;
 		}
 
+		/// <summary>
+		/// Retrieves the current object of the specified type from the document's configuration.
+		/// </summary>
+		/// <typeparam name="T">The type of the object to retrieve. Must be a type that implements <see cref="CadObject"/> and <see
+		/// cref="INamedCadObject"/>.</typeparam>
+		/// <returns>The current object of the specified type, or throws an exception if the type is not supported.</returns>
+		/// <exception cref="NotSupportedException">Thrown if the specified type <typeparamref name="T"/> is not a configurable type in the document.</exception>
+		public T GetCurrent<T>()
+			where T : CadObject, INamedCadObject
+		{
+			switch (typeof(T))
+			{
+				case Type t when t.Equals(typeof(Layer)):
+					return this.Header.CurrentLayer as T;
+				case Type t when t.Equals(typeof(LineType)):
+					return this.Header.CurrentLineType as T;
+				case Type t when t.Equals(typeof(TextStyle)):
+					return this.Header.CurrentTextStyle as T;
+				case Type t when t.Equals(typeof(DimensionStyle)):
+					return this.Header.CurrentDimensionStyle as T;
+				case Type t when t.Equals(typeof(MLineStyle)):
+					return this.Header.CurrentMLineStyle as T;
+				case Type t when t.Equals(typeof(MultiLeaderStyle)):
+					if (this.DictionaryVariables.TryGetValue(DictionaryVariable.CurrentMultiLeaderStyle, out DictionaryVariable variable))
+					{
+						if (this.MLeaderStyles.TryGetValue(variable.Value, out MultiLeaderStyle style))
+						{
+							return style as T;
+						}
+					}
+					return null;
+				default:
+					throw new NotSupportedException($"The type {typeof(T)} is not a configurable type in the document.");
+			}
+		}
+
 		/// <summary>
 		/// Reassign all the handles in the document to avoid the variable <see cref="CadHeader.HandleSeed"/> to grow past its limit.
 		/// </summary>
@@ -341,6 +363,49 @@ public void RestoreHandles()
 			this.Header.HandleSeed = nextHandle;
 		}
 
+		/// <summary>
+		/// This method sets the current configurable object of the specified type in the document's configuration.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="obj"></param>
+		/// <exception cref="NotSupportedException"></exception>
+		public void SetCurrent<T>(T obj)
+			where T : CadObject, INamedCadObject
+		{
+			switch (obj)
+			{
+				case Layer layer:
+					this.Header.CurrentLayerName = this.Layers.TryAdd(layer).Name;
+					break;
+				case LineType lineType:
+					this.Header.CurrentLineTypeName = this.LineTypes.TryAdd(lineType).Name; ;
+					break;
+				case TextStyle textStyle:
+					this.Header.CurrentTextStyleName = this.TextStyles.TryAdd(textStyle).Name;
+					break;
+				case DimensionStyle dimensionStyle:
+					this.Header.CurrentDimensionStyleName = this.DimensionStyles.TryAdd(dimensionStyle).Name;
+					break;
+				case MLineStyle mlineStyle:
+					this.Header.CurrentMLineStyleName = this.MLineStyles.TryAdd(mlineStyle).Name;
+					break;
+				case MultiLeaderStyle multiLeaderStyle:
+					if (this.DictionaryVariables.TryGetValue(DictionaryVariable.CurrentMultiLeaderStyle, out DictionaryVariable variable))
+					{
+						variable.Value = multiLeaderStyle.Name;
+					}
+					else
+					{
+						variable = new DictionaryVariable(DictionaryVariable.CurrentMultiLeaderStyle, multiLeaderStyle.Name);
+						this.DictionaryVariables.Add(variable);
+					}
+					this.MLeaderStyles.TryAdd(multiLeaderStyle);
+					break;
+				default:
+					throw new NotSupportedException($"The type {typeof(T)} is not a configurable type in the document.");
+			}
+		}
+
 		/// <summary>
 		/// Gets an object in the document by it's handle
 		/// </summary>
@@ -366,7 +431,7 @@ public bool TryGetCadObject<T>(ulong handle, out T cadObject)
 		}
 
 		/// <summary>
-		/// Updates the collections in the document and link them to it's dictionary
+		/// Updates the collections in the document and link them to it's dictionary.
 		/// </summary>
 		/// <param name="createDictionaries"></param>
 		public void UpdateCollections(bool createDictionaries)
@@ -419,6 +484,33 @@ public void UpdateCollections(bool createDictionaries)
 			{
 				this.Colors = new ColorCollection(colors);
 			}
+
+			if (this.updateCollection(CadDictionary.VariableDictionary, createDictionaries, out CadDictionary variables))
+			{
+				this.DictionaryVariables = new DictionaryVariableCollection(variables);
+			}
+		}
+
+		/// <summary>
+		/// Updates the <see cref="DxfClass"/> in the document and their instance count.
+		/// </summary>
+		/// <param name="reset">Resets the list and clears any unnecessary classes.</param>
+		public void UpdateDxfClasses(bool reset)
+		{
+			if (reset)
+			{
+				this.Classes.Clear();
+			}
+
+			DxfClassCollection.UpdateDxfClasses(this);
+
+			foreach (var item in this.Classes)
+			{
+				item.InstanceCount = this._cadObjects.Values
+					.OfType<CadObject>()
+					.Where(c => c.ObjectName == item.DxfName)
+					.Count();
+			}
 		}
 
 		internal void RegisterCollection<T>(IObservableCadCollection<T> collection)