diff --git a/App/Config/Config.cpp b/App/Config/Config.cpp index 4eadb32..0b2fd63 100644 --- a/App/Config/Config.cpp +++ b/App/Config/Config.cpp @@ -277,6 +277,31 @@ void Config::setMapType(QVariant type) setJsonObject("Map",obj); } +void Config::setReferencePoint(double lon, double lat, double hight) +{ + QJsonObject obj; + + obj["lon"] = lon; + obj["lat"] = lat; + obj["hight"] = hight; + + setJsonObject("ReferencePoint",obj); +} + +void Config::getReferencePoint(double &lon, double &lat, double &hight) +{ + QJsonObject obj = getJsonObject("ReferencePoint"); + + if(obj.empty() ) + { + return; + } + + lon = obj["lon"].toDouble(); + lat = obj["lat"].toDouble(); + hight = obj["hight"].toDouble(); +} + void Config::getBeep(QVariant *value) { QJsonObject obj = getJsonObject("Warnning"); diff --git a/App/Config/Config.h b/App/Config/Config.h index 121c1ee..84c8cdc 100644 --- a/App/Config/Config.h +++ b/App/Config/Config.h @@ -69,6 +69,9 @@ public slots: void getMapType(QVariant *type); void setMapType(QVariant type); + void setReferencePoint(double lon, double lat, double hight); + void getReferencePoint(double &lon, double &lat, double &hight); + private slots: void loadJson(const QString& jsonFilename); diff --git a/App/Setting/Index0/Global/GlobalSetting.cpp b/App/Setting/Index0/Global/GlobalSetting.cpp index 469c388..0fc189e 100644 --- a/App/Setting/Index0/Global/GlobalSetting.cpp +++ b/App/Setting/Index0/Global/GlobalSetting.cpp @@ -157,6 +157,14 @@ GlobalSetting::GlobalSetting(QWidget *parent) : } emit setMapTypes(bingmap.value(maptype.toString())); + + + double lon, lat, hight; + cfg->getReferencePoint(lon, lat, hight); + emit ReferencePointChanged(lon, lat, hight); + ui->dsbRefLon->setValue(lon); + ui->dsbRefLat->setValue(lat); + ui->dsbRefH->setValue(hight); } GlobalSetting::~GlobalSetting() @@ -703,5 +711,12 @@ void GlobalSetting::on_pushButton_TTS_clicked() void GlobalSetting::on_pushButton_clicked() { emit ReferencePointChanged(ui->dsbRefLon->value(), ui->dsbRefLat->value(), ui->dsbRefH->value() ); + + Config *cfg = new Config(); + + cfg->setReferencePoint(ui->dsbRefLon->value(), ui->dsbRefLat->value(), ui->dsbRefH->value() ); + + cfg->deleteLater(); + delete cfg; } diff --git a/App/Setting/Index0/Global/GlobalSetting.ui b/App/Setting/Index0/Global/GlobalSetting.ui index 56867d9..29aa9f2 100644 --- a/App/Setting/Index0/Global/GlobalSetting.ui +++ b/App/Setting/Index0/Global/GlobalSetting.ui @@ -731,16 +731,29 @@ 8 + + 0.000000000000000 + + + 1000000.000000000000000 + - + + + 100000000000.000000000000000 + + 8 + + 100000.000000000000000 + diff --git a/App/main.cpp b/App/main.cpp index b9e95f4..f0ef396 100644 --- a/App/main.cpp +++ b/App/main.cpp @@ -223,7 +223,7 @@ int main(int argc, char *argv[]) MainWindow w;//这一步已经全部初始化完成 - w.setWindowTitle(QString("KB3A GCS Qt%1 %2").arg(QT_VERSION_STR).arg(APP_VERSION));//with version + w.setWindowTitle("KB-3A地面站软件_二院");//with version //w.setWindowTitle(QString("KB3A-V1.00 %1").arg(APP_VERSION));//with version // 主要是控制HDMI输出,如果是LCD显示,此行无关紧要 //w.resize(GetDesktopSize()); diff --git a/MavLinkNode/mavlinknode.cpp b/MavLinkNode/mavlinknode.cpp index f3ee667..1840612 100644 --- a/MavLinkNode/mavlinknode.cpp +++ b/MavLinkNode/mavlinknode.cpp @@ -2364,55 +2364,55 @@ void MavLinkNode::infoExport(_showinfo info) buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; - src.D[0] = info.pe; + src.H = info.pe; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.pu; + src.H = info.pu; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.ps; + src.H = info.ps; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.ve; + src.H = info.ve; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.vu; + src.H = info.vu; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.vs; + src.H = info.vs; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.vt; + src.H = info.vt; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.rcs; + src.H = info.rcs; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2]; buff[dataCount++] = src.B[3]; - src.D[0] = info.reserve; + src.H = info.reserve; buff[dataCount++] = src.B[0]; buff[dataCount++] = src.B[1]; buff[dataCount++] = src.B[2];