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

Set correct model type and added model type "TypeReverseLookup"

Browse Source
This commit is contained in:
Klaus Basan
2018-11-17 23:07:50 +01:00
parent 8439f19ca3
commit 0ab4a18bda
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackcore/aircraftmatcher.cpp
View File

@@ -252,10 +252,10 @@ namespace BlackCore
// copy over callsign validate // copy over callsign validate
matchedModel.setCallsign(remoteAircraft.getCallsign()); matchedModel.setCallsign(remoteAircraft.getCallsign());
matchedModel.setModelType(CAircraftModel::TypeModelMatching);
Q_ASSERT_X(!matchedModel.getCallsign().isEmpty(), Q_FUNC_INFO, "Missing callsign"); Q_ASSERT_X(!matchedModel.getCallsign().isEmpty(), Q_FUNC_INFO, "Missing callsign");
Q_ASSERT_X(matchedModel.hasModelString(), Q_FUNC_INFO, "Missing model string"); Q_ASSERT_X(matchedModel.hasModelString(), Q_FUNC_INFO, "Missing model string");
Q_ASSERT_X(matchedModel.getModelType() != CAircraftModel::TypeUnknown, Q_FUNC_INFO, "Missing model type");
const QDateTime endTime = QDateTime::currentDateTimeUtc(); const QDateTime endTime = QDateTime::currentDateTimeUtc();
const qint64 matchingTime = startTime.msecsTo(endTime); const qint64 matchingTime = startTime.msecsTo(endTime);
@@ -271,6 +271,7 @@ namespace BlackCore
CAircraftModel model(networkModelString, type, "", networkAircraftIcao, livery); CAircraftModel model(networkModelString, type, "", networkAircraftIcao, livery);
model.setCallsign(callsign); model.setCallsign(callsign);
model = CAircraftMatcher::reverseLookupModel(model, networkLiveryInfo, log); model = CAircraftMatcher::reverseLookupModel(model, networkLiveryInfo, log);
model.setModelType(CAircraftModel::TypeReverseLookup);
return model; return model;
} }
@@ -434,6 +435,7 @@ namespace BlackCore
} }
} }
model.setCallsign(callsign); model.setCallsign(callsign);
model.setModelType(CAircraftModel::TypeReverseLookup);
return model; return model;
} }
@@ -453,6 +455,7 @@ namespace BlackCore
} }
} }
model.setCallsign(callsign); model.setCallsign(callsign);
model.setModelType(CAircraftModel::TypeReverseLookup);
return model; return model;
} }

14
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -792,18 +792,20 @@ namespace BlackMisc
static const QString set("manually set"); static const QString set("manually set");
static const QString fsinn("FSInn"); static const QString fsinn("FSInn");
static const QString probe("probe"); static const QString probe("probe");
static const QString reverse("reverse lookup");
static const QString unknown("unknown"); static const QString unknown("unknown");
switch (type) switch (type)
{ {
case TypeQueriedFromNetwork: return queried; case TypeQueriedFromNetwork: return queried;
case TypeModelMatching: return matching; case TypeModelMatching: return matching;
case TypeDatabaseEntry: return db; case TypeDatabaseEntry: return db;
case TypeManuallySet: return set;
case TypeFSInnData: return fsinn;
case TypeTerrainProbe: return probe;
case TypeReverseLookup: return reverse;
case TypeOwnSimulatorModel: return ownSim;
case TypeModelMatchingDefaultModel: return def; case TypeModelMatchingDefaultModel: return def;
case TypeOwnSimulatorModel: return ownSim;
case TypeManuallySet: return set;
case TypeFSInnData: return fsinn;
case TypeTerrainProbe: return probe;
case TypeUnknown: case TypeUnknown:
default: return unknown; default: return unknown;
} }

1
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -75,6 +75,7 @@ namespace BlackMisc
TypeUnknown, TypeUnknown,
TypeQueriedFromNetwork, //!< model was queried by network protocol TypeQueriedFromNetwork, //!< model was queried by network protocol
TypeFSInnData, //!< model based on FSD ICAO data TypeFSInnData, //!< model based on FSD ICAO data
TypeReverseLookup, //!< reverse lookup model
TypeModelMatching, //!< model is result of model matching TypeModelMatching, //!< model is result of model matching
TypeModelMatchingDefaultModel, //!< a default model assigned by model matching TypeModelMatchingDefaultModel, //!< a default model assigned by model matching
TypeDatabaseEntry, //!< used along with mapping definition TypeDatabaseEntry, //!< used along with mapping definition