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
968d9486
Commit
968d9486
authored
Mar 03, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for "All commands" category
parent
25ca15d1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
MissionCommandTree.cc
src/MissionManager/MissionCommandTree.cc
+3
-1
MissionCommandTree.h
src/MissionManager/MissionCommandTree.h
+5
-5
No files found.
src/MissionManager/MissionCommandTree.cc
View file @
968d9486
...
...
@@ -23,6 +23,7 @@
MissionCommandTree
::
MissionCommandTree
(
QGCApplication
*
app
,
bool
unitTest
)
:
QGCTool
(
app
)
,
_allCommandsCategory
(
tr
(
"All commands"
))
,
_settingsManager
(
NULL
)
,
_unitTest
(
unitTest
)
{
...
...
@@ -168,6 +169,7 @@ void MissionCommandTree::_buildAvailableCommands(Vehicle* vehicle)
_availableCategories
[
baseFirmwareType
][
baseVehicleType
].
append
(
newCategory
);
}
}
_availableCategories
[
baseFirmwareType
][
baseVehicleType
].
append
(
_allCommandsCategory
);
}
QStringList
MissionCommandTree
::
_availableCategoriesForVehicle
(
Vehicle
*
vehicle
)
...
...
@@ -238,7 +240,7 @@ QVariantList MissionCommandTree::getCommandsForCategory(Vehicle* vehicle, const
QMap
<
MAV_CMD
,
MissionCommandUIInfo
*>
commandMap
=
_availableCommands
[
baseFirmwareType
][
baseVehicleType
];
foreach
(
MAV_CMD
command
,
commandMap
.
keys
())
{
MissionCommandUIInfo
*
uiInfo
=
commandMap
[
command
];
if
(
uiInfo
->
category
()
==
category
)
{
if
(
uiInfo
->
category
()
==
category
||
category
==
_allCommandsCategory
)
{
list
.
append
(
QVariant
::
fromValue
(
uiInfo
));
}
}
...
...
src/MissionManager/MissionCommandTree.h
View file @
968d9486
...
...
@@ -76,8 +76,10 @@ private:
void
_baseVehicleInfo
(
Vehicle
*
vehicle
,
MAV_AUTOPILOT
&
baseFirmwareType
,
MAV_TYPE
&
baseVehicleType
)
const
;
private:
/// List of all known command ids (not vehicle specific)
QList
<
int
>
_allCommandIds
;
QString
_allCommandsCategory
;
///< Category which contains all available commands
QList
<
int
>
_allCommandIds
;
///< List of all known command ids (not vehicle specific)
SettingsManager
*
_settingsManager
;
bool
_unitTest
;
///< true: running in unit test mode
/// Full hierarchy
QMap
<
MAV_AUTOPILOT
,
QMap
<
MAV_TYPE
,
MissionCommandList
*>>
_staticCommandTree
;
...
...
@@ -88,8 +90,6 @@ private:
/// Collapsed hierarchy for specific vehicle type
QMap
<
MAV_AUTOPILOT
,
QMap
<
MAV_TYPE
,
QStringList
>>
_availableCategories
;
SettingsManager
*
_settingsManager
;
bool
_unitTest
;
///< true: running in unit test mode
#ifdef UNITTEST_BUILD
friend
class
MissionCommandTreeTest
;
...
...
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