diff --git a/App/ComponentUI/Scope/Chart.h b/App/ComponentUI/Scope/Chart.h index 635440c..2a7659e 100644 --- a/App/ComponentUI/Scope/Chart.h +++ b/App/ComponentUI/Scope/Chart.h @@ -24,15 +24,14 @@ using namespace QtCharts; - - namespace ColorMap{ -static QColor Color[5] = { - QColor(0,0,0), //黑 - QColor(255,0,0), //红 - QColor(0,255,0), //绿 - QColor(0,0,255), //蓝 - QColor(255,191,0) //橙 +static QColor Color[6] = { + QColor(0,0,0), //黑 + QColor(255,0,0), //红 + QColor(0,255,0), //绿 + QColor(0,0,255), //蓝 + QColor(255,191,0), //橙 + QColor(255,0,255) //紫色 }; } @@ -128,6 +127,9 @@ private: quint64 MaxCount = 600; + QMap DataSeries; + + }; #endif // CHART_H diff --git a/App/ToolsUI/Diagram/Diagram.cpp b/App/ToolsUI/Diagram/Diagram.cpp index 4eff643..667fc86 100644 --- a/App/ToolsUI/Diagram/Diagram.cpp +++ b/App/ToolsUI/Diagram/Diagram.cpp @@ -596,8 +596,6 @@ void Diagram::setNavigation(uint32_t pos,QVariant value) { setColor(ui->label_Fix,state::inital); } - - break; case 2: ui->label_SVN->setText(value.toString()); diff --git a/App/ToolsUI/Senser/Senser.cpp b/App/ToolsUI/Senser/Senser.cpp index a256ff2..d59b71b 100644 --- a/App/ToolsUI/Senser/Senser.cpp +++ b/App/ToolsUI/Senser/Senser.cpp @@ -15,6 +15,109 @@ Senser::Senser(QWidget *parent) : this->setStyleSheet(stylesheet); file.close(); + attChart = new Chart(ui->frame_Attitude); + gyroChart = new Chart(ui->frame_Gyro); + accChart = new Chart(ui->frame_Accelerate); + + attChart->setGeometry(0,0,ui->frame_Attitude->width(),ui->frame_Attitude->height()); + gyroChart->setGeometry(0,0,ui->frame_Gyro->width(),ui->frame_Gyro->height()); + accChart->setGeometry(0,0,ui->frame_Accelerate->width(),ui->frame_Accelerate->height()); + + + attChart->chart()->legend()->setAlignment(Qt::AlignRight); + gyroChart->chart()->legend()->setAlignment(Qt::AlignRight); + accChart->chart()->legend()->setAlignment(Qt::AlignRight); + + attChart->setOperation(false); + gyroChart->setOperation(false); + accChart->setOperation(false); + + attChart->setRenderHint(QPainter::Antialiasing); + gyroChart->setRenderHint(QPainter::Antialiasing); + accChart->setRenderHint(QPainter::Antialiasing); + + //ui->label->setFixedSize(w,h); + + + + attChart->setRubberBand(QChartView::RectangleRubberBand); + gyroChart->setRubberBand(QChartView::RectangleRubberBand); + accChart->setRubberBand(QChartView::RectangleRubberBand); + + //======================================================= + connect(ui->checkBox_ins_ax,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_acc_stateChanged); + + connect(ui->checkBox_ins_ay,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_acc_stateChanged); + + connect(ui->checkBox_ins_az,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_acc_stateChanged); + //======================================================= + connect(ui->checkBox_ins_p,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + + connect(ui->checkBox_ins_q,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + + connect(ui->checkBox_ins_r,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + //======================================================= + connect(ui->checkBox_ins_rol,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_att_stateChanged); + + connect(ui->checkBox_ins_pit,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_att_stateChanged); + + + //======================================================= + connect(ui->checkBox_sbg_ax,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_acc_stateChanged); + + connect(ui->checkBox_sbg_ay,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_acc_stateChanged); + + connect(ui->checkBox_sbg_az,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_acc_stateChanged); + //======================================================= + connect(ui->checkBox_sbg_p,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + + connect(ui->checkBox_sbg_q,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + + connect(ui->checkBox_sbg_r,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + //======================================================= + connect(ui->checkBox_sbg_rol,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_att_stateChanged); + + connect(ui->checkBox_sbg_pit,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_att_stateChanged); + + + //======================================================= + connect(ui->checkBox_use_p,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + + connect(ui->checkBox_use_q,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + + connect(ui->checkBox_use_r,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_gyro_stateChanged); + //======================================================= + connect(ui->checkBox_use_rol,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_att_stateChanged); + + connect(ui->checkBox_use_pit,&QCheckBox::stateChanged, + this,&Senser::on_checkBox_att_stateChanged); + + + + + + + } Senser::~Senser() @@ -39,8 +142,9 @@ void Senser::setValue(QLabel *w,QString s) void Senser::resizeEvent(QResizeEvent *event) { - - + attChart->setGeometry(0,0,ui->frame_Attitude->width(),ui->frame_Attitude->height()); + gyroChart->setGeometry(0,0,ui->frame_Gyro->width(),ui->frame_Gyro->height()); + accChart->setGeometry(0,0,ui->frame_Accelerate->width(),ui->frame_Accelerate->height()); } void Senser::closeEvent(QCloseEvent *event) @@ -68,6 +172,57 @@ void Senser::setFloat(void) } } +void Senser::on_checkBox_att_stateChanged(int arg1) +{ + QCheckBox *chk = qobject_cast(sender()); + if(chk) + { + if(arg1 == Qt::Checked) + { + attChart->addSeries(chk->text()); + } + else if(arg1 == Qt::Unchecked) + { + attChart->removeSerie(chk->text()); + } + update(); + } +} + +void Senser::on_checkBox_gyro_stateChanged(int arg1) +{ + QCheckBox *chk = qobject_cast(sender()); + if(chk) + { + if(arg1 == Qt::Checked) + { + gyroChart->addSeries(chk->text()); + } + else if(arg1 == Qt::Unchecked) + { + gyroChart->removeSerie(chk->text()); + } + update(); + } +} + +void Senser::on_checkBox_acc_stateChanged(int arg1) +{ + QCheckBox *chk = qobject_cast(sender()); + if(chk) + { + if(arg1 == Qt::Checked) + { + accChart->addSeries(chk->text()); + } + else if(arg1 == Qt::Unchecked) + { + accChart->removeSerie(chk->text()); + } + update(); + } +} + void Senser::setINS(int source,int pos,QVariant value) { @@ -262,10 +417,10 @@ void Senser::setDAS(int source,int pos,QVariant value) { switch (pos) { case 1: - ui->label_2_atteck->setText(value.toString()); + //ui->label_2_atteck->setText(value.toString()); break; case 2: - ui->label_2_slide->setText(value.toString()); + //ui->label_2_slide->setText(value.toString()); break; case 3: //ui->label_2_pre_alt->setText(value.toString()); diff --git a/App/ToolsUI/Senser/Senser.h b/App/ToolsUI/Senser/Senser.h index ff2759b..f9fb2c9 100644 --- a/App/ToolsUI/Senser/Senser.h +++ b/App/ToolsUI/Senser/Senser.h @@ -15,6 +15,11 @@ #include "QScreen" #include + + +#include "Chart.h" +#include "QCheckBox" + namespace Ui { class Senser; } @@ -45,8 +50,18 @@ public: void setINSState(int source,int pos,state value); + Chart *attChart = nullptr; + Chart *gyroChart = nullptr; + Chart *accChart = nullptr; + Chart *asChart = nullptr; + Chart *vzChart = nullptr; + Chart *altChart = nullptr; + private slots: + void on_checkBox_att_stateChanged(int arg1); + void on_checkBox_gyro_stateChanged(int arg1); + void on_checkBox_acc_stateChanged(int arg1); protected: void resizeEvent(QResizeEvent *event); void closeEvent(QCloseEvent *event); diff --git a/App/ToolsUI/Senser/Senser.ui b/App/ToolsUI/Senser/Senser.ui index 0493170..813d36e 100644 --- a/App/ToolsUI/Senser/Senser.ui +++ b/App/ToolsUI/Senser/Senser.ui @@ -6,1074 +6,1388 @@ 0 0 - 732 - 644 + 1191 + 702 Form - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter + + + + + 惯导状态 + + + + + 内部惯导 + + + Qt::AlignCenter + + + + + + + 外部惯导 + + + Qt::AlignCenter + + + + + + + 卫星数 + + + + + + + + 120 + 0 + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + + 120 + 0 + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + BIT + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 姿态状态 + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 航向状态 + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 速度状态 + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 位置状态 + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + System_Status + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + COM_Satatus + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + GPS_Status + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 经度[°] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 纬度[°] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 海拔[m] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 地速[m/s] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 滚转角[°] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 俯仰角[°] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 航向角[°] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 航迹角[°] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + p[°/s] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + q[°/s] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + r[°/s] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + ax[m/s2] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + ay[m/s2] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + az[m/s2] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter + + + + 大气机状态 + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + + 120 + 0 + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + + 120 + 0 + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 真空速[m/s] + + + + + + + 表速[m/s] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 动压[hPa] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + 气压高度[m] + + + + + + + 静压[hPa] + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + background-color: rgb(189, 189, 189); + + + 0 + + + Qt::AlignCenter + + + + + + + + 120 + 0 + + + + 内部大气机 + + + Qt::AlignCenter + + + + + + + 外部大气机 + + + Qt::AlignCenter + + + + + + + 马赫数 + + + + - - - - BIT - - - - - - - - 120 - 0 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 经度[°] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - GPS_Status + + + + 数据曲线 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + 200 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + - - - 内部惯导 - - - Qt::AlignCenter + + + 曲线数据源 + + + 5 + + + 5 + + + 5 + + + 5 + + + 6 + + + + + SBG + + + + + + + background-color: rgb(189, 189, 189); + + + ins ax + + + + + + + roll + + + + + + + background-color: rgb(189, 189, 189); + + + ins q + + + + + + + background-color: rgb(189, 189, 189); + + + ins p + + + + + + + background-color: rgb(189, 189, 189); + + + ins ay + + + + + + + ay + + + + + + + sbg ax + + + + + + + sbg ay + + + + + + + background-color: rgb(189, 189, 189); + + + use q + + + + + + + background-color: rgb(189, 189, 189); + + + use rol + + + + + + + q + + + + + + + sbg p + + + + + + + sbg pit + + + + + + + az + + + + + + + sbg az + + + + + + + background-color: rgb(189, 189, 189); + + + ins rol + + + + + + + ax + + + + + + + background-color: rgb(189, 189, 189); + + + ins az + + + + + + + sbg rol + + + + + + + p + + + + + + + background-color: rgb(189, 189, 189); + + + INS + + + + + + + background-color: rgb(189, 189, 189); + + + ins pit + + + + + + + pitch + + + + + + + background-color: rgb(189, 189, 189); + + + use p + + + + + + + background-color: rgb(189, 189, 189); + + + USE + + + + + + + sbg q + + + + + + + background-color: rgb(189, 189, 189); + + + use pit + + + + + + + r + + + + + + + background-color: rgb(189, 189, 189); + + + ins r + + + + + + + sbg r + + + + + + + background-color: rgb(189, 189, 189); + + + use r + + + + - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 地速[m/s] - - - - - - - COM_Satatus - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 纬度[°] - - - - - - - 俯仰角[°] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - r[°/s] - - - - - - - - 300 - 0 - - - - background-color: rgb(0, 255, 255); - - - 大气机状态 - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 海拔[m] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - - 300 - 0 - - - - background-color: rgb(0, 255, 255); - - - 传感器状态 - - - - - - - 速度状态 - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - - 120 - 0 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - p[°/s] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 航向状态 - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - + + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 20 + 40 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 侧滑角[°] - - - - - - - ay[m/s2] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - - 120 - 0 - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - q[°/s] - - - - - - - 卫星数 - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 航向角[°] - - - - - - - 航迹角[°] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 外部SBG - - - Qt::AlignCenter - - - - - - - az[m/s2] - - - - - - - 滚转角[°] - - - - - - - - 120 - 0 - - - - 攻角[°] - - - - - - - 姿态状态 - - - - - - - 外部大气机 - - - Qt::AlignCenter - - - - - - - ax[m/s2] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - - 120 - 0 - - - - 内部传感器 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - System_Status - - - - - - - 位置状态 - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - 气压高度[m] - - - - - - - 表速[m/s] - - - - - - - 真空速[m/s] - - - - - - - 马赫数 - - - - - - - 动压[hPa] - - - - - - - 静压[hPa] - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - - - - - background-color: rgb(189, 189, 189); - - - 0 - - - Qt::AlignCenter - - - diff --git a/App/ToolsUI/ToolsUI.cpp b/App/ToolsUI/ToolsUI.cpp index 53b0379..115de91 100644 --- a/App/ToolsUI/ToolsUI.cpp +++ b/App/ToolsUI/ToolsUI.cpp @@ -27,7 +27,7 @@ ToolsUI::ToolsUI(QWidget *parent) : ui->ServoSystem->setFixedSize(w,h); ui->pushButton_ShowExtern->setFixedSize(w,h); ui->pushButton_CommandBox->setFixedSize(w,h); - ui->pushButton_Diagram->setFixedSize(w,h); + //ui->pushButton_Diagram->setFixedSize(w,h); ui->pushButton_Senser->setFixedSize(w,h); @@ -58,16 +58,15 @@ ToolsUI::ToolsUI(QWidget *parent) : command = new CommandBox(ui->frame); command->hide(); - +/* diagram = new Diagram(ui->frame); diagram->hide(); + \*/ senser = new Senser(ui->frame); senser->hide(); - //connect(index4,SIGNAL(destroyed(QObject*))) - connect(this,SIGNAL(IndexChanged(int)), this,SLOT(onTabIndexChanged(int))); @@ -95,9 +94,6 @@ ToolsUI::ToolsUI(QWidget *parent) : setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - setPushButtonState(ui->pushButton_Diagram, - state::unSelected); - setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -150,7 +146,7 @@ void ToolsUI::resizeEvent(QResizeEvent *event) servosystem->setGeometry(0,0,ui->frame->geometry().width(),ui->frame->geometry().height()); - diagram->setGeometry(0,0,ui->frame->geometry().width(),ui->frame->geometry().height()); + //diagram->setGeometry(0,0,ui->frame->geometry().width(),ui->frame->geometry().height()); senser->setGeometry(0,0,ui->frame->geometry().width(),ui->frame->geometry().height()); @@ -307,6 +303,7 @@ void ToolsUI::onTabIndexChanged(const int &index)//界面选择管理 command->hide(); } + /* if(index == 8) { if(diagram->parent()) @@ -323,6 +320,7 @@ void ToolsUI::onTabIndexChanged(const int &index)//界面选择管理 if(diagram->parent()) diagram->hide(); } + */ if(index == 9) { @@ -368,9 +366,10 @@ void ToolsUI::on_pushButton_Inspector_clicked() setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -402,9 +401,10 @@ void ToolsUI::on_pushButton_Log_clicked() setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -436,9 +436,10 @@ void ToolsUI::on_pushButton_Replay_clicked() setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -470,9 +471,10 @@ void ToolsUI::on_pushButton_Console_clicked() setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -504,9 +506,10 @@ void ToolsUI::on_PowerSystem_clicked() setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -538,9 +541,10 @@ void ToolsUI::on_ServoSystem_clicked() setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -572,9 +576,10 @@ void ToolsUI::on_pushButton_CommandBox_clicked() setPushButtonState(ui->pushButton_CommandBox, state::Selected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::unSelected); @@ -582,40 +587,6 @@ void ToolsUI::on_pushButton_CommandBox_clicked() emit IndexChanged(CurrentIndex); } -void ToolsUI::on_pushButton_Diagram_clicked() -{ - CurrentIndex = 8; - - setPushButtonState(ui->pushButton_Inspector, - state::unSelected); - - setPushButtonState(ui->pushButton_Log, - state::unSelected); - - setPushButtonState(ui->pushButton_Replay, - state::unSelected); - - setPushButtonState(ui->pushButton_Console, - state::unSelected); - - setPushButtonState(ui->PowerSystem, - state::unSelected); - - setPushButtonState(ui->ServoSystem, - state::unSelected); - - setPushButtonState(ui->pushButton_CommandBox, - state::unSelected); - - - setPushButtonState(ui->pushButton_Diagram, - state::Selected); - - setPushButtonState(ui->pushButton_Senser, - state::unSelected); - - emit IndexChanged(CurrentIndex); -} void ToolsUI::on_pushButton_ShowExtern_clicked() @@ -646,7 +617,7 @@ void ToolsUI::on_pushButton_ShowExtern_clicked() command->setFloat(); break; case 8: - diagram->setFloat(); + //diagram->setFloat(); break; case 9: senser->setFloat(); @@ -679,9 +650,10 @@ void ToolsUI::on_pushButton_Senser_clicked() setPushButtonState(ui->pushButton_CommandBox, state::unSelected); - +/* setPushButtonState(ui->pushButton_Diagram, state::unSelected); + */ setPushButtonState(ui->pushButton_Senser, state::Selected); diff --git a/App/ToolsUI/ToolsUI.h b/App/ToolsUI/ToolsUI.h index e533f3a..d385d3a 100644 --- a/App/ToolsUI/ToolsUI.h +++ b/App/ToolsUI/ToolsUI.h @@ -15,7 +15,7 @@ #include "CommandUI/CommandUI.h" #include "CommandBox/CommandBox.h" -#include "Diagram/Diagram.h" +//#include "Diagram/Diagram.h" #include "Senser/Senser.h" namespace Ui { @@ -51,7 +51,7 @@ public: CommandBox *command = nullptr; - Diagram *diagram = nullptr; + //Diagram *diagram = nullptr; Senser *senser = nullptr; @@ -77,7 +77,7 @@ private slots: void on_pushButton_CommandBox_clicked(); - void on_pushButton_Diagram_clicked(); + //void on_pushButton_Diagram_clicked(); void on_pushButton_Senser_clicked(); diff --git a/App/ToolsUI/ToolsUI.ui b/App/ToolsUI/ToolsUI.ui index 0dd0755..a86e5ea 100644 --- a/App/ToolsUI/ToolsUI.ui +++ b/App/ToolsUI/ToolsUI.ui @@ -61,13 +61,6 @@ - - - - Diagram - - - @@ -113,14 +106,14 @@ - + Senser - + background-color: rgb(107, 255, 246); @@ -149,7 +142,7 @@ - + Qt::Vertical diff --git a/App/ToolsUI/tools_Index4/tools_Index4.cpp b/App/ToolsUI/tools_Index4/tools_Index4.cpp index 69e682d..5628797 100644 --- a/App/ToolsUI/tools_Index4/tools_Index4.cpp +++ b/App/ToolsUI/tools_Index4/tools_Index4.cpp @@ -43,8 +43,6 @@ tools_Index4::~tools_Index4() delete bar; } } - - delete ui; } diff --git a/App/mainwindow.cpp b/App/mainwindow.cpp index ac5a15b..275713d 100644 --- a/App/mainwindow.cpp +++ b/App/mainwindow.cpp @@ -390,9 +390,10 @@ MainWindow::MainWindow(QWidget *parent) connect(dlink->mavlinknode->Mission,SIGNAL(currentPoint(int)), menuBarUI,SLOT(setTargetPoint(int))); - +/* connect(dlink->mavlinknode->Mission,SIGNAL(currentPoint(int)), toolsui->diagram,SLOT(setTargetPoint(int))); + */ //==== showmessage===== connect(toolsui->command,SIGNAL(showMessage(QString,int)),this,SLOT(showMessage(QString,int))); @@ -1104,7 +1105,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 case MAV_MODE_FLAG_SAFETY_ARMED: arm_str.append(tr("ARM")); menuBarUI->setFlightTime(QTime::fromMSecsSinceStartOfDay(FlightTime->time().msecsTo(QDateTime::currentDateTime().time())));//飞行时长 - toolsui->diagram->setTime(4,QTime::fromMSecsSinceStartOfDay(FlightTime->time().msecsTo(QDateTime::currentDateTime().time())));//飞行时长 + //toolsui->diagram->setTime(4,QTime::fromMSecsSinceStartOfDay(FlightTime->time().msecsTo(QDateTime::currentDateTime().time())));//飞行时长 break; case 0: arm_str.append(tr("DISARM")); @@ -1692,7 +1693,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 */ - +/* toolsui->diagram->setAttitude(1, dlink->mavlinknode->vehicle.ins1.ax, dlink->mavlinknode->vehicle.ins1.ay, @@ -1768,7 +1769,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 QString::number(dir_re.toInt() * ((int16_t)dlink->mavlinknode->vehicle.servo_output_raw.servo2_raw) /32767.0 * max_re.toDouble()/scale_re.toDouble() - bias_re.toDouble(),'f',2)); toolsui->diagram->setServo(5,QString::number(dir_ru.toInt() * ((int16_t)dlink->mavlinknode->vehicle.servo_output_raw.servo13_raw)/32767.0 * max_ru.toDouble()/scale_ru.toDouble() - bias_ru.toDouble(),'f',2), QString::number(dir_ru.toInt() * ((int16_t)dlink->mavlinknode->vehicle.servo_output_raw.servo3_raw) /32767.0 * max_ru.toDouble()/scale_ru.toDouble() - bias_ru.toDouble(),'f',2)); - +*/ /* toolsui->diagram->setServo(1,QString::number( ((int16_t)dlink->mavlinknode->vehicle.servo_output_raw.servo14_raw)/32767.0 * 35.0 / 1.12 - m_la,'f',2), QString::number( ((int16_t)dlink->mavlinknode->vehicle.servo_output_raw.servo4_raw)/32767.0 * 35.0 / 1.12 - m_la,'f',2)); @@ -1803,7 +1804,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 Fix.append(tr("%1").arg(dlink->mavlinknode->vehicle.gps_raw_int.fix_type)); break; } - +/* toolsui->diagram->setNavigation(1,Fix);//定位状态 toolsui->diagram->setNavigation(2,QString::number(dlink->mavlinknode->vehicle.gps_raw_int.satellites_visible));//微型数 toolsui->diagram->setNavigation(3,getBit(health,12)?(tr("内置惯导")):(tr("外置SBG")));//数据源 @@ -1841,7 +1842,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 toolsui->diagram->setDlink(1,QString::number(dlink->mavlinknode->rssi,'f',0)); toolsui->diagram->setDlink(2,QString::number(dlink->mavlinknode->rate_in)); - +*/ //dlink->mavlinknode->vehicle.turbinstate.RPM_mea = 12000; @@ -1857,7 +1858,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 if(isEngineStartUp == true) { - toolsui->diagram->setTime(3,QTime::fromMSecsSinceStartOfDay(StartupTime->time().msecsTo(QDateTime::currentDateTime().time())));//开车时长 + //toolsui->diagram->setTime(3,QTime::fromMSecsSinceStartOfDay(StartupTime->time().msecsTo(QDateTime::currentDateTime().time())));//开车时长 }