github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-20 13:23:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge afbb7243fb into 88c22ca81e

Browse source
This commit is contained in:
Jacob Poteet 2024-09-08 08:03:28 +02:00 • committed by GitHub
commit 2988bfd9f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
View file

@ -166,7 +166,8 @@ namespace CalculatorApp
Area_Pyeong = UnitStart + 165, Area_Pyeong = UnitStart + 165,
Energy_Kilowatthour = UnitStart + 166, Energy_Kilowatthour = UnitStart + 166,
Data_Nibble = UnitStart + 167, Data_Nibble = UnitStart + 167,
UnitEnd = Data_Nibble Pressure_Torr = UnitStart + 168,
UnitEnd = Pressure_Torr
}; };
} }
} }

5
src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
View file

@ -756,6 +756,8 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
OrderedUnit{ UnitConverterUnits::Pressure_Pascal, GetLocalizedStringName(L"UnitName_Pascal"), GetLocalizedStringName(L"UnitAbbreviation_Pascal"), 5 }); OrderedUnit{ UnitConverterUnits::Pressure_Pascal, GetLocalizedStringName(L"UnitName_Pascal"), GetLocalizedStringName(L"UnitAbbreviation_Pascal"), 5 });
pressureUnits.push_back(OrderedUnit{ pressureUnits.push_back(OrderedUnit{
UnitConverterUnits::Pressure_PSI, GetLocalizedStringName(L"UnitName_PSI"), GetLocalizedStringName(L"UnitAbbreviation_PSI"), 6, false, false, false }); UnitConverterUnits::Pressure_PSI, GetLocalizedStringName(L"UnitName_PSI"), GetLocalizedStringName(L"UnitAbbreviation_PSI"), 6, false, false, false });
pressureUnits.push_back(OrderedUnit{
UnitConverterUnits::Pressure_Torr, GetLocalizedStringName(L"UnitName_Torr"), GetLocalizedStringName(L"UnitAbbreviation_Torr"), 7});
unitMap.emplace(ViewMode::Pressure, pressureUnits); unitMap.emplace(ViewMode::Pressure, pressureUnits);
vector<OrderedUnit> angleUnits; vector<OrderedUnit> angleUnits;
@ -944,7 +946,8 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
{ ViewMode::Pressure, UnitConverterUnits::Pressure_KiloPascal, 0.0098692326671601 }, { ViewMode::Pressure, UnitConverterUnits::Pressure_KiloPascal, 0.0098692326671601 },
{ ViewMode::Pressure, UnitConverterUnits::Pressure_MillimeterOfMercury, 0.0013155687145324 }, { ViewMode::Pressure, UnitConverterUnits::Pressure_MillimeterOfMercury, 0.0013155687145324 },
{ ViewMode::Pressure, UnitConverterUnits::Pressure_Pascal, 9.869232667160128e-6 }, { ViewMode::Pressure, UnitConverterUnits::Pressure_Pascal, 9.869232667160128e-6 },
{ ViewMode::Pressure, UnitConverterUnits::Pressure_PSI, 0.068045961016531 } }; { ViewMode::Pressure, UnitConverterUnits::Pressure_PSI, 0.068045961016531 },
{ ViewMode::Pressure, UnitConverterUnits::Pressure_Torr, 0.00131578947368 } };
// Populate the hash map and return; // Populate the hash map and return;
for (UnitData unitdata : unitDataList) for (UnitData unitdata : unitDataList)

8
src/Calculator/Resources/en-US/Resources.resw
View file

@ -2353,6 +2353,10 @@
<value>psi</value> <value>psi</value>
<comment>An abbreviation for a measurement unit of Pressure</comment> <comment>An abbreviation for a measurement unit of Pressure</comment>
</data> </data>
<data name="UnitAbbreviation_Torr" xml:space="preserve">
<value>Torr</value>
<comment>An abbreviation for a measurement unit of Pressure</comment>
</data>
<data name="UnitAbbreviation_Centigram" xml:space="preserve"> <data name="UnitAbbreviation_Centigram" xml:space="preserve">
<value>cg</value> <value>cg</value>
<comment>An abbreviation for a measurement unit of weight</comment> <comment>An abbreviation for a measurement unit of weight</comment>
@ -2445,6 +2449,10 @@
<value>Pounds per square inch</value> <value>Pounds per square inch</value>
<comment>A measurement unit for Pressure.</comment> <comment>A measurement unit for Pressure.</comment>
</data> </data>
<data name="UnitName_Torr" xml:space="preserve">
<value>Torr</value>
<comment>A measurement unit for Pressure.</comment>
</data>
<data name="UnitName_Centigram" xml:space="preserve"> <data name="UnitName_Centigram" xml:space="preserve">
<value>Centigrams</value> <value>Centigrams</value>
<comment>A measurement unit for weight. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment> <comment>A measurement unit for weight. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>

3
src/CalculatorUnitTests/Test.resw
View file

@ -573,6 +573,9 @@
<data name="Atmospheres-Pounds per square inch"> <data name="Atmospheres-Pounds per square inch">
<value>0.068045961016531</value> <value>0.068045961016531</value>
</data> </data>
<data name="Atmospheres-Torr">
<value>0.00131578947368</value>
</data>
<data name="Liters-Cubic meters-2" xml:space="preserve"> <data name="Liters-Cubic meters-2" xml:space="preserve">
<value>0.002</value> <value>0.002</value>
</data> </data>