diff --git a/entities/dpoint_entity.cpp b/entities/dpoint_entity.cpp index 0f8c32c..2a2d48d 100644 --- a/entities/dpoint_entity.cpp +++ b/entities/dpoint_entity.cpp @@ -16,14 +16,22 @@ QString dpoint_entity::title() { return this->_title; } -const QVector dpoint_entity::storages_ids() { - return this->_storages_ids; +const QVector dpoint_entity::storages() { + return this->_storages; } void dpoint_entity::serialize(QDataStream &output) { - output << this->_id << this->_title << this->_storages_ids; + output << this->_id << this->_title << this->_storages.size(); + for (auto &item : this->_storages) { + item.serialize(output); + } } void dpoint_entity::deserialize(QDataStream &input) { - input >> this->_id >> this->_title >> this->_storages_ids; + int icnt; + input >> this->_id >> this->_title >> icnt; + this->_storages.resize(icnt); + for (int i = 0; i < icnt; i++) { + this->_storages[i].deserialize(input); + } } diff --git a/entities/dpoint_entity.h b/entities/dpoint_entity.h index 6c363a5..23aebb6 100644 --- a/entities/dpoint_entity.h +++ b/entities/dpoint_entity.h @@ -2,6 +2,7 @@ #define DPOINT_ENTITY_H #include "IEntity.h" +#include "storage_entity.h" #include #include @@ -12,7 +13,7 @@ class dpoint_entity : public IEntity { private: entity_id _id; QString _title; - QVector _storages_ids; + QVector _storages; public: dpoint_entity() = default; @@ -20,7 +21,7 @@ public: entity_id id(); QString title(); - const QVector storages_ids(); + const QVector storages(); void serialize(QDataStream &output); void deserialize(QDataStream &input);