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

[Parts] Experimental try with aircraft parts, see https://discordapp.com/channels/539048679160676382/539846348275449887/701438699048796280

Browse Source
This commit is contained in:
Klaus Basan
2020-04-19 17:41:30 +02:00
committed by Mat Sutcliffe
parent 70766beea8
commit 1bdcd4ac9a
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -427,7 +427,23 @@ namespace BlackMisc
// validation in dev.env. // validation in dev.env.
const int attributes = jsonObject.size(); const int attributes = jsonObject.size();
const bool correctCount = (attributes == CAircraftParts::attributesCountFullJson); const bool correctCount = (attributes == CAircraftParts::attributesCountFullJson);
BLACK_VERIFY_X(correctCount, Q_FUNC_INFO, "Wrong full aircraft parts"); BLACK_VERIFY_X(correctCount || !CBuildConfig::isLocalDeveloperDebugBuild(), Q_FUNC_INFO, "Wrong full aircraft parts");
if (!correctCount)
{
CLogMessage(this).warning(u"Wrong full parts attributes, %1 (expected %2)") << attributes << CAircraftParts::attributesCountFullJson;
//! \todo KB 2020-04 ignore? make incremental?
if (attributes < 3)
{
// EXPERIMENTAL
if (attributes < 1) { return; }
// treat as incremental
CLogMessage(this).warning(u"Treating %1 attributes as incremental") << attributes;
parts = this->remoteAircraftParts(callsign).frontOrDefault(); // latest
const QJsonObject config = applyIncrementalObject(parts.toJson(), jsonObject);
parts.convertFromJson(config);
}
}
} }
parts.convertFromJson(jsonObject); parts.convertFromJson(jsonObject);
} }