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

refs #413 Decomposed json-related functions of CValueObject into Mixin::JsonByTuple.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-03 20:00:45 +01:00
parent 30cc7048ac
commit 64e21b0a46
8 changed files with 146 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/aviation/aircraftenginelist.h
View File

@@ -48,10 +48,10 @@ namespace BlackMisc
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
QJsonObject toJson() const;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
void convertFromJson(const QJsonObject &json);
//! Register metadata
static void registerMetadata();

4
src/blackmisc/containerbase.h
View File

@@ -122,7 +122,7 @@ namespace BlackMisc
friend uint qHash(const C<T> &) { return 0; }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override
QJsonObject toJson() const
{
QJsonArray array;
QJsonObject json;
@@ -135,7 +135,7 @@ namespace BlackMisc
}
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override
void convertFromJson(const QJsonObject &json)
{
QJsonArray array = json.value("containerbase").toArray();
for (auto i = array.begin(); i != array.end(); ++i)

4
src/blackmisc/dictionary.h
View File

@@ -233,7 +233,7 @@ namespace BlackMisc
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override
QJsonObject toJson() const
{
QJsonArray array;
QJsonObject json;
@@ -247,7 +247,7 @@ namespace BlackMisc
}
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override
void convertFromJson(const QJsonObject &json)
{
QJsonArray array = json.value("associativecontainerbase").toArray();
for (auto it = array.begin(); it != array.end(); ++it)

4
src/blackmisc/pq/physicalquantity.h
View File

@@ -205,10 +205,10 @@ namespace BlackMisc
friend uint qHash(const PQ &pq) { return pq.getValueHash(); };
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
QJsonObject toJson() const;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
void convertFromJson(const QJsonObject &json);
//! Parse to string, with specified separator
virtual void parseFromString(const QString &value, CPqString::SeparatorMode mode);

3
src/blackmisc/simulation/simulatorplugininfo.h
View File

@@ -42,7 +42,8 @@ namespace BlackMisc
//! Default constructor
CSimulatorPluginInfo() = default;
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc BlackMisc::CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json);
//! Unspecified simulator
bool isUnspecified() const;

191
src/blackmisc/valueobject.h
View File

@@ -105,18 +105,6 @@ namespace BlackMisc
//! Dummy comparison.
inline int compare(const CEmpty &, const CEmpty &) { return 0; }
/*!
* Terminating base cases for the recursive methods of CValueObject.
*/
struct CValueObjectDummyBase
{
//! To JSON
static QJsonObject toJson() { return {}; }
//! From JSON
static void convertFromJson(const QJsonObject &) {}
};
/*!
* Default policy classes for use by CValueObject.
*
@@ -353,6 +341,130 @@ namespace BlackMisc
static void baseUnmarshall(CEmpty &, const QDBusArgument &) {}
};
/*!
* CRTP class template from which a derived class can inherit common methods dealing with JSON by metatuple.
*/
template <class Derived, bool IsTupleBased = true>
class JsonByTuple : private Private::EncapsulationBreaker
{
public:
//! operator >> for JSON
friend const QJsonObject &operator>>(const QJsonObject &json, Derived &obj)
{
obj.convertFromJson(json);
return json;
}
//! operator >> for JSON
friend const QJsonValue &operator>>(const QJsonValue &json, Derived &obj)
{
obj.convertFromJson(json.toObject());
return json;
}
//! operator >> for JSON
friend const QJsonValueRef &operator>>(const QJsonValueRef &json, Derived &obj)
{
obj.convertFromJson(json.toObject());
return json;
}
//! operator << for JSON
friend QJsonArray &operator<<(QJsonArray &json, const Derived &obj)
{
json.append(obj.toJson());
return json;
}
//! operator << for JSON
friend QJsonObject &operator<<(QJsonObject &json, const std::pair<QString, const Derived &> &value)
{
json.insert(value.first, QJsonValue(value.second.toJson()));
return json;
}
//! Cast to JSON object
QJsonObject toJson() const
{
QJsonObject json = BlackMisc::serializeJson(Private::EncapsulationBreaker::toMetaTuple(*derived()));
return Json::appendJsonObject(json, baseToJson(static_cast<const typename Derived::base_type &>(*derived())));
}
//! Assign from JSON object
void convertFromJson(const QJsonObject &json)
{
baseConvertFromJson(static_cast<typename Derived::base_type &>(*derived()), json);
BlackMisc::deserializeJson(json, Private::EncapsulationBreaker::toMetaTuple(*derived()));
}
private:
const Derived *derived() const { return static_cast<const Derived *>(this); }
Derived *derived() { return static_cast<Derived *>(this); }
template <typename T> static QJsonObject baseToJson(const T &base) { return base.toJson(); }
template <typename T> static void baseConvertFromJson(T &base, const QJsonObject &json) { base.convertFromJson(json); }
static QJsonObject baseToJson(const CEmpty &) { return {}; }
static void baseConvertFromJson(CEmpty &, const QJsonObject &) {}
};
/*!
* Specialization of JsonByTuple for classes not registered with the tuple system.
*/
template <class Derived>
class JsonByTuple<Derived, false>
{
public:
//! operator >> for JSON
friend const QJsonObject &operator>>(const QJsonObject &json, Derived &obj)
{
obj.convertFromJson(json);
return json;
}
//! operator >> for JSON
friend const QJsonValue &operator>>(const QJsonValue &json, Derived &obj)
{
obj.convertFromJson(json.toObject());
return json;
}
//! operator >> for JSON
friend const QJsonValueRef &operator>>(const QJsonValueRef &json, Derived &obj)
{
obj.convertFromJson(json.toObject());
return json;
}
//! operator << for JSON
friend QJsonArray &operator<<(QJsonArray &json, const Derived &obj)
{
json.append(obj.toJson());
return json;
}
//! operator << for JSON
friend QJsonObject &operator<<(QJsonObject &json, const std::pair<QString, const Derived &> &value)
{
json.insert(value.first, QJsonValue(value.second.toJson()));
return json;
}
//! Do nothing
QJsonObject toJson() const { return baseToJson(static_cast<const typename Derived::base_type &>(*derived())); }
//! Do nothing
void convertFromJson(const QJsonObject &json) { baseConvertFromJson(static_cast<typename Derived::base_type &>(*derived()), json); }
private:
const Derived *derived() const { return static_cast<const Derived *>(this); }
Derived *derived() { return static_cast<Derived *>(this); }
template <typename T> static QJsonObject baseToJson(const T &base) { return base.toJson(); }
template <typename T> static void baseConvertFromJson(T &base, const QJsonObject &json) { base.convertFromJson(json); }
static QJsonObject baseToJson(const CEmpty &) { return {}; }
static void baseConvertFromJson(CEmpty &, const QJsonObject &) {}
};
}
/*!
@@ -370,17 +482,15 @@ namespace BlackMisc
public Mixin::MetaType<Derived>,
public Mixin::HashByTuple<Derived, Policy::Hash::IsMetaTuple<Derived, Base>::value>,
public Mixin::DBusByTuple<Derived, Policy::DBus::IsMetaTuple<Derived, Base>::value>,
public Mixin::JsonByTuple<Derived, Policy::Json::IsMetaTuple<Derived, Base>::value>,
private CValueObjectPolicy<Derived>::Equals::template Ops<Derived, Base>,
private CValueObjectPolicy<Derived>::LessThan::template Ops<Derived, Base>,
private CValueObjectPolicy<Derived>::Compare::template Ops<Derived, Base>
{
static_assert(std::is_same<CEmpty, Base>::value || IsValueObject<Base>::value, "Base must be either CEmpty or derived from CValueObject");
using JsonPolicy = typename CValueObjectPolicy<Derived>::Json;
using PropertyIndexPolicy = typename CValueObjectPolicy<Derived>::PropertyIndex;
using BaseOrDummy = typename std::conditional<std::is_same<Base, CEmpty>::value, CValueObjectDummyBase, Base>::type;
//! Stream << overload to be used in debugging messages
friend QDebug operator<<(QDebug debug, const Derived &obj)
{
@@ -416,41 +526,6 @@ namespace BlackMisc
return ostr;
}
//! operator >> for JSON
friend const QJsonObject &operator>>(const QJsonObject &json, Derived &valueObject)
{
valueObject.convertFromJson(json);
return json;
}
//! operator >> for JSON
friend const QJsonValue &operator>>(const QJsonValue &json, Derived &valueObject)
{
valueObject.convertFromJson(json.toObject());
return json;
}
//! operator >> for JSON
friend const QJsonValueRef &operator>>(const QJsonValueRef &json, Derived &valueObject)
{
valueObject.convertFromJson(json.toObject());
return json;
}
//! operator << for JSON
friend QJsonArray &operator<<(QJsonArray &json, const Derived &value)
{
json.append(value.toJson());
return json;
}
//! operator << for JSON
friend QJsonObject& operator<<(QJsonObject &json, const std::pair<QString, const Derived &> &value)
{
json.insert(value.first, QJsonValue(value.second.toJson()));
return json;
}
public:
//! Base class
using base_type = Base;
@@ -485,19 +560,11 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::MetaType::convertFromCVariant
using Mixin::MetaType<Derived>::convertFromCVariant;
//! Cast to JSON object
virtual QJsonObject toJson() const
{
QJsonObject json = JsonPolicy::serializeImpl(*derived());
return Json::appendJsonObject(json, BaseOrDummy::toJson());
}
//! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
using Mixin::JsonByTuple<Derived, Policy::Json::IsMetaTuple<Derived, Base>::value>::toJson;
//! Assign from JSON object
virtual void convertFromJson(const QJsonObject &json)
{
BaseOrDummy::convertFromJson(json);
JsonPolicy::deserializeImpl(json, *derived());
}
//! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
using Mixin::JsonByTuple<Derived, Policy::Json::IsMetaTuple<Derived, Base>::value>::convertFromJson;
//! \copydoc BlackMisc::Mixin::MetaType::toQVariant
using Mixin::MetaType<Derived>::toQVariant;

5
src/blackmisc/valueobject_policy.h
View File

@@ -395,6 +395,11 @@ namespace BlackMisc
template <class T, class...>
static void deserializeImpl(const QJsonObject &, T &) {}
};
//! \private Detect the policy of T, following inheritance.
template <class T, class B, class P = typename CValueObjectPolicy<T>::Json> struct IsMetaTuple : public std::false_type {};
template <class T, class B> struct IsMetaTuple<T, B, MetaTuple> : public std::true_type {};
template <class T, class B> struct IsMetaTuple<T, B, Inherit> : public IsMetaTuple<B, typename B::base_type> {};
}
namespace PropertyIndex

4
src/blackmisc/variant.h
View File

@@ -179,10 +179,10 @@ namespace BlackMisc
int userType() const { return m_v.userType(); }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
QJsonObject toJson() const;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
void convertFromJson(const QJsonObject &json);
//! \copydoc CValueObject::marshallToDbus
void marshallToDbus(QDBusArgument &argument) const;