flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T730, ATC station value object update

Browse Source
This commit is contained in:
Klaus Basan
2019-09-22 12:32:14 +02:00
committed by Mat Sutcliffe
parent 992d624c18
commit acde5e4f01
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/aviation/atcstation.cpp
View File

@@ -381,6 +381,7 @@ namespace BlackMisc
case IndexAtis: return m_atis.propertyByIndex(index.copyFrontRemoved()); case IndexAtis: return m_atis.propertyByIndex(index.copyFrontRemoved());
case IndexMetar: return m_metar.propertyByIndex(index.copyFrontRemoved()); case IndexMetar: return m_metar.propertyByIndex(index.copyFrontRemoved());
case IndexVoiceRoom: return m_voiceRoom.propertyByIndex(index.copyFrontRemoved()); case IndexVoiceRoom: return m_voiceRoom.propertyByIndex(index.copyFrontRemoved());
case IndexIsAfvCrossCoupled: return CVariant::from(m_isAfvCrossCoupled);
default: default:
return (ICoordinateWithRelativePosition::canHandleIndex(index)) ? return (ICoordinateWithRelativePosition::canHandleIndex(index)) ?
ICoordinateWithRelativePosition::propertyByIndex(index) : ICoordinateWithRelativePosition::propertyByIndex(index) :
@@ -405,6 +406,7 @@ namespace BlackMisc
case IndexAtis: m_atis.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexAtis: m_atis.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexMetar: m_metar.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexMetar: m_metar.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexVoiceRoom: m_voiceRoom.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexVoiceRoom: m_voiceRoom.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexIsAfvCrossCoupled: this->setAfvCrossCoupled(variant.value<bool>()); break;
default: default:
if (ICoordinateWithRelativePosition::canHandleIndex(index)) if (ICoordinateWithRelativePosition::canHandleIndex(index))
{ {
@@ -438,6 +440,7 @@ namespace BlackMisc
case IndexAtis: return m_atis.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getAtis()); case IndexAtis: return m_atis.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getAtis());
case IndexMetar: return m_metar.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getMetar()); case IndexMetar: return m_metar.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getMetar());
case IndexVoiceRoom: return this->getVoiceRoom().getVoiceRoomUrl().compare(compareValue.getVoiceRoom().getVoiceRoomUrl()); case IndexVoiceRoom: return this->getVoiceRoom().getVoiceRoomUrl().compare(compareValue.getVoiceRoom().getVoiceRoomUrl());
case IndexIsAfvCrossCoupled: return Compare::compare(this->isAfvCrossCoupled(), compareValue.isAfvCrossCoupled());
default: default:
if (ICoordinateWithRelativePosition::canHandleIndex(index)) if (ICoordinateWithRelativePosition::canHandleIndex(index))
{ {

9
src/blackmisc/aviation/atcstation.h
View File

@@ -54,6 +54,7 @@ namespace BlackMisc
IndexRange, IndexRange,
IndexIsInRange, IndexIsInRange,
IndexIsOnline, IndexIsOnline,
IndexIsAfvCrossCoupled,
IndexBookedFrom, IndexBookedFrom,
IndexBookedUntil, IndexBookedUntil,
IndexLatitude, IndexLatitude,
@@ -169,6 +170,12 @@ namespace BlackMisc
//! Set online //! Set online
bool setOnline(bool online); bool setOnline(bool online);
//! Is AFV cross coupled?
bool isAfvCrossCoupled() const { return m_isAfvCrossCoupled; }
//! Set AFV cross coupled
void setAfvCrossCoupled(bool coupled) { m_isAfvCrossCoupled = coupled; }
//! Get voice room //! Get voice room
const Audio::CVoiceRoom &getVoiceRoom() const { return m_voiceRoom; } const Audio::CVoiceRoom &getVoiceRoom() const { return m_voiceRoom; }
@@ -280,6 +287,7 @@ namespace BlackMisc
Geo::CCoordinateGeodetic m_position; Geo::CCoordinateGeodetic m_position;
PhysicalQuantities::CLength m_range; PhysicalQuantities::CLength m_range;
bool m_isOnline = false; bool m_isOnline = false;
bool m_isAfvCrossCoupled = false;
QDateTime m_bookedFromUtc; QDateTime m_bookedFromUtc;
QDateTime m_bookedUntilUtc; QDateTime m_bookedUntilUtc;
CInformationMessage m_atis { CInformationMessage::ATIS }; CInformationMessage m_atis { CInformationMessage::ATIS };
@@ -294,6 +302,7 @@ namespace BlackMisc
BLACK_METAMEMBER(position), BLACK_METAMEMBER(position),
BLACK_METAMEMBER(range), BLACK_METAMEMBER(range),
BLACK_METAMEMBER(isOnline), BLACK_METAMEMBER(isOnline),
BLACK_METAMEMBER(isAfvCrossCoupled),
BLACK_METAMEMBER(bookedFromUtc), BLACK_METAMEMBER(bookedFromUtc),
BLACK_METAMEMBER(bookedUntilUtc), BLACK_METAMEMBER(bookedUntilUtc),
BLACK_METAMEMBER(atis), BLACK_METAMEMBER(atis),