diff --git a/PayloadAPP.pro b/PayloadAPP.pro index 7e929b3..d6d0f61 100644 --- a/PayloadAPP.pro +++ b/PayloadAPP.pro @@ -14,6 +14,7 @@ QMAKE_PROJECT_DEPTH = 0 SOURCES += \ +<<<<<<< HEAD # Src/GDDC/gddcCmdDlg.cpp \ # Src/GDDC/gddcSet.cpp \ # Src/GDDC/gddcStateInfo.cpp \ @@ -24,6 +25,18 @@ SOURCES += \ # encodemodelcamera.cpp \ # ffmpegvideodlg.cpp \ # Src/GDDC/gddcdlg.cpp \ +======= + SDFPDlg.cpp \ + Src/GDDC/gddcCmdDlg.cpp \ + Src/GDDC/gddcSet.cpp \ + Src/GDDC/gddcStateInfo.cpp \ + Src/HomePage/homepagesetingwidget.cpp \ + cffmpeg_decode.cpp \ + customwebenginepage.cpp \ + cwebengineview.cpp \ + ffmpegvideodlg.cpp \ + Src/GDDC/gddcdlg.cpp \ +>>>>>>> 9cb45d43939c192a61d4fe2800b69ee9f4dd63d9 global.cpp \ # Src/HomePage/homepagedlg.cpp \ main.cpp \ @@ -34,6 +47,7 @@ SOURCES += \ # rescueloadwidget.cpp HEADERS += \ +<<<<<<< HEAD # DCFrameCkCmd.h \ # Src/GDDC/gddcCmdDlg.h \ # Src/GDDC/gddcSet.h \ @@ -46,6 +60,20 @@ HEADERS += \ # encodemodelcamera.h \ # ffmpegvideodlg.h \ # Src/GDDC/gddcdlg.h \ +======= + DCFrameCkCmd.h \ + SDFPDlg.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 \ + ffmpegvideodlg.h \ + Src/GDDC/gddcdlg.h \ +>>>>>>> 9cb45d43939c192a61d4fe2800b69ee9f4dd63d9 global.h \ # Src/HomePage/homepagedlg.h \ mainwindow.h \ @@ -55,6 +83,7 @@ HEADERS += \ # rescueloadwidget.h FORMS += \ +<<<<<<< HEAD # Src/GDDC/gddcCmdDlg.ui \ # Src/GDDC/gddcSet.ui \ # Src/GDDC/gddcStateInfo.ui \ @@ -62,6 +91,16 @@ FORMS += \ # ffmpegvideodlg.ui \ # Src/GDDC/gddcdlg.ui \ # Src/HomePage/homepagedlg.ui \ +======= + SDFPDlg.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 \ +>>>>>>> 9cb45d43939c192a61d4fe2800b69ee9f4dd63d9 mainwindow.ui \ # modelcameradlg.ui \ # qweb.ui \ diff --git a/PayloadAPP.pro.autosave b/PayloadAPP.pro.autosave new file mode 100644 index 0000000..e083b2c --- /dev/null +++ b/PayloadAPP.pro.autosave @@ -0,0 +1,104 @@ +QT += core gui webenginewidgets +QT += network +QT += quickwidgets qml +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++17 +# CONFIG += console +QMAKE_PROJECT_DEPTH = 0 +# You can make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.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 \ + SDFPDlg.cpp \ + global.cpp \ +# Src/HomePage/homepagedlg.cpp \ + main.cpp \ + mainwindow.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 \ + SDFPDlg.h \ + global.h \ +# Src/HomePage/homepagedlg.h \ + mainwindow.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 \ + SDFPDlg.ui \ + mainwindow.ui \ +# modelcameradlg.ui \ +# qweb.ui \ +# rescueloadwidget.ui + +TRANSLATIONS += \ + PayloadAPP_zh_CN.ts +CONFIG += lrelease +CONFIG += embed_translations + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target + +RESOURCES += \ + mainwindow.qrc \ +# map/places_map.qrc + +DISTFILES += \ + config.ini \ + res/Qss/qss.qss \ + style.qss + +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/SDFPDlg.cpp b/SDFPDlg.cpp new file mode 100644 index 0000000..71e8746 --- /dev/null +++ b/SDFPDlg.cpp @@ -0,0 +1,21 @@ +#include "SDFPDlg.h" +#include "ui_SDFPDlg.h" + +SDFPDlg::SDFPDlg(QWidget *parent) + : QWidget(parent) + , ui(new Ui::SDFPDlg) +{ + ui->setupUi(this); + QPalette palette; + //设置主窗口背景颜色 + palette.setColor(QPalette::Window,QColor(50, 50, 50)); + this->setPalette(palette); + //嵌入到主窗口 + setWindowFlags(Qt::CustomizeWindowHint|Qt::FramelessWindowHint); + hide(); +} + +SDFPDlg::~SDFPDlg() +{ + delete ui; +} diff --git a/SDFPDlg.h b/SDFPDlg.h new file mode 100644 index 0000000..8738f28 --- /dev/null +++ b/SDFPDlg.h @@ -0,0 +1,22 @@ +#ifndef SDFPDLG_H +#define SDFPDLG_H + +#include + +namespace Ui { +class SDFPDlg; +} + +class SDFPDlg : public QWidget +{ + Q_OBJECT + +public: + explicit SDFPDlg(QWidget *parent = nullptr); + ~SDFPDlg(); + +private: + Ui::SDFPDlg *ui; +}; + +#endif // SDFPDLG_H diff --git a/SDFPDlg.ui b/SDFPDlg.ui new file mode 100644 index 0000000..84f9cb9 --- /dev/null +++ b/SDFPDlg.ui @@ -0,0 +1,63 @@ + + + SDFPDlg + + + + 0 + 0 + 768 + 440 + + + + Form + + + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 40 + 20 + + + + + + + + image: url(:/res/981csNew.png); + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 40 + 20 + + + + + + + + + diff --git a/Src/GDDC/gddcCmdDlg.ui b/Src/GDDC/gddcCmdDlg.ui index ba0d99e..04d0cd4 100644 --- a/Src/GDDC/gddcCmdDlg.ui +++ b/Src/GDDC/gddcCmdDlg.ui @@ -6,8 +6,8 @@ 0 0 - 1008 - 284 + 1355 + 219 @@ -16,6 +16,12 @@ 0 + + + 0 + 200 + + Form @@ -30,8 +36,8 @@ 0 0 - 951 - 250 + 1121 + 211 @@ -43,7 +49,7 @@ 0 - 250 + 200 @@ -74,7 +80,7 @@ QTabWidget::TabShape::Rounded - 0 + 5 Qt::TextElideMode::ElideNone @@ -92,7 +98,7 @@ 680 40 100 - 30 + 21 @@ -106,9 +112,9 @@ 10 - 20 + 10 241 - 191 + 161 @@ -120,10 +126,10 @@ - 60 - 150 - 121 - 30 + 70 + 130 + 91 + 21 @@ -137,7 +143,7 @@ 110 - 80 + 70 113 21 @@ -147,7 +153,7 @@ 110 - 120 + 100 113 21 @@ -157,7 +163,7 @@ 10 - 80 + 70 81 20 @@ -170,7 +176,7 @@ 10 - 120 + 100 81 20 @@ -207,9 +213,9 @@ 260 - 20 + 10 231 - 191 + 161 @@ -221,10 +227,10 @@ - 60 - 140 - 121 - 30 + 70 + 130 + 91 + 21 @@ -262,9 +268,9 @@ 500 - 20 + 10 171 - 191 + 161 @@ -276,10 +282,10 @@ - 20 - 140 - 121 - 30 + 40 + 130 + 91 + 21 @@ -351,10 +357,10 @@ - 20 - 20 + 10 + 10 100 - 30 + 31 @@ -367,10 +373,10 @@ - 20 - 70 + 10 + 50 100 - 30 + 31 @@ -383,8 +389,8 @@ - 140 - 120 + 130 + 90 100 30 @@ -399,8 +405,8 @@ - 20 - 170 + 10 + 130 100 30 @@ -415,8 +421,8 @@ - 140 - 170 + 130 + 130 100 30 @@ -431,8 +437,8 @@ - 20 - 120 + 10 + 90 100 30 @@ -447,8 +453,8 @@ - 140 - 20 + 130 + 10 100 30 @@ -463,8 +469,8 @@ - 140 - 70 + 130 + 50 100 30 @@ -479,8 +485,8 @@ - 260 - 20 + 250 + 10 100 30 @@ -495,8 +501,8 @@ - 260 - 70 + 250 + 50 100 30 @@ -511,8 +517,8 @@ - 260 - 120 + 250 + 90 100 30 @@ -527,10 +533,10 @@ - 380 + 370 10 - 221 - 201 + 171 + 161 @@ -542,8 +548,8 @@ - 50 - 80 + 20 + 70 111 21 @@ -552,8 +558,8 @@ - 50 - 150 + 20 + 110 111 30 @@ -568,8 +574,8 @@ - 52 - 50 + 20 + 40 131 20 @@ -584,93 +590,11 @@ 可见光 - - - - 510 - 10 - 121 - 191 - - - - 亮度设置 - - - Qt::AlignmentFlag::AlignCenter - - - - - 10 - 40 - 99 - 31 - - - - - 0 - 0 - - - - - - - 亮度+ - - - - - - 10 - 90 - 99 - 31 - - - - - 0 - 0 - - - - - - - 亮度- - - - - - - 10 - 140 - 101 - 31 - - - - - 0 - 0 - - - - - - - 自动亮度 - - - - 130 - 30 + 10 + 50 100 30 @@ -686,7 +610,7 @@ 10 - 30 + 10 100 30 @@ -701,8 +625,8 @@ - 250 - 80 + 130 + 90 100 30 @@ -717,8 +641,8 @@ - 10 - 180 + 370 + 130 100 30 @@ -733,8 +657,8 @@ - 10 - 130 + 130 + 10 100 30 @@ -750,7 +674,7 @@ 130 - 130 + 50 100 30 @@ -766,7 +690,7 @@ 10 - 80 + 90 100 30 @@ -781,8 +705,8 @@ - 130 - 80 + 10 + 130 100 30 @@ -797,8 +721,8 @@ - 250 - 30 + 130 + 130 100 30 @@ -810,166 +734,261 @@ 可见光镜头初始化 - + - 640 + 250 + 130 + 100 + 30 + + + + + + + 恢复默认 + + + + + + 870 10 - 121 - 191 + 120 + 121 - 对比度设置 + 透雾模式 - Qt::AlignmentFlag::AlignCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - - - - 10 - 140 - 99 - 31 - - - - - 0 - 0 - - - - - - - 自动对比度 - - - + 10 - 90 - 99 - 31 + 70 + 100 + 30 - - - 0 - 0 - - - 对比度- + 设置 - + 10 - 40 - 99 - 31 + 30 + 101 + 21 - - - 0 - 0 - - - - - - - 对比度+ - - + + + + 370 + 10 + 100 + 30 + + + + + + + 增益+ + + + + + + 370 + 50 + 100 + 30 + + + + + + + 增益- + + + + + + 370 + 90 + 100 + 30 + + + + + + + 自动增益 + + + + + + 490 + 10 + 99 + 31 + + + + + 0 + 0 + + + + + + + 亮度+ + + + + + + 490 + 50 + 99 + 31 + + + + + 0 + 0 + + + + + + + 亮度- + + + - 250 - 130 - 100 - 30 + 490 + 90 + 101 + 31 + + + 0 + 0 + + - 恢复默认 + 自动亮度 - + - 920 + 250 10 - 120 - 211 + 99 + 31 - - 透雾模式设置 + + + 0 + 0 + - - Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter + + + + + 对比度+ + + + + + + 250 + 50 + 99 + 31 + + + + + 0 + 0 + + + + + + + 对比度- + + + + + + 250 + 90 + 99 + 31 + + + + + 0 + 0 + + + + + + + 自动对比度 - - - - 11 - 90 - 101 - 21 - - - - - - - 10 - 160 - 100 - 30 - - - - - - - 透雾模式 - - - + - 780 + 610 10 - 120 - 211 + 241 + 121 焦距设置 - - Qt::AlignmentFlag::AlignCenter - 10 - 40 + 30 99 31 @@ -991,7 +1010,7 @@ 10 - 90 + 70 99 31 @@ -1009,106 +1028,42 @@ 焦距- - + - 10 - 160 + 130 + 30 99 31 - + 0 0 - - - - - 设置 - - + - 10 - 130 + 130 + 70 99 - 21 + 31 - + 0 0 - - - - - - 380 - 10 - 120 - 191 - - - - 增益设置 - - - Qt::AlignmentFlag::AlignCenter - - - - - 10 - 40 - 100 - 30 - - - 增益+ - - - - - - 10 - 90 - 100 - 30 - - - - - - - 增益- - - - - - - 10 - 140 - 100 - 30 - - - - - - - 自动增益 + 设置 @@ -1121,7 +1076,7 @@ 10 - 30 + 10 100 30 @@ -1136,8 +1091,8 @@ - 120 - 30 + 130 + 10 100 30 @@ -1152,8 +1107,8 @@ - 340 - 30 + 370 + 10 100 30 @@ -1168,8 +1123,8 @@ - 230 - 70 + 250 + 50 100 30 @@ -1184,8 +1139,8 @@ - 230 - 110 + 250 + 90 100 30 @@ -1200,8 +1155,8 @@ - 230 - 150 + 250 + 130 100 30 @@ -1216,8 +1171,8 @@ - 590 - 70 + 600 + 50 100 30 @@ -1233,7 +1188,7 @@ 10 - 110 + 90 100 30 @@ -1249,7 +1204,7 @@ 10 - 150 + 130 100 30 @@ -1264,8 +1219,8 @@ - 340 - 70 + 370 + 50 100 30 @@ -1280,8 +1235,8 @@ - 120 - 110 + 130 + 90 100 30 @@ -1296,8 +1251,8 @@ - 120 - 150 + 130 + 130 100 30 @@ -1313,7 +1268,7 @@ 10 - 70 + 50 100 30 @@ -1328,8 +1283,8 @@ - 120 - 70 + 130 + 50 100 30 @@ -1344,8 +1299,8 @@ - 230 - 30 + 250 + 10 100 30 @@ -1360,8 +1315,8 @@ - 340 - 110 + 370 + 90 100 30 @@ -1376,8 +1331,8 @@ - 340 - 150 + 370 + 130 100 30 @@ -1392,8 +1347,8 @@ - 470 - 30 + 490 + 10 101 31 @@ -1402,8 +1357,8 @@ - 590 - 30 + 600 + 10 101 30 @@ -1418,8 +1373,8 @@ - 470 - 70 + 490 + 50 101 31 @@ -1433,8 +1388,8 @@ - 180 - 130 + 390 + 90 41 31 @@ -1449,8 +1404,8 @@ - 180 - 40 + 310 + 10 72 23 @@ -1462,8 +1417,8 @@ - 90 - 120 + 300 + 80 81 51 @@ -1478,9 +1433,9 @@ - 30 - 40 - 141 + 140 + 10 + 151 20 @@ -1495,8 +1450,8 @@ font: 12pt "Microsoft YaHei UI"; - 110 - 180 + 320 + 140 41 31 @@ -1511,8 +1466,8 @@ font: 12pt "Microsoft YaHei UI"; - 40 - 130 + 250 + 90 41 31 @@ -1527,8 +1482,8 @@ font: 12pt "Microsoft YaHei UI"; - 110 - 80 + 320 + 40 41 31 @@ -1543,8 +1498,8 @@ font: 12pt "Microsoft YaHei UI"; - 300 - 180 + 10 + 130 100 30 @@ -1559,8 +1514,8 @@ font: 12pt "Microsoft YaHei UI"; - 300 - 100 + 130 + 130 100 30 @@ -1575,8 +1530,8 @@ font: 12pt "Microsoft YaHei UI"; - 300 - 60 + 10 + 50 100 30 @@ -1591,8 +1546,8 @@ font: 12pt "Microsoft YaHei UI"; - 300 - 140 + 10 + 90 100 30 @@ -1607,8 +1562,8 @@ font: 12pt "Microsoft YaHei UI"; - 300 - 20 + 10 + 10 100 30 @@ -1623,10 +1578,10 @@ font: 12pt "Microsoft YaHei UI"; - 560 + 740 10 - 141 - 201 + 261 + 121 @@ -1681,10 +1636,10 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 120 + 150 + 39 101 - 30 + 21 @@ -1697,10 +1652,10 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 160 + 150 + 79 101 - 30 + 21 @@ -1714,10 +1669,10 @@ font: 12pt "Microsoft YaHei UI"; - 410 + 460 10 - 141 - 201 + 261 + 121 @@ -1726,10 +1681,10 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 160 + 150 + 79 100 - 30 + 21 @@ -1742,10 +1697,10 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 120 + 150 + 39 100 - 30 + 21 @@ -1805,8 +1760,8 @@ font: 12pt "Microsoft YaHei UI"; - 160 - 10 + 140 + 90 61 21 @@ -1822,8 +1777,8 @@ font: 12pt "Microsoft YaHei UI"; - 80 - 10 + 140 + 50 61 21 @@ -1844,8 +1799,8 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 20 + 10 + 10 121 30 @@ -1860,8 +1815,8 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 170 + 10 + 130 121 30 @@ -1876,8 +1831,8 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 70 + 10 + 50 121 30 @@ -1892,8 +1847,8 @@ font: 12pt "Microsoft YaHei UI"; - 20 - 120 + 10 + 90 121 30 @@ -1911,7 +1866,7 @@ font: 12pt "Microsoft YaHei UI"; 380 10 241 - 201 + 151 @@ -1921,9 +1876,9 @@ font: 12pt "Microsoft YaHei UI"; 80 - 150 + 120 100 - 30 + 21 @@ -1937,7 +1892,7 @@ font: 12pt "Microsoft YaHei UI"; 140 - 50 + 40 91 21 @@ -1947,7 +1902,7 @@ font: 12pt "Microsoft YaHei UI"; 140 - 90 + 80 91 21 @@ -1957,7 +1912,7 @@ font: 12pt "Microsoft YaHei UI"; 10 - 50 + 40 121 20 @@ -1970,7 +1925,7 @@ font: 12pt "Microsoft YaHei UI"; 10 - 90 + 80 121 20 @@ -1986,7 +1941,7 @@ font: 12pt "Microsoft YaHei UI"; 640 10 221 - 201 + 151 @@ -1996,9 +1951,9 @@ font: 12pt "Microsoft YaHei UI"; 110 - 150 + 120 91 - 30 + 21 @@ -2012,7 +1967,7 @@ font: 12pt "Microsoft YaHei UI"; 10 - 50 + 40 81 20 @@ -2025,7 +1980,7 @@ font: 12pt "Microsoft YaHei UI"; 10 - 90 + 80 81 20 @@ -2038,7 +1993,7 @@ font: 12pt "Microsoft YaHei UI"; 100 - 50 + 40 81 23 @@ -2048,7 +2003,7 @@ font: 12pt "Microsoft YaHei UI"; 100 - 90 + 80 81 23 @@ -2058,9 +2013,9 @@ font: 12pt "Microsoft YaHei UI"; 10 - 150 + 120 91 - 30 + 21 @@ -2080,7 +2035,7 @@ font: 12pt "Microsoft YaHei UI"; 150 10 211 - 201 + 151 @@ -2093,9 +2048,9 @@ font: 12pt "Microsoft YaHei UI"; 60 - 150 + 120 100 - 30 + 21 @@ -2109,7 +2064,7 @@ font: 12pt "Microsoft YaHei UI"; 100 - 50 + 40 101 21 @@ -2119,7 +2074,7 @@ font: 12pt "Microsoft YaHei UI"; 12 - 50 + 40 81 21 @@ -2132,7 +2087,7 @@ font: 12pt "Microsoft YaHei UI"; 10 - 100 + 80 81 21 @@ -2145,7 +2100,7 @@ font: 12pt "Microsoft YaHei UI"; 100 - 100 + 80 101 21 diff --git a/Src/GDDC/gddcSet.cpp b/Src/GDDC/gddcSet.cpp index 639b21f..b2fc636 100644 --- a/Src/GDDC/gddcSet.cpp +++ b/Src/GDDC/gddcSet.cpp @@ -26,16 +26,12 @@ void GDDCSet::initWindow() setAttribute(Qt::WA_QuitOnClose,false); //交付时隐藏部分未开发接口 - ui->label_2->hide(); ui->label_5->hide(); ui->label_6->hide(); ui->lineEdit_playURL2->hide(); - ui->lineEdit_playport2->hide(); ui->pushButton_ConnectURL2->hide(); ui->groupBox_2->hide(); ui->radioButton_NetCtrlTCP->hide(); - ui->label->hide(); - ui->lineEdit_playport1->hide(); } void GDDCSet::initUDPSocket() { @@ -58,8 +54,6 @@ void GDDCSet::initParam() /*"rtsp://192.168.1.160:554/live/track0"*/ /*"rtmp://liteavapp.qcloud.com/live/liteavdemoplayerstreamid"*/ - ui->lineEdit_playport1->setText("10008"); - ui->lineEdit_playport2->setText("0"); ui->radioButton_NetCtrlUDP->setChecked(true); ui->radioButton_NetCtrlTCP->setChecked(false); @@ -74,13 +68,10 @@ void GDDCSet::initParam() ::GetPrivateProfileStringA("光电吊舱-视频连接-显示窗口2", "播放URL", "-1", inBuf, 100, strSysIniName); m_playURL2 = QString::fromUtf8(inBuf); ui->lineEdit_playURL2->setText(m_playURL2); - ::GetPrivateProfileStringA("光电吊舱-视频连接-显示窗口2", "播放Port", "-1", inBuf, 100, strSysIniName); - m_playPort2 = atoi(inBuf);; - ui->lineEdit_playport2->setText(QString::number(m_playPort2)); - ::GetPrivateProfileStringA("光电吊舱-视频连接-显示窗口1", "播放Port", "-1", inBuf, 100, strSysIniName); - m_playPort1 = atoi(inBuf);; - ui->lineEdit_playport1->setText(QString::number(m_playPort1)); + ::GetPrivateProfileStringA("光电吊舱-推流", "推流URL", "-1", inBuf, 100, strSysIniName); + m_pushURL = QString::fromUtf8(inBuf); + ui->lineEdit_pushURL->setText(m_pushURL); ::GetPrivateProfileStringA("光电吊舱-网络控制", "远端IP", "-1", inBuf, 100, strSysIniName); m_myPairNetwork.setRemoteIP(QString::fromUtf8(inBuf)); @@ -177,6 +168,22 @@ void GDDCSet::on_pushButton_NetCtrlConnect_clicked() } } +//推流 +void GDDCSet::on_pushButton_pushURL_clicked() +{ + saveDataToLocalIni(); + if(ui->pushButton_pushURL->text()=="推送") + { + emit SignalStartConnect(6); + ui->pushButton_pushURL->setText("停止推送"); + } + else + { + emit SignalStopConnect(6); + ui->pushButton_pushURL->setText("推送"); + } +} + //保存数据至本地ini文件 void GDDCSet::saveDataToLocalIni() { @@ -208,14 +215,14 @@ void GDDCSet::saveDataToLocalIni() inBuf = ba.data(); ::WritePrivateProfileStringA("光电吊舱-视频连接-显示窗口2", "播放URL", inBuf, strSysIniName); - m_playPort2 = ui->lineEdit_playport2->text().toInt(); - _itoa_s(m_playPort2,inBuf,10,10); - ::WritePrivateProfileStringA("光电吊舱-视频连接-显示窗口2", "播放Port", inBuf, strSysIniName); + m_pushURL = ui->lineEdit_pushURL->text(); + ba = m_pushURL.toLocal8Bit(); + inBuf = ba.data(); + ::WritePrivateProfileStringA("光电吊舱-推流", "推流URL", inBuf, strSysIniName); m_playURL1 = ui->comboBox_playURL1->currentText(); - m_playPort1 = ui->lineEdit_playport1->text().toInt(); - _itoa_s(m_playPort1,inBuf,10,10); - ::WritePrivateProfileStringA("光电吊舱-视频连接-显示窗口1", "播放Port", inBuf, strSysIniName); - } + + + diff --git a/Src/GDDC/gddcSet.h b/Src/GDDC/gddcSet.h index 8d3f020..6450c8e 100644 --- a/Src/GDDC/gddcSet.h +++ b/Src/GDDC/gddcSet.h @@ -19,7 +19,7 @@ public: explicit GDDCSet(QWidget *parent = nullptr); ~GDDCSet(); -private: +public: Ui::GDDCSet *ui; public: @@ -30,19 +30,27 @@ public: QByteArray m_configIniPath; //ini配置文件路径 QString m_playURL1; //光电吊舱-视频连接-显示窗口1-URL地址 - int m_playPort1; //光电吊舱-视频连接-显示窗口-1端口 QString m_playURL2; //光电吊舱-视频连接-显示窗口2-URL地址 - int m_playPort2; //光电吊舱-视频连接-显示窗口-2端口 + QString m_pushURL; //光电吊舱-推流URL地址 MyPairNetwork m_myPairNetwork;//网络通信结构体 signals: - void SignalStartConnect(int a); //信号开始连接 - void SignalStopConnect(int a); //信号停止连接 + /* int a + * 1视频连接1 + * 2视频连接2 + * 3串口控制-刷新 + * 4串口控制-连接 + * 5网络控制-连接 + * 6视频(1)推流 + * */ + void SignalStartConnect(int a); //信号开始连接 + void SignalStopConnect(int a); //信号停止连接 private slots: - void on_pushButton_ConnectURL1_clicked(); - void on_pushButton_ConnectURL2_clicked(); - void on_pushButton_serialControlRefalsh_clicked(); - void on_pushButton_serialControlConnect_clicked(); - void on_pushButton_NetCtrlConnect_clicked(); + void on_pushButton_ConnectURL1_clicked(); //视频连接-显示窗口1-连接 + void on_pushButton_ConnectURL2_clicked(); //视频连接-显示窗口2-连接 + void on_pushButton_serialControlRefalsh_clicked(); //串口控制-刷新 + void on_pushButton_serialControlConnect_clicked(); //串口控制-连接 + void on_pushButton_NetCtrlConnect_clicked(); //网络控制-连接 + void on_pushButton_pushURL_clicked(); //推流 }; #endif // GDDCSET_H diff --git a/Src/GDDC/gddcSet.ui b/Src/GDDC/gddcSet.ui index 9e0e017..5ef7698 100644 --- a/Src/GDDC/gddcSet.ui +++ b/Src/GDDC/gddcSet.ui @@ -7,7 +7,7 @@ 0 0 761 - 387 + 360 @@ -22,7 +22,7 @@ 30 10 701 - 141 + 181 @@ -36,7 +36,7 @@ 10 30 - 53 + 61 21 @@ -72,7 +72,7 @@ 20 100 - 61 + 71 21 @@ -85,30 +85,7 @@ 90 100 - 301 - 23 - - - - - - - 440 - 100 - 53 - 21 - - - - 端口: - - - - - - 500 - 100 - 81 + 491 23 @@ -130,7 +107,7 @@ 10 - 140 + 180 61 21 @@ -143,7 +120,7 @@ 20 - 170 + 210 61 21 @@ -156,46 +133,59 @@ 90 - 170 - 301 + 210 + 491 23 - + - 440 - 170 - 53 + 600 + 210 + 80 + 23 + + + + 连接 + + + + + + 20 + 140 + 71 21 - 端口: + 推流地址: - + - 500 - 170 - 81 + 90 + 140 + 491 23 - + 600 - 170 + 140 80 23 - 连接 + 推送 @@ -203,7 +193,7 @@ 30 - 280 + 420 701 80 @@ -291,7 +281,7 @@ 30 - 180 + 200 701 141 diff --git a/Src/GDDC/gddcdlg.cpp b/Src/GDDC/gddcdlg.cpp index 7493b72..11dee2c 100644 --- a/Src/GDDC/gddcdlg.cpp +++ b/Src/GDDC/gddcdlg.cpp @@ -6,11 +6,43 @@ #include #include #include +#include +#include +#include + +#pragma comment(lib, "Wtsapi32.lib") +using namespace std; +DWORD GetmPid(LPCWSTR ProcessName) { + PWTS_PROCESS_INFOW wts; + DWORD Count; + DWORD i = 0; + + BOOL result =WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &wts, &Count); + if(result == 0){ + cout << "WTSEnumerateProcessesW Error" << endl; + + return 1; + } + cout << "WTSEnumerateProcessesW Success" << endl; + for (i;i < Count; i++) { + if (lstrcmpiW(wts[i].pProcessName, ProcessName) == 0) { + DWORD pid = wts[i].ProcessId; + cout << "find pid:" << pid << endl; + + return pid; + break; + } + } + + WTSFreeMemory(wts); +} + #define CONFIG_PATH "config.ini" -#define CMDPAGEHIGHT 250 +#define CMDPAGEHIGHT 210 #define STATEPAGEWIDTH 250 + GDDCdlg::GDDCdlg(QWidget *parent) : QWidget(parent) , ui(new Ui::GDDCdlg) @@ -54,6 +86,7 @@ void GDDCdlg::initWindow() m_DlgGDDCSet = new GDDCSet(); m_GDDCCmdDlg = new GDDCCmdDlg(this); m_GDDCStateDlg = new GDDCStateInfo(this); + } //初始化参数 @@ -65,7 +98,7 @@ void GDDCdlg::initParam() isStatePageShow = true; m_DCcmdBuffer.resize(cmdLength); detectionAreaSetting = false; - connectFlag.resize(10,false); + connectFlag.resize(12,false); ui->pushButShowCmdPage->setIcon(QIcon(":/res/down.png")); ui->pushButShowStatePage->setIcon(QIcon(":/res/right.png")); } @@ -114,6 +147,9 @@ void GDDCdlg::startConnect(int type) stopConnectUDPCtrl(); startConnectTCPCtrl(); break; + case 6://视频(1)推流 + startPushURL(); + break; default: break; } @@ -139,6 +175,9 @@ void GDDCdlg::stopConnect(int type) case 5: stopConnectTCPCtrl(); break; + case 6: + stopPushURL(); + break; default : break; } @@ -413,6 +452,7 @@ void GDDCdlg::stopConnectURL2() connectFlag[1] = false ; } } + void GDDCdlg::startConnectSerialCtrl() { if(!connectFlag[2]) @@ -420,6 +460,7 @@ void GDDCdlg::startConnectSerialCtrl() connectFlag[2] = true ; } } + void GDDCdlg::stopConnectSerialCtrl() { if(connectFlag[2]) @@ -427,6 +468,7 @@ void GDDCdlg::stopConnectSerialCtrl() connectFlag[2] = false ; } } + //开始UDP控制通信 void GDDCdlg::startConnectUDPCtrl() { @@ -449,6 +491,7 @@ void GDDCdlg::startConnectUDPCtrl() connectFlag[3] = true; } } + //停止UDP控制通信 void GDDCdlg::stopConnectUDPCtrl() { @@ -462,6 +505,7 @@ void GDDCdlg::stopConnectUDPCtrl() connectFlag[3] = false; } } + //开始TCP控制通信 void GDDCdlg::startConnectTCPCtrl() { @@ -470,6 +514,7 @@ void GDDCdlg::startConnectTCPCtrl() connectFlag[4] = true; } } + //停止TCP控制通信 void GDDCdlg::stopConnectTCPCtrl() { @@ -479,6 +524,69 @@ void GDDCdlg::stopConnectTCPCtrl() } } +//开始视频推流 +void GDDCdlg::startPushURL() +{ + if(!connectFlag[5]) + { + process = new QProcess(); + connect(process,&QProcess::readyReadStandardOutput,this,[=]()mutable{ // + QString Output=process->readAllStandardOutput(); + qDebug()<<"Output:"<readAllStandardError(); + qDebug()<<"Error:"<start("cmd",QStringList()<<"/c"<<"ffmpeg -i rtmp://liteavapp.qcloud.com/live/liteavdemoplayerstreamid -c copy -f flv rtmp://182.92.130.23/app/test"); + + QStringList m_cmd; + QString str; + str = "ffmpeg -i "+m_DlgGDDCSet->m_playURL1+" -c copy -f flv "+m_DlgGDDCSet->m_pushURL; + //str = "TaskList"; + m_cmd<<"/c"<start("cmd",m_cmd); + connectFlag[5] = true; + + //process->waitForStarted(); //等待程序启动 + //process->waitForFinished(); //等待程序关闭 + } +} + +//停止视频推流 +void GDDCdlg::stopPushURL() +{ + if(connectFlag[5]) + { + if(process!=nullptr) + { + process->terminate(); + process->close(); + process->kill(); + // 检查进程退出状态 + if (process->exitStatus() == QProcess::CrashExit) { + qDebug() << "Process crashed"; + } else { + qDebug() << "Process exited normally"; + } + delete process; + + //推流进程未自动关闭,手动关闭 + int pids = GetmPid(L"ffmpeg.exe"); + qDebug()<<"ffmpeg.exe进程的pid为:"<pushButton->setGeometry(this->width()/2,ui->tabWidget->height(),50,50); } } + diff --git a/Src/GDDC/gddcdlg.h b/Src/GDDC/gddcdlg.h index fc39a5c..27131c6 100644 --- a/Src/GDDC/gddcdlg.h +++ b/Src/GDDC/gddcdlg.h @@ -20,7 +20,9 @@ #include "ui_gddcCmdDlg.h" //吊舱控制对话框ui #include "gddcStateInfo.h" //吊舱状态信息显示对话框 #include "ui_gddcStateInfo.h" //吊舱状态信息显示对话框 - +#include "ui_gddcSet.h" +#include "QProcess" +#include #define cmdLength 44 namespace Ui { class GDDCdlg; @@ -62,8 +64,8 @@ public: QString localIP; //本地IP QHostAddress localAddr; //本地地址 quint16 localPort; //本地port - - + QProcess* process; //执行CMD + QThread workerThread; //线程 //bool eventFilter(QObject *,QEvent *); //事件过滤器 void mousePressEvent(QMouseEvent *event); //事件过滤器 @@ -79,6 +81,8 @@ public: void stopConnectUDPCtrl(); void startConnectTCPCtrl(); void stopConnectTCPCtrl(); + void startPushURL(); + void stopPushURL(); public: bool pointSelectionTracking; //选点跟踪 bool Is_openVideo; //视频是否已打开,默认未打开 diff --git a/Src/HomePage/homepagedlg.ui b/Src/HomePage/homepagedlg.ui index 10e8af0..06b1a9d 100644 --- a/Src/HomePage/homepagedlg.ui +++ b/Src/HomePage/homepagedlg.ui @@ -20,27 +20,25 @@ Form - - - + + + + GroupBox + + + + + + + GroupBox + + + + + + - - - - - Qt::Orientation::Horizontal - - - QSizePolicy::Policy::Fixed - - - - 200 - 20 - - - - + @@ -58,26 +56,27 @@ - - - Qt::Orientation::Horizontal - - - QSizePolicy::Policy::Fixed - - - - 200 - 20 - - - + + + + + GroupBox + + + + + + + GroupBox + + + diff --git a/Src/Video/cffmpeg_decode.cpp b/Src/Video/cffmpeg_decode.cpp index 77b5c5a..f3dca8c 100644 --- a/Src/Video/cffmpeg_decode.cpp +++ b/Src/Video/cffmpeg_decode.cpp @@ -29,11 +29,11 @@ bool Cffmpeg_decode::open_input_file() AVDictionary* avdic = NULL; av_dict_set(&avdic, "buffer_size", "2048000", 0); //设置缓存大小,1080p可将值调大 av_dict_set(&avdic, "rtsp_transport", "udp", 0); //以udp方式打开,如果以tcp方式打开将udp替换为tcp - av_dict_set(&avdic, "listen_timeout", "200000", 0); //设置超时断开连接时间,单位微秒 + av_dict_set(&avdic, "listen_timeout", "2", 0); //设置超时断开连接时间,单位微秒 av_dict_set(&avdic, "max_delay", "3000", 0); //设置最大时延 av_dict_set(&avdic, "tune", "zerolatency", 0); av_dict_set(&avdic, "preset", "ultrafast", 0); - + fmtCtx->flags |= AVFMT_FLAG_NONBLOCK; if(avformat_open_input(&fmtCtx,_url.toLocal8Bit().data(),NULL,&avdic)<0){ printf("Cannot open input file.\n"); return 0; diff --git a/global.cpp b/global.cpp index 08778ea..5c4ce21 100644 --- a/global.cpp +++ b/global.cpp @@ -75,7 +75,7 @@ QString g_PushBtnSelStyle = /**选中情况下样式**/ QString g_ToolBtnStyle = /**正常情况下样式**/ "QToolButton{" "font: 10pt '微软雅黑';" - "color: #2f3640;" + "color: rgba(0,0,0,200);" /*#2f3640*/ "background-color: #f5f6fa;" "border-color: #2f3640;" "border-radius: 15px;" diff --git a/mainwindow.cpp b/mainwindow.cpp index 3ffac16..2b65f6f 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -80,6 +80,7 @@ void MainWindow::initWindow() this->resize(1450,860); //this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);//隐藏边框 + m_SDFPDlg = new SDFPDlg(this); m_GDDCdlg = new GDDCdlg(this); m_HomePagedlg = new HomePageDlg(this); @@ -124,10 +125,10 @@ void MainWindow::initWindow() lLinkWeb->load(QUrl(url)); break; case HomePageSetingWidget::Adhoc_Network: - lLinkWeb->load(QUrl(url)); + adHocNetworkWeb->load(QUrl(url)); break; case HomePageSetingWidget::Satelite_Comm: - lLinkWeb->load(QUrl(url)); + satelliteCommWeb->load(QUrl(url)); break; default: break; @@ -141,16 +142,17 @@ void MainWindow::initWindow() satelliteCommWeb->load(QUrl(urlMap["机载卫通"])); }); // 设置栈窗口,多页面共享同一窗口 + ui->stackedWidget->addWidget(m_SDFPDlg); + ui->stackedWidget->addWidget(m_HomePagedlg); + ui->stackedWidget->addWidget(m_GDDCdlg); ui->stackedWidget->addWidget(mWeb); ui->stackedWidget->addWidget(lLinkWeb); ui->stackedWidget->addWidget(adHocNetworkWeb); ui->stackedWidget->addWidget(satelliteCommWeb); - ui->stackedWidget->addWidget(m_GDDCdlg); - ui->stackedWidget->addWidget(m_HomePagedlg); ui->stackedWidget->addWidget(m_rescueLoadWidget); ui->stackedWidget->addWidget(m_ModelCameraDlg); // 初始栈窗口显示主页 - ui->stackedWidget->setCurrentWidget(m_HomePagedlg); + ui->stackedWidget->setCurrentWidget(m_SDFPDlg); } void MainWindow::initButton() @@ -166,6 +168,7 @@ void MainWindow::initButton() ui->toolButton_6->setIcon(QIcon(":/res/Ku.png")); ui->toolButton_7->setIcon(QIcon(":/res/research.png")); ui->toolButton_8->setIcon(QIcon(":/res/3D.png")); + ui->toolButton_9->setIcon(QIcon(":/res/SDFP3.png")); ui->toolButton->setIconSize(QSize(sizeX,sizeY)); ui->toolButton_2->setIconSize(QSize(sizeX,sizeY)); ui->toolButton_3->setIconSize(QSize(sizeX,sizeY)); @@ -174,6 +177,7 @@ void MainWindow::initButton() ui->toolButton_6->setIconSize(QSize(sizeX,sizeY)); ui->toolButton_7->setIconSize(QSize(sizeX,sizeY)); ui->toolButton_8->setIconSize(QSize(sizeX,sizeY)); + ui->toolButton_9->setIconSize(QSize(sizeX*1.2,sizeY*1.2)); ui->toolButton->setText("主页"); ui->toolButton_2->setText("光电吊舱"); ui->toolButton_3->setText("L链"); @@ -182,6 +186,7 @@ void MainWindow::initButton() ui->toolButton_6->setText("机载卫通"); ui->toolButton_7->setText("搜救载荷"); ui->toolButton_8->setText("三维建模"); + ui->toolButton_9->setText("时代飞鹏"); ui->toolButton->setFixedWidth(FixedWidth); ui->toolButton_2->setFixedWidth(FixedWidth); ui->toolButton_3->setFixedWidth(FixedWidth); @@ -190,6 +195,7 @@ void MainWindow::initButton() ui->toolButton_6->setFixedWidth(FixedWidth); ui->toolButton_7->setFixedWidth(FixedWidth); ui->toolButton_8->setFixedWidth(FixedWidth); + ui->toolButton_9->setFixedWidth(FixedWidth); ui->toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); ui->toolButton_2->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); ui->toolButton_3->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); @@ -198,6 +204,7 @@ void MainWindow::initButton() ui->toolButton_6->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); ui->toolButton_7->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); ui->toolButton_8->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + ui->toolButton_9->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); ui->toolButton->setStyleSheet(g_ToolBtnStyle); ui->toolButton_2->setStyleSheet(g_ToolBtnStyle); ui->toolButton_3->setStyleSheet(g_ToolBtnStyle); @@ -206,6 +213,8 @@ void MainWindow::initButton() ui->toolButton_6->setStyleSheet(g_ToolBtnStyle); ui->toolButton_7->setStyleSheet(g_ToolBtnStyle); ui->toolButton_8->setStyleSheet(g_ToolBtnStyle); + ui->toolButton_9->setStyleSheet(g_ToolBtnStyle); + //ui->pushButton->setStyleSheet(g_PushBtnStyle); } void MainWindow::initMenuBar() @@ -294,6 +303,7 @@ void MainWindow::initSignalSlot() connect(ui->toolButton_6,SIGNAL(clicked()),this,SLOT(toolButton_6_clicked())); connect(ui->toolButton_7,SIGNAL(clicked()),this,SLOT(toolButton_7_clicked())); connect(ui->toolButton_8,SIGNAL(clicked()),this,SLOT(toolButton_8_clicked())); + connect(ui->toolButton_9,SIGNAL(clicked()),this,SLOT(toolButton_9_clicked())); } //主页 @@ -370,8 +380,15 @@ void MainWindow::toolButton_8_clicked() //process->setWorkingDirectory("D:/QTdemo/playerApp/app"); // 设置工作目录 //process->start("D:/QTdemo/playerApp/app/XCOM V2.0.exe"); // 启动exe并传递参数 + //process->setWorkingDirectory("D:/Software/TCPUDPDbg"); // 设置工作目录 + //process->start("D:/Software/TCPUDPDbg/TCPUDPDbg.exe"); // 启动exe并传递参数 +} +//时代飞鹏 +void MainWindow::toolButton_9_clicked() +{ + changeBtnColor(9); + ui->stackedWidget->setCurrentWidget(m_SDFPDlg); } - //更新主界面按钮颜色 void MainWindow::changeBtnColor(int num) @@ -404,6 +421,9 @@ void MainWindow::changeBtnColor(int num) case 8: ui->toolButton_8->setStyleSheet(g_ToolBtnSelStyle); break; + case 9: + ui->toolButton_9->setStyleSheet(g_ToolBtnSelStyle); + break; } } diff --git a/mainwindow.h b/mainwindow.h index 458bbd0..8eedfbf 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -6,6 +6,7 @@ #include "Src/ModelCamera/modelcameradlg.h" #include "Src/HomePage/homepagedlg.h" #include "Src/RescueLoad/rescueloadwidget.h" +#include "SDFPDlg.h" #include #include #include @@ -49,11 +50,13 @@ private slots: void toolButton_6_clicked(); void toolButton_7_clicked(); void toolButton_8_clicked(); + void toolButton_9_clicked(); public: GDDCdlg *m_GDDCdlg; HomePageDlg *m_HomePagedlg; RescueLoadWidget *m_rescueLoadWidget; + SDFPDlg *m_SDFPDlg; //QWeb *m_qWeb; QWebEngineView *mWeb; ModelCameraDlg* m_ModelCameraDlg; diff --git a/mainwindow.qrc b/mainwindow.qrc index 047c706..86e1a56 100644 --- a/mainwindow.qrc +++ b/mainwindow.qrc @@ -17,5 +17,8 @@ res/left.png res/right.png res/981csNew.png + res/SDFP2.png + res/SDFP3.png + res/settings2.png diff --git a/mainwindow.ui b/mainwindow.ui index 87d2b05..1b90dd1 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 954 - 594 + 1113 + 572 @@ -20,13 +20,13 @@ MainWindow - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight - Qt::ToolButtonTextBesideIcon + Qt::ToolButtonStyle::ToolButtonTextBesideIcon @@ -36,10 +36,10 @@ - Qt::NoFocus + Qt::FocusPolicy::NoFocus - Qt::NoContextMenu + Qt::ContextMenuPolicy::NoContextMenu @@ -57,55 +57,38 @@ 0 - - - - Qt::Horizontal - - - - 40 - 0 - - - - - - - - - - - - + + + + 0 + 0 + + background-color: rgb(40, 40, 40); - - QFrame::StyledPanel - - - QFrame::Raised - - + + + + - + - - - Qt::Vertical - - - - 20 - 40 - + + + ... - + + + + 0 + 0 + + ... @@ -113,6 +96,12 @@ + + + 0 + 0 + + ... @@ -120,6 +109,12 @@ + + + 0 + 0 + + ... @@ -127,6 +122,12 @@ + + + 0 + 0 + + ... @@ -134,6 +135,12 @@ + + + 0 + 0 + + ... @@ -141,6 +148,12 @@ + + + 0 + 0 + + ... @@ -148,6 +161,12 @@ + + + 0 + 0 + + ... @@ -155,52 +174,31 @@ + + + 0 + 0 + + ... - - - - Qt::Vertical - - - - 20 - 40 - - - - + + + - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 0 - - - + + + + + + @@ -221,7 +219,7 @@ 帮助 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole @@ -259,19 +257,19 @@ - + :/res/GDDC.png:/res/GDDC.png 光电吊舱 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole - + :/res/LChain.png:/res/LChain.png @@ -281,7 +279,7 @@ L链 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole @@ -293,7 +291,7 @@ 自 组 网 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole @@ -305,7 +303,7 @@ PDT集群 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole @@ -317,7 +315,7 @@ Ku 卫 通 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole @@ -329,7 +327,7 @@ 搜救载荷 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole @@ -341,12 +339,10 @@ 三维建模 - QAction::TextHeuristicRole + QAction::MenuRole::TextHeuristicRole - - - + diff --git a/res/Qss/qss.qss b/res/Qss/qss.qss index 554adb8..2ee9419 100644 --- a/res/Qss/qss.qss +++ b/res/Qss/qss.qss @@ -18,7 +18,7 @@ QPushButton{ border-radius: 2px; border: 1px groove gray; border-style: outset; - font: 12pt "微软雅黑"; + font: 10pt "微软雅黑"; } /**************************QLineEdit编辑框设置*************************/ @@ -27,7 +27,7 @@ QLineEdit{ border-radius: 2px; border: 1px groove gray; border-style: outset; - font: 12pt "微软雅黑"; + font: 10pt "微软雅黑"; } /***************************QComboBox下拉框设置************************/ @@ -35,7 +35,7 @@ QComboBox { border-radius:3px; background-color:rgba(60,60,60,200); - font: 75 11pt "微软雅黑"; + font: 75 10pt "微软雅黑"; color:rgb(255,255,255); border:0px ; padding-top: 2px; @@ -47,7 +47,7 @@ QComboBox QComboBox:disabled { background-color:rgba(50,50,50,200); - font: 75 11pt "微软雅黑"; + font: 75 10pt "微软雅黑"; color:rgb(160,160,160); } QComboBox:hover @@ -60,7 +60,7 @@ QComboBox:on { border-radius:3px; background-color:rgba(35,35,35); - font: 75 11pt "微软雅黑"; + font: 75 10pt "微软雅黑"; color:rgb(255,255,255); border:1px solid rgb(31,156,220) ; } @@ -69,7 +69,7 @@ QComboBox QAbstractItemView { outline: 0px solid gray; /*取消选中虚线*/ border: 1px solid rgb(31,156,220); - font: 75 11pt "微软雅黑"; + font: 75 10pt "微软雅黑"; color: rgb(255,255,255); background-color: rgb(45,45,45); selection-background-color: rgb(90,90,90); @@ -155,13 +155,13 @@ QTabBar QToolButton:hover { QLabel{ color: rgb(255, 255, 255); font-family:"微软雅黑"; - font-size:11pt; + font-size:10.5pt; } /***************************QSpinBox设置***********************/ QSpinBox{ border-radius:1px; background-color:rgba(60,60,60,200); - font: 12pt "微软雅黑"; + font: 10pt "微软雅黑"; color:rgb(255,255,255); border-width: 0.5px; border-style: solid; @@ -189,7 +189,7 @@ QGroupBox::title QRadioButton{ color: rgb(255, 255, 255); font-family:"微软雅黑"; - font-size:11pt; + font-size:10pt; } /***************************QFrame***********************/ QFrame#frameGDDCPage @@ -206,7 +206,7 @@ QTableView selection-background-color: rgba(96, 96, 96, 0); /*选中区域的背景色,设置成透明96,96,96*/ } QTableWidget::item { - font-size: 12pt; + font-size: 10pt; color: #34495E; height: 30px; width: 80px; diff --git a/res/SDFP2.png b/res/SDFP2.png new file mode 100644 index 0000000..dca6775 Binary files /dev/null and b/res/SDFP2.png differ diff --git a/res/SDFP3.png b/res/SDFP3.png new file mode 100644 index 0000000..6356503 Binary files /dev/null and b/res/SDFP3.png differ diff --git a/res/settings2.png b/res/settings2.png new file mode 100644 index 0000000..a1de657 Binary files /dev/null and b/res/settings2.png differ