diff --git a/ComponentBasic/DeduceFramework.cpp b/ComponentBasic/DeduceFramework.cpp index 2698bdf..95b9cd0 100644 --- a/ComponentBasic/DeduceFramework.cpp +++ b/ComponentBasic/DeduceFramework.cpp @@ -322,7 +322,7 @@ void DeduceFramework::execute(std::shared_ptr map, out << result; } -#include "VisibleBox.h" +#include "VisibleCube.h" ComponentFactory::ComponentFactory() { auto ins = std::make_shared(); diff --git a/MessageBasic/route_access.cpp b/MessageBasic/route_access.cpp index 70f0a2d..2a41f7f 100644 --- a/MessageBasic/route_access.cpp +++ b/MessageBasic/route_access.cpp @@ -1 +1,68 @@ #include "route_access.h" + +PlainRouteReset::PlainRouteReset() + :AbstractMessage(NAME(PlainRouteReset)) { +} + +void PlainRouteReset::recoveryFrom(const QJsonObject& obj) +{ + AbstractMessage::recoveryFrom(obj); + STRING_PEAK(this->_route_name); + + QStringList lonlist, latlist; + STRLIST_PEAK(lonlist); + STRLIST_PEAK(latlist); + for (auto idx = 0; idx < lonlist.size(); ++idx) { + auto lon = lonlist.at(idx).toDouble(); + auto lat = latlist.at(idx).toDouble(); + this->_lonlat_list << LonLatPos{ lon, lat }; + } +} + +void PlainRouteReset::saveTo(QJsonObject& obj) const +{ + AbstractMessage::saveTo(obj); + STRING_SAVE(this->_route_name); + + QStringList lonlist, latlist; + for (auto pos : this->_lonlat_list) { + lonlist << QString("%1").arg(pos._lon_deg); + latlist << QString("%1").arg(pos._lat_deg); + } + STRLIST_SAVE(lonlist); + STRLIST_SAVE(latlist); +} + +NewPlainRoute::NewPlainRoute() + :AbstractMessage(NAME(NewPlainRoute)) { +} + +void NewPlainRoute::recoveryFrom(const QJsonObject& obj) +{ + AbstractMessage::recoveryFrom(obj); + STRING_PEAK(_route_name); +} + +void NewPlainRoute::saveTo(QJsonObject& obj) const +{ + AbstractMessage::saveTo(obj); + STRING_SAVE(_route_name); +} + +RemovePlainRoute::RemovePlainRoute() + :AbstractMessage(NAME(RemovePlainRoute)) +{ + +} + +void RemovePlainRoute::recoveryFrom(const QJsonObject& obj) +{ + AbstractMessage::recoveryFrom(obj); + STRING_PEAK(_route_name); +} + +void RemovePlainRoute::saveTo(QJsonObject& obj) const +{ + AbstractMessage::saveTo(obj); + STRING_SAVE(_route_name); +} diff --git a/MessageBasic/route_access.h b/MessageBasic/route_access.h index f2f0597..87ba861 100644 --- a/MessageBasic/route_access.h +++ b/MessageBasic/route_access.h @@ -1,6 +1,43 @@ #pragma once #include "messagebasic.h" +#include -struct NewPlainRoute : public AbstractMessage { - QList lonlatList; -}; \ No newline at end of file +/// +/// 新建平面路径 +/// +struct MESSAGEBASIC_EXPORT NewPlainRoute : public AbstractMessage { + QString _route_name; + + NewPlainRoute(); + + // Serializable + void recoveryFrom(const QJsonObject& obj) override; + void saveTo(QJsonObject& obj) const override; +}; + +/// +/// 删除平面路径 +/// +struct MESSAGEBASIC_EXPORT RemovePlainRoute : public AbstractMessage { + QString _route_name; + + RemovePlainRoute(); + + // Serializable + void recoveryFrom(const QJsonObject& obj) override; + void saveTo(QJsonObject& obj) const override; +}; + +/// +/// 重置平面路径 +/// +struct MESSAGEBASIC_EXPORT PlainRouteReset : public AbstractMessage { + QList _lonlat_list; + QString _route_name; + + PlainRouteReset(); + + // Serializable + void recoveryFrom(const QJsonObject& obj) override; + void saveTo(QJsonObject& obj) const override; +};