From ee3c9add6262447266030879521a5972e2322fa3 Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Thu, 8 Aug 2024 15:06:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PayloadAPP.pro | 3 + Src/GDDC/gddcCmdDlg.ui | 28 +- mainwindow.cpp | 20 +- mainwindow.h | 2 + modelcameradlg.cpp | 65 +++++ modelcameradlg.h | 24 ++ modelcameradlg.ui | 599 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 722 insertions(+), 19 deletions(-) create mode 100644 modelcameradlg.cpp create mode 100644 modelcameradlg.h create mode 100644 modelcameradlg.ui diff --git a/PayloadAPP.pro b/PayloadAPP.pro index 9373f84..9006c68 100644 --- a/PayloadAPP.pro +++ b/PayloadAPP.pro @@ -24,6 +24,7 @@ SOURCES += \ homepagedlg.cpp \ main.cpp \ mainwindow.cpp \ + modelcameradlg.cpp \ qweb.cpp HEADERS += \ @@ -40,6 +41,7 @@ HEADERS += \ global.h \ homepagedlg.h \ mainwindow.h \ + modelcameradlg.h \ qweb.h FORMS += \ @@ -50,6 +52,7 @@ FORMS += \ Src/GDDC/gddcdlg.ui \ homepagedlg.ui \ mainwindow.ui \ + modelcameradlg.ui \ qweb.ui TRANSLATIONS += \ diff --git a/Src/GDDC/gddcCmdDlg.ui b/Src/GDDC/gddcCmdDlg.ui index 0950da2..ba0d99e 100644 --- a/Src/GDDC/gddcCmdDlg.ui +++ b/Src/GDDC/gddcCmdDlg.ui @@ -59,7 +59,7 @@ false - Qt::NoFocus + Qt::FocusPolicy::NoFocus false @@ -68,16 +68,16 @@ - QTabWidget::North + QTabWidget::TabPosition::North - QTabWidget::Rounded + QTabWidget::TabShape::Rounded 0 - Qt::ElideNone + Qt::TextElideMode::ElideNone @@ -115,7 +115,7 @@ 目标跟踪模板大小设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -216,7 +216,7 @@ 视频显示模式设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -271,7 +271,7 @@ IP设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -537,7 +537,7 @@ 字符叠加设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -597,7 +597,7 @@ 亮度设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -823,7 +823,7 @@ 对比度设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -921,7 +921,7 @@ 透雾模式设置 - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -963,7 +963,7 @@ 焦距设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1061,7 +1061,7 @@ 增益设置 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2087,7 +2087,7 @@ font: 12pt "Microsoft YaHei UI"; AI跟踪 - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter diff --git a/mainwindow.cpp b/mainwindow.cpp index 19266ec..7ed7dd8 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -54,7 +54,7 @@ MainWindow::~MainWindow() delete mWeb; delete process; delete ui; - + if(m_ModelCameraDlg!=nullptr) delete m_ModelCameraDlg; } void MainWindow::initWindow() { @@ -70,6 +70,7 @@ void MainWindow::initWindow() m_GDDCdlg = new GDDCdlg(this); m_HomePagedlg = new HomePageDlg(this); + m_ModelCameraDlg = new ModelCameraDlg(this); mWeb = new CWebEngineView(); mWeb->setPage(new CustomWebEnginePage()); // mWeb = new QWebEngineView(this); @@ -78,12 +79,13 @@ void MainWindow::initWindow() ui->SubPage->addWidget(mWeb); ui->SubPage->addWidget(m_GDDCdlg); ui->SubPage->addWidget(m_HomePagedlg); + ui->SubPage->addWidget(m_ModelCameraDlg); // mWeb->show(); mWeb->hide(); m_HomePagedlg->hide(); m_HomePagedlg->show(); - + m_ModelCameraDlg->hide(); } void MainWindow::initButton() @@ -237,6 +239,7 @@ void MainWindow::toolButton_clicked() m_HomePagedlg->show(); //显示窗口 m_GDDCdlg->hide(); mWeb->hide(); + m_ModelCameraDlg->hide(); process->kill(); } //光电吊舱 @@ -246,6 +249,7 @@ void MainWindow::toolButton_2_clicked() //m_GDDCdlg->move(130,80); m_GDDCdlg->show(); //显示窗口 m_HomePagedlg->hide(); + m_ModelCameraDlg->hide(); mWeb->hide(); } @@ -255,6 +259,7 @@ void MainWindow::toolButton_3_clicked() changeBtnColor(3); mWeb->show(); m_HomePagedlg->hide(); + m_ModelCameraDlg->hide(); m_GDDCdlg->hide(); } @@ -264,6 +269,7 @@ void MainWindow::toolButton_4_clicked() changeBtnColor(4); m_HomePagedlg->hide(); m_GDDCdlg->hide(); + m_ModelCameraDlg->hide(); mWeb->load(QUrl("http://192.168.1.10")); mWeb->show(); //process->kill(); @@ -275,6 +281,7 @@ void MainWindow::toolButton_5_clicked() changeBtnColor(5); m_HomePagedlg->hide(); m_GDDCdlg->hide(); + m_ModelCameraDlg->hide(); mWeb->load(QUrl("http://192.168.150.1")); mWeb->show(); @@ -286,7 +293,7 @@ void MainWindow::toolButton_6_clicked() changeBtnColor(6); m_HomePagedlg->hide(); m_GDDCdlg->hide(); - + m_ModelCameraDlg->hide(); mWeb->load(QUrl("http://192.168.0.2")); mWeb->show(); @@ -299,6 +306,7 @@ void MainWindow::toolButton_7_clicked() changeBtnColor(7); m_HomePagedlg->hide(); m_GDDCdlg->hide(); + m_ModelCameraDlg->hide(); // mWeb->stop(); mWeb->load(QUrl("https://baidu.com")); mWeb->show(); @@ -312,8 +320,10 @@ void MainWindow::toolButton_8_clicked() changeBtnColor(8); m_HomePagedlg->hide(); m_GDDCdlg->hide(); - process->setWorkingDirectory("D:/QTdemo/playerApp/app"); // 设置工作目录 - process->start("D:/QTdemo/playerApp/app/XCOM V2.0.exe"); // 启动exe并传递参数 + mWeb->hide(); + m_ModelCameraDlg->show(); + //process->setWorkingDirectory("D:/QTdemo/playerApp/app"); // 设置工作目录 + //process->start("D:/QTdemo/playerApp/app/XCOM V2.0.exe"); // 启动exe并传递参数 } diff --git a/mainwindow.h b/mainwindow.h index 6ea101b..56faf3b 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -4,6 +4,7 @@ #include #include "Src/GDDC/gddcdlg.h" #include "homepagedlg.h" +#include "modelcameradlg.h" #include #include @@ -54,6 +55,7 @@ public: HomePageDlg *m_HomePagedlg; //QWeb *m_qWeb; QWebEngineView *mWeb; + ModelCameraDlg* m_ModelCameraDlg; private: QProcess *process; QString exeDirPathName = ""; diff --git a/modelcameradlg.cpp b/modelcameradlg.cpp new file mode 100644 index 0000000..20b0bfd --- /dev/null +++ b/modelcameradlg.cpp @@ -0,0 +1,65 @@ +#include "modelcameradlg.h" +#include "ui_modelcameradlg.h" + +ModelCameraDlg::ModelCameraDlg(QWidget *parent) + : QDialog(parent) + , ui(new Ui::ModelCameraDlg) +{ + ui->setupUi(this); + + InitialComboBox(); +} + +ModelCameraDlg::~ModelCameraDlg() +{ + delete ui; +} + +void ModelCameraDlg::InitialComboBox() +{ + //快门速度 + ui->SSComboBox->insertItem(0,"1/100"); + ui->SSComboBox->insertItem(1,"1/125"); + ui->SSComboBox->insertItem(2,"1/160"); + ui->SSComboBox->insertItem(3,"1/200"); + ui->SSComboBox->insertItem(4,"1/250"); + ui->SSComboBox->insertItem(5,"1/320"); + ui->SSComboBox->insertItem(6,"1/400"); + ui->SSComboBox->insertItem(7,"1/500"); + ui->SSComboBox->insertItem(8,"1/640"); + ui->SSComboBox->insertItem(9,"1/800"); + ui->SSComboBox->insertItem(10,"1/1000"); + ui->SSComboBox->insertItem(11,"1/1250"); + ui->SSComboBox->insertItem(12,"1/1600"); + ui->SSComboBox->insertItem(13,"1/2000"); + + //ISO + ui->ISOComboBox->insertItem(0,"50~800"); + ui->ISOComboBox->insertItem(1,"50~1600"); + ui->ISOComboBox->insertItem(2,"50"); + ui->ISOComboBox->insertItem(3,"100"); + ui->ISOComboBox->insertItem(4,"125"); + ui->ISOComboBox->insertItem(5,"160"); + ui->ISOComboBox->insertItem(6,"200"); + ui->ISOComboBox->insertItem(7,"250"); + ui->ISOComboBox->insertItem(8,"320"); + ui->ISOComboBox->insertItem(9,"400"); + ui->ISOComboBox->insertItem(10,"500"); + ui->ISOComboBox->insertItem(11,"640"); + ui->ISOComboBox->insertItem(12,"800"); + ui->ISOComboBox->insertItem(13,"1000"); + ui->ISOComboBox->insertItem(14,"1250"); + ui->ISOComboBox->insertItem(15,"1600"); + + //AWB + ui->AWBComboBox->insertItem(0,"自动"); + ui->AWBComboBox->insertItem(1,"日光"); + + //相机模式 + ui->cameraModelComboBox->insertItem(0,"拍照模式"); + ui->cameraModelComboBox->insertItem(1,"录像模式"); + + //色彩模式 + ui->ColorModelComboBox->insertItem(0,"艳丽"); + ui->ColorModelComboBox->insertItem(1,"标准"); +} diff --git a/modelcameradlg.h b/modelcameradlg.h new file mode 100644 index 0000000..ecb5f55 --- /dev/null +++ b/modelcameradlg.h @@ -0,0 +1,24 @@ +#ifndef MODELCAMERADLG_H +#define MODELCAMERADLG_H + +#include + +namespace Ui { +class ModelCameraDlg; +} + +class ModelCameraDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ModelCameraDlg(QWidget *parent = nullptr); + ~ModelCameraDlg(); +private: + void InitialComboBox(); +private: + Ui::ModelCameraDlg *ui; + +}; + +#endif // MODELCAMERADLG_H diff --git a/modelcameradlg.ui b/modelcameradlg.ui new file mode 100644 index 0000000..1306fbf --- /dev/null +++ b/modelcameradlg.ui @@ -0,0 +1,599 @@ + + + ModelCameraDlg + + + + 0 + 0 + 907 + 917 + + + + Dialog + + + + 2 + + + 4 + + + 4 + + + 4 + + + 2 + + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Raised + + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 600 + 400 + + + + + + + + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Raised + + + + 2 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + 拍照指令 + + + Qt::AlignmentFlag::AlignCenter + + + false + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + 11 + + + 12 + + + 4 + + + + + + 10 + + + + 拍照间隔： + + + + + + + QAbstractSpinBox::ButtonSymbols::NoButtons + + + 1 + + + 0.800000000000000 + + + QAbstractSpinBox::StepType::DefaultStepType + + + + + + + 开始拍照 + + + + + + + 停止拍照 + + + + + + + 开机 + + + + + + + 关机 + + + + + + + + + 9 + + + + + + 10 + + + + 拉流地址： + + + + + + + + + + 播放视频 + + + + + + + + + + + + 设置相机参数 + + + Qt::AlignmentFlag::AlignCenter + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + 8 + + + 16 + + + 4 + + + + + + 10 + + + + 快门速度： + + + + + + + + + + + 10 + + + + ISO： + + + + + + + + + + + 10 + + + + AWB模式： + + + + + + + + + + + 10 + + + + 相机模式： + + + + + + + + + + + 10 + + + + 色彩模式： + + + + + + + + + + + + + + + 相机状态 + + + Qt::AlignmentFlag::AlignCenter + + + + 4 + + + 4 + + + 4 + + + 4 + + + 4 + + + + + QLayout::SizeConstraint::SetDefaultConstraint + + + 4 + + + 8 + + + 4 + + + + + + 10 + + + + 开关机状态： + + + 2 + + + + + + + + + + + 10 + + + + 温度： + + + + + + + + + + + 10 + + + + 图传状态： + + + + + + + + + + + 10 + + + + 相片总数： + + + + + + + + + + + 10 + + + + 快门速度： + + + + + + + + + + + 10 + + + + A照片数： + + + + + + + + + + + 10 + + + + ISO范围值： + + + + + + + + + + + 10 + + + + D照片数： + + + + + + + + + + + 10 + + + + AWB： + + + + + + + + + + + 10 + + + + S照片数： + + + + + + + + + + + 10 + + + + 相机模式： + + + + + + + + + + + 10 + + + + W照片数： + + + + + + + + + + + 10 + + + + 色彩模式： + + + + + + + + + + + 10 + + + + X照片数： + + + + + + + + + + + + + + + + + + +