From 25cf1caca2990002f9a342ea0c08e4384cbd1a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=A2=E9=80=9F?= Date: Mon, 4 Aug 2025 15:20:36 +0800 Subject: [PATCH] Add astronomical units to length unit convert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Light year (ly) and Astronomical unit (AU) and Parsec (pc) to length unit convert. 1ly = 9460730472580800 m, 1AU=149597870700 m. 1pc = 648000/π AU. --- .../DataLoaders/UnitConverterDataConstants.h | 5 +++- .../DataLoaders/UnitConverterDataLoader.cpp | 9 +++++++ src/Calculator/Resources/af-ZA/Resources.resw | 24 ++++++++++++++++-- src/Calculator/Resources/am-ET/Resources.resw | 24 ++++++++++++++++-- src/Calculator/Resources/ar-SA/Resources.resw | 22 ++++++++++++++-- .../Resources/az-Latn-AZ/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/bg-BG/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ca-ES/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/cs-CZ/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/da-DK/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/de-DE/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/el-GR/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/en-GB/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/en-US/Resources.resw | 24 ++++++++++++++++++ src/Calculator/Resources/es-ES/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/es-MX/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/et-EE/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/eu-ES/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/fa-IR/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/fi-FI/Resources.resw | 20 ++++++++++++++- .../Resources/fil-PH/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/fr-CA/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/fr-FR/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/gl-ES/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/he-IL/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/hi-IN/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/hr-HR/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/hu-HU/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/id-ID/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/is-IS/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/it-IT/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ja-JP/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/kk-KZ/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/km-KH/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/kn-IN/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ko-KR/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/lo-LA/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/lt-LT/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/lv-LV/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/mk-MK/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ml-IN/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ms-MY/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/nb-NO/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/nl-NL/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/pl-PL/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/pt-BR/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/pt-PT/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ro-RO/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ru-RU/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/sk-SK/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/sl-SI/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/sq-AL/Resources.resw | 20 ++++++++++++++- .../Resources/sr-Latn-RS/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/sv-SE/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/ta-IN/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/te-IN/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/th-TH/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/tr-TR/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/uk-UA/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/vi-VN/Resources.resw | 20 ++++++++++++++- src/Calculator/Resources/zh-CN/Resources.resw | 25 +++++++++++++++++-- src/Calculator/Resources/zh-TW/Resources.resw | 20 ++++++++++++++- src/CalculatorUnitTests/Test.resw | 9 +++++++ 63 files changed, 1178 insertions(+), 64 deletions(-) diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h index db01aab7..fe296c2f 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h @@ -167,7 +167,10 @@ namespace CalculatorApp Energy_Kilowatthour = UnitStart + 166, Data_Nibble = UnitStart + 167, Length_Angstrom = UnitStart + 168, - UnitEnd = Length_Angstrom + Length_AstronomicalUnit = UnitStart + 169, + Length_LightYear = UnitStart + 170, + Length_Parsec = UnitStart + 171, + UnitEnd = Length_Parsec }; } } diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index 795091e9..dcaa38fe 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -400,6 +400,12 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map lengthUnits; + lengthUnits.push_back(OrderedUnit{ + UnitConverterUnits::Length_AstronomicalUnit, GetLocalizedStringName(L"UnitName_AstronomicalUnit"), GetLocalizedStringName(L"UnitAbbreviation_AstronomicalUnit"), 16 }); + lengthUnits.push_back(OrderedUnit{ + UnitConverterUnits::Length_LightYear, GetLocalizedStringName(L"UnitName_LightYear"), GetLocalizedStringName(L"UnitAbbreviation_LightYear"), 17 }); + lengthUnits.push_back(OrderedUnit{ + UnitConverterUnits::Length_Parsec, GetLocalizedStringName(L"UnitName_Parsec"), GetLocalizedStringName(L"UnitAbbreviation_Parsec"), 18 }); lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Angstrom, GetLocalizedStringName(L"UnitName_Angstrom"), GetLocalizedStringName(L"UnitAbbreviation_Angstrom"), 1 }); lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter, @@ -858,6 +864,9 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map +