This commit is contained in:
hm
2020-03-25 13:01:49 +08:00
parent 6048031bc4
commit c37d1076e9
7 changed files with 139 additions and 27 deletions
+3 -1
View File
@@ -9,9 +9,11 @@ QT += serialport
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
include (./LinkUI/LinkUI.pri)
include (./LinkUI/LinkUI.pri)
include (./InspectUI/InspectUI.pri)
win32:
+14
View File
@@ -0,0 +1,14 @@
#include "InspectUI.h"
#include "ui_InspectUI.h"
InspectUI::InspectUI(QWidget *parent) :
QWidget(parent),
ui(new Ui::InspectUI)
{
ui->setupUi(this);
}
InspectUI::~InspectUI()
{
delete ui;
}
+22
View File
@@ -0,0 +1,22 @@
#ifndef INSPECTUI_H
#define INSPECTUI_H
#include <QWidget>
namespace Ui {
class InspectUI;
}
class InspectUI : public QWidget
{
Q_OBJECT
public:
explicit InspectUI(QWidget *parent = nullptr);
~InspectUI();
private:
Ui::InspectUI *ui;
};
#endif // INSPECTUI_H
+28
View File
@@ -0,0 +1,28 @@
HEADERS += \
$$PWD/InspectUI.h \
SOURCES += \
$$PWD/InspectUI.cpp \
FORMS += \
$$PWD/InspectUI.ui \
+45
View File
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>InspectUI</class>
<widget class="QWidget" name="InspectUI">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>614</width>
<height>320</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>270</x>
<y>10</y>
<width>131</width>
<height>131</height>
</rect>
</property>
<property name="text">
<string>Mavlink Inspector</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>410</x>
<y>10</y>
<width>131</width>
<height>131</height>
</rect>
</property>
<property name="text">
<string>Parameter Inspector</string>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>
+24 -23
View File
@@ -11,11 +11,12 @@
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
{
//ui inital
//ui initial
linkui = new LinkUI(this);
linkui->hide();
inspectui = new InspectUI(this);
inspectui->hide();
@@ -71,7 +72,6 @@ MainWindow::MainWindow(QWidget *parent)
updateTimer->start(200);
}
MainWindow::~MainWindow()
@@ -239,21 +239,27 @@ void MainWindow::onTabIndexChanged(const int &index)//界面选择管理
}
if(index == 2)
{
linkui->show();
}
else
{
linkui->hide();
}
if(index == 3)
{
inspectui->show();
}
else
{
inspectui->hide();
}
switch(index)
{
case 0:{//flight
}break;
case 1:{//mission
dlink_triggered();
}break;
case 2:{//all link
//client_triggered();
linkui->show();
}break;
case 3:{//mavlink param
dlink->mavlinknode->mavlinkinspector->show();
}break;
case 4:{//cmd console
dlink->mavlinknode->Parameter->paramInspect->show();
}break;
@@ -302,7 +308,6 @@ void MainWindow::dlink_triggered()
if (QDialog::Accepted == ret)
{
dlink->setupPort(dlg.port, dlg.baudrate,dlg.parity);
//qDebug() << "setup serial port";
}
}
@@ -323,16 +328,12 @@ void MainWindow::client_triggered()
}
void MainWindow::updateUI()
void MainWindow::updateUI()//事件驱动式更新数据
{
//qDebug() << "updateUI";
copk->setAttitude(dlink->mavlinknode->vehicle.attitude.pitch * 57.3,
dlink->mavlinknode->vehicle.attitude.roll * 57.3,
dlink->mavlinknode->vehicle.attitude.yaw * 57.3);
copk->setAltitude(dlink->mavlinknode->vehicle.gps_raw_int.alt * 10e-3 );
copk->setAirSpeed(dlink->mavlinknode->vehicle.airspeed_autocal.vx);
+3 -3
View File
@@ -21,9 +21,9 @@
#include "mavlinknode.h"
//ui include
#include "LinkUI/LinkUI.h"
#include "InspectUI/InspectUI.h"
#pragma execution_character_set("utf-8")
@@ -69,7 +69,7 @@ protected:
LinkUI *linkui = nullptr;
InspectUI *inspectui = nullptr;