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
deb279bf
Commit
deb279bf
authored
Jun 17, 2016
by
Nate Weibley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct camelCase
parent
970e41aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
MissionController.cc
src/MissionManager/MissionController.cc
+6
-6
MissionController.h
src/MissionManager/MissionController.h
+1
-1
No files found.
src/MissionManager/MissionController.cc
View file @
deb279bf
...
...
@@ -616,8 +616,8 @@ void MissionController::_recalcWaypointLines(void)
qCDebug
(
MissionControllerLog
)
<<
"_recalcWaypointLines"
;
CoordVectHashTable
old_table
=
_lines
_t
able
;
_lines
_t
able
.
clear
();
CoordVectHashTable
old_table
=
_lines
T
able
;
_lines
T
able
.
clear
();
_waypointLines
.
clear
();
bool
linkBackToHome
=
false
;
...
...
@@ -639,7 +639,7 @@ void MissionController::_recalcWaypointLines(void)
if
(
lastCoordinateItem
!=
homeItem
||
(
showHomePosition
&&
linkBackToHome
))
{
if
(
old_table
.
contains
(
pair
))
{
// Do nothing, this segment already exists and is wired up
_lines
_t
able
[
pair
]
=
old_table
.
take
(
pair
);
_lines
T
able
[
pair
]
=
old_table
.
take
(
pair
);
}
else
{
// Create a new segment and wire update notifiers
auto
linevect
=
new
CoordinateVector
(
lastCoordinateItem
->
isSimpleItem
()
?
lastCoordinateItem
->
coordinate
()
:
lastCoordinateItem
->
exitCoordinate
(),
item
->
coordinate
(),
this
);
...
...
@@ -652,7 +652,7 @@ void MissionController::_recalcWaypointLines(void)
// FIXME: We should ideally have signals for 2D position change, alt change, and 3D position change
// Not optimal, but still pretty fast, do a full update of range/bearing/altitudes
connect
(
item
,
&
VisualMissionItem
::
coordinateChanged
,
this
,
&
MissionController
::
_recalcAltitudeRangeBearing
);
_lines
_t
able
[
pair
]
=
linevect
;
_lines
T
able
[
pair
]
=
linevect
;
}
}
lastCoordinateItem
=
item
;
...
...
@@ -664,8 +664,8 @@ void MissionController::_recalcWaypointLines(void)
{
// Create a temporary QObjectList and replace the model data
QObjectList
objs
;
objs
.
reserve
(
_lines
_t
able
.
count
());
foreach
(
CoordinateVector
*
vect
,
_lines
_t
able
.
values
())
{
objs
.
reserve
(
_lines
T
able
.
count
());
foreach
(
CoordinateVector
*
vect
,
_lines
T
able
.
values
())
{
objs
.
append
(
vect
);
}
...
...
src/MissionManager/MissionController.h
View file @
deb279bf
...
...
@@ -117,7 +117,7 @@ private:
QmlObjectListModel
*
_visualItems
;
QmlObjectListModel
*
_complexItems
;
QmlObjectListModel
_waypointLines
;
CoordVectHashTable
_lines
_t
able
;
CoordVectHashTable
_lines
T
able
;
Vehicle
*
_activeVehicle
;
bool
_autoSync
;
bool
_firstItemsFromVehicle
;
...
...
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