hm
e7cf44504c
## 架构升级：Service Registry + Bridge 模式 - 新增 PluginSDK/IPluginServices.h：10 个纯虚服务接口(IDataProvider/ILinkProvider/...) - 新增 MavLinkServiceBridge：单 QObject 实现全部服务，隔离 MavLinkNode 依赖 - 升级 PluginManifest：支持 plugin.json 的 provides/consumes 声明式依赖 - 实现 ExtensionHost::autoWire()：元对象自省自动连接信号槽 - 集成到 AppController：initModules() 中创建桥接器并注册到 ServiceRegistry - CockpitPlugin 演示服务发现：initialize() 中通过 PluginContext 查找服务 ## 代码清理 - Plugins/opmap：~280 行死代码(waypointsetting 100行注释块/tilematrix 54行/等27个文件) - Plugins/MavLinkNode：~200 行 GBK 乱码注释翻译为 UTF-8 + 12 行注释死代码 - Plugins/ToolsUI：~222 行死代码(ECU.cpp 82行/INS.cpp 113行/Parse/ToolsUI 等) - StatusUI/Setting/MissionUI：~65 行注释死代码 - Cockpit/leftladder.cpp：10 处 GBK 乱码翻译为中文 - 清理头文件注释掉的 #include(19 处)、空 if-else 分支、注释变量声明 ## 编译验证 - [100%] Built target GCS 零错误 - 运行时 timeout 3s 正常退出，无崩溃
88 lines
2.3 KiB
C++
88 lines
2.3 KiB
C++
/****************************************************************************
|
|
*
|
|
* (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
|
|
*
|
|
* QGroundControl is licensed according to the terms in the file
|
|
* COPYING.md in the root of the source code directory.
|
|
*
|
|
****************************************************************************/
|
|
|
|
#include "QGCFencePolygon.h"
|
|
#include "JsonHelper.h"
|
|
|
|
const char* QGCFencePolygon::_jsonInclusionKey = "inclusion";
|
|
|
|
QGCFencePolygon::QGCFencePolygon(bool inclusion, QObject* parent)
|
|
: QGCMapPolygon (parent)
|
|
, _inclusion (inclusion)
|
|
{
|
|
_init();
|
|
}
|
|
|
|
QGCFencePolygon::QGCFencePolygon(const QGCFencePolygon& other, QObject* parent)
|
|
: QGCMapPolygon (other, parent)
|
|
, _inclusion (other._inclusion)
|
|
{
|
|
_init();
|
|
}
|
|
|
|
void QGCFencePolygon::_init(void)
|
|
{
|
|
connect(this, &QGCFencePolygon::inclusionChanged, this, &QGCFencePolygon::_setDirty);
|
|
}
|
|
|
|
const QGCFencePolygon& QGCFencePolygon::operator=(const QGCFencePolygon& other)
|
|
{
|
|
QGCMapPolygon::operator=(other);
|
|
|
|
setInclusion(other._inclusion);
|
|
|
|
return *this;
|
|
}
|
|
|
|
void QGCFencePolygon::_setDirty(void)
|
|
{
|
|
setDirty(true);
|
|
}
|
|
|
|
void QGCFencePolygon::saveToJson(QJsonObject& json)
|
|
{
|
|
json[JsonHelper::jsonVersionKey] = _jsonCurrentVersion;
|
|
json[_jsonInclusionKey] = _inclusion;
|
|
QGCMapPolygon::saveToJson(json);
|
|
}
|
|
|
|
bool QGCFencePolygon::loadFromJson(const QJsonObject& json, bool required, QString& errorString)
|
|
{
|
|
errorString.clear();
|
|
|
|
QList<JsonHelper::KeyValidateInfo> keyInfoList = {
|
|
{ JsonHelper::jsonVersionKey, QJsonValue::Double, true },
|
|
{ _jsonInclusionKey, QJsonValue::Bool, true },
|
|
};
|
|
if (!JsonHelper::validateKeys(json, keyInfoList, errorString)) {
|
|
return false;
|
|
}
|
|
|
|
if (json[JsonHelper::jsonVersionKey].toInt() != _jsonCurrentVersion) {
|
|
errorString = tr("GeoFence Polygon only supports version %1").arg(_jsonCurrentVersion);
|
|
return false;
|
|
}
|
|
|
|
if (!QGCMapPolygon::loadFromJson(json, required, errorString)) {
|
|
return false;
|
|
}
|
|
|
|
setInclusion(json[_jsonInclusionKey].toBool());
|
|
|
|
return true;
|
|
}
|
|
|
|
void QGCFencePolygon::setInclusion(bool inclusion)
|
|
{
|
|
if (inclusion != _inclusion) {
|
|
_inclusion = inclusion;
|
|
emit inclusionChanged(inclusion);
|
|
}
|
|
}
|