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

refs #192, enable value objects for JSON:

Browse Source 
* from/toJson methods
* jsonMembers where applicable
This commit is contained in:
Klaus Basan
2014-03-26 18:44:17 +01:00
parent 586e1e4053
commit 88fb9e8832
47 changed files with 910 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/blackmisc/mathvector3dbase.cpp
View File

@@ -151,26 +151,24 @@ namespace BlackMisc
return CMatrix3x1(this->m_i, this->m_j, this->m_k);
}
/*!
* \brief Stream to DBus
* \param argument
/*
* Stream to DBus
*/
template <class ImplVector> void CVector3DBase<ImplVector>::marshallToDbus(QDBusArgument &argument) const
{
argument << TupleConverter<CVector3DBase>::toTuple(*this);
}
/*!
* \brief Stream from DBus
* \param argument
/*
* Stream from DBus
*/
template <class ImplVector> void CVector3DBase<ImplVector>::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> TupleConverter<CVector3DBase>::toTuple(*this);
}
/*!
* \copydoc CValueObject::getValueHash()
/*
* getValueHash()
*/
template <class ImplVector> uint CVector3DBase<ImplVector>::getValueHash() const
{
@@ -190,6 +188,61 @@ namespace BlackMisc
qDBusRegisterMetaType<ImplVector>();
}
/*
* To JSON
*/
template <class ImplVector> QJsonObject CVector3DBase<ImplVector>::toJson() const
{
QJsonObject json;
QJsonArray jsonArray;
jsonArray.append(QJsonValue(this->m_i));
jsonArray.append(QJsonValue(this->m_j));
jsonArray.append(QJsonValue(this->m_k));
json.insert("vector", QJsonValue(jsonArray));
return json;
}
/*
* From Json
*/
template <class ImplVector> void CVector3DBase<ImplVector>::fromJson(const QJsonObject &json)
{
QJsonArray jsonArray = json.value("vector").toArray();
this->m_i = jsonArray.at(0).toDouble();
this->m_i = jsonArray.at(1).toDouble();
this->m_i = jsonArray.at(2).toDouble();
}
/*
* To JSON
*/
template <class ImplMatrix, int Rows, int Columns> QJsonObject CMatrixBase<ImplMatrix, Rows, Columns>::toJson() const
{
QJsonObject json;
QJsonArray jsonArray;
foreach(double v, this->toList())
{
jsonArray.append(QJsonValue(v));
}
json.insert("matrix", QJsonValue(jsonArray));
return json;
}
/*
* From Json
*/
template <class ImplMatrix, int Rows, int Columns> void CMatrixBase<ImplMatrix, Rows, Columns>::fromJson(const QJsonObject &json)
{
QJsonArray jsonArray = json.value("matrix").toArray();
QList<double> list;
for (auto i = jsonArray.begin(); i != jsonArray.end(); ++i)
{
list.append((*i).toDouble());
}
this->fromList(list);
}
// see here for the reason of thess forward instantiations
// http://www.parashift.com/c++-faq/separate-template-class-defn-from-decl.html
template class CVector3DBase<CVector3D>;