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
6796b7a2
Commit
6796b7a2
authored
Feb 09, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
JSon helper routines
parent
b4f7e006
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
112 additions
and
0 deletions
+112
-0
qgroundcontrol.pro
qgroundcontrol.pro
+2
-0
JsonHelper.cc
src/JsonHelper.cc
+73
-0
JsonHelper.h
src/JsonHelper.h
+37
-0
No files found.
qgroundcontrol.pro
View file @
6796b7a2
...
...
@@ -249,6 +249,7 @@ HEADERS += \
src
/
HomePositionManager
.
h
\
src
/
Joystick
/
Joystick
.
h
\
src
/
Joystick
/
JoystickManager
.
h
\
src
/
JsonHelper
.
h
\
src
/
LogCompressor
.
h
\
src
/
MG
.
h
\
src
/
MissionManager
/
MissionCommandList
.
h
\
...
...
@@ -373,6 +374,7 @@ SOURCES += \
src
/
HomePositionManager
.
cc
\
src
/
Joystick
/
Joystick
.
cc
\
src
/
Joystick
/
JoystickManager
.
cc
\
src
/
JsonHelper
.
cc
\
src
/
LogCompressor
.
cc
\
src
/
main
.
cc
\
src
/
MissionManager
/
MissionCommandList
.
cc
\
...
...
src/JsonHelper.cc
0 → 100644
View file @
6796b7a2
/*===================================================================
QGroundControl Open Source Ground Control Station
(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
#include "JsonHelper.h"
#include <QJsonArray>
bool
JsonHelper
::
validateRequiredKeys
(
const
QJsonObject
&
jsonObject
,
const
QStringList
&
keys
,
QString
&
errorString
)
{
QString
missingKeys
;
foreach
(
const
QString
&
key
,
keys
)
{
if
(
!
jsonObject
.
contains
(
key
))
{
if
(
!
missingKeys
.
isEmpty
())
{
missingKeys
+=
QStringLiteral
(
", "
);
}
missingKeys
+=
key
;
}
}
if
(
missingKeys
.
count
()
!=
0
)
{
errorString
=
QString
(
"The following required keys are missing: %1"
).
arg
(
missingKeys
);
return
false
;
}
return
true
;
}
bool
JsonHelper
::
toQGeoCoordinate
(
const
QJsonValue
&
jsonValue
,
QGeoCoordinate
&
coordinate
,
bool
altitudeRequired
,
QString
&
errorString
)
{
if
(
!
jsonValue
.
isArray
())
{
errorString
=
QStringLiteral
(
"JSon value for coordinate is not array"
);
return
false
;
}
QJsonArray
coordinateArray
=
jsonValue
.
toArray
();
int
requiredCount
=
altitudeRequired
?
3
:
2
;
if
(
coordinateArray
.
count
()
!=
requiredCount
)
{
errorString
=
QString
(
"Json array must contains %1 values"
).
arg
(
requiredCount
);
return
false
;
}
coordinate
=
QGeoCoordinate
(
coordinateArray
[
0
].
toDouble
(),
coordinateArray
[
1
].
toDouble
());
if
(
altitudeRequired
)
{
coordinate
.
setAltitude
(
coordinateArray
[
2
].
toDouble
());
}
if
(
!
coordinate
.
isValid
())
{
errorString
=
QString
(
"Coordinate is invalid: %1"
).
arg
(
coordinate
.
toString
());
return
false
;
}
return
true
;
}
src/JsonHelper.h
0 → 100644
View file @
6796b7a2
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009 - 2014 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
#ifndef JsonHelper_H
#define JsonHelper_H
#include <QJsonObject>
#include <QGeoCoordinate>
class
JsonHelper
{
public:
static
bool
validateRequiredKeys
(
const
QJsonObject
&
jsonObject
,
const
QStringList
&
keys
,
QString
&
errorString
);
static
bool
toQGeoCoordinate
(
const
QJsonValue
&
jsonValue
,
QGeoCoordinate
&
coordinate
,
bool
altitudeRequired
,
QString
&
errorString
);
};
#endif
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