diff --git a/Common/UnitDefinitions/Pressure.json b/Common/UnitDefinitions/Pressure.json index c5411d1cb9..5317fc2d86 100644 --- a/Common/UnitDefinitions/Pressure.json +++ b/Common/UnitDefinitions/Pressure.json @@ -401,6 +401,34 @@ "Abbreviations": [ "inH2O", "inch wc", "wc" ] } ] + }, + { + "SingularName": "MilligramForcePerSquareMeter", + "PluralName": "MilligramsForcePerSquareMeter", + "FromUnitToBaseFunc": "{x} * 9.80665e-6", + "FromBaseToUnitFunc": "{x} / 9.80665e-6", + "Localization": [ + { + "Culture": "en-US", + "Abbreviations": [ "mgf/m²" ] + }, + { + "Culture": "ru-RU", + "Abbreviations": [ "мгс/м²" ] + } + ] + }, + { + "SingularName": "MilligramForcePerSquareFoot", + "PluralName": "MilligramsForcePerSquareFoot", + "FromUnitToBaseFunc": "{x} * 1.0555790208802639466e-4", + "FromBaseToUnitFunc": "{x} / 1.0555790208802639466e-4", + "Localization": [ + { + "Culture": "en-US", + "Abbreviations": [ "mgf/ft²" ] + } + ] } ] } diff --git a/Common/UnitEnumValues.g.json b/Common/UnitEnumValues.g.json index 3ebdc3d87d..b97d81fbd5 100644 --- a/Common/UnitEnumValues.g.json +++ b/Common/UnitEnumValues.g.json @@ -1188,7 +1188,9 @@ "Torr": 47, "MeterOfWaterColumn": 57, "CentimeterOfWaterColumn": 48, - "Millitorr": 52 + "Millitorr": 52, + "MilligramForcePerSquareFoot": 59, + "MilligramForcePerSquareMeter": 51 }, "PressureChangeRate": { "AtmospherePerSecond": 1, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs index 84fa430f11..a9abd080d0 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/Pressure.g.cs @@ -233,6 +233,16 @@ public Pressure(double value, PressureUnit unit) /// public double Millibars => As(PressureUnit.Millibar); + /// + /// Gets a value of this quantity converted into + /// + public double MilligramsForcePerSquareFoot => As(PressureUnit.MilligramForcePerSquareFoot); + + /// + /// Gets a value of this quantity converted into + /// + public double MilligramsForcePerSquareMeter => As(PressureUnit.MilligramForcePerSquareMeter); + /// /// Gets a value of this quantity converted into /// @@ -477,6 +487,16 @@ public Pressure(double value, PressureUnit unit) /// public static Pressure FromMillibars(double millibars) => new Pressure(millibars, PressureUnit.Millibar); + /// + /// Creates a from . + /// + public static Pressure FromMilligramsForcePerSquareFoot(double milligramsforcepersquarefoot) => new Pressure(milligramsforcepersquarefoot, PressureUnit.MilligramForcePerSquareFoot); + + /// + /// Creates a from . + /// + public static Pressure FromMilligramsForcePerSquareMeter(double milligramsforcepersquaremeter) => new Pressure(milligramsforcepersquaremeter, PressureUnit.MilligramForcePerSquareMeter); + /// /// Creates a from . /// @@ -633,6 +653,8 @@ private double GetValueInBaseUnit() PressureUnit.Microbar => (_value * 1e5) * 1e-6d, PressureUnit.Micropascal => (_value) * 1e-6d, PressureUnit.Millibar => (_value * 1e5) * 1e-3d, + PressureUnit.MilligramForcePerSquareFoot => _value * 1.0555790208802639466e-4, + PressureUnit.MilligramForcePerSquareMeter => _value * 9.80665e-6, PressureUnit.MillimeterOfMercury => _value * 133.322387415, PressureUnit.MillimeterOfWaterColumn => (_value * 9.80665e3) * 1e-3d, PressureUnit.Millipascal => (_value) * 1e-3d, @@ -694,6 +716,8 @@ private double GetValueAs(PressureUnit unit) PressureUnit.Microbar => (baseUnitValue / 1e5) / 1e-6d, PressureUnit.Micropascal => (baseUnitValue) / 1e-6d, PressureUnit.Millibar => (baseUnitValue / 1e5) / 1e-3d, + PressureUnit.MilligramForcePerSquareFoot => baseUnitValue / 1.0555790208802639466e-4, + PressureUnit.MilligramForcePerSquareMeter => baseUnitValue / 9.80665e-6, PressureUnit.MillimeterOfMercury => baseUnitValue / 133.322387415, PressureUnit.MillimeterOfWaterColumn => (baseUnitValue / 9.80665e3) / 1e-3d, PressureUnit.Millipascal => (baseUnitValue) / 1e-3d, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs index dbcff54072..51cf34bf04 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Units/PressureUnit.g.cs @@ -86,6 +86,8 @@ public enum PressureUnit Microbar = 29, Micropascal = 30, Millibar = 31, + MilligramForcePerSquareFoot = 59, + MilligramForcePerSquareMeter = 51, /// /// A millimetre of mercury is a manometric unit of pressure, formerly defined as the extra pressure generated by a column of mercury one millimetre high, and currently defined as exactly 133.322387415 pascals. diff --git a/UnitsNet.NumberExtensions.CS14.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs b/UnitsNet.NumberExtensions.CS14.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs index 904dc52a68..60b81b778f 100644 --- a/UnitsNet.NumberExtensions.CS14.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs +++ b/UnitsNet.NumberExtensions.CS14.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs @@ -148,6 +148,14 @@ public void NumberToMicropascalsTest() => public void NumberToMillibarsTest() => Assert.Equal(Pressure.FromMillibars(2), 2.Millibars); + [Fact] + public void NumberToMilligramsForcePerSquareFootTest() => + Assert.Equal(Pressure.FromMilligramsForcePerSquareFoot(2), 2.MilligramsForcePerSquareFoot); + + [Fact] + public void NumberToMilligramsForcePerSquareMeterTest() => + Assert.Equal(Pressure.FromMilligramsForcePerSquareMeter(2), 2.MilligramsForcePerSquareMeter); + [Fact] public void NumberToMillimetersOfMercuryTest() => Assert.Equal(Pressure.FromMillimetersOfMercury(2), 2.MillimetersOfMercury); diff --git a/UnitsNet.NumberExtensions.CS14/GeneratedCode/NumberToPressureExtensions.g.cs b/UnitsNet.NumberExtensions.CS14/GeneratedCode/NumberToPressureExtensions.g.cs index 538f5530f5..31c8ea993e 100644 --- a/UnitsNet.NumberExtensions.CS14/GeneratedCode/NumberToPressureExtensions.g.cs +++ b/UnitsNet.NumberExtensions.CS14/GeneratedCode/NumberToPressureExtensions.g.cs @@ -290,6 +290,22 @@ public Pressure Millibars => Pressure.FromMillibars(value.ToDouble(null)); #endif + /// + public Pressure MilligramsForcePerSquareFoot +#if NET7_0_OR_GREATER + => Pressure.FromMilligramsForcePerSquareFoot(double.CreateChecked(value)); +#else + => Pressure.FromMilligramsForcePerSquareFoot(value.ToDouble(null)); +#endif + + /// + public Pressure MilligramsForcePerSquareMeter +#if NET7_0_OR_GREATER + => Pressure.FromMilligramsForcePerSquareMeter(double.CreateChecked(value)); +#else + => Pressure.FromMilligramsForcePerSquareMeter(value.ToDouble(null)); +#endif + /// public Pressure MillimetersOfMercury #if NET7_0_OR_GREATER diff --git a/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs b/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs index eccdde9422..763287cadf 100644 --- a/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs +++ b/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToPressureExtensionsTest.g.cs @@ -148,6 +148,14 @@ public void NumberToMicropascalsTest() => public void NumberToMillibarsTest() => Assert.Equal(Pressure.FromMillibars(2), 2.Millibars()); + [Fact] + public void NumberToMilligramsForcePerSquareFootTest() => + Assert.Equal(Pressure.FromMilligramsForcePerSquareFoot(2), 2.MilligramsForcePerSquareFoot()); + + [Fact] + public void NumberToMilligramsForcePerSquareMeterTest() => + Assert.Equal(Pressure.FromMilligramsForcePerSquareMeter(2), 2.MilligramsForcePerSquareMeter()); + [Fact] public void NumberToMillimetersOfMercuryTest() => Assert.Equal(Pressure.FromMillimetersOfMercury(2), 2.MillimetersOfMercury()); diff --git a/UnitsNet.NumberExtensions/GeneratedCode/NumberToPressureExtensions.g.cs b/UnitsNet.NumberExtensions/GeneratedCode/NumberToPressureExtensions.g.cs index b731ef1138..a6c054de82 100644 --- a/UnitsNet.NumberExtensions/GeneratedCode/NumberToPressureExtensions.g.cs +++ b/UnitsNet.NumberExtensions/GeneratedCode/NumberToPressureExtensions.g.cs @@ -373,6 +373,28 @@ public static Pressure Millibars(this T value) => Pressure.FromMillibars(value.ToDouble(null)); #endif + /// + public static Pressure MilligramsForcePerSquareFoot(this T value) + where T : notnull +#if NET7_0_OR_GREATER + , INumber + => Pressure.FromMilligramsForcePerSquareFoot(double.CreateChecked(value)); +#else + , IConvertible + => Pressure.FromMilligramsForcePerSquareFoot(value.ToDouble(null)); +#endif + + /// + public static Pressure MilligramsForcePerSquareMeter(this T value) + where T : notnull +#if NET7_0_OR_GREATER + , INumber + => Pressure.FromMilligramsForcePerSquareMeter(double.CreateChecked(value)); +#else + , IConvertible + => Pressure.FromMilligramsForcePerSquareMeter(value.ToDouble(null)); +#endif + /// public static Pressure MillimetersOfMercury(this T value) where T : notnull diff --git a/UnitsNet.Tests/CustomCode/PressureTests.cs b/UnitsNet.Tests/CustomCode/PressureTests.cs index f536bfa00c..28c3035e0c 100644 --- a/UnitsNet.Tests/CustomCode/PressureTests.cs +++ b/UnitsNet.Tests/CustomCode/PressureTests.cs @@ -108,6 +108,10 @@ public class PressureTests : PressureTestsBase protected override double MillipascalsInOnePascal => 1e3; + protected override double MilligramsForcePerSquareFootInOnePascal => 9.4734736122936992615e3; + + protected override double MilligramsForcePerSquareMeterInOnePascal => 1.0197162129779282259e5; + [Fact] public void Absolute_WithAbsolutePressureReference_IsEqual() { diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs index fbb8444297..1238ffc99d 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs @@ -71,6 +71,8 @@ public abstract partial class PressureTestsBase : QuantityTestsBase protected abstract double MicrobarsInOnePascal { get; } protected abstract double MicropascalsInOnePascal { get; } protected abstract double MillibarsInOnePascal { get; } + protected abstract double MilligramsForcePerSquareFootInOnePascal { get; } + protected abstract double MilligramsForcePerSquareMeterInOnePascal { get; } protected abstract double MillimetersOfMercuryInOnePascal { get; } protected abstract double MillimetersOfWaterColumnInOnePascal { get; } protected abstract double MillipascalsInOnePascal { get; } @@ -121,6 +123,8 @@ public abstract partial class PressureTestsBase : QuantityTestsBase protected virtual double MicrobarsTolerance { get { return 1e-5; } } protected virtual double MicropascalsTolerance { get { return 1e-5; } } protected virtual double MillibarsTolerance { get { return 1e-5; } } + protected virtual double MilligramsForcePerSquareFootTolerance { get { return 1e-5; } } + protected virtual double MilligramsForcePerSquareMeterTolerance { get { return 1e-5; } } protected virtual double MillimetersOfMercuryTolerance { get { return 1e-5; } } protected virtual double MillimetersOfWaterColumnTolerance { get { return 1e-5; } } protected virtual double MillipascalsTolerance { get { return 1e-5; } } @@ -175,6 +179,8 @@ public abstract partial class PressureTestsBase : QuantityTestsBase PressureUnit.Microbar => (MicrobarsInOnePascal, MicrobarsTolerance), PressureUnit.Micropascal => (MicropascalsInOnePascal, MicropascalsTolerance), PressureUnit.Millibar => (MillibarsInOnePascal, MillibarsTolerance), + PressureUnit.MilligramForcePerSquareFoot => (MilligramsForcePerSquareFootInOnePascal, MilligramsForcePerSquareFootTolerance), + PressureUnit.MilligramForcePerSquareMeter => (MilligramsForcePerSquareMeterInOnePascal, MilligramsForcePerSquareMeterTolerance), PressureUnit.MillimeterOfMercury => (MillimetersOfMercuryInOnePascal, MillimetersOfMercuryTolerance), PressureUnit.MillimeterOfWaterColumn => (MillimetersOfWaterColumnInOnePascal, MillimetersOfWaterColumnTolerance), PressureUnit.Millipascal => (MillipascalsInOnePascal, MillipascalsTolerance), @@ -229,6 +235,8 @@ public abstract partial class PressureTestsBase : QuantityTestsBase new object[] { PressureUnit.Microbar }, new object[] { PressureUnit.Micropascal }, new object[] { PressureUnit.Millibar }, + new object[] { PressureUnit.MilligramForcePerSquareFoot }, + new object[] { PressureUnit.MilligramForcePerSquareMeter }, new object[] { PressureUnit.MillimeterOfMercury }, new object[] { PressureUnit.MillimeterOfWaterColumn }, new object[] { PressureUnit.Millipascal }, @@ -348,6 +356,8 @@ public void PascalToPressureUnits() AssertEx.EqualTolerance(MicrobarsInOnePascal, pascal.Microbars, MicrobarsTolerance); AssertEx.EqualTolerance(MicropascalsInOnePascal, pascal.Micropascals, MicropascalsTolerance); AssertEx.EqualTolerance(MillibarsInOnePascal, pascal.Millibars, MillibarsTolerance); + AssertEx.EqualTolerance(MilligramsForcePerSquareFootInOnePascal, pascal.MilligramsForcePerSquareFoot, MilligramsForcePerSquareFootTolerance); + AssertEx.EqualTolerance(MilligramsForcePerSquareMeterInOnePascal, pascal.MilligramsForcePerSquareMeter, MilligramsForcePerSquareMeterTolerance); AssertEx.EqualTolerance(MillimetersOfMercuryInOnePascal, pascal.MillimetersOfMercury, MillimetersOfMercuryTolerance); AssertEx.EqualTolerance(MillimetersOfWaterColumnInOnePascal, pascal.MillimetersOfWaterColumn, MillimetersOfWaterColumnTolerance); AssertEx.EqualTolerance(MillipascalsInOnePascal, pascal.Millipascals, MillipascalsTolerance); @@ -431,6 +441,8 @@ public void As() AssertEx.EqualTolerance(MicrobarsInOnePascal, pascal.As(PressureUnit.Microbar), MicrobarsTolerance); AssertEx.EqualTolerance(MicropascalsInOnePascal, pascal.As(PressureUnit.Micropascal), MicropascalsTolerance); AssertEx.EqualTolerance(MillibarsInOnePascal, pascal.As(PressureUnit.Millibar), MillibarsTolerance); + AssertEx.EqualTolerance(MilligramsForcePerSquareFootInOnePascal, pascal.As(PressureUnit.MilligramForcePerSquareFoot), MilligramsForcePerSquareFootTolerance); + AssertEx.EqualTolerance(MilligramsForcePerSquareMeterInOnePascal, pascal.As(PressureUnit.MilligramForcePerSquareMeter), MilligramsForcePerSquareMeterTolerance); AssertEx.EqualTolerance(MillimetersOfMercuryInOnePascal, pascal.As(PressureUnit.MillimeterOfMercury), MillimetersOfMercuryTolerance); AssertEx.EqualTolerance(MillimetersOfWaterColumnInOnePascal, pascal.As(PressureUnit.MillimeterOfWaterColumn), MillimetersOfWaterColumnTolerance); AssertEx.EqualTolerance(MillipascalsInOnePascal, pascal.As(PressureUnit.Millipascal), MillipascalsTolerance); @@ -554,6 +566,8 @@ public void ToUnit_UnitSystem_ThrowsArgumentExceptionIfNotSupported() [InlineData("en-US", "4.2 µbar", PressureUnit.Microbar, 4.2)] [InlineData("en-US", "4.2 µPa", PressureUnit.Micropascal, 4.2)] [InlineData("en-US", "4.2 mbar", PressureUnit.Millibar, 4.2)] + [InlineData("en-US", "4.2 mgf/ft²", PressureUnit.MilligramForcePerSquareFoot, 4.2)] + [InlineData("en-US", "4.2 mgf/m²", PressureUnit.MilligramForcePerSquareMeter, 4.2)] [InlineData("en-US", "4.2 mmHg", PressureUnit.MillimeterOfMercury, 4.2)] [InlineData("en-US", "4.2 mmH₂O", PressureUnit.MillimeterOfWaterColumn, 4.2)] [InlineData("en-US", "4.2 mmH2O", PressureUnit.MillimeterOfWaterColumn, 4.2)] @@ -600,6 +614,7 @@ public void ToUnit_UnitSystem_ThrowsArgumentExceptionIfNotSupported() [InlineData("ru-RU", "4,2 мкбар", PressureUnit.Microbar, 4.2)] [InlineData("ru-RU", "4,2 мкПа", PressureUnit.Micropascal, 4.2)] [InlineData("ru-RU", "4,2 мбар", PressureUnit.Millibar, 4.2)] + [InlineData("ru-RU", "4,2 мгс/м²", PressureUnit.MilligramForcePerSquareMeter, 4.2)] [InlineData("ru-RU", "4,2 мм рт.ст.", PressureUnit.MillimeterOfMercury, 4.2)] [InlineData("ru-RU", "4,2 мПа", PressureUnit.Millipascal, 4.2)] [InlineData("ru-RU", "4,2 мторр", PressureUnit.Millitorr, 4.2)] @@ -660,6 +675,8 @@ public void Parse(string culture, string quantityString, PressureUnit expectedUn [InlineData("en-US", "4.2 µbar", PressureUnit.Microbar, 4.2)] [InlineData("en-US", "4.2 µPa", PressureUnit.Micropascal, 4.2)] [InlineData("en-US", "4.2 mbar", PressureUnit.Millibar, 4.2)] + [InlineData("en-US", "4.2 mgf/ft²", PressureUnit.MilligramForcePerSquareFoot, 4.2)] + [InlineData("en-US", "4.2 mgf/m²", PressureUnit.MilligramForcePerSquareMeter, 4.2)] [InlineData("en-US", "4.2 mmHg", PressureUnit.MillimeterOfMercury, 4.2)] [InlineData("en-US", "4.2 mmH₂O", PressureUnit.MillimeterOfWaterColumn, 4.2)] [InlineData("en-US", "4.2 mmH2O", PressureUnit.MillimeterOfWaterColumn, 4.2)] @@ -706,6 +723,7 @@ public void Parse(string culture, string quantityString, PressureUnit expectedUn [InlineData("ru-RU", "4,2 мкбар", PressureUnit.Microbar, 4.2)] [InlineData("ru-RU", "4,2 мкПа", PressureUnit.Micropascal, 4.2)] [InlineData("ru-RU", "4,2 мбар", PressureUnit.Millibar, 4.2)] + [InlineData("ru-RU", "4,2 мгс/м²", PressureUnit.MilligramForcePerSquareMeter, 4.2)] [InlineData("ru-RU", "4,2 мм рт.ст.", PressureUnit.MillimeterOfMercury, 4.2)] [InlineData("ru-RU", "4,2 мПа", PressureUnit.Millipascal, 4.2)] [InlineData("ru-RU", "4,2 мторр", PressureUnit.Millitorr, 4.2)] @@ -766,6 +784,8 @@ public void TryParse(string culture, string quantityString, PressureUnit expecte [InlineData("µbar", PressureUnit.Microbar)] [InlineData("µPa", PressureUnit.Micropascal)] [InlineData("mbar", PressureUnit.Millibar)] + [InlineData("mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -838,6 +858,8 @@ public void ParseUnit_WithUsEnglishCurrentCulture(string abbreviation, PressureU [InlineData("µbar", PressureUnit.Microbar)] [InlineData("µPa", PressureUnit.Micropascal)] [InlineData("mbar", PressureUnit.Millibar)] + [InlineData("mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -910,6 +932,8 @@ public void ParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(string [InlineData("en-US", "µbar", PressureUnit.Microbar)] [InlineData("en-US", "µPa", PressureUnit.Micropascal)] [InlineData("en-US", "mbar", PressureUnit.Millibar)] + [InlineData("en-US", "mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("en-US", "mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("en-US", "mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("en-US", "mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("en-US", "mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -956,6 +980,7 @@ public void ParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(string [InlineData("ru-RU", "мкбар", PressureUnit.Microbar)] [InlineData("ru-RU", "мкПа", PressureUnit.Micropascal)] [InlineData("ru-RU", "мбар", PressureUnit.Millibar)] + [InlineData("ru-RU", "мгс/м²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("ru-RU", "мм рт.ст.", PressureUnit.MillimeterOfMercury)] [InlineData("ru-RU", "мПа", PressureUnit.Millipascal)] [InlineData("ru-RU", "мторр", PressureUnit.Millitorr)] @@ -1015,6 +1040,8 @@ public void ParseUnit_WithCurrentCulture(string culture, string abbreviation, Pr [InlineData("en-US", "µbar", PressureUnit.Microbar)] [InlineData("en-US", "µPa", PressureUnit.Micropascal)] [InlineData("en-US", "mbar", PressureUnit.Millibar)] + [InlineData("en-US", "mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("en-US", "mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("en-US", "mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("en-US", "mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("en-US", "mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -1061,6 +1088,7 @@ public void ParseUnit_WithCurrentCulture(string culture, string abbreviation, Pr [InlineData("ru-RU", "мкбар", PressureUnit.Microbar)] [InlineData("ru-RU", "мкПа", PressureUnit.Micropascal)] [InlineData("ru-RU", "мбар", PressureUnit.Millibar)] + [InlineData("ru-RU", "мгс/м²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("ru-RU", "мм рт.ст.", PressureUnit.MillimeterOfMercury)] [InlineData("ru-RU", "мПа", PressureUnit.Millipascal)] [InlineData("ru-RU", "мторр", PressureUnit.Millitorr)] @@ -1119,6 +1147,8 @@ public void ParseUnit_WithCulture(string culture, string abbreviation, PressureU [InlineData("µbar", PressureUnit.Microbar)] [InlineData("µPa", PressureUnit.Micropascal)] [InlineData("mbar", PressureUnit.Millibar)] + [InlineData("mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -1191,6 +1221,8 @@ public void TryParseUnit_WithUsEnglishCurrentCulture(string abbreviation, Pressu [InlineData("µbar", PressureUnit.Microbar)] [InlineData("µPa", PressureUnit.Micropascal)] [InlineData("mbar", PressureUnit.Millibar)] + [InlineData("mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -1263,6 +1295,8 @@ public void TryParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(stri [InlineData("en-US", "µbar", PressureUnit.Microbar)] [InlineData("en-US", "µPa", PressureUnit.Micropascal)] [InlineData("en-US", "mbar", PressureUnit.Millibar)] + [InlineData("en-US", "mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("en-US", "mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("en-US", "mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("en-US", "mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("en-US", "mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -1309,6 +1343,7 @@ public void TryParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(stri [InlineData("ru-RU", "мкбар", PressureUnit.Microbar)] [InlineData("ru-RU", "мкПа", PressureUnit.Micropascal)] [InlineData("ru-RU", "мбар", PressureUnit.Millibar)] + [InlineData("ru-RU", "мгс/м²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("ru-RU", "мм рт.ст.", PressureUnit.MillimeterOfMercury)] [InlineData("ru-RU", "мПа", PressureUnit.Millipascal)] [InlineData("ru-RU", "мторр", PressureUnit.Millitorr)] @@ -1368,6 +1403,8 @@ public void TryParseUnit_WithCurrentCulture(string culture, string abbreviation, [InlineData("en-US", "µbar", PressureUnit.Microbar)] [InlineData("en-US", "µPa", PressureUnit.Micropascal)] [InlineData("en-US", "mbar", PressureUnit.Millibar)] + [InlineData("en-US", "mgf/ft²", PressureUnit.MilligramForcePerSquareFoot)] + [InlineData("en-US", "mgf/m²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("en-US", "mmHg", PressureUnit.MillimeterOfMercury)] [InlineData("en-US", "mmH₂O", PressureUnit.MillimeterOfWaterColumn)] [InlineData("en-US", "mmH2O", PressureUnit.MillimeterOfWaterColumn)] @@ -1414,6 +1451,7 @@ public void TryParseUnit_WithCurrentCulture(string culture, string abbreviation, [InlineData("ru-RU", "мкбар", PressureUnit.Microbar)] [InlineData("ru-RU", "мкПа", PressureUnit.Micropascal)] [InlineData("ru-RU", "мбар", PressureUnit.Millibar)] + [InlineData("ru-RU", "мгс/м²", PressureUnit.MilligramForcePerSquareMeter)] [InlineData("ru-RU", "мм рт.ст.", PressureUnit.MillimeterOfMercury)] [InlineData("ru-RU", "мПа", PressureUnit.Millipascal)] [InlineData("ru-RU", "мторр", PressureUnit.Millitorr)] @@ -1463,6 +1501,8 @@ public void TryParseUnit_WithCulture(string culture, string abbreviation, Pressu [InlineData("en-US", PressureUnit.Microbar, "µbar")] [InlineData("en-US", PressureUnit.Micropascal, "µPa")] [InlineData("en-US", PressureUnit.Millibar, "mbar")] + [InlineData("en-US", PressureUnit.MilligramForcePerSquareFoot, "mgf/ft²")] + [InlineData("en-US", PressureUnit.MilligramForcePerSquareMeter, "mgf/m²")] [InlineData("en-US", PressureUnit.MillimeterOfMercury, "mmHg")] [InlineData("en-US", PressureUnit.MillimeterOfWaterColumn, "mmH₂O")] [InlineData("en-US", PressureUnit.Millipascal, "mPa")] @@ -1502,6 +1542,7 @@ public void TryParseUnit_WithCulture(string culture, string abbreviation, Pressu [InlineData("ru-RU", PressureUnit.Microbar, "мкбар")] [InlineData("ru-RU", PressureUnit.Micropascal, "мкПа")] [InlineData("ru-RU", PressureUnit.Millibar, "мбар")] + [InlineData("ru-RU", PressureUnit.MilligramForcePerSquareMeter, "мгс/м²")] [InlineData("ru-RU", PressureUnit.MillimeterOfMercury, "мм рт.ст.")] [InlineData("ru-RU", PressureUnit.Millipascal, "мПа")] [InlineData("ru-RU", PressureUnit.Millitorr, "мторр")] @@ -1627,6 +1668,8 @@ public void ConversionRoundTrip() AssertEx.EqualTolerance(1, Pressure.FromMicrobars(pascal.Microbars).Pascals, MicrobarsTolerance); AssertEx.EqualTolerance(1, Pressure.FromMicropascals(pascal.Micropascals).Pascals, MicropascalsTolerance); AssertEx.EqualTolerance(1, Pressure.FromMillibars(pascal.Millibars).Pascals, MillibarsTolerance); + AssertEx.EqualTolerance(1, Pressure.FromMilligramsForcePerSquareFoot(pascal.MilligramsForcePerSquareFoot).Pascals, MilligramsForcePerSquareFootTolerance); + AssertEx.EqualTolerance(1, Pressure.FromMilligramsForcePerSquareMeter(pascal.MilligramsForcePerSquareMeter).Pascals, MilligramsForcePerSquareMeterTolerance); AssertEx.EqualTolerance(1, Pressure.FromMillimetersOfMercury(pascal.MillimetersOfMercury).Pascals, MillimetersOfMercuryTolerance); AssertEx.EqualTolerance(1, Pressure.FromMillimetersOfWaterColumn(pascal.MillimetersOfWaterColumn).Pascals, MillimetersOfWaterColumnTolerance); AssertEx.EqualTolerance(1, Pressure.FromMillipascals(pascal.Millipascals).Pascals, MillipascalsTolerance); @@ -1831,6 +1874,8 @@ public void ToString_ReturnsValueAndUnitAbbreviationInCurrentCulture() Assert.Equal("1 µbar", new Pressure(1, PressureUnit.Microbar).ToString()); Assert.Equal("1 µPa", new Pressure(1, PressureUnit.Micropascal).ToString()); Assert.Equal("1 mbar", new Pressure(1, PressureUnit.Millibar).ToString()); + Assert.Equal("1 mgf/ft²", new Pressure(1, PressureUnit.MilligramForcePerSquareFoot).ToString()); + Assert.Equal("1 mgf/m²", new Pressure(1, PressureUnit.MilligramForcePerSquareMeter).ToString()); Assert.Equal("1 mmHg", new Pressure(1, PressureUnit.MillimeterOfMercury).ToString()); Assert.Equal("1 mmH₂O", new Pressure(1, PressureUnit.MillimeterOfWaterColumn).ToString()); Assert.Equal("1 mPa", new Pressure(1, PressureUnit.Millipascal).ToString()); @@ -1887,6 +1932,8 @@ public void ToString_WithSwedishCulture_ReturnsUnitAbbreviationForEnglishCulture Assert.Equal("1 µbar", new Pressure(1, PressureUnit.Microbar).ToString(swedishCulture)); Assert.Equal("1 µPa", new Pressure(1, PressureUnit.Micropascal).ToString(swedishCulture)); Assert.Equal("1 mbar", new Pressure(1, PressureUnit.Millibar).ToString(swedishCulture)); + Assert.Equal("1 mgf/ft²", new Pressure(1, PressureUnit.MilligramForcePerSquareFoot).ToString(swedishCulture)); + Assert.Equal("1 mgf/m²", new Pressure(1, PressureUnit.MilligramForcePerSquareMeter).ToString(swedishCulture)); Assert.Equal("1 mmHg", new Pressure(1, PressureUnit.MillimeterOfMercury).ToString(swedishCulture)); Assert.Equal("1 mmH₂O", new Pressure(1, PressureUnit.MillimeterOfWaterColumn).ToString(swedishCulture)); Assert.Equal("1 mPa", new Pressure(1, PressureUnit.Millipascal).ToString(swedishCulture)); diff --git a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs index 2a91befa59..1914e77279 100644 --- a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs @@ -158,6 +158,8 @@ public static IEnumerable> GetDefaultMappings() yield return new (PressureUnit.Microbar, "Microbar", "Microbars", BaseUnits.Undefined); yield return new (PressureUnit.Micropascal, "Micropascal", "Micropascals", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Milligram, time: DurationUnit.Second)); yield return new (PressureUnit.Millibar, "Millibar", "Millibars", BaseUnits.Undefined); + yield return new (PressureUnit.MilligramForcePerSquareFoot, "MilligramForcePerSquareFoot", "MilligramsForcePerSquareFoot", BaseUnits.Undefined); + yield return new (PressureUnit.MilligramForcePerSquareMeter, "MilligramForcePerSquareMeter", "MilligramsForcePerSquareMeter", BaseUnits.Undefined); yield return new (PressureUnit.MillimeterOfMercury, "MillimeterOfMercury", "MillimetersOfMercury", BaseUnits.Undefined); yield return new (PressureUnit.MillimeterOfWaterColumn, "MillimeterOfWaterColumn", "MillimetersOfWaterColumn", BaseUnits.Undefined); yield return new (PressureUnit.Millipascal, "Millipascal", "Millipascals", new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Gram, time: DurationUnit.Second)); @@ -435,6 +437,16 @@ public Pressure(double value, UnitSystem unitSystem) /// public double Millibars => As(PressureUnit.Millibar); + /// + /// Gets a value of this quantity converted into + /// + public double MilligramsForcePerSquareFoot => As(PressureUnit.MilligramForcePerSquareFoot); + + /// + /// Gets a value of this quantity converted into + /// + public double MilligramsForcePerSquareMeter => As(PressureUnit.MilligramForcePerSquareMeter); + /// /// Gets a value of this quantity converted into /// @@ -562,6 +574,8 @@ internal static void RegisterDefaultConversions(UnitConverter unitConverter) unitConverter.SetConversionFunction(PressureUnit.Microbar, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); unitConverter.SetConversionFunction(PressureUnit.Micropascal, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); unitConverter.SetConversionFunction(PressureUnit.Millibar, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); + unitConverter.SetConversionFunction(PressureUnit.MilligramForcePerSquareFoot, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); + unitConverter.SetConversionFunction(PressureUnit.MilligramForcePerSquareMeter, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); unitConverter.SetConversionFunction(PressureUnit.MillimeterOfMercury, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); unitConverter.SetConversionFunction(PressureUnit.MillimeterOfWaterColumn, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); unitConverter.SetConversionFunction(PressureUnit.Millipascal, PressureUnit.Pascal, quantity => quantity.ToUnit(PressureUnit.Pascal)); @@ -614,6 +628,8 @@ internal static void RegisterDefaultConversions(UnitConverter unitConverter) unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.Microbar, quantity => quantity.ToUnit(PressureUnit.Microbar)); unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.Micropascal, quantity => quantity.ToUnit(PressureUnit.Micropascal)); unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.Millibar, quantity => quantity.ToUnit(PressureUnit.Millibar)); + unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.MilligramForcePerSquareFoot, quantity => quantity.ToUnit(PressureUnit.MilligramForcePerSquareFoot)); + unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.MilligramForcePerSquareMeter, quantity => quantity.ToUnit(PressureUnit.MilligramForcePerSquareMeter)); unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.MillimeterOfMercury, quantity => quantity.ToUnit(PressureUnit.MillimeterOfMercury)); unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.MillimeterOfWaterColumn, quantity => quantity.ToUnit(PressureUnit.MillimeterOfWaterColumn)); unitConverter.SetConversionFunction(PressureUnit.Pascal, PressureUnit.Millipascal, quantity => quantity.ToUnit(PressureUnit.Millipascal)); @@ -905,6 +921,22 @@ public static Pressure FromMillibars(double value) return new Pressure(value, PressureUnit.Millibar); } + /// + /// Creates a from . + /// + public static Pressure FromMilligramsForcePerSquareFoot(double value) + { + return new Pressure(value, PressureUnit.MilligramForcePerSquareFoot); + } + + /// + /// Creates a from . + /// + public static Pressure FromMilligramsForcePerSquareMeter(double value) + { + return new Pressure(value, PressureUnit.MilligramForcePerSquareMeter); + } + /// /// Creates a from . /// @@ -1529,6 +1561,8 @@ private bool TryToUnit(PressureUnit unit, [NotNullWhen(true)] out Pressure? conv (PressureUnit.Microbar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e-6d, PressureUnit.Pascal), (PressureUnit.Micropascal, PressureUnit.Pascal) => new Pressure((_value) * 1e-6d, PressureUnit.Pascal), (PressureUnit.Millibar, PressureUnit.Pascal) => new Pressure((_value * 1e5) * 1e-3d, PressureUnit.Pascal), + (PressureUnit.MilligramForcePerSquareFoot, PressureUnit.Pascal) => new Pressure(_value * 1.0555790208802639466e-4, PressureUnit.Pascal), + (PressureUnit.MilligramForcePerSquareMeter, PressureUnit.Pascal) => new Pressure(_value * 9.80665e-6, PressureUnit.Pascal), (PressureUnit.MillimeterOfMercury, PressureUnit.Pascal) => new Pressure(_value * 133.322387415, PressureUnit.Pascal), (PressureUnit.MillimeterOfWaterColumn, PressureUnit.Pascal) => new Pressure((_value * 9.80665e3) * 1e-3d, PressureUnit.Pascal), (PressureUnit.Millipascal, PressureUnit.Pascal) => new Pressure((_value) * 1e-3d, PressureUnit.Pascal), @@ -1578,6 +1612,8 @@ private bool TryToUnit(PressureUnit unit, [NotNullWhen(true)] out Pressure? conv (PressureUnit.Pascal, PressureUnit.Microbar) => new Pressure((_value / 1e5) / 1e-6d, PressureUnit.Microbar), (PressureUnit.Pascal, PressureUnit.Micropascal) => new Pressure((_value) / 1e-6d, PressureUnit.Micropascal), (PressureUnit.Pascal, PressureUnit.Millibar) => new Pressure((_value / 1e5) / 1e-3d, PressureUnit.Millibar), + (PressureUnit.Pascal, PressureUnit.MilligramForcePerSquareFoot) => new Pressure(_value / 1.0555790208802639466e-4, PressureUnit.MilligramForcePerSquareFoot), + (PressureUnit.Pascal, PressureUnit.MilligramForcePerSquareMeter) => new Pressure(_value / 9.80665e-6, PressureUnit.MilligramForcePerSquareMeter), (PressureUnit.Pascal, PressureUnit.MillimeterOfMercury) => new Pressure(_value / 133.322387415, PressureUnit.MillimeterOfMercury), (PressureUnit.Pascal, PressureUnit.MillimeterOfWaterColumn) => new Pressure((_value / 9.80665e3) / 1e-3d, PressureUnit.MillimeterOfWaterColumn), (PressureUnit.Pascal, PressureUnit.Millipascal) => new Pressure((_value) / 1e-3d, PressureUnit.Millipascal), diff --git a/UnitsNet/GeneratedCode/Resources/Pressure.restext b/UnitsNet/GeneratedCode/Resources/Pressure.restext index 133dbef717..d2590c7548 100644 --- a/UnitsNet/GeneratedCode/Resources/Pressure.restext +++ b/UnitsNet/GeneratedCode/Resources/Pressure.restext @@ -29,6 +29,8 @@ MetersOfWaterColumn=mH₂O,mH2O,m wc,m wg Microbars=µbar Micropascals=µPa Millibars=mbar +MilligramsForcePerSquareFoot=mgf/ft² +MilligramsForcePerSquareMeter=mgf/m² MillimetersOfMercury=mmHg MillimetersOfWaterColumn=mmH₂O,mmH2O,mm wc,mm wg Millipascals=mPa diff --git a/UnitsNet/GeneratedCode/Resources/Pressure.ru-RU.restext b/UnitsNet/GeneratedCode/Resources/Pressure.ru-RU.restext index 4a13b08a9e..b2202b3f02 100644 --- a/UnitsNet/GeneratedCode/Resources/Pressure.ru-RU.restext +++ b/UnitsNet/GeneratedCode/Resources/Pressure.ru-RU.restext @@ -20,6 +20,7 @@ Megapascals=МПа Microbars=мкбар Micropascals=мкПа Millibars=мбар +MilligramsForcePerSquareMeter=мгс/м² MillimetersOfMercury=мм рт.ст. Millipascals=мПа Millitorrs=мторр diff --git a/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs b/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs index dbcff54072..51cf34bf04 100644 --- a/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/PressureUnit.g.cs @@ -86,6 +86,8 @@ public enum PressureUnit Microbar = 29, Micropascal = 30, Millibar = 31, + MilligramForcePerSquareFoot = 59, + MilligramForcePerSquareMeter = 51, /// /// A millimetre of mercury is a manometric unit of pressure, formerly defined as the extra pressure generated by a column of mercury one millimetre high, and currently defined as exactly 133.322387415 pascals.