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
5f71c60d
Commit
5f71c60d
authored
4 years ago
by
DoinLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove buggy support for generation of incomplete lines
parent
e0614431
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
16 deletions
+14
-16
MissionController.cc
src/MissionManager/MissionController.cc
+14
-16
No files found.
src/MissionManager/MissionController.cc
View file @
5f71c60d
...
@@ -1214,8 +1214,7 @@ void MissionController::_recalcWaypointLines(void)
...
@@ -1214,8 +1214,7 @@ void MissionController::_recalcWaypointLines(void)
bool
foundRTL
=
false
;
bool
foundRTL
=
false
;
bool
homePositionValid
=
_settingsItem
->
coordinate
().
isValid
();
bool
homePositionValid
=
_settingsItem
->
coordinate
().
isValid
();
bool
roiActive
=
false
;
bool
roiActive
=
false
;
bool
setupIncompleteItem
=
false
;
bool
previousItemIsIncomplete
=
false
;
VisualMissionItem
*
startVIForIncompleteItem
=
nullptr
;
qCDebug
(
MissionControllerLog
)
<<
"_recalcWaypointLines homePositionValid"
<<
homePositionValid
;
qCDebug
(
MissionControllerLog
)
<<
"_recalcWaypointLines homePositionValid"
<<
homePositionValid
;
...
@@ -1224,6 +1223,10 @@ void MissionController::_recalcWaypointLines(void)
...
@@ -1224,6 +1223,10 @@ void MissionController::_recalcWaypointLines(void)
_linesTable
.
clear
();
_linesTable
.
clear
();
_waypointPath
.
clear
();
_waypointPath
.
clear
();
// Note: Although visual support _incompleteComplexItemLines is still in the codebase. The support for populating the list is not.
// This is due to the initial implementation being buggy and incomplete with respect to correctly generating the line set.
// So for now we leave the code for displaying them in, but none are ever added until we have time to implement the correct support.
_waypointLines
.
beginReset
();
_waypointLines
.
beginReset
();
_directionArrows
.
beginReset
();
_directionArrows
.
beginReset
();
_incompleteComplexItemLines
.
beginReset
();
_incompleteComplexItemLines
.
beginReset
();
...
@@ -1278,22 +1281,17 @@ void MissionController::_recalcWaypointLines(void)
...
@@ -1278,22 +1281,17 @@ void MissionController::_recalcWaypointLines(void)
if
(
visualItem
->
specifiesCoordinate
()
&&
!
visualItem
->
isStandaloneCoordinate
())
{
if
(
visualItem
->
specifiesCoordinate
()
&&
!
visualItem
->
isStandaloneCoordinate
())
{
// Incomplete items are complex items which are waiting for the user to complete setup before there visuals can become valid.
// Incomplete items are complex items which are waiting for the user to complete setup before there visuals can become valid.
//
For example a Survey which has no polygon set for it yet. For these cases we draw incomplete segment lines so that there
//
They may not yet have valid entry/exit coordinates associated with them while in the incomplete state.
//
isn't a hole in the flight path lines
.
//
For examples a Survey item which has no polygon set yet
.
if
(
complexItem
&&
complexItem
->
isIncomplete
())
{
if
(
complexItem
&&
complexItem
->
isIncomplete
())
{
setupIncompleteItem
=
true
;
// We don't link lines from a valid item to an incomplete item
previousItemIsIncomplete
=
true
;
}
else
if
(
previousItemIsIncomplete
)
{
// We also don't link lines from an incomplete item to a valid item.
previousItemIsIncomplete
=
false
;
firstCoordinateNotFound
=
false
;
lastCoordinateItemBeforeRTL
=
visualItem
;
}
else
{
}
else
{
if
(
setupIncompleteItem
)
{
VisualItemPair
viPair
(
startVIForIncompleteItem
,
visualItem
);
CoordinateVector
*
coordVector
=
_createCoordinateVectorWorker
(
viPair
);
_incompleteComplexItemLines
.
append
(
coordVector
);
startVIForIncompleteItem
=
nullptr
;
setupIncompleteItem
=
false
;
}
else
{
startVIForIncompleteItem
=
visualItem
;
}
if
(
lastCoordinateItemBeforeRTL
!=
_settingsItem
||
(
homePositionValid
&&
linkStartToHome
))
{
if
(
lastCoordinateItemBeforeRTL
!=
_settingsItem
||
(
homePositionValid
&&
linkStartToHome
))
{
bool
addDirectionArrow
=
false
;
bool
addDirectionArrow
=
false
;
if
(
i
!=
1
)
{
if
(
i
!=
1
)
{
...
...
This diff is collapsed.
Click to expand it.
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