Unverified Commit 86ead133 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #7119 from DonLakeFlyer/MissionController

Expose complex item names in a way useful for custom builds
parents 557f7452 5cb7e53c
...@@ -56,11 +56,12 @@ const char* MissionController::_jsonMavAutopilotKey = "MAV_AUTOPILOT"; ...@@ -56,11 +56,12 @@ const char* MissionController::_jsonMavAutopilotKey = "MAV_AUTOPILOT";
const int MissionController::_missionFileVersion = 2; 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) MissionController::MissionController(PlanMasterController* masterController, QObject *parent)
: PlanElementController (masterController, parent) : PlanElementController (masterController, parent)
, patternFWLandingName (tr("Fixed Wing Landing"))
, patternStructureScanName (tr("Structure Scan"))
, patternCorridorScanName (tr("Corridor Scan"))
, _missionManager (_managerVehicle->missionManager()) , _missionManager (_managerVehicle->missionManager())
, _missionItemCount (0) , _missionItemCount (0)
, _visualItems (nullptr) , _visualItems (nullptr)
......
...@@ -196,9 +196,9 @@ public: ...@@ -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 // 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:: // they don't want through the QGCCorePlugin::
QString patternFWLandingName; static const QString patternFWLandingName;
QString patternStructureScanName; static const QString patternStructureScanName;
QString patternCorridorScanName; static const QString patternCorridorScanName;
signals: signals:
void visualItemsChanged (void); void visualItemsChanged (void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment