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

added kilowatthour to energy units

Browse source
This commit is contained in:
Flippchen 2022-11-03 21:29:31 +01:00
commit ca82582d2c
7 changed files with 586 additions and 549 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,9 @@ namespace CalculatorApp
Data_Zetabits = UnitStart + 163, Data_Zetabits = UnitStart + 163,
Data_Zetabytes = UnitStart + 164, Data_Zetabytes = UnitStart + 164,
Area_Pyeong = UnitStart + 165, Area_Pyeong = UnitStart + 165,
UnitEnd = Area_Pyeong Energy_Kilowatthour = UnitStart + 166,
UnitEnd = Energy_Kilowatthour
}; };
} }
} }

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

@ -358,12 +358,19 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
true, true,
false, false,
false }); false });
energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilowatthour,
GetLocalizedStringName(L"UnitName_Kilowatthour"),
GetLocalizedStringName(L"UnitAbbreviation_Kilowatthour"),
166,
true,
false,
false });
energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilocalorie, energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilocalorie,
GetLocalizedStringName(L"UnitName_Kilocalorie"), GetLocalizedStringName(L"UnitName_Kilocalorie"),
GetLocalizedStringName(L"UnitAbbreviation_Kilocalorie"), GetLocalizedStringName(L"UnitAbbreviation_Kilocalorie"),
5, 5,
false, false,
true, false,
false }); false });
energyUnits.push_back(OrderedUnit{ energyUnits.push_back(OrderedUnit{
UnitConverterUnits::Energy_Kilojoule, GetLocalizedStringName(L"UnitName_Kilojoule"), GetLocalizedStringName(L"UnitAbbreviation_Kilojoule"), 3 }); UnitConverterUnits::Energy_Kilojoule, GetLocalizedStringName(L"UnitName_Kilojoule"), GetLocalizedStringName(L"UnitAbbreviation_Kilojoule"), 3 });
@ -830,6 +837,7 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
{ ViewMode::Energy, UnitConverterUnits::Energy_Kilocalorie, 4184 }, { ViewMode::Energy, UnitConverterUnits::Energy_Kilocalorie, 4184 },
{ ViewMode::Energy, UnitConverterUnits::Energy_BritishThermalUnit, 1055.056 }, { ViewMode::Energy, UnitConverterUnits::Energy_BritishThermalUnit, 1055.056 },
{ ViewMode::Energy, UnitConverterUnits::Energy_Kilojoule, 1000 }, { ViewMode::Energy, UnitConverterUnits::Energy_Kilojoule, 1000 },
{ ViewMode::Energy, UnitConverterUnits::Energy_Kilowatthour, 3600000 },
{ ViewMode::Energy, UnitConverterUnits::Energy_ElectronVolt, 0.0000000000000000001602176565 }, { ViewMode::Energy, UnitConverterUnits::Energy_ElectronVolt, 0.0000000000000000001602176565 },
{ ViewMode::Energy, UnitConverterUnits::Energy_Joule, 1 }, { ViewMode::Energy, UnitConverterUnits::Energy_Joule, 1 },
{ ViewMode::Energy, UnitConverterUnits::Energy_FootPound, 1.3558179483314 }, { ViewMode::Energy, UnitConverterUnits::Energy_FootPound, 1.3558179483314 },

48
src/Calculator.sln
View file

@ -41,6 +41,30 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.ActiveCfg = Debug|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Build.0 = Debug|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Deploy.0 = Debug|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.ActiveCfg = Debug|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Build.0 = Debug|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Deploy.0 = Debug|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.ActiveCfg = Debug|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Build.0 = Debug|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Deploy.0 = Debug|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.ActiveCfg = Debug|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Build.0 = Debug|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Deploy.0 = Debug|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.ActiveCfg = Release|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Build.0 = Release|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Deploy.0 = Release|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.ActiveCfg = Release|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Build.0 = Release|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Deploy.0 = Release|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.ActiveCfg = Release|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Build.0 = Release|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Deploy.0 = Release|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.ActiveCfg = Release|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Build.0 = Release|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Deploy.0 = Release|x86
{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.ActiveCfg = Debug|ARM {311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.ActiveCfg = Debug|ARM
{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.Build.0 = Debug|ARM {311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM.Build.0 = Debug|ARM
{311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.ActiveCfg = Debug|ARM64 {311E866D-8B93-4609-A691-265941FEE101}.Debug|ARM64.ActiveCfg = Debug|ARM64
@ -169,30 +193,6 @@ Global
{FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x64.Build.0 = Release|x64 {FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x64.Build.0 = Release|x64
{FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x86.ActiveCfg = Release|Win32 {FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x86.ActiveCfg = Release|Win32
{FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x86.Build.0 = Release|Win32 {FC81FF41-02CD-4CD9-9BC5-45A1E39AC6ED}.Release|x86.Build.0 = Release|Win32
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.ActiveCfg = Debug|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Build.0 = Debug|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM.Deploy.0 = Debug|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.ActiveCfg = Debug|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Build.0 = Debug|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|ARM64.Deploy.0 = Debug|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.ActiveCfg = Debug|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Build.0 = Debug|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x64.Deploy.0 = Debug|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.ActiveCfg = Debug|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Build.0 = Debug|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Debug|x86.Deploy.0 = Debug|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.ActiveCfg = Release|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Build.0 = Release|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM.Deploy.0 = Release|ARM
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.ActiveCfg = Release|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Build.0 = Release|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|ARM64.Deploy.0 = Release|ARM64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.ActiveCfg = Release|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Build.0 = Release|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x64.Deploy.0 = Release|x64
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.ActiveCfg = Release|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Build.0 = Release|x86
{3B773403-B0D6-4F9A-948E-512A7A5FB315}.Release|x86.Deploy.0 = Release|x86
{CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM.ActiveCfg = Debug|ARM {CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM.ActiveCfg = Debug|ARM
{CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM.Build.0 = Debug|ARM {CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM.Build.0 = Debug|ARM
{CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM64.ActiveCfg = Debug|ARM64 {CC9B4FA7-D746-4F52-9401-0AD1B4D6B16D}.Debug|ARM64.ActiveCfg = Debug|ARM64

10
src/Calculator/Resources/de-DE/Resources.resw
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -1384,6 +1384,10 @@
<data name="UnitAbbreviation_Joule" xml:space="preserve"> <data name="UnitAbbreviation_Joule" xml:space="preserve">
<value>J</value> <value>J</value>
<comment>An abbreviation for a measurement unit of energy</comment> <comment>An abbreviation for a measurement unit of energy</comment>
</data>
<data name="UnitAbbreviation_Kilowatthour" xml:space="preserve">
<value>kWh</value>
<comment>An abbreviation for a measurement unit of energy</comment>
</data> </data>
<data name="UnitAbbreviation_Kelvin" xml:space="preserve"> <data name="UnitAbbreviation_Kelvin" xml:space="preserve">
<value>K</value> <value>K</value>
@ -1748,6 +1752,10 @@
<data name="UnitName_Joule" xml:space="preserve"> <data name="UnitName_Joule" xml:space="preserve">
<value>Joule</value> <value>Joule</value>
<comment>A measurement unit for energy. (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 energy. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
</data>
<data name="UnitName_Kilowatthour" xml:space="preserve">
<value>Kilowattstunde</value>
<comment>A measurement unit for energy. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
</data> </data>
<data name="UnitName_Kelvin" xml:space="preserve"> <data name="UnitName_Kelvin" xml:space="preserve">
<value>Kelvin</value> <value>Kelvin</value>

10
src/Calculator/Resources/en-GB/Resources.resw
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -1384,6 +1384,10 @@
<data name="UnitAbbreviation_Joule" xml:space="preserve"> <data name="UnitAbbreviation_Joule" xml:space="preserve">
<value>J</value> <value>J</value>
<comment>An abbreviation for a measurement unit of energy</comment> <comment>An abbreviation for a measurement unit of energy</comment>
</data>
<data name="UnitAbbreviation_Kilowatthour" xml:space="preserve">
<value>kWh</value>
<comment>An abbreviation for a measurement unit of energy</comment>
</data> </data>
<data name="UnitAbbreviation_Kelvin" xml:space="preserve"> <data name="UnitAbbreviation_Kelvin" xml:space="preserve">
<value>K</value> <value>K</value>
@ -1748,6 +1752,10 @@
<data name="UnitName_Joule" xml:space="preserve"> <data name="UnitName_Joule" xml:space="preserve">
<value>Joules</value> <value>Joules</value>
<comment>A measurement unit for energy. (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 energy. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
</data>
<data name="UnitName_Kilowatthour" xml:space="preserve">
<value>Kilowatt-hour</value>
<comment>A measurement unit for energy. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
</data> </data>
<data name="UnitName_Kelvin" xml:space="preserve"> <data name="UnitName_Kelvin" xml:space="preserve">
<value>Kelvin</value> <value>Kelvin</value>

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

@ -1772,6 +1772,10 @@
<data name="UnitAbbreviation_Joule" xml:space="preserve"> <data name="UnitAbbreviation_Joule" xml:space="preserve">
<value>J</value> <value>J</value>
<comment>An abbreviation for a measurement unit of energy</comment> <comment>An abbreviation for a measurement unit of energy</comment>
</data>
<data name="UnitAbbreviation_Kilowatthour" xml:space="preserve">
<value>kWh</value>
<comment>An abbreviation for a measurement unit of energy</comment>
</data> </data>
<data name="UnitAbbreviation_Kelvin" xml:space="preserve"> <data name="UnitAbbreviation_Kelvin" xml:space="preserve">
<value>K</value> <value>K</value>
@ -2136,6 +2140,10 @@
<data name="UnitName_Joule" xml:space="preserve"> <data name="UnitName_Joule" xml:space="preserve">
<value>Joules</value> <value>Joules</value>
<comment>A measurement unit for energy. (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 energy. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
</data>
<data name="UnitName_Kilowatthour" xml:space="preserve">
<value>Kilowat-thour</value>
<comment>A measurement unit for energy. (Please choose the most appropriate plural form to fit any number between 0 and 999,999,999,999,999)</comment>
</data> </data>
<data name="UnitName_Kelvin" xml:space="preserve"> <data name="UnitName_Kelvin" xml:space="preserve">
<value>Kelvin</value> <value>Kelvin</value>

1037
src/CalculatorUnitTests/Test.resw
View file

File diff suppressed because it is too large Load diff