Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
9f795bbc
Commit
9f795bbc
authored
Jun 12, 2020
by
Aleksey Kontsevich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
_findAppSettingsSpeedUnitsTranslation() method added
parent
abeb22db
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
FactMetaData.cc
src/FactSystem/FactMetaData.cc
+21
-1
FactMetaData.h
src/FactSystem/FactMetaData.h
+1
-0
No files found.
src/FactSystem/FactMetaData.cc
View file @
9f795bbc
...
...
@@ -1080,6 +1080,26 @@ const FactMetaData::AppSettingsTranslation_s* FactMetaData::_findAppSettingsArea
return
nullptr
;
}
const
FactMetaData
::
AppSettingsTranslation_s
*
FactMetaData
::
_findAppSettingsSpeedUnitsTranslation
(
const
QString
&
rawUnits
)
{
for
(
size_t
i
=
0
;
i
<
sizeof
(
_rgAppSettingsTranslations
)
/
sizeof
(
_rgAppSettingsTranslations
[
0
]);
i
++
)
{
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
&
_rgAppSettingsTranslations
[
i
];
if
(
rawUnits
.
toLower
()
!=
pAppSettingsTranslation
->
rawUnits
.
toLower
())
{
continue
;
}
uint
settingsUnits
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
unitsSettings
()
->
speedUnits
()
->
rawValue
().
toUInt
();
if
(
pAppSettingsTranslation
->
unitType
==
UnitSpeed
&&
pAppSettingsTranslation
->
unitOption
==
settingsUnits
)
{
return
pAppSettingsTranslation
;
}
}
return
nullptr
;
}
QVariant
FactMetaData
::
metersToAppSettingsHorizontalDistanceUnits
(
const
QVariant
&
meters
)
{
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
_findAppSettingsHorizontalDistanceUnitsTranslation
(
"m"
);
...
...
@@ -1200,7 +1220,7 @@ QVariant FactMetaData::appSettingsWeightUnitsToGrams(const QVariant& weight) {
QString
FactMetaData
::
appSettingsSpeedUnitsString
()
{
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
_findAppSettings
HorizontalDistance
UnitsTranslation
(
"m/s"
);
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
_findAppSettings
Speed
UnitsTranslation
(
"m/s"
);
if
(
pAppSettingsTranslation
)
{
return
pAppSettingsTranslation
->
cookedUnits
;
}
else
{
...
...
src/FactSystem/FactMetaData.h
View file @
9f795bbc
...
...
@@ -289,6 +289,7 @@ private:
static
const
AppSettingsTranslation_s
*
_findAppSettingsVerticalDistanceUnitsTranslation
(
const
QString
&
rawUnits
);
static
const
AppSettingsTranslation_s
*
_findAppSettingsAreaUnitsTranslation
(
const
QString
&
rawUnits
);
static
const
AppSettingsTranslation_s
*
_findAppSettingsWeightUnitsTranslation
(
const
QString
&
rawUnits
);
static
const
AppSettingsTranslation_s
*
_findAppSettingsSpeedUnitsTranslation
(
const
QString
&
rawUnits
);
static
void
_loadJsonDefines
(
const
QJsonObject
&
jsonDefinesObject
,
QMap
<
QString
,
QString
>&
defineMap
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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