hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改航线界面，在任意时候都显示

Browse Source
This commit is contained in:
hm
2022-06-25 10:40:17 +08:00
parent e95fd84dd8
commit 7521e50633
5 changed files with 180 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/ToolsUI/ServoSystem/ServoSystem.cpp
+6
View File
@@ -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);
}
App/ToolsUI/ServoSystem/ServoSystem.h
+2
View File
@@ -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);
App/ToolsUI/ServoSystem/ServoSystem.ui
+155 -132
View File
@@ -31,39 +31,6 @@
<property name="spacing">
<number>12</number>
</property>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_Servo">
<property name="title">
<string>空速管加热</string>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<property name="spacing">
<number>12</number>
</property>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_heatTime">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_AirHeatOn">
<property name="text">
<string>加热打开</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton_HeatOff">
<property name="text">
<string>加热关闭</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_14">
<property name="title">
@@ -110,7 +77,117 @@
</layout>
</widget>
</item>
<item row="5" column="0">
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_13">
<property name="title">
<string>参数设置</string>
</property>
<layout class="QGridLayout" name="gridLayout_20">
<property name="spacing">
<number>12</number>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_sys"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_21">
<property name="text">
<string>无人机#</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="pushButton_IAS_SEL_2">
<property name="text">
<string>外置大气机</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>选择惯导</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_IMU"/>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_IMU">
<property name="text">
<string>选择</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>IAS_SEL</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_IAS_SEL_0">
<property name="text">
<string>地速算空速</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton_IAS_SEL_1">
<property name="text">
<string>内置大气机</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QGroupBox" name="groupBox_16">
<property name="title">
<string>电源指令</string>
</property>
<layout class="QGridLayout" name="gridLayout_27">
<property name="spacing">
<number>12</number>
</property>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_500W_Open">
<property name="text">
<string>500瓦打开</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_500W_Close">
<property name="text">
<string>500瓦关闭</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>500瓦电源</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QFrame" name="frame_3">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -300,110 +377,33 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_13">
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_Servo">
<property name="title">
<string>参数设置</string>
<string>空速管加热</string>
</property>
<layout class="QGridLayout" name="gridLayout_20">
<layout class="QGridLayout" name="gridLayout_10">
<property name="spacing">
<number>12</number>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_sys"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_21">
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_heatTime">
<property name="text">
<string>无人机#</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QPushButton" name="pushButton_IAS_SEL_2">
<property name="text">
<string>外置大气机</string>
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_22">
<widget class="QPushButton" name="pushButton_AirHeatOn">
<property name="text">
<string>选择惯导</string>
<string>加热打开</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_IMU"/>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_IMU">
<widget class="QPushButton" name="pushButton_HeatOff">
<property name="text">
<string>选择</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>IAS_SEL</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pushButton_IAS_SEL_0">
<property name="text">
<string>地速算空速</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton_IAS_SEL_1">
<property name="text">
<string>内置大气机</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QGroupBox" name="groupBox_16">
<property name="title">
<string>电源指令</string>
</property>
<layout class="QGridLayout" name="gridLayout_27">
<property name="spacing">
<number>12</number>
</property>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_500W_Open">
<property name="text">
<string>500瓦打开</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_500W_Close">
<property name="text">
<string>500瓦关闭</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>500瓦电源</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QFrame" name="frame_3">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<string>加热关闭</string>
</property>
</widget>
</item>
@@ -608,6 +608,19 @@
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_10">
<property name="title">
@@ -740,17 +753,27 @@
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<widget class="QGroupBox" name="groupBox_17">
<property name="title">
<string>曳光管指令</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
<layout class="QGridLayout" name="gridLayout_28">
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_tracer">
<property name="text">
<string>发射曳光管</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>曳光管</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
MavLinkNode/missionprocess.cpp
+14 -10
View File
@@ -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);
opmap/mapwidget/opmapwidget.cpp
+3
View File
@@ -1875,10 +1875,13 @@ void OPMapWidget::setWPCreate(bool const & value)
}
}
/*
//如果不是编辑，那就关闭编辑界面
if(value == false)
{
emit closeMissionDialog(true);
}
*/