diff --git a/SDFPDlg.cpp b/SDFPDlg.cpp index 71e8746..c6a0a29 100644 --- a/SDFPDlg.cpp +++ b/SDFPDlg.cpp @@ -13,6 +13,7 @@ SDFPDlg::SDFPDlg(QWidget *parent) //嵌入到主窗口 setWindowFlags(Qt::CustomizeWindowHint|Qt::FramelessWindowHint); hide(); + ui->label_version->setText(g_SoftwareVersion); } SDFPDlg::~SDFPDlg() diff --git a/SDFPDlg.h b/SDFPDlg.h index 8738f28..c4b4cef 100644 --- a/SDFPDlg.h +++ b/SDFPDlg.h @@ -2,6 +2,7 @@ #define SDFPDLG_H #include +#include "global.h" namespace Ui { class SDFPDlg; diff --git a/SDFPDlg.ui b/SDFPDlg.ui index 84f9cb9..d39cc04 100644 --- a/SDFPDlg.ui +++ b/SDFPDlg.ui @@ -6,8 +6,8 @@ 0 0 - 768 - 440 + 955 + 518 @@ -16,9 +16,39 @@ - - - + + + + + + 0 + 0 + + + + image: url(:/res/981csNew.png); + + + + + + + + + + 0 + 0 + + + + 版本号:V0.00.00 + + + + + + + Qt::Orientation::Horizontal @@ -33,15 +63,8 @@ - - - - image: url(:/res/981csNew.png); - - - - - + + Qt::Orientation::Horizontal diff --git a/Src/GDDC/gddcCmdDlg.cpp b/Src/GDDC/gddcCmdDlg.cpp index 08e174a..6e12a86 100644 --- a/Src/GDDC/gddcCmdDlg.cpp +++ b/Src/GDDC/gddcCmdDlg.cpp @@ -69,6 +69,8 @@ void GDDCCmdDlg::initParam() { ui->comboBox_4_2->addItem("5"); ui->comboBox_4_2->addItem("6"); ui->comboBox_4_2->addItem("7"); + ui->comboBox_4_3->addItem("关闭");//关闭温度报警或者阈值检测功能 + ui->comboBox_4_3->addItem("开启");//开启温度报警或者阈值检测功能 /*稳定平台*/ ui->comboBox_5_1->addItem("非常慢"); @@ -654,6 +656,36 @@ void GDDCCmdDlg::on_pushButton_4_18_pressed() { } void GDDCCmdDlg::on_pushButton_4_18_released() { clearTJDCCmdBuffer(); } +// 红外报警设置 +void GDDCCmdDlg::on_pushButton_4_19_pressed() +{ + UINT8 Bit7 = 0; + UINT8 Bit0 = 0; + int sel = ui->lineEdit_4_1->text().toInt(); + int sel2 = ui->lineEdit_4_2->text().toInt()*10; + + if(ui->comboBox_4_3->currentIndex()==0) { // 关闭温度报警或者阈值检测功能; + Bit7 = 0b00000000; + } else { // 开启温度报警或者阈值检测功能; + Bit7 = 0b10000000; + } + + if(ui->radioButton_4_1->isChecked()) { //温度阈值 + Bit0 = 0b00000000; + TJDCCmdBuffer[0] = (std::byte)(Bit7+Bit0); + TJDCCmdBuffer[1] = (std::byte)sel; //观瞄型 + TJDCCmdBuffer[2] = (std::byte)(sel>>8); + } else { //16位 RAW 数据阈值 + Bit0 = 0b00000001; + TJDCCmdBuffer[0] = (std::byte)(Bit7+Bit0); + TJDCCmdBuffer[1] = (std::byte)sel2; //测温型 + TJDCCmdBuffer[2] = (std::byte)(sel2>>8); + } +} + + +void GDDCCmdDlg::on_pushButton_4_19_released(){ clearTJDCCmdBuffer(); } + // 俯仰+ void GDDCCmdDlg::on_pushButton_5_1_pressed() { if (paramIsFrame) { @@ -928,3 +960,6 @@ void GDDCCmdDlg::on_pushButton_6_8_clicked() { ui->pushButton_6_8->setDown(false); } } + + + diff --git a/Src/GDDC/gddcCmdDlg.h b/Src/GDDC/gddcCmdDlg.h index 8897969..a4ea38c 100644 --- a/Src/GDDC/gddcCmdDlg.h +++ b/Src/GDDC/gddcCmdDlg.h @@ -174,6 +174,8 @@ private slots: void on_pushButton_4_17_released(); void on_pushButton_4_18_pressed(); void on_pushButton_4_18_released(); + void on_pushButton_4_19_pressed(); + void on_pushButton_4_19_released(); /*云台控制*/ void on_pushButton_5_1_pressed(); void on_pushButton_5_1_released(); @@ -225,6 +227,7 @@ private slots: void on_pushButton_6_7_pressed(); void on_pushButton_6_7_released(); void on_pushButton_6_8_clicked(); + }; #endif // GDDCCMDDLG_H diff --git a/Src/GDDC/gddcCmdDlg.ui b/Src/GDDC/gddcCmdDlg.ui index 04d0cd4..c6cf031 100644 --- a/Src/GDDC/gddcCmdDlg.ui +++ b/Src/GDDC/gddcCmdDlg.ui @@ -80,7 +80,7 @@ QTabWidget::TabShape::Rounded - 5 + 3 Qt::TextElideMode::ElideNone @@ -1380,6 +1380,104 @@ + + + + 720 + 10 + 201 + 161 + + + + 红外报警设置 + + + + + 10 + 120 + 71 + 31 + + + + + + + 100 + 120 + 71 + 31 + + + + + + + 设置 + + + + + + 80 + 40 + 91 + 23 + + + + + + + 80 + 80 + 91 + 23 + + + + + + + 180 + 80 + 16 + 21 + + + + + + + + + + 10 + 40 + 61 + 21 + + + + 观瞄型 + + + + + + 10 + 80 + 61 + 21 + + + + 测温型 + + + diff --git a/Src/GDDC/gddcdlg.cpp b/Src/GDDC/gddcdlg.cpp index 0243e55..e0b9010 100644 --- a/Src/GDDC/gddcdlg.cpp +++ b/Src/GDDC/gddcdlg.cpp @@ -341,7 +341,7 @@ void GDDCdlg::resizeUI() { // 定时器处理 void GDDCdlg::GDDCControlTimeOut() { - if (m_GDDCCmdDlg->sendTimes > 0) { + if (m_GDDCCmdDlg->sendTimes > 0) { // 优先发送次数指令 m_GDDCCmdDlg->sendTimes -= 1; // UDP控制 @@ -357,7 +357,7 @@ void GDDCdlg::GDDCControlTimeOut() { if (m_GDDCCmdDlg->sendTimes == 0) { m_GDDCCmdDlg->clearTJDCCmdBuffer(); } - } else { + } else { // 发送常发帧或长按指令 m_GDDCCmdDlg->UpdateDataTJDC(); // UDP控制 if (connectFlag[3]) { diff --git a/global.cpp b/global.cpp index 5c4ce21..e946894 100644 --- a/global.cpp +++ b/global.cpp @@ -1,12 +1,10 @@ #include "global.h" +global::global() {} - +QString g_SoftwareVersion = "版本号:V1.00.00"; QColor g_themeColor(51, 51, 51); - - - QString g_PushBtnStyle = /**正常情况下样式**/ "QPushButton{" "font: 12pt '微软雅黑';" @@ -155,4 +153,4 @@ uint16_t calCRC16(const uint8_t *cpu8Data, uint16_t u16Len) return u16CRC; } -global::global() {} + diff --git a/global.h b/global.h index c20085e..11fd27c 100644 --- a/global.h +++ b/global.h @@ -3,6 +3,7 @@ #include +extern QString g_SoftwareVersion; //软件版本号 /*******************系统颜色***************************************/ extern QColor g_themeColor;