flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 01:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed missing compare index, message placeholder, and minor style fixes

Browse Source
This commit is contained in:
Klaus Basan
2019-11-09 15:10:29 +01:00
committed by Mat Sutcliffe
parent be9e2a37f3
commit 11187870de
3 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/blackmisc/simulation/simulatedaircraft.cpp
View File

@@ -345,16 +345,16 @@ namespace BlackMisc
case IndexNetworkModelAircraftIcaoDifference: return this->getNetworkModelAircraftIcaoDifference();
case IndexNetworkModelAirlineIcaoDifference: return this->getNetworkModelAirlineIcaoDifference();
case IndexNetworkModelLiveryDifference: return this->getNetworkModelLiveryDifference();
case IndexEnabled: return CVariant::fromValue(this->isEnabled());
case IndexEnabled: return CVariant::fromValue(this->isEnabled());
case IndexRendered: return CVariant::fromValue(this->isRendered());
case IndexPartsSynchronized: return CVariant::fromValue(this->isPartsSynchronized());
case IndexFastPositionUpdates: return CVariant::fromValue(this->fastPositionUpdates());
case IndexSupportsGndFlag: return CVariant::fromValue(this->isSupportingGndFlag());
case IndexCallsign: return m_callsign.propertyByIndex(index.copyFrontRemoved());
case IndexPilot: return m_pilot.propertyByIndex(index.copyFrontRemoved());
case IndexPilot: return m_pilot.propertyByIndex(index.copyFrontRemoved());
case IndexRelativeDistance: return m_relativeDistance.propertyByIndex(index.copyFrontRemoved());
case IndexCom1System: return m_com1system.propertyByIndex(index.copyFrontRemoved());
case IndexCom2System: return m_com2system.propertyByIndex(index.copyFrontRemoved());
case IndexCom1System: return m_com1system.propertyByIndex(index.copyFrontRemoved());
case IndexCom2System: return m_com2system.propertyByIndex(index.copyFrontRemoved());
case IndexTransponder: return m_transponder.propertyByIndex(index.copyFrontRemoved());
case IndexSituation: return m_situation.propertyByIndex(index.copyFrontRemoved());
case IndexAircraftIcaoCode: return this->getAircraftIcaoCode().propertyByIndex(index.copyFrontRemoved());
@@ -379,17 +379,17 @@ namespace BlackMisc
case IndexCallsign: m_callsign.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexPilot: m_pilot.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexRelativeDistance: m_relativeDistance.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexCom1System: m_com1system.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexCom2System: m_com2system.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexTransponder: m_transponder.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexSituation: m_situation.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexParts: m_parts.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexCom1System: m_com1system.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexCom2System: m_com2system.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexTransponder: m_transponder.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexSituation: m_situation.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexParts: m_parts.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexNetworkModel: m_models[NetworkModel].setPropertyByIndex(index.copyFrontRemoved(), variant); break;
case IndexEnabled: m_enabled = variant.toBool(); break;
case IndexRendered: m_rendered = variant.toBool(); break;
case IndexPartsSynchronized: m_partsSynchronized = variant.toBool(); break;
case IndexEnabled: m_enabled = variant.toBool(); break;
case IndexRendered: m_rendered = variant.toBool(); break;
case IndexPartsSynchronized: m_partsSynchronized = variant.toBool(); break;
case IndexFastPositionUpdates: m_fastPositionUpdates = variant.toBool(); break;
case IndexSupportsGndFlag: m_supportsGndFlag = variant.toBool(); break;
case IndexSupportsGndFlag: m_supportsGndFlag = variant.toBool(); break;
case IndexLivery: Q_ASSERT_X(false, Q_FUNC_INFO, "Unsupported"); break;
case IndexModel:
m_models[CurrentModel].setPropertyByIndex(index.copyFrontRemoved(), variant);
@@ -414,24 +414,25 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexCallsign: return m_callsign.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCallsign());
case IndexPilot: return m_pilot.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getPilot());
case IndexCallsign: return m_callsign.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCallsign());
case IndexPilot: return m_pilot.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getPilot());
case IndexSituation: return m_situation.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getSituation());
case IndexRelativeDistance: return m_relativeDistance.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getRelativeDistance());
case IndexCom1System: return m_com1system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom1System());
case IndexCom2System: return m_com2system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom2System());
case IndexCom1System: return m_com1system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom1System());
case IndexCom2System: return m_com2system.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCom2System());
case IndexTransponder: return Compare::compare(m_transponder.getTransponderCode(), compareValue.getTransponder().getTransponderCode());
case IndexLivery: return this->getLivery().comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getLivery());
case IndexParts: return m_parts.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getParts());
case IndexModel: return m_models[CurrentModel].comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getModel());
case IndexParts: return m_parts.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getParts());
case IndexModel: return m_models[CurrentModel].comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getModel());
case IndexNetworkModel: return m_models[NetworkModel].comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getModel());
case IndexNetworkModelAircraftIcaoDifference: return this->getNetworkModelAircraftIcaoDifference().compare(compareValue.getNetworkModelAircraftIcaoDifference());
case IndexNetworkModelAirlineIcaoDifference: return this->getNetworkModelAirlineIcaoDifference().compare(compareValue.getNetworkModelAirlineIcaoDifference());
case IndexNetworkModelLiveryDifference: return this->getNetworkModelLiveryDifference().compare(compareValue.getNetworkModelLiveryDifference());
case IndexRendered: return Compare::compare(m_rendered, compareValue.isRendered());
case IndexPartsSynchronized: return Compare::compare(m_partsSynchronized, compareValue.isPartsSynchronized());
case IndexFastPositionUpdates: return Compare::compare(m_fastPositionUpdates, compareValue.fastPositionUpdates());
case IndexSupportsGndFlag: return Compare::compare(m_supportsGndFlag, compareValue.isSupportingGndFlag());
case IndexNetworkModelAirlineIcaoDifference: return this->getNetworkModelAirlineIcaoDifference().compare(compareValue.getNetworkModelAirlineIcaoDifference());
case IndexNetworkModelLiveryDifference: return this->getNetworkModelLiveryDifference().compare(compareValue.getNetworkModelLiveryDifference());
case IndexEnabled: return Compare::compare(this->isEnabled(), compareValue.isEnabled());
case IndexRendered: return Compare::compare(this->isRendered(), compareValue.isRendered());
case IndexPartsSynchronized: return Compare::compare(this->isPartsSynchronized(), compareValue.isPartsSynchronized());
case IndexFastPositionUpdates: return Compare::compare(this->fastPositionUpdates(), compareValue.fastPositionUpdates());
case IndexSupportsGndFlag: return Compare::compare(this->isSupportingGndFlag(), compareValue.isSupportingGndFlag());
case IndexCombinedIcaoLiveryString: return this->getCombinedIcaoLiveryString(false).compare(compareValue.getCombinedIcaoLiveryString(false));
case IndexCombinedIcaoLiveryStringNetworkModel: return this->getCombinedIcaoLiveryString(true).compare(compareValue.getCombinedIcaoLiveryString(true));
default: