Skip to content

Commit 3fe02e7

Browse files
authored
Add Pico and Femto prefixes to meter (#1294)
Fix #1270
1 parent e199079 commit 3fe02e7

File tree

13 files changed

+360
-86
lines changed

13 files changed

+360
-86
lines changed

Common/UnitDefinitions/Length.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"FromUnitToBaseFunc": "{x}",
1616
"FromBaseToUnitFunc": "{x}",
17-
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo", "Mega" ],
17+
"Prefixes": [ "Femto", "Pico", "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo", "Mega" ],
1818
"Localization": [
1919
{
2020
"Culture": "en-US",

Common/UnitEnumValues.g.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,9 @@
691691
"UsSurveyFoot": 35,
692692
"Yard": 36,
693693
"Megameter": 41,
694-
"Kilofoot": 45
694+
"Kilofoot": 45,
695+
"Femtometer": 48,
696+
"Picometer": 43
695697
},
696698
"Level": {
697699
"Decibel": 1,

UnitsNet.NanoFramework/GeneratedCode/Quantities/Length.g.cs

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.NanoFramework/GeneratedCode/Units/LengthUnit.g.cs

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToLengthExtensionsTest.g.cs

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.NumberExtensions/GeneratedCode/NumberToLengthExtensions.g.cs

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.Tests/CustomCode/LengthTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class LengthTests : LengthTestsBase
2121
protected override double DtpPicasInOneMeter => 236.22047244;
2222
protected override double DtpPointsInOneMeter => 2834.6456693;
2323

24+
protected override double FemtometersInOneMeter => 1E+15;
2425
protected override double FeetInOneMeter => 3.28083989501;
2526

2627
protected override double HectometersInOneMeter => 1E-2;
@@ -50,6 +51,7 @@ public class LengthTests : LengthTestsBase
5051

5152
protected override double FathomsInOneMeter => 0.546806649;
5253

54+
protected override double PicometersInOneMeter => 1E+12;
5355
protected override double PrinterPicasInOneMeter => 237.10630158;
5456
protected override double PrinterPointsInOneMeter => 2845.2755906;
5557

0 commit comments

Comments
 (0)