UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added more units

Browse Source
This commit is contained in:
0b101
2020-02-17 08:54:43 -06:00
parent 3123a6183e
commit 978c3e28e9
9 changed files with 97 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/math_toolbox.cpp
View File

@@ -109,13 +109,28 @@ const ToolboxMessageTree unitDistanceMeterChildren[] = {
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterPicoSymbol, I18n::Message::UnitDistanceMeterPico), ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterPicoSymbol, I18n::Message::UnitDistanceMeterPico),
}; };
const ToolboxMessageTree unitDistanceImperialChildren[] = {
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceInchSymbol, I18n::Message::UnitDistanceInch),
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceFootSymbol, I18n::Message::UnitDistanceFoot),
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceYardSymbol, I18n::Message::UnitDistanceYard),
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMileSymbol, I18n::Message::UnitDistanceMile),
};
const ToolboxMessageTree unitDistanceChildren[] = { const ToolboxMessageTree unitDistanceChildren[] = {
ToolboxMessageTree::Node(I18n::Message::UnitDistanceMeterMenu, unitDistanceMeterChildren), ToolboxMessageTree::Node(I18n::Message::UnitDistanceMeterMenu, unitDistanceMeterChildren),
ToolboxMessageTree::Node(I18n::Message::UnitDistanceImperialMenu, unitDistanceImperialChildren),
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceAstronomicalUnitSymbol, I18n::Message::UnitDistanceAstronomicalUnit), ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceAstronomicalUnitSymbol, I18n::Message::UnitDistanceAstronomicalUnit),
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceLightYearSymbol, I18n::Message::UnitDistanceLightYear), ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceLightYearSymbol, I18n::Message::UnitDistanceLightYear),
ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceParsecSymbol, I18n::Message::UnitDistanceParsec)}; ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceParsecSymbol, I18n::Message::UnitDistanceParsec)};
const ToolboxMessageTree unitMassImperialChildren[] = {
ToolboxMessageTree::Leaf(I18n::Message::UnitMassPoundSymbol, I18n::Message::UnitMassPound),
ToolboxMessageTree::Leaf(I18n::Message::UnitMassOunceSymbol, I18n::Message::UnitMassOunce),
ToolboxMessageTree::Leaf(I18n::Message::UnitMassTonSymbol, I18n::Message::UnitMassTon),
};
const ToolboxMessageTree unitMassChildren[] = { const ToolboxMessageTree unitMassChildren[] = {
ToolboxMessageTree::Node(I18n::Message::UnitMassImperialMenu, unitMassImperialChildren),
ToolboxMessageTree::Leaf(I18n::Message::UnitMassTonneSymbol, I18n::Message::UnitMassTonne), ToolboxMessageTree::Leaf(I18n::Message::UnitMassTonneSymbol, I18n::Message::UnitMassTonne),
ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramKiloSymbol, I18n::Message::UnitMassGramKilo), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramKiloSymbol, I18n::Message::UnitMassGramKilo),
ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramSymbol, I18n::Message::UnitMassGram), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramSymbol, I18n::Message::UnitMassGram),

7
apps/shared.universal.i18n
View File

@@ -14,9 +14,16 @@ UnitDistanceMeterMilliSymbol = "_mm"
UnitDistanceMeterMicroSymbol = "_μm" UnitDistanceMeterMicroSymbol = "_μm"
UnitDistanceMeterNanoSymbol = "_nm" UnitDistanceMeterNanoSymbol = "_nm"
UnitDistanceMeterPicoSymbol = "_pm" UnitDistanceMeterPicoSymbol = "_pm"
UnitDistanceInchSymbol = "_in"
UnitDistanceFootSymbol = "_ft"
UnitDistanceYardSymbol = "_yd"
UnitDistanceMileSymbol = "_mi"
UnitDistanceAstronomicalUnitSymbol = "_au" UnitDistanceAstronomicalUnitSymbol = "_au"
UnitDistanceLightYearSymbol = "_ly" UnitDistanceLightYearSymbol = "_ly"
UnitDistanceParsecSymbol = "_pc" UnitDistanceParsecSymbol = "_pc"
UnitMassPoundSymbol = "_lb"
UnitMassOunceSymbol = "_oz"
UnitMassTonSymbol = "_ton"
UnitMassGramKiloSymbol = "_kg" UnitMassGramKiloSymbol = "_kg"
UnitMassGramSymbol = "_g" UnitMassGramSymbol = "_g"
UnitMassGramMilliSymbol = "_mg" UnitMassGramMilliSymbol = "_mg"

9
apps/toolbox.de.i18n
View File

@@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter"
UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterMicro = "Micrometer"
UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterNano = "Nanometer"
UnitDistanceMeterPico = "Picometer" UnitDistanceMeterPico = "Picometer"
UnitDistanceImperialMenu = "US Customary"
UnitDistanceInch = "Inch"
UnitDistanceFoot = "Foot"
UnitDistanceYard = "Yard"
UnitDistanceMile = "Mile"
UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceAstronomicalUnit = "Astronomical unit"
UnitDistanceLightYear = "Light year" UnitDistanceLightYear = "Light year"
UnitDistanceParsec = "Parsec" UnitDistanceParsec = "Parsec"
UnitMassImperialMenu = "US Customary"
UnitMassPound = "Pound"
UnitMassOunce = "Ounce"
UnitMassTon = "US Ton"
UnitMassMenu = "Mass" UnitMassMenu = "Mass"
UnitMassGramKilo = "Kilogram" UnitMassGramKilo = "Kilogram"
UnitMassGram = "Gram" UnitMassGram = "Gram"

9
apps/toolbox.en.i18n
View File

@@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter"
UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterMicro = "Micrometer"
UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterNano = "Nanometer"
UnitDistanceMeterPico = "Picometer" UnitDistanceMeterPico = "Picometer"
UnitDistanceImperialMenu = "US Customary"
UnitDistanceInch = "Inch"
UnitDistanceFoot = "Foot"
UnitDistanceYard = "Yard"
UnitDistanceMile = "Mile"
UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceAstronomicalUnit = "Astronomical unit"
UnitDistanceLightYear = "Light year" UnitDistanceLightYear = "Light year"
UnitDistanceParsec = "Parsec" UnitDistanceParsec = "Parsec"
UnitMassImperialMenu = "US Customary"
UnitMassPound = "Pound"
UnitMassOunce = "Ounce"
UnitMassTon = "US Ton"
UnitMassMenu = "Mass" UnitMassMenu = "Mass"
UnitMassGramKilo = "Kilogram" UnitMassGramKilo = "Kilogram"
UnitMassGram = "Gram" UnitMassGram = "Gram"

9
apps/toolbox.es.i18n
View File

@@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter"
UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterMicro = "Micrometer"
UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterNano = "Nanometer"
UnitDistanceMeterPico = "Picometer" UnitDistanceMeterPico = "Picometer"
UnitDistanceImperialMenu = "US Customary"
UnitDistanceInch = "Inch"
UnitDistanceFoot = "Foot"
UnitDistanceYard = "Yard"
UnitDistanceMile = "Mile"
UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceAstronomicalUnit = "Astronomical unit"
UnitDistanceLightYear = "Light year" UnitDistanceLightYear = "Light year"
UnitDistanceParsec = "Parsec" UnitDistanceParsec = "Parsec"
UnitMassImperialMenu = "US Customary"
UnitMassPound = "Pound"
UnitMassOunce = "Ounce"
UnitMassTon = "US Ton"
UnitMassMenu = "Mass" UnitMassMenu = "Mass"
UnitMassGramKilo = "Kilogram" UnitMassGramKilo = "Kilogram"
UnitMassGram = "Gram" UnitMassGram = "Gram"

9
apps/toolbox.fr.i18n
View File

@@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimètre"
UnitDistanceMeterMicro = "Micromètre" UnitDistanceMeterMicro = "Micromètre"
UnitDistanceMeterNano = "Nanomètre" UnitDistanceMeterNano = "Nanomètre"
UnitDistanceMeterPico = "Picomètre" UnitDistanceMeterPico = "Picomètre"
UnitDistanceImperialMenu = "US Customary"
UnitDistanceInch = "Inch"
UnitDistanceFoot = "Foot"
UnitDistanceYard = "Yard"
UnitDistanceMile = "Mile"
UnitDistanceAstronomicalUnit = "Unité astronomique" UnitDistanceAstronomicalUnit = "Unité astronomique"
UnitDistanceLightYear = "Année lumière" UnitDistanceLightYear = "Année lumière"
UnitDistanceParsec = "Parsec" UnitDistanceParsec = "Parsec"
UnitMassImperialMenu = "US Customary"
UnitMassPound = "Pound"
UnitMassOunce = "Ounce"
UnitMassTon = "US Ton"
UnitMassMenu = "Masse" UnitMassMenu = "Masse"
UnitMassGramKilo = "Kilogramme" UnitMassGramKilo = "Kilogramme"
UnitMassGram = "Gramme" UnitMassGram = "Gramme"

9
apps/toolbox.hu.i18n
View File

@@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Milliméter"
UnitDistanceMeterMicro = "Mikrométer" UnitDistanceMeterMicro = "Mikrométer"
UnitDistanceMeterNano = "Nanométer" UnitDistanceMeterNano = "Nanométer"
UnitDistanceMeterPico = "Pikométer" UnitDistanceMeterPico = "Pikométer"
UnitDistanceImperialMenu = "US Customary"
UnitDistanceInch = "Inch"
UnitDistanceFoot = "Foot"
UnitDistanceYard = "Yard"
UnitDistanceMile = "Mile"
UnitDistanceAstronomicalUnit = "Csillagászati ​​egység" UnitDistanceAstronomicalUnit = "Csillagászati ​​egység"
UnitDistanceLightYear = "Világos év" UnitDistanceLightYear = "Világos év"
UnitDistanceParsec = "Parsec" UnitDistanceParsec = "Parsec"
UnitMassImperialMenu = "US Customary"
UnitMassPound = "Pound"
UnitMassOunce = "Ounce"
UnitMassTon = "US Ton"
UnitMassMenu = "Tömeg" UnitMassMenu = "Tömeg"
UnitMassGramKilo = "Kilogram" UnitMassGramKilo = "Kilogram"
UnitMassGram = "Gram" UnitMassGram = "Gram"

9
apps/toolbox.pt.i18n
View File

@@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter"
UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterMicro = "Micrometer"
UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterNano = "Nanometer"
UnitDistanceMeterPico = "Picometer" UnitDistanceMeterPico = "Picometer"
UnitDistanceImperialMenu = "US Customary"
UnitDistanceInch = "Inch"
UnitDistanceFoot = "Foot"
UnitDistanceYard = "Yard"
UnitDistanceMile = "Mile"
UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceAstronomicalUnit = "Astronomical unit"
UnitDistanceLightYear = "Light year" UnitDistanceLightYear = "Light year"
UnitDistanceParsec = "Parsec" UnitDistanceParsec = "Parsec"
UnitMassImperialMenu = "US Customary"
UnitMassPound = "Pound"
UnitMassOunce = "Ounce"
UnitMassTon = "US Ton"
UnitMassMenu = "Mass" UnitMassMenu = "Mass"
UnitMassGramKilo = "Kilogram" UnitMassGramKilo = "Kilogram"
UnitMassGram = "Gram" UnitMassGram = "Gram"

22
poincare/include/poincare/unit.h
View File

@@ -255,6 +255,18 @@ public:
Representative("pc", "180*60*60/π*_au", Representative("pc", "180*60*60/π*_au",
Representative::Prefixable::No, Representative::Prefixable::No,
NoPrefix), NoPrefix),
Representative("ft", "0.3048*_m", // used meters to allow for conversion
Representative::Prefixable::No,
NoPrefix),
Representative("in", "(1/12)*_ft",
Representative::Prefixable::No,
NoPrefix),
Representative("yd", "3*_ft",
Representative::Prefixable::No,
NoPrefix),
Representative("mi", "1760*_yd",
Representative::Prefixable::No,
NoPrefix),
}, },
MassRepresentatives[] = { MassRepresentatives[] = {
Representative("g", nullptr, Representative("g", nullptr,
@@ -266,6 +278,15 @@ public:
Representative("Da", "(6.02214076*10^23*1000)^-1*_kg", Representative("Da", "(6.02214076*10^23*1000)^-1*_kg",
Representative::Prefixable::Yes, Representative::Prefixable::Yes,
NoPrefix), NoPrefix),
Representative("lb", "453.59237*_g",
Representative::Prefixable::Yes,
NoPrefix),
Representative("oz", "(1/16)*_lb",
Representative::Prefixable::Yes,
NoPrefix),
Representative("ton", "2000*_lb",
Representative::Prefixable::Yes,
NoPrefix),
}, },
CurrentRepresentatives[] = { CurrentRepresentatives[] = {
Representative("A", nullptr, Representative("A", nullptr,
@@ -276,7 +297,6 @@ public:
Representative("K", nullptr, Representative("K", nullptr,
Representative::Prefixable::No, Representative::Prefixable::No,
NoPrefix), NoPrefix),
},
AmountOfSubstanceRepresentatives[] = { AmountOfSubstanceRepresentatives[] = {
Representative("mol", nullptr, Representative("mol", nullptr,
Representative::Prefixable::Yes, Representative::Prefixable::Yes,