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
01179ac0
Commit
01179ac0
authored
Apr 12, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dirty bit after removeAll
parent
576d339f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
17 deletions
+2
-17
MissionController.cc
src/MissionManager/MissionController.cc
+2
-16
MissionController.h
src/MissionManager/MissionController.h
+0
-1
No files found.
src/MissionManager/MissionController.cc
View file @
01179ac0
...
...
@@ -1255,7 +1255,7 @@ void MissionController::_initAllVisualItems(void)
_recalcAll
();
connect
(
_visualItems
,
&
QmlObjectListModel
::
dirtyChanged
,
this
,
&
MissionController
::
_visualItemsD
irtyChanged
);
connect
(
_visualItems
,
&
QmlObjectListModel
::
dirtyChanged
,
this
,
&
MissionController
::
d
irtyChanged
);
connect
(
_visualItems
,
&
QmlObjectListModel
::
countChanged
,
this
,
&
MissionController
::
_updateContainsItems
);
emit
visualItemsChanged
();
...
...
@@ -1274,7 +1274,7 @@ void MissionController::_deinitAllVisualItems(void)
_deinitVisualItem
(
qobject_cast
<
VisualMissionItem
*>
(
_visualItems
->
get
(
i
)));
}
disconnect
(
_visualItems
,
&
QmlObjectListModel
::
dirtyChanged
,
this
,
&
MissionController
::
_visualItemsD
irtyChanged
);
disconnect
(
_visualItems
,
&
QmlObjectListModel
::
dirtyChanged
,
this
,
&
MissionController
::
d
irtyChanged
);
disconnect
(
_visualItems
,
&
QmlObjectListModel
::
countChanged
,
this
,
&
MissionController
::
_updateContainsItems
);
}
...
...
@@ -1586,20 +1586,6 @@ QStringList MissionController::complexMissionItemNames(void) const
return
complexItems
;
}
void
MissionController
::
_visualItemsDirtyChanged
(
bool
dirty
)
{
if
(
dirty
)
{
if
(
_visualItems
->
count
()
>
1
)
{
emit
dirtyChanged
(
true
);
}
else
{
// This was a change to mission settings with no other mission items added
_visualItems
->
setDirty
(
false
);
}
}
else
{
emit
dirtyChanged
(
false
);
}
}
void
MissionController
::
resumeMission
(
int
resumeIndex
)
{
if
(
!
_activeVehicle
->
firmwarePlugin
()
->
sendHomePositionToVehicle
())
{
...
...
src/MissionManager/MissionController.h
View file @
01179ac0
...
...
@@ -171,7 +171,6 @@ private slots:
void
_recalcWaypointLines
(
void
);
void
_recalcMissionFlightStatus
(
void
);
void
_updateContainsItems
(
void
);
void
_visualItemsDirtyChanged
(
bool
dirty
);
private:
void
_init
(
void
);
...
...
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