UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] [poincare] Merge AngleUnit enum class (previously in preference

Browse Source 
and expression)

Change-Id: I1cf5175e724904f75ced16f947033b1e30f02eb6
This commit is contained in:
Émilie Feral
2017-02-01 16:12:24 +01:00
parent 42e4cf408d
commit e4d08ee685
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/preferences.cpp
View File

@@ -1,7 +1,7 @@
#include "preferences.h"
Preferences::Preferences() :
m_angleUnit(AngleUnit::Degree),
m_angleUnit(Expression::AngleUnit::Degree),
m_displayMode(Expression::DisplayMode::Auto),
m_numberType(NumberType::Reel),
m_complexFormat(ComplexFormat::Algebric),
@@ -9,11 +9,11 @@ Preferences::Preferences() :
{
}
Preferences::AngleUnit Preferences::angleUnit() const {
Expression::AngleUnit Preferences::angleUnit() const {
return m_angleUnit;
}
void Preferences::setAngleUnit(AngleUnit angleUnit) {
void Preferences::setAngleUnit(Expression::AngleUnit angleUnit) {
if (angleUnit != m_angleUnit) {
m_angleUnit = angleUnit;
}

10
apps/preferences.h
View File

@@ -5,10 +5,6 @@
class Preferences {
public:
enum class AngleUnit {
Degree = 0,
Radian = 1
};
enum class NumberType {
Reel = 0,
Complex = 1
@@ -22,8 +18,8 @@ public:
English = 1
};
Preferences();
AngleUnit angleUnit() const;
void setAngleUnit(AngleUnit angleUnit);
Expression::AngleUnit angleUnit() const;
void setAngleUnit(Expression::AngleUnit angleUnit);
Expression::DisplayMode displayMode() const;
void setDisplayMode(Expression::DisplayMode displayMode);
NumberType numberType() const;
@@ -33,7 +29,7 @@ public:
Language language() const;
void setLanguage(Language language);
private:
AngleUnit m_angleUnit;
Expression::AngleUnit m_angleUnit;
Expression::DisplayMode m_displayMode;
NumberType m_numberType;
ComplexFormat m_complexFormat;

2
apps/settings/sub_controller.cpp
View File

@@ -82,7 +82,7 @@ StackViewController * SubController::stackController() const {
void SubController::setPreferenceAtIndexWithValueIndex(int preferenceIndex, int valueIndex) {
switch (preferenceIndex) {
case 0:
m_preferences->setAngleUnit((Preferences::AngleUnit)valueIndex);
m_preferences->setAngleUnit((Expression::AngleUnit)valueIndex);
break;
case 1:
m_preferences->setDisplayMode((Expression::DisplayMode)valueIndex);

2
apps/title_bar_view.cpp
View File

@@ -55,7 +55,7 @@ void TitleBarView::setPreferences(Preferences * preferences) {
strlcpy(buffer+numberOfChar, "cplx/", 6);
numberOfChar += 5;
}
if (preferences->angleUnit() == Preferences::AngleUnit::Radian) {
if (preferences->angleUnit() == Expression::AngleUnit::Radian) {
strlcpy(buffer+numberOfChar, "rad", 4);
} else {
strlcpy(buffer+numberOfChar, "deg", 4);