feat: Service Registry + Bridge 解耦架构 + 全工程代码清理
## 架构升级: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 正常退出,无崩溃
This commit is contained in:
@@ -0,0 +1,123 @@
|
||||
/****************************************************************************
|
||||
*
|
||||
* (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 <QStringList>
|
||||
#include <QDebug>
|
||||
|
||||
#include "RallyPoint.h"
|
||||
|
||||
const char* RallyPoint::_longitudeFactName = "Longitude";
|
||||
const char* RallyPoint::_latitudeFactName = "Latitude";
|
||||
const char* RallyPoint::_altitudeFactName = "Relative Altitude";
|
||||
|
||||
QMap<QString, FactMetaData*> RallyPoint::_metaDataMap;
|
||||
|
||||
RallyPoint::RallyPoint(const QGeoCoordinate& coordinate, QObject* parent)
|
||||
: QObject(parent)
|
||||
, _dirty(false)
|
||||
, _longitudeFact(0, _longitudeFactName, FactMetaData::valueTypeDouble)
|
||||
, _latitudeFact(0, _latitudeFactName, FactMetaData::valueTypeDouble)
|
||||
, _altitudeFact(0, _altitudeFactName, FactMetaData::valueTypeDouble)
|
||||
{
|
||||
setCoordinate(coordinate);
|
||||
|
||||
_factSetup();
|
||||
}
|
||||
|
||||
RallyPoint::RallyPoint(const RallyPoint& other, QObject* parent)
|
||||
: QObject(parent)
|
||||
, _dirty(false)
|
||||
, _longitudeFact(0, _longitudeFactName, FactMetaData::valueTypeDouble)
|
||||
, _latitudeFact(0, _latitudeFactName, FactMetaData::valueTypeDouble)
|
||||
, _altitudeFact(0, _altitudeFactName, FactMetaData::valueTypeDouble)
|
||||
{
|
||||
_longitudeFact.setRawValue(other._longitudeFact.rawValue());
|
||||
_latitudeFact.setRawValue(other._latitudeFact.rawValue());
|
||||
_altitudeFact.setRawValue(other._altitudeFact.rawValue());
|
||||
|
||||
_factSetup();
|
||||
}
|
||||
|
||||
const RallyPoint& RallyPoint::operator=(const RallyPoint& other)
|
||||
{
|
||||
_longitudeFact.setRawValue(other._longitudeFact.rawValue());
|
||||
_latitudeFact.setRawValue(other._latitudeFact.rawValue());
|
||||
_altitudeFact.setRawValue(other._altitudeFact.rawValue());
|
||||
|
||||
emit coordinateChanged(coordinate());
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
RallyPoint::~RallyPoint()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void RallyPoint::_factSetup(void)
|
||||
{
|
||||
_cacheFactMetadata();
|
||||
|
||||
_longitudeFact.setMetaData(_metaDataMap[_longitudeFactName]);
|
||||
_latitudeFact.setMetaData(_metaDataMap[_latitudeFactName]);
|
||||
_altitudeFact.setMetaData(_metaDataMap[_altitudeFactName]);
|
||||
|
||||
_textFieldFacts.append(QVariant::fromValue(&_longitudeFact));
|
||||
_textFieldFacts.append(QVariant::fromValue(&_latitudeFact));
|
||||
_textFieldFacts.append(QVariant::fromValue(&_altitudeFact));
|
||||
|
||||
connect(&_longitudeFact, &Fact::valueChanged, this, &RallyPoint::_sendCoordinateChanged);
|
||||
connect(&_latitudeFact, &Fact::valueChanged, this, &RallyPoint::_sendCoordinateChanged);
|
||||
connect(&_altitudeFact, &Fact::valueChanged, this, &RallyPoint::_sendCoordinateChanged);
|
||||
}
|
||||
|
||||
void RallyPoint::_cacheFactMetadata() {
|
||||
if (_metaDataMap.isEmpty()) {
|
||||
_metaDataMap = FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/RallyPoint.FactMetaData.json"), nullptr /* metaDataParent */);
|
||||
}
|
||||
}
|
||||
|
||||
void RallyPoint::setCoordinate(const QGeoCoordinate& coordinate)
|
||||
{
|
||||
if (coordinate != this->coordinate()) {
|
||||
_longitudeFact.setRawValue(coordinate.longitude());
|
||||
_latitudeFact.setRawValue(coordinate.latitude());
|
||||
_altitudeFact.setRawValue(coordinate.altitude());
|
||||
emit coordinateChanged(coordinate);
|
||||
setDirty(true);
|
||||
}
|
||||
}
|
||||
|
||||
void RallyPoint::setDirty(bool dirty)
|
||||
{
|
||||
if (dirty != _dirty) {
|
||||
_dirty = dirty;
|
||||
emit dirtyChanged(dirty);
|
||||
}
|
||||
}
|
||||
|
||||
double RallyPoint::getDefaultFactAltitude() {
|
||||
_cacheFactMetadata();
|
||||
auto it = _metaDataMap.find(QString(_altitudeFactName));
|
||||
if(it != _metaDataMap.end() && (*it)->defaultValueAvailable()) {
|
||||
return (*it)->rawDefaultValue().toDouble();
|
||||
}
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
QGeoCoordinate RallyPoint::coordinate(void) const
|
||||
{
|
||||
return QGeoCoordinate(_latitudeFact.rawValue().toDouble(), _longitudeFact.rawValue().toDouble(), _altitudeFact.rawValue().toDouble());
|
||||
}
|
||||
|
||||
void RallyPoint::_sendCoordinateChanged(void)
|
||||
{
|
||||
emit coordinateChanged(coordinate());
|
||||
}
|
||||
Reference in New Issue
Block a user