Merge branch 'master-anjdreas' into feature/ambiguous-abbreviations

Author: neutmute

UnitsNet.Tests/CustomCode/LengthTests.cs

@@ -20,6 +20,7 @@
 // THE SOFTWARE.
 
 using NUnit.Framework;
+using UnitsNet.Units;
 
 namespace UnitsNet.Tests.CustomCode
 {
@@ -88,5 +89,25 @@ public void LengthTimesLengthEqualsArea()
             Area area = Length.FromMeters(10)*Length.FromMeters(2);
             Assert.AreEqual(area, Area.FromSquareMeters(20));
         }
+
+        [Test]
+        public void ToStringReturnsCorrectNumberAndUnitWithDefaultUnitWhichIsMeter()
+        {
+            Length.ToStringDefaultUnit = LengthUnit.Meter;
+            Length meter = Length.FromMeters(5);
+            string meterString = meter.ToString();
+            Assert.AreEqual("5 m", meterString);
+        }
+
+        [Test]
+        public void ToStringReturnsCorrectNumberAndUnitWithCentimeterAsDefualtUnit()
+        {
+            LengthUnit oldUnit = Length.ToStringDefaultUnit;
+            Length.ToStringDefaultUnit = LengthUnit.Centimeter;
+            Length value = Length.From(2, LengthUnit.Centimeter);
+            string valueString = value.ToString();
+            Length.ToStringDefaultUnit = oldUnit;
+            Assert.AreEqual("2 cm", valueString);
+        }
     }
 }

UnitsNet/CustomCode/UnitClasses/Length.extra.cs

@@ -20,6 +20,7 @@
 // THE SOFTWARE.
 
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using UnitsNet.Units;
 

UnitsNet/GeneratedCode/UnitClasses/Acceleration.g.cs

@@ -477,13 +477,18 @@ public static AccelerationUnit ParseUnit(string str, IFormatProvider formatProvi
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is MeterPerSecondSquared
+        /// </summary>
+        public static AccelerationUnit ToStringDefaultUnit { get; set; } = AccelerationUnit.MeterPerSecondSquared;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(AccelerationUnit.MeterPerSecondSquared);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>

UnitsNet/GeneratedCode/UnitClasses/AmplitudeRatio.g.cs

@@ -405,13 +405,18 @@ public static AmplitudeRatioUnit ParseUnit(string str, IFormatProvider formatPro
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is DecibelVolt
+        /// </summary>
+        public static AmplitudeRatioUnit ToStringDefaultUnit { get; set; } = AmplitudeRatioUnit.DecibelVolt;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(AmplitudeRatioUnit.DecibelVolt);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>

UnitsNet/GeneratedCode/UnitClasses/Angle.g.cs

@@ -537,13 +537,18 @@ public static AngleUnit ParseUnit(string str, IFormatProvider formatProvider = n
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is Degree
+        /// </summary>
+        public static AngleUnit ToStringDefaultUnit { get; set; } = AngleUnit.Degree;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(AngleUnit.Degree);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>

UnitsNet/GeneratedCode/UnitClasses/Area.g.cs

@@ -537,13 +537,18 @@ public static AreaUnit ParseUnit(string str, IFormatProvider formatProvider = nu
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is SquareMeter
+        /// </summary>
+        public static AreaUnit ToStringDefaultUnit { get; set; } = AreaUnit.SquareMeter;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(AreaUnit.SquareMeter);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>

UnitsNet/GeneratedCode/UnitClasses/Density.g.cs

@@ -537,13 +537,18 @@ public static DensityUnit ParseUnit(string str, IFormatProvider formatProvider =
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is KilogramPerCubicMeter
+        /// </summary>
+        public static DensityUnit ToStringDefaultUnit { get; set; } = DensityUnit.KilogramPerCubicMeter;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(DensityUnit.KilogramPerCubicMeter);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>

UnitsNet/GeneratedCode/UnitClasses/Duration.g.cs

@@ -537,13 +537,18 @@ public static DurationUnit ParseUnit(string str, IFormatProvider formatProvider
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is Second
+        /// </summary>
+        public static DurationUnit ToStringDefaultUnit { get; set; } = DurationUnit.Second;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(DurationUnit.Second);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>

UnitsNet/GeneratedCode/UnitClasses/ElectricCurrent.g.cs

@@ -457,13 +457,18 @@ public static ElectricCurrentUnit ParseUnit(string str, IFormatProvider formatPr
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is Ampere
+        /// </summary>
+        public static ElectricCurrentUnit ToStringDefaultUnit { get; set; } = ElectricCurrentUnit.Ampere;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(ElectricCurrentUnit.Ampere);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>

UnitsNet/GeneratedCode/UnitClasses/ElectricPotential.g.cs

@@ -437,13 +437,18 @@ public static ElectricPotentialUnit ParseUnit(string str, IFormatProvider format
 
         #endregion
 
+        /// <summary>
+        ///     Set the default unit used by ToString(). Default is Volt
+        /// </summary>
+        public static ElectricPotentialUnit ToStringDefaultUnit { get; set; } = ElectricPotentialUnit.Volt;
+
         /// <summary>
         ///     Get default string representation of value and unit.
         /// </summary>
         /// <returns>String representation.</returns>
         public override string ToString()
         {
-            return ToString(ElectricPotentialUnit.Volt);
+            return ToString(ToStringDefaultUnit);
         }
 
         /// <summary>