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 1/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=89?= =?UTF-8?q?=E7=BB=B4=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照片数： + + + + + + + + + + + + + + + + + + + From a40f174a78e0ec9a8b131dda7f05f5b1b811ebd7 Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Tue, 13 Aug 2024 16:12:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=9B=B8?= =?UTF-8?q?=E6=9C=BA=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PayloadAPP.pro | 2 + encodemodelcamera.cpp | 34 +++++++++ encodemodelcamera.h | 24 ++++++ global.cpp | 20 +++++ global.h | 7 ++ modelcameradlg.cpp | 165 ++++++++++++++++++++++++++++++++++++++++++ modelcameradlg.h | 31 +++++++- modelcameradlg.ui | 36 +++++++++ 8 files changed, 318 insertions(+), 1 deletion(-) create mode 100644 encodemodelcamera.cpp create mode 100644 encodemodelcamera.h diff --git a/PayloadAPP.pro b/PayloadAPP.pro index 9006c68..e27bab6 100644 --- a/PayloadAPP.pro +++ b/PayloadAPP.pro @@ -18,6 +18,7 @@ SOURCES += \ cffmpeg_decode.cpp \ customwebenginepage.cpp \ cwebengineview.cpp \ + encodemodelcamera.cpp \ ffmpegvideodlg.cpp \ Src/GDDC/gddcdlg.cpp \ global.cpp \ @@ -36,6 +37,7 @@ HEADERS += \ cffmpeg_decode.h \ customwebenginepage.h \ cwebengineview.h \ + encodemodelcamera.h \ ffmpegvideodlg.h \ Src/GDDC/gddcdlg.h \ global.h \ diff --git a/encodemodelcamera.cpp b/encodemodelcamera.cpp new file mode 100644 index 0000000..bb8d8a6 --- /dev/null +++ b/encodemodelcamera.cpp @@ -0,0 +1,34 @@ +#include "encodemodelcamera.h" + +EncodeModelCamera::EncodeModelCamera(QObject *parent) + : QObject{parent} +{ + cameraUDP = new QUdpSocket(this); + //cameraUDP->bind(QHostAddress("198.18.0.1"),8080); + + cmdArray.insert(0,0xFA); + cmdArray.insert(1,0xFA); +} + +/** + * @brief 发送三维建模相机指令 + * @param cmdDataArray 指令ID与负载数据 + */ +void EncodeModelCamera::SendCMD(QByteArray cmdDataArray) +{ + cmdArray.clear(); + cmdArray.insert(0,0xFA); + cmdArray.insert(1,0xFA); + + cmdArray.append(cmdDataArray); + uint8_t* data = reinterpret_cast(cmdArray.data()); + uint16_t crc16 = calCRC16(data,cmdArray.size()); + + QByteArray byteArray; + QDataStream stream(&byteArray, QIODevice::WriteOnly); + stream.setByteOrder(QDataStream::BigEndian); + stream << crc16; + cmdArray.append(byteArray); + + cameraUDP->writeDatagram(cmdArray,QHostAddress("127.0.0.1"),8080); +} diff --git a/encodemodelcamera.h b/encodemodelcamera.h new file mode 100644 index 0000000..55f2a26 --- /dev/null +++ b/encodemodelcamera.h @@ -0,0 +1,24 @@ +#ifndef ENCODEMODELCAMERA_H +#define ENCODEMODELCAMERA_H + +#include +#include +#include +#include +#include "global.h" + +class EncodeModelCamera : public QObject +{ + Q_OBJECT +public: + explicit EncodeModelCamera(QObject *parent = nullptr); +private: + QByteArray cmdArray; + QUdpSocket* cameraUDP; +public slots: + void SendCMD(QByteArray cmdDataArray); + +signals: +}; + +#endif // ENCODEMODELCAMERA_H diff --git a/global.cpp b/global.cpp index 47b785c..e1cf60a 100644 --- a/global.cpp +++ b/global.cpp @@ -135,4 +135,24 @@ QString g_ToolBtnSelStyle = /**选中情况下样式**/ "border-color: #dcdde1;" "}"; +/** + * @brief calCRC16 + * @param cpu8Data + * @param u16Len + * @return + */ +uint16_t calCRC16(const uint8_t *cpu8Data, uint16_t u16Len) +{ + uint8_t u8X; + uint16_t u16CRC = 0X8848; + + while (u16Len--) + { + u8X = u16CRC >> 8 ^ *cpu8Data++; + u8X ^= u8X >> 4; + u16CRC = (u16CRC << 8) ^ ((uint16_t)(u8X << 12)) ^ ((uint16_t)(u8X << 5)) ^ ((uint16_t)u8X); + } + return u16CRC; +} + global::global() {} diff --git a/global.h b/global.h index 0ff2a1b..c20085e 100644 --- a/global.h +++ b/global.h @@ -12,6 +12,13 @@ extern QString g_ToolBtnStyle; extern QString g_ToolBtnSelStyle; /*******************系统颜色***************************************/ +/** + * @brief calCRC16 + * @param cpu8Data + * @param u16Len + * @return + */ +extern uint16_t calCRC16(const uint8_t *cpu8Data, uint16_t u16Len); class global { diff --git a/modelcameradlg.cpp b/modelcameradlg.cpp index 20b0bfd..7698ce3 100644 --- a/modelcameradlg.cpp +++ b/modelcameradlg.cpp @@ -8,6 +8,10 @@ ModelCameraDlg::ModelCameraDlg(QWidget *parent) ui->setupUi(this); InitialComboBox(); + + cameraCMDThread = new QThread(this); + encodeModelCamera = new EncodeModelCamera(this); + connect(this,&ModelCameraDlg::on_sendCmdData_signal,encodeModelCamera,&EncodeModelCamera::SendCMD); } ModelCameraDlg::~ModelCameraDlg() @@ -17,6 +21,8 @@ ModelCameraDlg::~ModelCameraDlg() void ModelCameraDlg::InitialComboBox() { + ui->photoTimeDbSpinBox->setSuffix("s"); + //快门速度 ui->SSComboBox->insertItem(0,"1/100"); ui->SSComboBox->insertItem(1,"1/125"); @@ -63,3 +69,162 @@ void ModelCameraDlg::InitialComboBox() ui->ColorModelComboBox->insertItem(0,"艳丽"); ui->ColorModelComboBox->insertItem(1,"标准"); } + +//开始拍照点击事件 +void ModelCameraDlg::on_startPhotoBtn_clicked() +{ + quint8 photoTime = ui->photoTimeDbSpinBox->value() * 10; + + cmdDataArray.clear(); + cmdDataArray.insert(0,0x02); + cmdDataArray.insert(1,0xA1); + cmdDataArray.insert(2,0x03); + cmdDataArray.insert(3,0x01); + cmdDataArray.insert(4,photoTime); + emit on_sendCmdData_signal(cmdDataArray); +} + +//停止拍照 +void ModelCameraDlg::on_stopPhotoBtn_clicked() +{ + cmdDataArray.clear(); + cmdDataArray.insert(0,0x01); + cmdDataArray.insert(1,0xA1); + cmdDataArray.insert(2,0x03); + cmdDataArray.insert(3,QByteArray(1, char(0x00))); + emit on_sendCmdData_signal(cmdDataArray); +} + +//开机 +void ModelCameraDlg::on_ONBtn_clicked() +{ + cmdDataArray.clear(); + cmdDataArray.insert(0,0x01); + cmdDataArray.insert(1,0xA1); + cmdDataArray.insert(2,0x01); + cmdDataArray.insert(3,0x01); + emit on_sendCmdData_signal(cmdDataArray); +} + +//关机 +void ModelCameraDlg::on_OFFBtn_clicked() +{ + cmdDataArray.clear(); + cmdDataArray.insert(0,0x01); + cmdDataArray.insert(1,0xA1); + cmdDataArray.insert(2,0x01); + cmdDataArray.insert(3,QByteArray(1, char(0x00))); + emit on_sendCmdData_signal(cmdDataArray); +} + +//播放视频 +void ModelCameraDlg::on_pushButton_5_clicked() +{ + +} + +//快门速度 +void ModelCameraDlg::on_SSComboBox_activated(int index) +{ + QString tmp = ui->SSComboBox->itemText(index); + QString strSS = tmp.right(tmp.length()-2); + qint16 hexValue = strSS.toShort();// + + cmdDataArray.clear(); + cmdDataArray.insert(0,0x04); + cmdDataArray.insert(1,0xA2); + cmdDataArray.insert(2,0x01); + cmdDataArray.insert(3,0x01); + + QByteArray byteArray; + byteArray.resize(2); + qToBigEndian(hexValue, (char*)byteArray.data()); + + cmdDataArray.append(byteArray); + cmdDataArray.insert(6,0xFF); + emit on_sendCmdData_signal(cmdDataArray); +} + +//ISO +void ModelCameraDlg::on_ISOComboBox_activated(int index) +{ + QString strSS = ui->ISOComboBox->itemText(index); + if(index == 0) strSS = "-2"; + else if(index == 1) strSS = "-1"; + qint16 hexValue = strSS.toShort();// + + cmdDataArray.clear(); + cmdDataArray.insert(0,0x04); + cmdDataArray.insert(1,0xA2); + cmdDataArray.insert(2,0x02); + cmdDataArray.insert(3,0x01); + + QByteArray byteArray; + byteArray.resize(2); + qToBigEndian(hexValue, (char*)byteArray.data()); + + cmdDataArray.append(byteArray); + cmdDataArray.insert(6,0xFF); + + emit on_sendCmdData_signal(cmdDataArray); +} + +//AWB +void ModelCameraDlg::on_AWBComboBox_activated(int index) +{ + quint16 hexValue = index + 1;// + + cmdDataArray.clear(); + cmdDataArray.insert(0,0x04); + cmdDataArray.insert(1,0xA2); + cmdDataArray.insert(2,0x06); + cmdDataArray.insert(3,0x01); + + QByteArray byteArray; + byteArray.resize(2); + qToBigEndian(hexValue, (uchar*)byteArray.data()); + + cmdDataArray.append(byteArray); + cmdDataArray.insert(6,0xFF); + + emit on_sendCmdData_signal(cmdDataArray); +} + +//相机模式 +void ModelCameraDlg::on_cameraModelComboBox_activated(int index) +{ + quint16 hexValue = index + 1;// + + cmdDataArray.clear(); + cmdDataArray.insert(0,0x01); + cmdDataArray.insert(1,0xA1); + cmdDataArray.insert(2,0x02); + if(index == 0) + cmdDataArray.insert(3,QByteArray(1, char(0x00))); + else if(index == 1) + cmdDataArray.insert(3,0x01); + + emit on_sendCmdData_signal(cmdDataArray); +} + +//色彩模式 +void ModelCameraDlg::on_ColorModelComboBox_activated(int index) +{ + quint16 hexValue = index + 1;// + + cmdDataArray.clear(); + cmdDataArray.insert(0,0x04); + cmdDataArray.insert(1,0xA2); + cmdDataArray.insert(2,0x08); + cmdDataArray.insert(3,0x01); + + QByteArray byteArray; + byteArray.resize(2); + qToBigEndian(hexValue, (uchar*)byteArray.data()); + + cmdDataArray.append(byteArray); + cmdDataArray.insert(6,0xFF); + + emit on_sendCmdData_signal(cmdDataArray); +} + diff --git a/modelcameradlg.h b/modelcameradlg.h index ecb5f55..e836cc8 100644 --- a/modelcameradlg.h +++ b/modelcameradlg.h @@ -2,6 +2,10 @@ #define MODELCAMERADLG_H #include +#include +#include +#include "encodemodelcamera.h" +#include namespace Ui { class ModelCameraDlg; @@ -14,11 +18,36 @@ class ModelCameraDlg : public QDialog public: explicit ModelCameraDlg(QWidget *parent = nullptr); ~ModelCameraDlg(); +signals: + void on_sendCmdData_signal(QByteArray cmdDataArray); +private slots: + void on_startPhotoBtn_clicked(); + + void on_stopPhotoBtn_clicked(); + + void on_ONBtn_clicked(); + + void on_OFFBtn_clicked(); + + void on_pushButton_5_clicked(); + + void on_SSComboBox_activated(int index); + + void on_ISOComboBox_activated(int index); + + void on_AWBComboBox_activated(int index); + + void on_cameraModelComboBox_activated(int index); + + void on_ColorModelComboBox_activated(int index); + private: void InitialComboBox(); private: Ui::ModelCameraDlg *ui; - + QThread* cameraCMDThread; + QByteArray cmdDataArray; + EncodeModelCamera* encodeModelCamera; }; #endif // MODELCAMERADLG_H diff --git a/modelcameradlg.ui b/modelcameradlg.ui index 1306fbf..beee92a 100644 --- a/modelcameradlg.ui +++ b/modelcameradlg.ui @@ -130,6 +130,12 @@ + + + 0 + 0 + + 10 @@ -142,6 +148,12 @@ + + + 0 + 0 + + QAbstractSpinBox::ButtonSymbols::NoButtons @@ -158,6 +170,12 @@ + + + 0 + 0 + + 开始拍照 @@ -165,6 +183,12 @@ + + + 0 + 0 + + 停止拍照 @@ -172,6 +196,12 @@ + + + 0 + 0 + + 开机 @@ -179,6 +209,12 @@ + + + 0 + 0 + + 关机 From eeb9e043e3c2b8a335848b8b9bae83c5b2854ca3 Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Thu, 15 Aug 2024 13:38:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=B8=89=E7=BB=B4=E5=BB=BA?= =?UTF-8?q?=E6=A8=A1=E6=8B=89=E6=B5=81=EF=BC=8Cui=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modelcameradlg.cpp | 18 +++++++++++++----- modelcameradlg.ui | 8 ++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/modelcameradlg.cpp b/modelcameradlg.cpp index ebe62a9..3836926 100644 --- a/modelcameradlg.cpp +++ b/modelcameradlg.cpp @@ -128,11 +128,19 @@ void ModelCameraDlg::on_OFFBtn_clicked() //播放视频 void ModelCameraDlg::on_pushButton_5_clicked() { - QString ip = ui->videoIPLineEdit->text(); - ui->cameraVideoWidget->setUrl(ip); - ui->cameraVideoWidget->play(); - - ui->cameraVideoWidget->m_PlayStatus = false; + QString str = ui->pushButton_5->text(); + if(str == "播放视频") + { + QString ip = ui->videoIPLineEdit->text(); + ui->cameraVideoWidget->play(); + ui->cameraVideoWidget->setUrl(ip); + ui->pushButton_5->setText("暂停播放"); + } + else + { + ui->cameraVideoWidget->stop(); + ui->pushButton_5->setText("播放视频"); + } } //快门速度 diff --git a/modelcameradlg.ui b/modelcameradlg.ui index 362d420..c82e033 100644 --- a/modelcameradlg.ui +++ b/modelcameradlg.ui @@ -118,16 +118,16 @@ 4 - + + + 4 + 11 12 - - 4 - From 508c4d5d1704954adbb62a5f4ffbf3b0f621d5f4 Mon Sep 17 00:00:00 2001 From: cbwu <504-wuchengbo@htsdfp.com> Date: Fri, 16 Aug 2024 17:04:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PayloadAPP.pro | 97 +++++++++--------- DCFrameCkCmd.h => Src/GDDC/DCFrameCkCmd.h | 0 Src/GDDC/GDDC.pri | 20 ++++ Src/GDDC/gddcdlg.h | 2 +- Src/HomePage/HomePage.pri | 11 ++ Src/ModelCamera/ModelCamera.pri | 11 ++ .../ModelCamera/encodemodelcamera.cpp | 0 .../ModelCamera/encodemodelcamera.h | 0 .../ModelCamera/modelcameradlg.cpp | 0 .../ModelCamera/modelcameradlg.h | 0 .../ModelCamera/modelcameradlg.ui | 2 +- Src/RescueLoad/RescueLoad.pri | 13 +++ {map => Src/RescueLoad/map}/marker.png | Bin {map => Src/RescueLoad/map}/places_map.qml | 0 {map => Src/RescueLoad/map}/places_map.qrc | 0 .../RescueLoad/map}/selectlocation.png | Bin .../RescueLoad/rescueload.cpp | 0 rescueload.h => Src/RescueLoad/rescueload.h | 0 .../RescueLoad/rescueloadwidget.cpp | 0 .../RescueLoad/rescueloadwidget.h | 0 .../RescueLoad/rescueloadwidget.ui | 0 Src/Video/Video.pri | 10 ++ .../Video/cffmpeg_decode.cpp | 0 .../Video/cffmpeg_decode.h | 0 .../Video/ffmpegvideodlg.cpp | 0 .../Video/ffmpegvideodlg.h | 0 .../Video/ffmpegvideodlg.ui | 0 Src/WebPage/WebPage.pri | 12 +++ .../WebPage/customwebenginepage.cpp | 0 .../WebPage/customwebenginepage.h | 0 .../WebPage/cwebengineview.cpp | 0 .../WebPage/cwebengineview.h | 0 qweb.cpp => Src/WebPage/qweb.cpp | 0 qweb.h => Src/WebPage/qweb.h | 0 qweb.ui => Src/WebPage/qweb.ui | 0 mainwindow.cpp | 4 +- mainwindow.h | 4 +- 37 files changed, 134 insertions(+), 52 deletions(-) rename DCFrameCkCmd.h => Src/GDDC/DCFrameCkCmd.h (100%) create mode 100644 Src/GDDC/GDDC.pri create mode 100644 Src/HomePage/HomePage.pri create mode 100644 Src/ModelCamera/ModelCamera.pri rename encodemodelcamera.cpp => Src/ModelCamera/encodemodelcamera.cpp (100%) rename encodemodelcamera.h => Src/ModelCamera/encodemodelcamera.h (100%) rename modelcameradlg.cpp => Src/ModelCamera/modelcameradlg.cpp (100%) rename modelcameradlg.h => Src/ModelCamera/modelcameradlg.h (100%) rename modelcameradlg.ui => Src/ModelCamera/modelcameradlg.ui (99%) create mode 100644 Src/RescueLoad/RescueLoad.pri rename {map => Src/RescueLoad/map}/marker.png (100%) rename {map => Src/RescueLoad/map}/places_map.qml (100%) rename {map => Src/RescueLoad/map}/places_map.qrc (100%) rename {map => Src/RescueLoad/map}/selectlocation.png (100%) rename rescueload.cpp => Src/RescueLoad/rescueload.cpp (100%) rename rescueload.h => Src/RescueLoad/rescueload.h (100%) rename rescueloadwidget.cpp => Src/RescueLoad/rescueloadwidget.cpp (100%) rename rescueloadwidget.h => Src/RescueLoad/rescueloadwidget.h (100%) rename rescueloadwidget.ui => Src/RescueLoad/rescueloadwidget.ui (100%) create mode 100644 Src/Video/Video.pri rename cffmpeg_decode.cpp => Src/Video/cffmpeg_decode.cpp (100%) rename cffmpeg_decode.h => Src/Video/cffmpeg_decode.h (100%) rename ffmpegvideodlg.cpp => Src/Video/ffmpegvideodlg.cpp (100%) rename ffmpegvideodlg.h => Src/Video/ffmpegvideodlg.h (100%) rename ffmpegvideodlg.ui => Src/Video/ffmpegvideodlg.ui (100%) create mode 100644 Src/WebPage/WebPage.pri rename customwebenginepage.cpp => Src/WebPage/customwebenginepage.cpp (100%) rename customwebenginepage.h => Src/WebPage/customwebenginepage.h (100%) rename cwebengineview.cpp => Src/WebPage/cwebengineview.cpp (100%) rename cwebengineview.h => Src/WebPage/cwebengineview.h (100%) rename qweb.cpp => Src/WebPage/qweb.cpp (100%) rename qweb.h => Src/WebPage/qweb.h (100%) rename qweb.ui => Src/WebPage/qweb.ui (100%) diff --git a/PayloadAPP.pro b/PayloadAPP.pro index 1ac2deb..7e929b3 100644 --- a/PayloadAPP.pro +++ b/PayloadAPP.pro @@ -14,59 +14,58 @@ QMAKE_PROJECT_DEPTH = 0 SOURCES += \ - Src/GDDC/gddcCmdDlg.cpp \ - Src/GDDC/gddcSet.cpp \ - Src/GDDC/gddcStateInfo.cpp \ - Src/HomePage/homepagesetingwidget.cpp \ - cffmpeg_decode.cpp \ - customwebenginepage.cpp \ - cwebengineview.cpp \ - encodemodelcamera.cpp \ - ffmpegvideodlg.cpp \ - Src/GDDC/gddcdlg.cpp \ +# Src/GDDC/gddcCmdDlg.cpp \ +# Src/GDDC/gddcSet.cpp \ +# Src/GDDC/gddcStateInfo.cpp \ +# Src/HomePage/homepagesetingwidget.cpp \ +# cffmpeg_decode.cpp \ +# customwebenginepage.cpp \ +# cwebengineview.cpp \ +# encodemodelcamera.cpp \ +# ffmpegvideodlg.cpp \ +# Src/GDDC/gddcdlg.cpp \ global.cpp \ - Src/HomePage/homepagedlg.cpp \ +# Src/HomePage/homepagedlg.cpp \ main.cpp \ mainwindow.cpp \ - modelcameradlg.cpp \ - qweb.cpp \ - rescueload.cpp \ - rescueloadwidget.cpp +# modelcameradlg.cpp \ +# qweb.cpp \ +# rescueload.cpp \ +# rescueloadwidget.cpp HEADERS += \ - DCFrameCkCmd.h \ - Src/GDDC/gddcCmdDlg.h \ - Src/GDDC/gddcSet.h \ - Src/GDDC/gddcStateInfo.h \ - Src/GDDC/structDefineMyslef.h \ - Src/HomePage/homepagesetingwidget.h \ - cffmpeg_decode.h \ - customwebenginepage.h \ - cwebengineview.h \ - encodemodelcamera.h \ - ffmpegvideodlg.h \ - Src/GDDC/gddcdlg.h \ +# DCFrameCkCmd.h \ +# Src/GDDC/gddcCmdDlg.h \ +# Src/GDDC/gddcSet.h \ +# Src/GDDC/gddcStateInfo.h \ +# Src/GDDC/structDefineMyslef.h \ +# Src/HomePage/homepagesetingwidget.h \ +# cffmpeg_decode.h \ +# customwebenginepage.h \ +# cwebengineview.h \ +# encodemodelcamera.h \ +# ffmpegvideodlg.h \ +# Src/GDDC/gddcdlg.h \ global.h \ - Src/HomePage/homepagedlg.h \ +# Src/HomePage/homepagedlg.h \ mainwindow.h \ - modelcameradlg.h \ - qweb.h \ - rescueload.h \ - rescueloadwidget.h +# modelcameradlg.h \ +# qweb.h \ +# rescueload.h \ +# rescueloadwidget.h FORMS += \ - Src/GDDC/gddcCmdDlg.ui \ - Src/GDDC/gddcSet.ui \ - Src/GDDC/gddcStateInfo.ui \ - Src/HomePage/homepagesetingwidget.ui \ - ffmpegvideodlg.ui \ - Src/GDDC/gddcdlg.ui \ - Src/HomePage/homepagedlg.ui \ +# Src/GDDC/gddcCmdDlg.ui \ +# Src/GDDC/gddcSet.ui \ +# Src/GDDC/gddcStateInfo.ui \ +# Src/HomePage/homepagesetingwidget.ui \ +# ffmpegvideodlg.ui \ +# Src/GDDC/gddcdlg.ui \ +# Src/HomePage/homepagedlg.ui \ mainwindow.ui \ - modelcameradlg.ui \ - qweb.ui \ - rescueloadwidget.ui - rescueloadwidget.ui +# modelcameradlg.ui \ +# qweb.ui \ +# rescueloadwidget.ui TRANSLATIONS += \ PayloadAPP_zh_CN.ts @@ -80,17 +79,23 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin RESOURCES += \ mainwindow.qrc \ - map/places_map.qrc +# map/places_map.qrc DISTFILES += \ config.ini \ res/Qss/qss.qss \ style.qss -INCLUDEPATH += $$PWD/ffmpeg//include +INCLUDEPATH += $$PWD/ffmpeg/include \ + $$PWD/Src/Video/ LIBS += -L$$PWD/ffmpeg/lib \ -lavcodec -lavdevice -lavfilter -lavformat -lavutil -lpostproc \ -lswresample -lswscale - +include($$PWD/Src/HomePage/HomePage.pri) +include($$PWD/Src/WebPage/WebPage.pri) +include($$PWD/Src/ModelCamera/ModelCamera.pri) +include($$PWD/Src/RescueLoad/RescueLoad.pri) +include($$PWD/Src/GDDC/GDDC.pri) +include($$PWD/Src/Video/Video.pri) diff --git a/DCFrameCkCmd.h b/Src/GDDC/DCFrameCkCmd.h similarity index 100% rename from DCFrameCkCmd.h rename to Src/GDDC/DCFrameCkCmd.h diff --git a/Src/GDDC/GDDC.pri b/Src/GDDC/GDDC.pri new file mode 100644 index 0000000..e1f1fa2 --- /dev/null +++ b/Src/GDDC/GDDC.pri @@ -0,0 +1,20 @@ +SOURCES += \ + $$PWD/gddcCmdDlg.cpp \ + $$PWD/gddcdlg.cpp \ + $$PWD/gddcSet.cpp \ + $$PWD/gddcStateInfo.cpp \ + +HEADERS += \ + $$PWD/gddcCmdDlg.h \ + $$PWD/gddcdlg.h \ + $$PWD/gddcSet.h \ + $$PWD/gddcStateInfo.h \ + $$PWD/structDefineMyslef.h \ + $$PWD/DCFrameCkCmd.h \ + +FORMS += \ + $$PWD/gddcCmdDlg.ui \ + $$PWD/gddcdlg.ui \ + $$PWD/gddcSet.ui \ + $$PWD/gddcStateInfo.ui \ + diff --git a/Src/GDDC/gddcdlg.h b/Src/GDDC/gddcdlg.h index f5067be..fc39a5c 100644 --- a/Src/GDDC/gddcdlg.h +++ b/Src/GDDC/gddcdlg.h @@ -11,7 +11,7 @@ #include #include #include -#include "cffmpeg_decode.h" +#include "Src/Video/cffmpeg_decode.h" #include "Src/GDDC/gddcSet.h" #include #include diff --git a/Src/HomePage/HomePage.pri b/Src/HomePage/HomePage.pri new file mode 100644 index 0000000..dc16701 --- /dev/null +++ b/Src/HomePage/HomePage.pri @@ -0,0 +1,11 @@ +SOURCES += \ + $$PWD/homepagesetingwidget.cpp \ + $$PWD/homepagedlg.cpp + +HEADERS += \ + $$PWD/homepagesetingwidget.h \ + $$PWD/homepagedlg.h + +FORMS += \ + $$PWD/homepagesetingwidget.ui \ + $$PWD/homepagedlg.ui \ diff --git a/Src/ModelCamera/ModelCamera.pri b/Src/ModelCamera/ModelCamera.pri new file mode 100644 index 0000000..c9c762d --- /dev/null +++ b/Src/ModelCamera/ModelCamera.pri @@ -0,0 +1,11 @@ +SOURCES += \ + $$PWD/encodemodelcamera.cpp \ + $$PWD/modelcameradlg.cpp \ + +HEADERS += \ + $$PWD/encodemodelcamera.h \ + $$PWD/modelcameradlg.h \ + +FORMS += \ + $$PWD/modelcameradlg.ui \ + diff --git a/encodemodelcamera.cpp b/Src/ModelCamera/encodemodelcamera.cpp similarity index 100% rename from encodemodelcamera.cpp rename to Src/ModelCamera/encodemodelcamera.cpp diff --git a/encodemodelcamera.h b/Src/ModelCamera/encodemodelcamera.h similarity index 100% rename from encodemodelcamera.h rename to Src/ModelCamera/encodemodelcamera.h diff --git a/modelcameradlg.cpp b/Src/ModelCamera/modelcameradlg.cpp similarity index 100% rename from modelcameradlg.cpp rename to Src/ModelCamera/modelcameradlg.cpp diff --git a/modelcameradlg.h b/Src/ModelCamera/modelcameradlg.h similarity index 100% rename from modelcameradlg.h rename to Src/ModelCamera/modelcameradlg.h diff --git a/modelcameradlg.ui b/Src/ModelCamera/modelcameradlg.ui similarity index 99% rename from modelcameradlg.ui rename to Src/ModelCamera/modelcameradlg.ui index c82e033..6214646 100644 --- a/modelcameradlg.ui +++ b/Src/ModelCamera/modelcameradlg.ui @@ -634,7 +634,7 @@ ffmpegvideoDlg QWidget -
ffmpegvideodlg.h
+
ffmpegvideodlg.h
1 diff --git a/Src/RescueLoad/RescueLoad.pri b/Src/RescueLoad/RescueLoad.pri new file mode 100644 index 0000000..edef6ae --- /dev/null +++ b/Src/RescueLoad/RescueLoad.pri @@ -0,0 +1,13 @@ +SOURCES += \ + $$PWD/rescueload.cpp \ + $$PWD/rescueloadwidget.cpp \ + +HEADERS += \ + $$PWD/rescueload.h \ + $$PWD/rescueloadwidget.h \ + +FORMS += \ + $$PWD/rescueloadwidget.ui \ + +RESOURCES += \ + $$PWD/map/places_map.qrc diff --git a/map/marker.png b/Src/RescueLoad/map/marker.png similarity index 100% rename from map/marker.png rename to Src/RescueLoad/map/marker.png diff --git a/map/places_map.qml b/Src/RescueLoad/map/places_map.qml similarity index 100% rename from map/places_map.qml rename to Src/RescueLoad/map/places_map.qml diff --git a/map/places_map.qrc b/Src/RescueLoad/map/places_map.qrc similarity index 100% rename from map/places_map.qrc rename to Src/RescueLoad/map/places_map.qrc diff --git a/map/selectlocation.png b/Src/RescueLoad/map/selectlocation.png similarity index 100% rename from map/selectlocation.png rename to Src/RescueLoad/map/selectlocation.png diff --git a/rescueload.cpp b/Src/RescueLoad/rescueload.cpp similarity index 100% rename from rescueload.cpp rename to Src/RescueLoad/rescueload.cpp diff --git a/rescueload.h b/Src/RescueLoad/rescueload.h similarity index 100% rename from rescueload.h rename to Src/RescueLoad/rescueload.h diff --git a/rescueloadwidget.cpp b/Src/RescueLoad/rescueloadwidget.cpp similarity index 100% rename from rescueloadwidget.cpp rename to Src/RescueLoad/rescueloadwidget.cpp diff --git a/rescueloadwidget.h b/Src/RescueLoad/rescueloadwidget.h similarity index 100% rename from rescueloadwidget.h rename to Src/RescueLoad/rescueloadwidget.h diff --git a/rescueloadwidget.ui b/Src/RescueLoad/rescueloadwidget.ui similarity index 100% rename from rescueloadwidget.ui rename to Src/RescueLoad/rescueloadwidget.ui diff --git a/Src/Video/Video.pri b/Src/Video/Video.pri new file mode 100644 index 0000000..30b4e0b --- /dev/null +++ b/Src/Video/Video.pri @@ -0,0 +1,10 @@ +SOURCES += \ + $$PWD/cffmpeg_decode.cpp \ + $$PWD/ffmpegvideodlg.cpp \ + +HEADERS += \ + $$PWD/cffmpeg_decode.h \ + $$PWD/ffmpegvideodlg.h \ + +FORMS += \ + $$PWD/ffmpegvideodlg.ui \ diff --git a/cffmpeg_decode.cpp b/Src/Video/cffmpeg_decode.cpp similarity index 100% rename from cffmpeg_decode.cpp rename to Src/Video/cffmpeg_decode.cpp diff --git a/cffmpeg_decode.h b/Src/Video/cffmpeg_decode.h similarity index 100% rename from cffmpeg_decode.h rename to Src/Video/cffmpeg_decode.h diff --git a/ffmpegvideodlg.cpp b/Src/Video/ffmpegvideodlg.cpp similarity index 100% rename from ffmpegvideodlg.cpp rename to Src/Video/ffmpegvideodlg.cpp diff --git a/ffmpegvideodlg.h b/Src/Video/ffmpegvideodlg.h similarity index 100% rename from ffmpegvideodlg.h rename to Src/Video/ffmpegvideodlg.h diff --git a/ffmpegvideodlg.ui b/Src/Video/ffmpegvideodlg.ui similarity index 100% rename from ffmpegvideodlg.ui rename to Src/Video/ffmpegvideodlg.ui diff --git a/Src/WebPage/WebPage.pri b/Src/WebPage/WebPage.pri new file mode 100644 index 0000000..e663552 --- /dev/null +++ b/Src/WebPage/WebPage.pri @@ -0,0 +1,12 @@ +SOURCES += \ + $$PWD/customwebenginepage.cpp \ + $$PWD/cwebengineview.cpp \ + $$PWD/qweb.cpp + +HEADERS += \ + $$PWD/customwebenginepage.h \ + $$PWD/cwebengineview.h \ + $$PWD/qweb.h + +FORMS += \ + $$PWD/qweb.ui \ diff --git a/customwebenginepage.cpp b/Src/WebPage/customwebenginepage.cpp similarity index 100% rename from customwebenginepage.cpp rename to Src/WebPage/customwebenginepage.cpp diff --git a/customwebenginepage.h b/Src/WebPage/customwebenginepage.h similarity index 100% rename from customwebenginepage.h rename to Src/WebPage/customwebenginepage.h diff --git a/cwebengineview.cpp b/Src/WebPage/cwebengineview.cpp similarity index 100% rename from cwebengineview.cpp rename to Src/WebPage/cwebengineview.cpp diff --git a/cwebengineview.h b/Src/WebPage/cwebengineview.h similarity index 100% rename from cwebengineview.h rename to Src/WebPage/cwebengineview.h diff --git a/qweb.cpp b/Src/WebPage/qweb.cpp similarity index 100% rename from qweb.cpp rename to Src/WebPage/qweb.cpp diff --git a/qweb.h b/Src/WebPage/qweb.h similarity index 100% rename from qweb.h rename to Src/WebPage/qweb.h diff --git a/qweb.ui b/Src/WebPage/qweb.ui similarity index 100% rename from qweb.ui rename to Src/WebPage/qweb.ui diff --git a/mainwindow.cpp b/mainwindow.cpp index 8283208..3ffac16 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,7 +1,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include "CWebEngineView.h" -#include "CustomWebEnginePage.h" +#include "Src/WebPage/cwebengineview.h" +#include "Src/WebPage/CustomWebEnginePage.h" #include "global.h" #include #include diff --git a/mainwindow.h b/mainwindow.h index 4eb1f24..458bbd0 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -3,9 +3,9 @@ #include #include "Src/GDDC/gddcdlg.h" -#include "modelcameradlg.h" +#include "Src/ModelCamera/modelcameradlg.h" #include "Src/HomePage/homepagedlg.h" -#include "rescueloadwidget.h" +#include "Src/RescueLoad/rescueloadwidget.h" #include #include #include