From 7521e5063306a7e96699d47907dca699cc96a055 Mon Sep 17 00:00:00 2001 From: hm Date: Sat, 25 Jun 2022 10:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=88=AA=E7=BA=BF=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=9C=A8=E4=BB=BB=E6=84=8F=E6=97=B6=E5=80=99?= =?UTF-8?q?=E9=83=BD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/ToolsUI/ServoSystem/ServoSystem.cpp | 6 + App/ToolsUI/ServoSystem/ServoSystem.h | 2 + App/ToolsUI/ServoSystem/ServoSystem.ui | 287 +++++++++++++----------- MavLinkNode/missionprocess.cpp | 24 +- opmap/mapwidget/opmapwidget.cpp | 3 + 5 files changed, 180 insertions(+), 142 deletions(-) diff --git a/App/ToolsUI/ServoSystem/ServoSystem.cpp b/App/ToolsUI/ServoSystem/ServoSystem.cpp index 7ae0fde..b598ec1 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.cpp +++ b/App/ToolsUI/ServoSystem/ServoSystem.cpp @@ -1234,3 +1234,9 @@ void ServoSystem::on_pushButton_500W_Close_clicked() on_commandClicked(tr("设定 %1").arg(ui->pushButton_500W_Close->text()), 102,0,0,0,0,0,0,180,0); } + +void ServoSystem::on_pushButton_tracer_clicked() +{ + on_commandClicked(tr("设定 %1").arg(ui->pushButton_tracer->text()), + 0,0,0,0,0,0,0,20013,0); +} diff --git a/App/ToolsUI/ServoSystem/ServoSystem.h b/App/ToolsUI/ServoSystem/ServoSystem.h index abee133..09489a7 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.h +++ b/App/ToolsUI/ServoSystem/ServoSystem.h @@ -123,6 +123,8 @@ private slots: void on_pushButton_500W_Close_clicked(); + void on_pushButton_tracer_clicked(); + signals: void showMessage(const QString &message,int TimeOut = 0); void cmd_int(float param1, float param2, float param3, float param4, int x, int y, float z); diff --git a/App/ToolsUI/ServoSystem/ServoSystem.ui b/App/ToolsUI/ServoSystem/ServoSystem.ui index 19d08ed..9cf0abd 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.ui +++ b/App/ToolsUI/ServoSystem/ServoSystem.ui @@ -31,39 +31,6 @@ 12 - - - - 空速管加热 - - - - 12 - - - - - - - - - - - - 加热打开 - - - - - - - 加热关闭 - - - - - - @@ -110,7 +77,117 @@ - + + + + 参数设置 + + + + 12 + + + + + + + + 无人机# + + + + + + + 外置大气机 + + + + + + + 选择惯导 + + + + + + + + + + 选择 + + + + + + + IAS_SEL + + + + + + + 地速算空速 + + + + + + + 内置大气机 + + + + + + + + + + 电源指令 + + + + 12 + + + + + 500瓦打开 + + + + + + + 500瓦关闭 + + + + + + + 500瓦电源 + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + Qt::Vertical @@ -300,110 +377,33 @@ - - + + - 参数设置 + 空速管加热 - + 12 - - - - - + + - 无人机# - - - - - - - 外置大气机 + - + - 选择惯导 + 加热打开 - - - - + - 选择 - - - - - - - IAS_SEL - - - - - - - 地速算空速 - - - - - - - 内置大气机 - - - - - - - - - - 电源指令 - - - - 12 - - - - - 500瓦打开 - - - - - - - 500瓦关闭 - - - - - - - 500瓦电源 - - - - - - - QFrame::StyledPanel - - - QFrame::Raised + 加热关闭 @@ -608,6 +608,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -740,17 +753,27 @@ - - - Qt::Vertical + + + 曳光管指令 - - - 20 - 40 - - - + + + + + 发射曳光管 + + + + + + + 曳光管 + + + + + diff --git a/MavLinkNode/missionprocess.cpp b/MavLinkNode/missionprocess.cpp index 51feba2..7c18b9c 100644 --- a/MavLinkNode/missionprocess.cpp +++ b/MavLinkNode/missionprocess.cpp @@ -188,15 +188,7 @@ void MissionProcess::sendFence(qreal Vertex, mapcontrol::WayPointItem::_property item; - qDebug() << Vertex - << group - << Lat - << Lng - << FecneSeq - << command - << sysid - << compid - << mission_type; + item.param1 = Vertex; item.param2 = group; @@ -216,6 +208,18 @@ void MissionProcess::sendFence(qreal Vertex, item.mission_type = mission_type; items.insert(item.seq,item); + + qDebug() << Vertex + << group + << Lat + << Lng + << FecneSeq + << command + << sysid + << compid + << mission_type + << items.size(); + } @@ -302,7 +306,7 @@ void MissionProcess::Parse(mavlink_message_t msg) case MAVLINK_MSG_ID_MISSION_REQUEST_INT: { mavlink_msg_mission_request_int_decode(&msg,&mission_request_int); - qDebug() << "recieve mission_request_int " << "mision type" << mission_request_int.mission_type; + qDebug() << "recieve mission_request_int " << "mision type" << mission_request_int.mission_type << mission_item_int.seq; mission_item_int.seq ++; emit sendItemOK(mission_item_int.seq,true); diff --git a/opmap/mapwidget/opmapwidget.cpp b/opmap/mapwidget/opmapwidget.cpp index 3b660ed..e20a7ef 100644 --- a/opmap/mapwidget/opmapwidget.cpp +++ b/opmap/mapwidget/opmapwidget.cpp @@ -1875,10 +1875,13 @@ void OPMapWidget::setWPCreate(bool const & value) } } + /* + //如果不是编辑，那就关闭编辑界面 if(value == false) { emit closeMissionDialog(true); } + */