Fixes #942 - Added ToDegrees() to handle angular string representation

- corrected default AngularZeroHandling
- adjusted GetZeroHandlingFormat to actually use AngularDecimalPlaces
- added/adjusted UnitTests

Author: cpetry

src/ACadSharp.Tests/Tables/DimensionStyleTests.cs

@@ -31,7 +31,8 @@ static DimensionStyleTests()
 				},
 				{
 					new DimensionStyle {
-						AngularUnit = AngularUnitFormat.Radians
+						AngularUnit = AngularUnitFormat.Radians,
+						AngularDecimalPlaces = 2
 					},
 					new DimensionAngular2Line{
 						FirstPoint = XYZ.Zero,
@@ -51,11 +52,39 @@ static DimensionStyleTests()
 						AngleVertex = XYZ.Zero,
 						DefinitionPoint = new XYZ(0,10, 0),
 					},
-					"1.57"
+					"90°"
 				},
 				{
 					new DimensionStyle {
 						AngularUnit = AngularUnitFormat.DecimalDegrees,
+						AngularZeroHandling = ZeroHandling.SuppressDecimalLeadingZeroes,
+						AngularDecimalPlaces = 2
+					},
+					new DimensionAngular2Line{
+						FirstPoint = XYZ.Zero,
+						SecondPoint = new XYZ(10, 0, 0),
+						AngleVertex = XYZ.Zero,
+						DefinitionPoint = new XYZ(0,10, 0),
+					},
+					"90.00°"
+				},
+				{
+					new DimensionStyle {
+						AngularUnit = AngularUnitFormat.Radians,
+						AngularDecimalPlaces = 2
+					},
+					new DimensionAngular2Line{
+						FirstPoint = XYZ.Zero,
+						SecondPoint = new XYZ(10, 0, 0),
+						AngleVertex = XYZ.Zero,
+						DefinitionPoint = new XYZ(0,10, 0),
+					},
+					"1.57r"
+				},
+				{
+					new DimensionStyle {
+						AngularUnit = AngularUnitFormat.Radians,
+						AngularDecimalPlaces = 2,
 						DecimalSeparator = ','
 					},
 					new DimensionAngular2Line{
@@ -64,11 +93,26 @@ static DimensionStyleTests()
 						AngleVertex = XYZ.Zero,
 						DefinitionPoint = new XYZ(0,10, 0),
 					},
-					"1,57"
+					"1,57r"
 				},
 				{
 					new DimensionStyle {
-						AngularUnit = AngularUnitFormat.Gradians
+						AngularUnit = AngularUnitFormat.Gradians,
+						AngularDecimalPlaces = 2
+					},
+					new DimensionAngular2Line{
+						FirstPoint = XYZ.Zero,
+						SecondPoint = new XYZ(10, 0, 0),
+						AngleVertex = XYZ.Zero,
+						DefinitionPoint = new XYZ(0,10, 0),
+					},
+					"100g"
+				},
+				{
+					new DimensionStyle {
+						AngularUnit = AngularUnitFormat.Gradians,
+						AngularZeroHandling = ZeroHandling.SuppressDecimalLeadingZeroes,
+						AngularDecimalPlaces = 2
 					},
 					new DimensionAngular2Line{
 						FirstPoint = XYZ.Zero,
@@ -107,6 +151,14 @@ static DimensionStyleTests()
 					new DimensionAligned(XYZ.Zero, new XYZ(10.5, 0, 0)),
 					"10.5"
 				},
+				{
+					new DimensionStyle {
+						LinearUnitFormat = LinearUnitFormat.Decimal,
+						Rounding = 1
+					},
+					new DimensionAligned(XYZ.Zero, new XYZ(10.1, 0, 0)),
+					"10"
+				},
 				{
 					new DimensionStyle {
 						LinearUnitFormat = LinearUnitFormat.Decimal,
@@ -145,6 +197,15 @@ static DimensionStyleTests()
 					new DimensionAligned(XYZ.Zero, new XYZ(10.25, 0, 0)),
 					"1.03E+01"
 				},
+				{
+					new DimensionStyle {
+						LinearUnitFormat = LinearUnitFormat.Decimal,
+						Prefix = "Pre",
+						Suffix = "Suf"
+					},
+					new DimensionAligned(XYZ.Zero, new XYZ(10.5, 0, 0)),
+					"Pre10.5Suf"
+				},
 			};
 		}
 

src/ACadSharp/Entities/Dimension.cs

@@ -348,6 +348,9 @@ public string GetMeasurementText(DimensionStyle style)
 			{
 				switch (style.AngularUnit)
 				{
+					case AngularUnitFormat.DecimalDegrees:
+						text = unitFormat.ToDegrees(value);
+						break;
 					case AngularUnitFormat.DegreesMinutesSeconds:
 						text = unitFormat.ToDegreesMinutesSeconds(value);
 						break;
@@ -357,7 +360,6 @@ public string GetMeasurementText(DimensionStyle style)
 					case AngularUnitFormat.Radians:
 						text = unitFormat.ToRadians(value);
 						break;
-					case AngularUnitFormat.DecimalDegrees:
 					case AngularUnitFormat.SurveyorsUnits:
 					default:
 						text = unitFormat.ToDecimal(value, true);

src/ACadSharp/Tables/DimensionStyle.cs

@@ -139,7 +139,7 @@ public class DimensionStyle : TableEntry
 		/// (see DIMAZIN System Variable).
 		/// </summary>
 		[DxfCodeValue(79)]
-		public ZeroHandling AngularZeroHandling { get; set; } = ZeroHandling.SuppressZeroFeetAndInches;
+		public ZeroHandling AngularZeroHandling { get; set; } = ZeroHandling.SuppressDecimalLeadingAndTrailingZeroes;
 
 		/// <summary>
 		/// Controls display of the arc symbol in an arc length dimension

src/ACadSharp/Types/Units/UnitStyleFormat.cs

@@ -232,16 +232,18 @@ public UnitStyleFormat()
 		/// <returns></returns>
 		public string GetZeroHandlingFormat(bool isAngular = false)
 		{
-			short decimalPlaces = this.LinearDecimalPlaces;
+			short decimalPlaces;
 			ZeroHandling handling;
 
 			if (isAngular)
 			{
 				handling = this.AngularZeroHandling;
+				decimalPlaces = this.AngularDecimalPlaces;
 			}
 			else
 			{
 				handling = this.LinearZeroHandling;
+				decimalPlaces = this.LinearDecimalPlaces;
 			}
 
 			char leading = handling == ZeroHandling.SuppressDecimalLeadingZeroes
@@ -386,6 +388,22 @@ public string ToDecimal(double value, bool isAngular = false)
 			return value.ToString(this.GetZeroHandlingFormat(isAngular), numberFormat);
 		}
 
+		/// <summary>
+		/// Converts an angle value in degrees string representation.
+		/// </summary>
+		/// <param name="angle">Angle value in radians.</param>
+		/// <returns></returns>
+		/// <exception cref="ArgumentNullException"></exception>
+		public string ToDegrees(double angle)
+		{
+			double degrees = MathHelper.RadToDeg(angle);
+			NumberFormatInfo numberFormat = new NumberFormatInfo
+			{
+				NumberDecimalSeparator = this.DecimalSeparator
+			};
+			return degrees.ToString(GetZeroHandlingFormat(isAngular: true), numberFormat) + this.DegreesSymbol;
+		}
+
 		/// <summary>
 		/// Converts an angle value in degrees into its degrees, minutes and seconds string representation.
 		/// </summary>