504-Software-Development-Group
/
VideoClient98
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 合并分支，解决冲突

Browse Source
chen^2
cbwu 3 weeks ago
parent 8e2d490d30 530b18113c
commit 01c4ad2a20
13 changed files with 546 additions and 301 deletions
Show Stats Download Patch File Download Diff File

1
src/CMakeLists.txt
Unescape Escape View File

@ -10,6 +10,7 @@ qt_add_executable(VideoClient
communicationsettingdlg.h communicationsettingdlg.cpp communicationsettingdlg.ui communicationsettingdlg.h communicationsettingdlg.cpp communicationsettingdlg.ui
commandwidget.h commandwidget.cpp commandwidget.ui commandwidget.h commandwidget.cpp commandwidget.ui
streamaddrsettingsdlg.h streamaddrsettingsdlg.cpp streamaddrsettingsdlg.ui streamaddrsettingsdlg.h streamaddrsettingsdlg.cpp streamaddrsettingsdlg.ui
videoControl.h videoControl.ui videoControl.cpp
) )
qt6_add_resources(VideoClient "resources" qt6_add_resources(VideoClient "resources"

176
src/commandwidget.ui
Unescape Escape View File

@ -6,40 +6,17 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1039</width> <width>295</width>
<height>105</height> <height>541</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QToolButton" name="settingToolBtn"> <widget class="QToolButton" name="settingToolBtn">
<property name="text"> <property name="text">
<string>通信设置</string> <string>通信设置</string>
@ -56,165 +33,136 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QToolButton" name="startConnectionToolBtn"> <widget class="QToolButton" name="startConnectionToolBtn">
<property name="text"> <property name="text">
<string>连接</string> <string>连接</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="2">
<widget class="QToolButton" name="stopConnectionToolBtn"> <widget class="QToolButton" name="stopConnectionToolBtn">
<property name="text"> <property name="text">
<string>断开</string> <string>断开</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QPushButton" name="pushButton">
<property name="title">
<string/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
<property name="bottomMargin">
<number>6</number>
</property>
<property name="spacing">
<number>12</number>
</property>
<item row="1" column="7">
<widget class="QPushButton" name="pushButton_15">
<property name="text"> <property name="text">
<string>4-6图拼接</string> <string>方位+</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="1" column="1">
<widget class="QPushButton" name="pushButton_8"> <widget class="QPushButton" name="pushButton_4">
<property name="text"> <property name="text">
<string>画中画开</string> <string>俯仰+</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="2">
<widget class="QPushButton" name="pushButton_7"> <widget class="QPushButton" name="pushButton_8">
<property name="text"> <property name="text">
<string>画中画关</string> <string>画中画开</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="7"> <item row="2" column="0">
<widget class="QPushButton" name="pushButton_16"> <widget class="QPushButton" name="pushButton_2">
<property name="text"> <property name="text">
<string>0-3图拼接</string> <string>方位-</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="pushButton_4"> <widget class="QPushButton" name="pushButton_3">
<property name="text"> <property name="text">
<string>俯仰+</string> <string>俯仰-</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="2">
<widget class="QPushButton" name="pushButton_2"> <widget class="QPushButton" name="pushButton_7">
<property name="text"> <property name="text">
<string>方位-</string> <string>画中画关</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="3" column="0">
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="pushButton_5">
<property name="text"> <property name="text">
<string>方位+</string> <string>变焦推远</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="6"> <item row="3" column="1">
<widget class="QPushButton" name="pushButton_14"> <widget class="QPushButton" name="pushButton_14">
<property name="text"> <property name="text">
<string>扫描</string> <string>扫描</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="3" column="2">
<widget class="QPushButton" name="pushButton_10"> <widget class="QPushButton" name="pushButton_12">
<property name="text"> <property name="text">
<string>红外小</string> <string>复位</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="5"> <item row="4" column="0">
<widget class="QPushButton" name="pushButton_11"> <widget class="QPushButton" name="pushButton_6">
<property name="text"> <property name="text">
<string>锁定</string> <string>变焦拉近</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="6"> <item row="4" column="1">
<widget class="QPushButton" name="pushButton_13"> <widget class="QPushButton" name="pushButton_13">
<property name="text"> <property name="text">
<string>吊舱</string> <string>吊舱</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5"> <item row="4" column="2">
<widget class="QPushButton" name="pushButton_12"> <widget class="QPushButton" name="pushButton_11">
<property name="text"> <property name="text">
<string>复位</string> <string>锁定</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="5" column="0">
<widget class="QPushButton" name="pushButton_5"> <widget class="QPushButton" name="pushButton_10">
<property name="text"> <property name="text">
<string>变焦推远</string> <string>红外小</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="5" column="1">
<widget class="QPushButton" name="pushButton_6"> <widget class="QPushButton" name="pushButton_17">
<property name="text"> <property name="text">
<string>变焦拉近</string> <string>图像切换</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4"> <item row="5" column="2">
<widget class="QPushButton" name="pushButton_9"> <widget class="QPushButton" name="pushButton_16">
<property name="text"> <property name="text">
<string>红外大</string> <string>0-3图拼接</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="6" column="0">
<widget class="QPushButton" name="pushButton_3"> <widget class="QPushButton" name="pushButton_9">
<property name="text"> <property name="text">
<string>俯仰-</string> <string>红外大</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="8"> <item row="6" column="2">
<widget class="QPushButton" name="pushButton_17"> <widget class="QPushButton" name="pushButton_15">
<property name="text"> <property name="text">
<string>图像切换</string> <string>4-6图拼接</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -222,22 +170,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

8
src/communicationsettingdlg.ui
Unescape Escape View File

@ -115,7 +115,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QSpinBox" name="remotePort"> <widget class="QSpinBox" name="remotePort">
<property name="buttonSymbols"> <property name="buttonSymbols">
<enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum> <enum>QAbstractSpinBox::NoButtons</enum>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>65534</number> <number>65534</number>
@ -137,7 +137,7 @@
<item row="4" column="1"> <item row="4" column="1">
<widget class="QSpinBox" name="localPort"> <widget class="QSpinBox" name="localPort">
<property name="buttonSymbols"> <property name="buttonSymbols">
<enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum> <enum>QAbstractSpinBox::NoButtons</enum>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>65534</number> <number>65534</number>
@ -154,7 +154,7 @@
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
@ -179,7 +179,7 @@
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>

167
src/mainwindow.ui
Unescape Escape View File

@ -6,34 +6,24 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1388</width>
<height>600</height> <height>854</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="9,2">
<property name="leftMargin"> <item>
<number>2</number> <layout class="QVBoxLayout" name="verticalLayout" stretch="15,1,1">
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item> <item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<widget class="QWidget" name="page"> <property name="currentIndex">
<layout class="QVBoxLayout" name="verticalLayout_2"> <number>1</number>
<property name="spacing">
<number>2</number>
</property> </property>
<widget class="QWidget" name="page_3">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="leftMargin"> <property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>
@ -51,11 +41,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_2"> <widget class="QWidget" name="page_4">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>
@ -91,6 +78,128 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QWidget" name="widget_3" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0">
<property name="spacing">
<number>14</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>00:00:00</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="minimumSize">
<size>
<width>854</width>
<height>0</height>
</size>
</property>
<property name="value">
<number>24</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>00:00:00</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widget_2" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,10,1">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="VideoControl" name="widget" native="true"/>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item> <item>
<widget class="CommandWidget" name="commandWidget" native="true"/> <widget class="CommandWidget" name="commandWidget" native="true"/>
</item> </item>
@ -101,7 +210,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1388</width>
<height>24</height> <height>24</height>
</rect> </rect>
</property> </property>
@ -111,7 +220,7 @@
<customwidget> <customwidget>
<class>VideoWidget</class> <class>VideoWidget</class>
<extends>QOpenGLWidget</extends> <extends>QOpenGLWidget</extends>
<header location="global">videowidget.h</header> <header>videowidget.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>CommandWidget</class> <class>CommandWidget</class>
@ -119,6 +228,12 @@
<header>commandwidget.h</header> <header>commandwidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>VideoControl</class>
<extends>QWidget</extends>
<header>videoControl.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>

24
src/resources/Qss/qss.qss
Unescape Escape View File

@ -1,6 +1,6 @@
/************************QWidget窗体设置****************************/ /************************QWidget窗体设置****************************/
QWidget{ QWidget{
background-color: rgb(50, 50, 50); background-color: rgb(55,55,55);
} }
/************************QPushButton按钮设置****************************/ /************************QPushButton按钮设置****************************/
@ -34,6 +34,27 @@ QPushButton::disabled {
/**播放按钮样式**/
QPushButton#medio{
background: transparent;
}
QPushButton#medio:hover {
background-color: #646464;
border-color: #2f3640;
border-radius: 15px;
border-style: solid;
border-width: 1px;
padding: 1px;
}
QPushButton#medio:pressed {
background: transparent;
}
/**************************QToolButton设置*************************/ /**************************QToolButton设置*************************/
QToolButton{ QToolButton{
@ -63,6 +84,7 @@ QToolButton::disabled {
} }
/**************************QLineEdit编辑框设置*************************/ /**************************QLineEdit编辑框设置*************************/
QLineEdit{ QLineEdit{
color:rgb(255,255,255); color:rgb(255,255,255);

BIN
src/resources/images/playFast.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
src/resources/images/playMedio.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
src/resources/images/playSlow.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
src/resources/images/stop.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

5
src/resources/res.qrc
Unescape Escape View File

@ -25,5 +25,10 @@
<file>images/playback.png</file> <file>images/playback.png</file>
<file>images/videolayout1.png</file> <file>images/videolayout1.png</file>
<file>images/videolayout4.png</file> <file>images/videolayout4.png</file>
<file>images/playMedio.png</file>
<file>images/stop.png</file>
<file>images/playFast.png</file>
<file>images/playSlow.png</file>
</qresource> </qresource>
</RCC> </RCC>

37
src/videoControl.cpp
Unescape Escape View File

@ -0,0 +1,37 @@
#include "videoControl.h"
#include "ui_videoControl.h"
VideoControl::VideoControl(QWidget *parent) :
QWidget(parent),
ui(new Ui::VideoControl)
{
ui->setupUi(this);
// 其他初始化代码...
ui->pbPlayer->setIcon(QIcon(":/images/playMedio.png"));
ui->pbPlayer->setIconSize(QSize(56,56));
ui->pbPlayer->setFixedSize(64, 64);
ui->pbPlayer->setObjectName("medio");
// ui->pbPlayer->set
ui->pbStop->setIcon(QIcon(":/images/stop.png"));
ui->pbStop->setIconSize(QSize(42,42));
ui->pbStop->setFixedSize(50, 50);
ui->pbStop->setObjectName("medio");
ui->pbFast->setIcon(QIcon(":/images/playFast.png"));
ui->pbFast->setIconSize(QSize(42,42));
ui->pbFast->setFixedSize(50, 50);
ui->pbFast->setObjectName("medio");
ui->pbSlow->setIcon(QIcon(":/images/playSlow.png"));
ui->pbSlow->setIconSize(QSize(42,42));
ui->pbSlow->setFixedSize(50, 50);
ui->pbSlow->setObjectName("medio");
}
VideoControl::~VideoControl()
{
delete ui;
}

30
src/videoControl.h
Unescape Escape View File

@ -0,0 +1,30 @@
#ifndef VIDEOCONTROL_H
#define VIDEOCONTROL_H
#include <QWidget>
namespace Ui {
class VideoControl;
}
class VideoControl : public QWidget {
Q_OBJECT
public:
explicit VideoControl(QWidget *parent = nullptr);
~VideoControl();
private:
Ui::VideoControl *ui;
};
#endif // VIDEOCONTROL_H

103
src/videoControl.ui
Unescape Escape View File

@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>VideoControl</class>
<widget class="QWidget" name="VideoControl">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>713</width>
<height>91</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,5,1">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0">
<property name="spacing">
<number>6</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QPushButton" name="pbSlow">
<property name="text">
<string/>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbPlayer">
<property name="text">
<string/>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbStop">
<property name="text">
<string/>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbFast">
<property name="text">
<string/>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
Write Preview
Loading…
Cancel
Save