flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-11 23:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T265, Ref T430, Ref T473 DB model changes/JSON changes

Browse Source
This commit is contained in:
Klaus Basan
2018-12-16 22:31:22 +01:00
committed by Mat Sutcliffe
parent a40e37e59b
commit 7ded12a965
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,13 +9,13 @@
#include "matchingutils.h" #include "matchingutils.h"
#include "aircraftmodel.h" #include "aircraftmodel.h"
#include "blackmisc/compare.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/db/datastoreutility.h" #include "blackmisc/db/datastoreutility.h"
#include "blackmisc/comparefunctions.h"
#include "blackmisc/fileutils.h" #include "blackmisc/fileutils.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h" #include "blackmisc/logcategorylist.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include "blackmisc/compare.h"
#include "blackmisc/verify.h" #include "blackmisc/verify.h"
#include <QJsonDocument> #include <QJsonDocument>
@@ -28,6 +28,7 @@
#include <QFileInfo> #include <QFileInfo>
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Db; using namespace BlackMisc::Db;
namespace BlackMisc namespace BlackMisc
@@ -77,7 +78,16 @@ namespace BlackMisc
obj.insert("name", this->getName()); obj.insert("name", this->getName());
obj.insert("modelstring", QJsonValue(m_modelString)); obj.insert("modelstring", QJsonValue(m_modelString));
obj.insert("description", QJsonValue(m_description)); obj.insert("description", QJsonValue(m_description));
obj.insert("version", QJsonValue(m_version));
obj.insert("mode", QJsonValue(getModelModeAsString().left(1).toUpper())); // clazy:exclude=qstring-left obj.insert("mode", QJsonValue(getModelModeAsString().left(1).toUpper())); // clazy:exclude=qstring-left
if (m_cg.isNull())
{
obj.insert("cgft", QJsonValue()); // null value
}
else
{
obj.insert("cgft", QJsonValue(m_cg.value(CLengthUnit::ft())));
}
// sims // sims
const CSimulatorInfo sim(getSimulator()); const CSimulatorInfo sim(getSimulator());
@@ -89,6 +99,8 @@ namespace BlackMisc
obj.insert("simfs9", QJsonValue(flag)); obj.insert("simfs9", QJsonValue(flag));
flag = CDatastoreUtility::boolToDbYN(sim.isXPlane()); flag = CDatastoreUtility::boolToDbYN(sim.isXPlane());
obj.insert("simxplane", QJsonValue(flag)); obj.insert("simxplane", QJsonValue(flag));
flag = CDatastoreUtility::boolToDbYN(sim.isFG());
obj.insert("simfg", QJsonValue(flag));
// foreign keys // foreign keys
obj.insert("iddistributor", this->getDistributor().getDbKeyAsJsonValue()); obj.insert("iddistributor", this->getDistributor().getDbKeyAsJsonValue());