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
ed8e6bd4
Commit
ed8e6bd4
authored
Sep 26, 2017
by
Don Gagne
Committed by
GitHub
Sep 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5699 from bluerobotics/pr-mobile-default-fact
Add JSON key for mobile-specific default values
parents
de55d6e8
1f220051
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
FactMetaData.cc
src/FactSystem/FactMetaData.cc
+9
-0
FactMetaData.h
src/FactSystem/FactMetaData.h
+1
-0
No files found.
src/FactSystem/FactMetaData.cc
View file @
ed8e6bd4
...
...
@@ -68,6 +68,7 @@ const char* FactMetaData::_shortDescriptionJsonKey = "shortDescription";
const
char
*
FactMetaData
::
_longDescriptionJsonKey
=
"longDescription"
;
const
char
*
FactMetaData
::
_unitsJsonKey
=
"units"
;
const
char
*
FactMetaData
::
_defaultValueJsonKey
=
"defaultValue"
;
const
char
*
FactMetaData
::
_mobileDefaultValueJsonKey
=
"mobileDefaultValue"
;
const
char
*
FactMetaData
::
_minJsonKey
=
"min"
;
const
char
*
FactMetaData
::
_maxJsonKey
=
"max"
;
...
...
@@ -861,9 +862,17 @@ FactMetaData* FactMetaData::createFromJsonObject(const QJsonObject& json, QObjec
if
(
json
.
contains
(
_unitsJsonKey
))
{
metaData
->
setRawUnits
(
json
[
_unitsJsonKey
].
toString
());
}
#ifdef __mobile__
if
(
json
.
contains
(
_mobileDefaultValueJsonKey
))
{
metaData
->
setRawDefaultValue
(
json
[
_mobileDefaultValueJsonKey
].
toVariant
());
}
else
if
(
json
.
contains
(
_defaultValueJsonKey
))
{
metaData
->
setRawDefaultValue
(
json
[
_defaultValueJsonKey
].
toVariant
());
}
#else
if
(
json
.
contains
(
_defaultValueJsonKey
))
{
metaData
->
setRawDefaultValue
(
json
[
_defaultValueJsonKey
].
toVariant
());
}
#endif
if
(
json
.
contains
(
_minJsonKey
))
{
QVariant
typedValue
;
QString
errorString
;
...
...
src/FactSystem/FactMetaData.h
View file @
ed8e6bd4
...
...
@@ -245,6 +245,7 @@ private:
static
const
char
*
_longDescriptionJsonKey
;
static
const
char
*
_unitsJsonKey
;
static
const
char
*
_defaultValueJsonKey
;
static
const
char
*
_mobileDefaultValueJsonKey
;
static
const
char
*
_minJsonKey
;
static
const
char
*
_maxJsonKey
;
};
...
...
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