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
f55d443a
Commit
f55d443a
authored
Aug 09, 2017
by
Patrick José Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add KML integration
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
74eead41
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
111 additions
and
1 deletion
+111
-1
MissionController.cc
src/MissionManager/MissionController.cc
+40
-0
MissionController.h
src/MissionManager/MissionController.h
+4
-0
PlanMasterController.cc
src/MissionManager/PlanMasterController.cc
+39
-0
PlanMasterController.h
src/MissionManager/PlanMasterController.h
+4
-0
PlanView.qml
src/PlanView/PlanView.qml
+21
-1
AppSettings.cc
src/Settings/AppSettings.cc
+1
-0
AppSettings.h
src/Settings/AppSettings.h
+2
-0
No files found.
src/MissionManager/MissionController.cc
View file @
f55d443a
...
...
@@ -8,6 +8,7 @@
****************************************************************************/
#include "MissionCommandUIInfo.h"
#include "MissionController.h"
#include "MultiVehicleManager.h"
#include "MissionManager.h"
...
...
@@ -25,6 +26,7 @@
#include "MissionSettingsItem.h"
#include "QGCQGeoCoordinate.h"
#include "PlanMasterController.h"
#include "KML.h"
#ifndef __mobile__
#include "MainWindow.h"
...
...
@@ -256,6 +258,44 @@ bool MissionController::_convertToMissionItems(QmlObjectListModel* visualMission
return
endActionSet
;
}
void
MissionController
::
convertToKMLDocument
(
QDomDocument
&
document
)
{
QJsonObject
missionJson
;
QmlObjectListModel
*
visualItems
=
new
QmlObjectListModel
();
QList
<
MissionItem
*>
missionItens
;
QString
error
;
save
(
missionJson
);
_loadItemsFromJson
(
missionJson
,
visualItems
,
error
);
_convertToMissionItems
(
visualItems
,
missionItens
,
this
);
float
altitude
=
missionJson
[
_jsonPlannedHomePositionKey
].
toArray
()[
2
].
toDouble
();
QString
coord
;
QStringList
coords
;
// Drop home position
bool
dropPoint
=
true
;
for
(
const
auto
&
item
:
missionItens
)
{
if
(
dropPoint
)
{
dropPoint
=
false
;
continue
;
}
const
MissionCommandUIInfo
*
uiInfo
=
\
qgcApp
()
->
toolbox
()
->
missionCommandTree
()
->
getUIInfo
(
_controllerVehicle
,
item
->
command
());
if
(
uiInfo
&&
uiInfo
->
specifiesCoordinate
()
&&
!
uiInfo
->
isStandaloneCoordinate
())
{
coord
=
QString
::
number
(
item
->
param6
())
\
+
","
\
+
QString
::
number
(
item
->
param5
())
\
+
","
\
+
QString
::
number
(
item
->
param7
()
+
altitude
);
coords
.
append
(
coord
);
}
}
Kml
kml
;
kml
.
points
(
coords
);
kml
.
save
(
document
);
}
void
MissionController
::
sendItemsToVehicle
(
Vehicle
*
vehicle
,
QmlObjectListModel
*
visualMissionItems
)
{
if
(
vehicle
)
{
...
...
src/MissionManager/MissionController.h
View file @
f55d443a
...
...
@@ -26,6 +26,7 @@ class MissionSettingsItem;
class
AppSettings
;
class
MissionManager
;
class
SimpleMissionItem
;
class
QDomDocument
;
Q_DECLARE_LOGGING_CATEGORY
(
MissionControllerLog
)
...
...
@@ -125,6 +126,9 @@ public:
void
managerVehicleChanged
(
Vehicle
*
managerVehicle
)
final
;
bool
showPlanFromManagerVehicle
(
void
)
final
;
// Create KML file
void
convertToKMLDocument
(
QDomDocument
&
document
);
// Property accessors
QmlObjectListModel
*
visualItems
(
void
)
{
return
_visualItems
;
}
...
...
src/MissionManager/PlanMasterController.cc
View file @
f55d443a
...
...
@@ -14,7 +14,9 @@
#include "AppSettings.h"
#include "JsonHelper.h"
#include "MissionManager.h"
#include "KML.h"
#include <QDomDocument>
#include <QJsonDocument>
#include <QFileInfo>
...
...
@@ -372,6 +374,30 @@ void PlanMasterController::saveToFile(const QString& filename)
}
}
void
PlanMasterController
::
saveToKml
(
const
QString
&
filename
)
{
if
(
filename
.
isEmpty
())
{
return
;
}
QString
kmlFilename
=
filename
;
if
(
!
QFileInfo
(
filename
).
fileName
().
contains
(
"."
))
{
kmlFilename
+=
QString
(
".%1"
).
arg
(
kmlFileExtension
());
}
QFile
file
(
kmlFilename
);
if
(
!
file
.
open
(
QIODevice
::
WriteOnly
|
QIODevice
::
Text
))
{
qgcApp
()
->
showMessage
(
tr
(
"KML save error %1 : %2"
).
arg
(
filename
).
arg
(
file
.
errorString
()));
}
else
{
QDomDocument
domDocument
;
_missionController
.
convertToKMLDocument
(
domDocument
);
QTextStream
stream
(
&
file
);
stream
<<
domDocument
.
toString
();
file
.
close
();
}
}
void
PlanMasterController
::
removeAll
(
void
)
{
_missionController
.
removeAll
();
...
...
@@ -417,6 +443,11 @@ QString PlanMasterController::fileExtension(void) const
return
AppSettings
::
planFileExtension
;
}
QString
PlanMasterController
::
kmlFileExtension
(
void
)
const
{
return
AppSettings
::
kmlFileExtension
;
}
QStringList
PlanMasterController
::
loadNameFilters
(
void
)
const
{
QStringList
filters
;
...
...
@@ -435,6 +466,14 @@ QStringList PlanMasterController::saveNameFilters(void) const
return
filters
;
}
QStringList
PlanMasterController
::
saveKmlFilters
(
void
)
const
{
QStringList
filters
;
filters
<<
tr
(
"KML Files (*.%1)"
).
arg
(
kmlFileExtension
())
<<
tr
(
"All Files (*.*)"
);
return
filters
;
}
void
PlanMasterController
::
sendPlanToVehicle
(
Vehicle
*
vehicle
,
const
QString
&
filename
)
{
// Use a transient PlanMasterController to accomplish this
...
...
src/MissionManager/PlanMasterController.h
View file @
f55d443a
...
...
@@ -43,6 +43,7 @@ public:
///< kml file extension for missions
Q_PROPERTY
(
QStringList
loadNameFilters
READ
loadNameFilters
CONSTANT
)
///< File filter list loading plan files
Q_PROPERTY
(
QStringList
saveNameFilters
READ
saveNameFilters
CONSTANT
)
///< File filter list saving plan files
Q_PROPERTY
(
QStringList
saveKmlFilters
READ
saveKmlFilters
CONSTANT
)
///< File filter list saving KML files
/// Should be called immediately upon Component.onCompleted.
/// @param editMode true: controller being used in Plan view, false: controller being used in Fly view
...
...
@@ -60,6 +61,7 @@ public:
Q_INVOKABLE
void
sendToVehicle
(
void
);
Q_INVOKABLE
void
loadFromFile
(
const
QString
&
filename
);
Q_INVOKABLE
void
saveToFile
(
const
QString
&
filename
);
Q_INVOKABLE
void
saveToKml
(
const
QString
&
filename
);
Q_INVOKABLE
void
removeAll
(
void
);
///< Removes all from controller only, synce required to remove from vehicle
Q_INVOKABLE
void
removeAllFromVehicle
(
void
);
///< Removes all from vehicle and controller
...
...
@@ -73,8 +75,10 @@ public:
bool
dirty
(
void
)
const
;
void
setDirty
(
bool
dirty
);
QString
fileExtension
(
void
)
const
;
QString
kmlFileExtension
(
void
)
const
;
QStringList
loadNameFilters
(
void
)
const
;
QStringList
saveNameFilters
(
void
)
const
;
QStringList
saveKmlFilters
(
void
)
const
;
Vehicle
*
controllerVehicle
(
void
)
{
return
_controllerVehicle
;
}
Vehicle
*
managerVehicle
(
void
)
{
return
_managerVehicle
;
}
...
...
src/PlanView/PlanView.qml
View file @
f55d443a
...
...
@@ -169,6 +169,7 @@ QGCView {
function
saveToSelectedFile
()
{
fileDialog
.
title
=
qsTr
(
"
Save Plan
"
)
fileDialog
.
plan
=
true
fileDialog
.
selectExisting
=
false
fileDialog
.
nameFilters
=
masterController
.
saveNameFilters
fileDialog
.
openForSave
()
...
...
@@ -177,6 +178,14 @@ QGCView {
function
fitViewportToItems
()
{
mapFitFunctions
.
fitMapViewportToMissionItems
()
}
function
saveKmlToSelectedFile
()
{
fileDialog
.
title
=
qsTr
(
"
Save KML
"
)
fileDialog
.
plan
=
false
fileDialog
.
selectExisting
=
false
fileDialog
.
nameFilters
=
masterController
.
saveKmlFilters
fileDialog
.
openForSave
()
}
}
Connections
{
...
...
@@ -228,12 +237,13 @@ QGCView {
QGCFileDialog
{
id
:
fileDialog
qgcView
:
_qgcView
property
var
plan
:
true
folder
:
QGroundControl
.
settingsManager
.
appSettings
.
missionSavePath
fileExtension
:
QGroundControl
.
settingsManager
.
appSettings
.
planFileExtension
fileExtension2
:
QGroundControl
.
settingsManager
.
appSettings
.
missionFileExtension
onAcceptedForSave
:
{
masterController
.
saveToFile
(
file
)
plan
?
masterController
.
saveToFile
(
file
)
:
masterController
.
saveToKml
(
file
)
close
()
}
...
...
@@ -792,6 +802,16 @@ QGCView {
_qgcView
.
showDialog
(
removeAllPromptDialog
,
qsTr
(
"
Remove all
"
),
_qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Yes
|
StandardButton
.
No
)
}
}
QGCButton
{
text
:
qsTr
(
"
Save KML...
"
)
Layout.fillWidth
:
true
enabled
:
!
masterController
.
syncInProgress
onClicked
:
{
dropPanel
.
hide
()
masterController
.
saveKmlToSelectedFile
()
}
}
}
}
}
...
...
src/Settings/AppSettings.cc
View file @
f55d443a
...
...
@@ -44,6 +44,7 @@ const char* AppSettings::waypointsFileExtension = "waypoints";
const
char
*
AppSettings
::
fenceFileExtension
=
"fence"
;
const
char
*
AppSettings
::
rallyPointFileExtension
=
"rally"
;
const
char
*
AppSettings
::
telemetryFileExtension
=
"tlog"
;
const
char
*
AppSettings
::
kmlFileExtension
=
"kml"
;
const
char
*
AppSettings
::
logFileExtension
=
"ulg"
;
const
char
*
AppSettings
::
parameterDirectory
=
"Parameters"
;
...
...
src/Settings/AppSettings.h
View file @
f55d443a
...
...
@@ -52,6 +52,7 @@ public:
Q_PROPERTY
(
QString
waypointsFileExtension
MEMBER
waypointsFileExtension
CONSTANT
)
Q_PROPERTY
(
QString
parameterFileExtension
MEMBER
parameterFileExtension
CONSTANT
)
Q_PROPERTY
(
QString
telemetryFileExtension
MEMBER
telemetryFileExtension
CONSTANT
)
Q_PROPERTY
(
QString
kmlFileExtension
MEMBER
kmlFileExtension
CONSTANT
)
Q_PROPERTY
(
QString
logFileExtension
MEMBER
logFileExtension
CONSTANT
)
Fact
*
offlineEditingFirmwareType
(
void
);
...
...
@@ -115,6 +116,7 @@ public:
static
const
char
*
fenceFileExtension
;
static
const
char
*
rallyPointFileExtension
;
static
const
char
*
telemetryFileExtension
;
static
const
char
*
kmlFileExtension
;
static
const
char
*
logFileExtension
;
// Child directories of savePath for specific file types
...
...
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