fly/flightgear
1
0
Fork 0
Code Activity

Launcher: Fix helipad selection

Browse source
This commit is contained in:
James Turner 2018-07-25 09:27:14 +01:00
parent f3a1c10b24
commit 4395f96b13
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/GUI/LauncherController.cxx
View file

@ -411,7 +411,9 @@ void LauncherController::updateSelectedAircraft()
m_selectedAircraftInfo->setUri(m_selectedAircraft);
QModelIndex index = m_aircraftModel->indexOfAircraftURI(m_selectedAircraft);
if (index.isValid()) {
m_aircraftType = Airplane;
// we have to default to unknown here, until we have an explicit
// way to determine if it's a regular aircraft or not
m_aircraftType = Unknown;
if (index.data(AircraftIsHelicopterRole).toBool()) {
m_aircraftType = Helicopter;
} else if (index.data(AircraftIsSeaplaneRole).toBool()) {

3
src/GUI/LauncherController.hxx
View file

@ -158,7 +158,8 @@ public:
enum AircraftType
{
Airplane = 0,
Unknown = 0,
Airplane,
Seaplane,
Helicopter,
Airship

23
src/GUI/NavaidSearchModel.cxx
View file

@ -115,14 +115,23 @@ public:
addType(FGPositioned::NDB);
}
if (aircraft == LauncherController::Helicopter) {
addType(FGPositioned::HELIPAD);
}
if (aircraft == LauncherController::Seaplane) {
addType(FGPositioned::SEAPORT);
} else {
addType(FGPositioned::AIRPORT);
switch (aircraft) {
case LauncherController::Airplane:
break;
case LauncherController::Helicopter:
addType(FGPositioned::HELIPORT);
break;
case LauncherController::Seaplane:
addType(FGPositioned::SEAPORT);
break;
default:
addType(FGPositioned::HELIPORT);
addType(FGPositioned::SEAPORT);
}
}
};

3
src/GUI/NavaidSearchModel.hxx
View file

@ -54,6 +54,7 @@ public:
enum AircraftType
{
Unknown = LauncherController::Unknown,
Airplane = LauncherController::Airplane,
Seaplane = LauncherController::Seaplane,
Helicopter = LauncherController::Helicopter,
@ -62,7 +63,7 @@ public:
Q_ENUMS(AircraftType)
Q_INVOKABLE void setSearch(QString t, AircraftType aircraft);
Q_INVOKABLE void setSearch(QString t, AircraftType aircraft = Unknown);
Q_INVOKABLE void clear();