diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h index 057b6da02..0b4a666df 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h @@ -166,7 +166,8 @@ namespace CalculatorApp Area_Pyeong = UnitStart + 165, Energy_Kilowatthour = UnitStart + 166, Data_Nibble = UnitStart + 167, - UnitEnd = Data_Nibble + Pressure_Torr = UnitStart + 168, + UnitEnd = Pressure_Torr }; } } diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index 844dd3fe1..0e1bbd7ef 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -756,6 +756,8 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map angleUnits; @@ -944,7 +946,8 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_mappsi An abbreviation for a measurement unit of Pressure + + Torr + An abbreviation for a measurement unit of Pressure + cg An abbreviation for a measurement unit of weight @@ -2445,6 +2449,10 @@ Pounds per square inch A measurement unit for Pressure. + + Torr + A measurement unit for Pressure. + Centigrams A measurement unit for weight. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999) diff --git a/src/CalculatorUnitTests/Test.resw b/src/CalculatorUnitTests/Test.resw index bc8b6f69c..9e61bbd1d 100644 --- a/src/CalculatorUnitTests/Test.resw +++ b/src/CalculatorUnitTests/Test.resw @@ -573,6 +573,9 @@ 0.068045961016531 + + 0.00131578947368 + 0.002