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
86ead133
Unverified
Commit
86ead133
authored
Jan 03, 2019
by
Don Gagne
Committed by
GitHub
Jan 03, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7119 from DonLakeFlyer/MissionController
Expose complex item names in a way useful for custom builds
parents
557f7452
5cb7e53c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
MissionController.cc
src/MissionManager/MissionController.cc
+4
-3
MissionController.h
src/MissionManager/MissionController.h
+3
-3
No files found.
src/MissionManager/MissionController.cc
View file @
86ead133
...
...
@@ -56,11 +56,12 @@ const char* MissionController::_jsonMavAutopilotKey = "MAV_AUTOPILOT";
const
int
MissionController
::
_missionFileVersion
=
2
;
const
QString
MissionController
::
patternFWLandingName
(
tr
(
"Fixed Wing Landing"
));
const
QString
MissionController
::
patternStructureScanName
(
tr
(
"Structure Scan"
));
const
QString
MissionController
::
patternCorridorScanName
(
tr
(
"Corridor Scan"
));
MissionController
::
MissionController
(
PlanMasterController
*
masterController
,
QObject
*
parent
)
:
PlanElementController
(
masterController
,
parent
)
,
patternFWLandingName
(
tr
(
"Fixed Wing Landing"
))
,
patternStructureScanName
(
tr
(
"Structure Scan"
))
,
patternCorridorScanName
(
tr
(
"Corridor Scan"
))
,
_missionManager
(
_managerVehicle
->
missionManager
())
,
_missionItemCount
(
0
)
,
_visualItems
(
nullptr
)
...
...
src/MissionManager/MissionController.h
View file @
86ead133
...
...
@@ -196,9 +196,9 @@ public:
// These are the names shown in the UI for the pattern items. They are public so custom builds can remove the ones
// they don't want through the QGCCorePlugin::
QString
patternFWLandingName
;
QString
patternStructureScanName
;
QString
patternCorridorScanName
;
static
const
QString
patternFWLandingName
;
static
const
QString
patternStructureScanName
;
static
const
QString
patternCorridorScanName
;
signals:
void
visualItemsChanged
(
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