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
f52b6281
Commit
f52b6281
authored
Nov 12, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Signalling fixes
parent
1b382490
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
4 deletions
+8
-4
GeoFenceController.cc
src/MissionManager/GeoFenceController.cc
+3
-2
GeoFenceController.h
src/MissionManager/GeoFenceController.h
+1
-0
GeoFenceManager.cc
src/MissionManager/GeoFenceManager.cc
+1
-1
RallyPointController.cc
src/MissionManager/RallyPointController.cc
+1
-0
RallyPointController.h
src/MissionManager/RallyPointController.h
+1
-0
RallyPointManager.cc
src/MissionManager/RallyPointManager.cc
+1
-1
No files found.
src/MissionManager/GeoFenceController.cc
View file @
f52b6281
...
...
@@ -333,9 +333,9 @@ void GeoFenceController::loadFromVehicle(void)
void
GeoFenceController
::
sendToVehicle
(
void
)
{
if
(
_activeVehicle
->
parameterManager
()
->
parametersReady
()
&&
!
syncInProgress
())
{
setDirty
(
false
);
_polygon
.
setDirty
(
false
);
_activeVehicle
->
geoFenceManager
()
->
sendToVehicle
(
_breachReturnPoint
,
_polygon
.
coordinateList
());
_polygon
.
setDirty
(
false
);
setDirty
(
false
);
}
else
{
qCWarning
(
GeoFenceControllerLog
)
<<
"GeoFenceController::loadFromVehicle call at wrong time"
<<
_activeVehicle
->
parameterManager
()
->
parametersReady
()
<<
syncInProgress
();
}
...
...
@@ -433,6 +433,7 @@ void GeoFenceController::_loadComplete(const QGeoCoordinate& breachReturn, const
_setReturnPointFromManager
(
breachReturn
);
_setPolygonFromManager
(
polygon
);
setDirty
(
false
);
emit
loadComplete
();
}
QString
GeoFenceController
::
fileExtension
(
void
)
const
...
...
src/MissionManager/GeoFenceController.h
View file @
f52b6281
...
...
@@ -78,6 +78,7 @@ signals:
void
paramsChanged
(
QVariantList
params
);
void
paramLabelsChanged
(
QStringList
paramLabels
);
void
editorQmlChanged
(
QString
editorQml
);
void
loadComplete
(
void
);
private
slots
:
void
_polygonDirtyChanged
(
bool
dirty
);
...
...
src/MissionManager/GeoFenceManager.cc
View file @
f52b6281
...
...
@@ -34,7 +34,7 @@ void GeoFenceManager::_sendError(ErrorCode_t errorCode, const QString& errorMsg)
void
GeoFenceManager
::
loadFromVehicle
(
void
)
{
// No geofence support in unknown vehicle
loadComplete
(
QGeoCoordinate
(),
QList
<
QGeoCoordinate
>
());
emit
loadComplete
(
QGeoCoordinate
(),
QList
<
QGeoCoordinate
>
());
}
void
GeoFenceManager
::
sendToVehicle
(
const
QGeoCoordinate
&
breachReturn
,
const
QList
<
QGeoCoordinate
>&
polygon
)
...
...
src/MissionManager/RallyPointController.cc
View file @
f52b6281
...
...
@@ -254,6 +254,7 @@ void RallyPointController::_loadComplete(const QList<QGeoCoordinate> rgPoints)
_points
.
swapObjectList
(
pointList
);
setDirty
(
false
);
_setFirstPointCurrent
();
emit
loadComplete
();
}
QString
RallyPointController
::
fileExtension
(
void
)
const
...
...
src/MissionManager/RallyPointController.h
View file @
f52b6281
...
...
@@ -61,6 +61,7 @@ public:
signals:
void
rallyPointsSupportedChanged
(
bool
rallyPointsSupported
);
void
currentRallyPointChanged
(
QObject
*
rallyPoint
);
void
loadComplete
(
void
);
private
slots
:
void
_loadComplete
(
const
QList
<
QGeoCoordinate
>
rgPoints
);
...
...
src/MissionManager/RallyPointManager.cc
View file @
f52b6281
...
...
@@ -34,7 +34,7 @@ void RallyPointManager::_sendError(ErrorCode_t errorCode, const QString& errorMs
void
RallyPointManager
::
loadFromVehicle
(
void
)
{
// No support in generic vehicle
loadComplete
(
QList
<
QGeoCoordinate
>
());
emit
loadComplete
(
QList
<
QGeoCoordinate
>
());
}
void
RallyPointManager
::
sendToVehicle
(
const
QList
<
QGeoCoordinate
>&
rgPoints
)
...
...
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