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
2020-10-22 11:27:45 +08:00
parent fe24c25a3e
commit d4c6b81b67
13 changed files with 112 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/CommandBox/CommandBox.ui
+13 -6
View File
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>366</width>
<width>373</width>
<height>534</height>
</rect>
</property>
@@ -159,25 +159,32 @@
<string>惯导选择</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="2">
<widget class="QComboBox" name="comboBox_IMU"/>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_sys"/>
</item>
<item row="0" column="3">
<widget class="QComboBox" name="comboBox_IMU"/>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="pushButton_IMU">
<property name="text">
<string>选择</string>
</property>
</widget>
</item>
<item row="0" column="0">
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>选择惯导</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_sys"/>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>无人机#</string>
</property>
</widget>
</item>
</layout>
</widget>
App/CommandUI/CommandButton.cpp
+20
View File
@@ -0,0 +1,20 @@
#include "CommandButton.h"
CommandButton::CommandButton(QWidget *parent) : QPushButton(parent)
{
}
void CommandButton::keyPressEvent(QKeyEvent* event)
{
QWidget::keyPressEvent(event);
}
void CommandButton::keyReleaseEvent(QKeyEvent* event)
{
QWidget::keyReleaseEvent(event);
}
App/CommandUI/CommandButton.h
+26
View File
@@ -0,0 +1,26 @@
#ifndef COMMANDBUTTON_H
#define COMMANDBUTTON_H
#include <QObject>
#include <QWidget>
#include "QPushButton"
#include "QDebug"
#include "QEvent"
class CommandButton : public QPushButton
{
Q_OBJECT
public:
explicit CommandButton(QWidget *parent = nullptr);
protected:
void keyPressEvent(QKeyEvent* event);
void keyReleaseEvent(QKeyEvent* event);
signals:
};
#endif // COMMANDBUTTON_H
App/CommandUI/CommandUI.h
+1
View File
@@ -6,6 +6,7 @@
#include "QDebug"
#include "QPushButton"
#include "CommandButton.h"
#include "QJsonArray"
#include "QJsonDocument"
App/CommandUI/CommandUI.pri
+2
View File
@@ -32,9 +32,11 @@ FORMS += \
$$PWD/CommandUI.ui \
HEADERS += \
$$PWD/CommandButton.h \
$$PWD/CommandUI.h
SOURCES += \
$$PWD/CommandButton.cpp \
$$PWD/CommandUI.cpp
RESOURCES += \
App/ComponentUI/Selector/Selector.cpp
+8 -1
View File
@@ -39,13 +39,20 @@ Selector::~Selector()
bool Selector::event(QEvent *event)
{
//qDebug() << event->type() << "wvent";
if(event->type() == QEvent::Leave)
{
this->close();
//if(QApplication::activeWindow() != this)
this->close();
}
return QWidget::event(event);
}
void Selector::focusOutEvent(QFocusEvent *event)
{
qDebug() << "focus out" << event;
App/ComponentUI/Selector/Selector.h
+2
View File
@@ -11,6 +11,8 @@
#include <QScrollBar>
#include "QFile"
#include "QEvent"
namespace Ui {
class Selector;
}
App/MissionUI/propertyui.cpp
+4 -4
View File
@@ -203,8 +203,8 @@ void propertyui::rebuildUI(QString CMD)
ui->pushButton_Lat->show();
ui->pushButton_Lng->show();
ui->pushButton_Lat->setText(QString::number(m_x * 10e-8,'f',6));
ui->pushButton_Lng->setText(QString::number(m_y * 10e-8,'f',6));
ui->pushButton_Lat->setText(QString::number(m_x * 10e-8,'f',7));
ui->pushButton_Lng->setText(QString::number(m_y * 10e-8,'f',7));
}
@@ -1189,7 +1189,7 @@ void propertyui::on_pushButton_Lat_clicked()
inputter->setGeometry(0,0,this->width(),this->height());
inputter->setLabel(tr("setLatitude"));
inputter->setDecimalPlaces(6);
inputter->setDecimalPlaces(7);
inputter->setInitValue(ui->pushButton_Lat->text());
connect(inputter,SIGNAL(confirmValue(QVariant)),
this,SLOT(setLatitude(QVariant)));
@@ -1210,7 +1210,7 @@ void propertyui::on_pushButton_Lng_clicked()
inputter->setGeometry(0,0,this->width(),this->height());
inputter->setLabel(tr("setLongitude"));
inputter->setDecimalPlaces(6);
inputter->setDecimalPlaces(7);
inputter->setInitValue(ui->pushButton_Lng->text());
connect(inputter,SIGNAL(confirmValue(QVariant)),
App/mainwindow.cpp
+13 -8
View File
@@ -819,6 +819,12 @@ void MainWindow::updateUI()//事件驱动式更新数据
case 8<<16:
mode_str.append(tr("RATTITUDE"));
break;
case 9<<16:
mode_str.append(tr("STANDBY"));
break;
case 10<<16:
mode_str.append(tr("BIT"));
break;
case (4<<16)+(1<<24):
mode_str.append(tr("AUTO_READY"));
break;
@@ -1010,7 +1016,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
healthui->setState(26,getBit(health,12)?(HealthUI::state::warning):(HealthUI::state::success));//sel
healthui->setValueState(26,getBit(health,12)?(tr("连接内置惯导")):(tr("连接SBG")));//sel
statusui->setState(1,QString::number(dlink->mavlinknode->vehicle.airspeed_autocal.ratio,'f',1),0);
statusui->setState(1,QString::number(dlink->mavlinknode->vehicle.emb_atom_com.alpha,'f',1),0);
statusui->setState(2,QString::number(dlink->mavlinknode->vehicle.attitude.pitch * 57.3,'f',1),
QString::number(dlink->mavlinknode->vehicle.nav_controller_output.nav_pitch * 57.3,'f',1));
@@ -1028,17 +1034,16 @@ void MainWindow::updateUI()//事件驱动式更新数据
QString::number(dlink->mavlinknode->vehicle.gps_raw_int.alt * 10e-4
+dlink->mavlinknode->vehicle.nav_controller_output.alt_error * 10e-4,'f',1));
statusui->setState(7,QString::number(dlink->mavlinknode->vehicle.vfr_hud.airspeed,'f',1),
QString::number(dlink->mavlinknode->vehicle.vfr_hud.airspeed
statusui->setState(7,QString::number(dlink->mavlinknode->vehicle.emb_atom_com.Airspeed,'f',1),
QString::number(dlink->mavlinknode->vehicle.emb_atom_com.Airspeed
+dlink->mavlinknode->vehicle.nav_controller_output.aspd_error,'f',1));
statusui->setState(8,QString::number(dlink->mavlinknode->vehicle.vfr_hud.airspeed,'f',1),
QString::number(dlink->mavlinknode->vehicle.vfr_hud.airspeed
statusui->setState(8,QString::number(dlink->mavlinknode->vehicle.emb_atom_com.Airspeed,'f',1),
QString::number(dlink->mavlinknode->vehicle.emb_atom_com.Airspeed
+dlink->mavlinknode->vehicle.nav_controller_output.aspd_error,'f',1));
statusui->setState(9,QString::number(dlink->mavlinknode->vehicle.vfr_hud.airspeed/340.0,'f',1),
QString::number((dlink->mavlinknode->vehicle.vfr_hud.airspeed
+dlink->mavlinknode->vehicle.nav_controller_output.aspd_error)/340.0,'f',1));
statusui->setState(9,QString::number(dlink->mavlinknode->vehicle.emb_atom_com.mach,'f',1),
QString::number(dlink->mavlinknode->vehicle.emb_atom_com.Airspeed,'f',1));
statusui->setState(10,QString::number(dlink->mavlinknode->vehicle.global_position_int.vz * 10e-3,'f',1),
QString::number(dlink->mavlinknode->vehicle.global_position_int.vz * 10e-3,'f',1));