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

[apps/settings] Engineering notation selection

Browse Source
This commit is contained in:
Léa Saviot
2019-08-07 17:12:47 +02:00
committed by Émilie Feral
parent 8af50eca90
commit ab86fa84de
10 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/settings/base.de.i18n
View File

@@ -13,6 +13,7 @@ About = "Über"
Degres = "Grad "
Radian = "Bogenmaß "
Decimal = "Dezimal "
Engineering = "Engineering "
Scientific = "Wissenschaftlich "
SignificantFigures = "Signifikante Stellen "
Real = "Reel "

1
apps/settings/base.en.i18n
View File

@@ -14,6 +14,7 @@ Degres = "Degrees "
Radian = "Radians "
Decimal = "Decimal "
Scientific = "Scientific "
Engineering = "Engineering "
SignificantFigures = "Significant figures "
Real = "Real "
Cartesian = "Cartesian "

1
apps/settings/base.es.i18n
View File

@@ -12,6 +12,7 @@ ExamModeActive = "Modo examen: activo"
About = "Acerca"
Degres = "Grados "
Radian = "Radianes "
Engineering = "Engineering "
Decimal = "Decimal "
Scientific = "Científico "
SignificantFigures = "Cifras significativas "

1
apps/settings/base.fr.i18n
View File

@@ -14,6 +14,7 @@ Degres = "Degrés "
Radian = "Radians "
Decimal = "Décimal "
Scientific = "Scientifique "
Engineering = "Ingénieur "
SignificantFigures = "Chiffres significatifs "
Real = "Réel "
Cartesian = "Algébrique "

1
apps/settings/base.pt.i18n
View File

@@ -14,6 +14,7 @@ Degres = "Graus "
Radian = "Radianos "
Decimal = "Decimal "
Scientific = "Científico "
Engineering = "Engineering "
SignificantFigures = "Algarismo significativo "
Real = "Real "
Cartesian = "Cartesiana "

4
apps/settings/main_controller_prompt_beta.cpp
View File

@@ -5,14 +5,14 @@ namespace Settings {
constexpr SettingsMessageTree s_modelAngleChildren[2] = {SettingsMessageTree(I18n::Message::Degres), SettingsMessageTree(I18n::Message::Radian)};
constexpr SettingsMessageTree s_modelEditionModeChildren[2] = {SettingsMessageTree(I18n::Message::Edition2D), SettingsMessageTree(I18n::Message::EditionLinear)};
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[3] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::Engineering), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
constexpr SettingsMessageTree s_modelAboutChildren[3] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 2),
SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren, 3),
SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren, 4),
SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren, 2),
SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren, 3),
SettingsMessageTree(I18n::Message::Brightness),

4
apps/settings/main_controller_prompt_none.cpp
View File

@@ -6,14 +6,14 @@ namespace Settings {
// TODO: factorize most parts of the final models with main_controller_prompt_beta and main_controller_prompt_update
constexpr SettingsMessageTree s_modelAngleChildren[2] = {SettingsMessageTree(I18n::Message::Degres), SettingsMessageTree(I18n::Message::Radian)};
constexpr SettingsMessageTree s_modelEditionModeChildren[2] = {SettingsMessageTree(I18n::Message::Edition2D), SettingsMessageTree(I18n::Message::EditionLinear)};
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[3] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::Engineering), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
constexpr SettingsMessageTree s_modelAboutChildren[3] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 2),
SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren, 3),
SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren, 4),
SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren, 2),
SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren, 3),
SettingsMessageTree(I18n::Message::Brightness),

4
apps/settings/main_controller_prompt_update.cpp
View File

@@ -9,14 +9,14 @@ namespace Settings {
constexpr SettingsMessageTree s_modelAngleChildren[2] = {SettingsMessageTree(I18n::Message::Degres), SettingsMessageTree(I18n::Message::Radian)};
constexpr SettingsMessageTree s_modelEditionModeChildren[2] = {SettingsMessageTree(I18n::Message::Edition2D), SettingsMessageTree(I18n::Message::EditionLinear)};
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[3] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::Engineering), SettingsMessageTree(I18n::Message::SignificantFigures)};
constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
constexpr SettingsMessageTree s_modelExamChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
constexpr SettingsMessageTree s_modelAboutChildren[3] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};
constexpr SettingsMessageTree s_modelMenu[] =
{SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren, 2),
SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren, 3),
SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren, 4),
SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren, 2),
SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren, 3),
SettingsMessageTree(I18n::Message::Brightness),

9
apps/settings/sub_menu/preferences_controller.cpp
View File

@@ -63,10 +63,15 @@ Layout PreferencesController::layoutForPreferences(I18n::Message message) {
// Display Mode format
case I18n::Message::Decimal:
return LayoutHelper::String("12.34", 5, k_layoutFont);
return LayoutHelper::String("123.45", 5, k_layoutFont);
case I18n::Message::Scientific:
{
const char * text = "1.234ᴇ1";
const char * text = "1.2345ᴇ2";
return LayoutHelper::String(text, strlen(text), k_layoutFont);
}
case I18n::Message::Engineering:
{
const char * text = "12.345ᴇ3";
return LayoutHelper::String(text, strlen(text), k_layoutFont);
}

1
poincare/include/poincare/preferences.h
View File

@@ -17,6 +17,7 @@ public:
enum class PrintFloatMode {
Decimal = 0,
Scientific = 1,
Engineering = 2,
};
enum class ComplexFormat {
Real = 0,