Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
abeb22db
Commit
abeb22db
authored
Jun 09, 2020
by
Aleksey Kontsevich
Browse files
appSettingsSpeedUnitsString() method added
parent
0482f9ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/FactSystem/FactMetaData.cc
View file @
abeb22db
...
...
@@ -1198,6 +1198,15 @@ QVariant FactMetaData::appSettingsWeightUnitsToGrams(const QVariant& weight) {
}
}
QString
FactMetaData
::
appSettingsSpeedUnitsString
()
{
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
_findAppSettingsHorizontalDistanceUnitsTranslation
(
"m/s"
);
if
(
pAppSettingsTranslation
)
{
return
pAppSettingsTranslation
->
cookedUnits
;
}
else
{
return
QStringLiteral
(
"m/s"
);
}
}
double
FactMetaData
::
cookedIncrement
(
void
)
const
{
...
...
src/FactSystem/FactMetaData.h
View file @
abeb22db
...
...
@@ -95,6 +95,9 @@ public:
/// Returns the string for distance units which has configued by user
static
QString
appSettingsAreaUnitsString
(
void
);
/// Returns the string for speed units which has configued by user
static
QString
appSettingsSpeedUnitsString
();
static
const
QString
defaultCategory
();
static
const
QString
defaultGroup
();
...
...
src/QmlControls/QmlUnitsConversion.h
View file @
abeb22db
...
...
@@ -25,6 +25,7 @@ public:
Q_PROPERTY
(
QString
appSettingsVerticalDistanceUnitsString
READ
appSettingsVerticalDistanceUnitsString
CONSTANT
)
Q_PROPERTY
(
QString
appSettingsAreaUnitsString
READ
appSettingsAreaUnitsString
CONSTANT
)
Q_PROPERTY
(
QString
appSettingsWeightUnitsString
READ
appSettingsWeightUnitsString
CONSTANT
)
Q_PROPERTY
(
QString
appSettingsSpeedUnitsString
READ
appSettingsSpeedUnitsString
CONSTANT
)
/// Converts from meters to the user specified distance unit
Q_INVOKABLE
QVariant
metersToAppSettingsHorizontalDistanceUnits
(
const
QVariant
&
meters
)
const
{
return
FactMetaData
::
metersToAppSettingsHorizontalDistanceUnits
(
meters
);
}
...
...
@@ -58,6 +59,9 @@ public:
QString
appSettingsAreaUnitsString
(
void
)
const
{
return
FactMetaData
::
appSettingsAreaUnitsString
();
}
/// Returns the string for speed units which has configued by user
QString
appSettingsSpeedUnitsString
()
{
return
FactMetaData
::
appSettingsSpeedUnitsString
();
}
Q_INVOKABLE
double
degreesToRadians
(
double
degrees
)
{
return
qDegreesToRadians
(
degrees
);
}
Q_INVOKABLE
double
radiansToDegrees
(
double
radians
)
{
return
qRadiansToDegrees
(
radians
);
}
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment