Почистил мусор

MimusTriurus · Feb 9, 2019 · be6527b · be6527b
1 parent c66685a
commit be6527b
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 46 deletions.
diff --git a/lib/static/CvVideoCapture/Capture.cpp b/lib/static/CvVideoCapture/Capture.cpp
@@ -2,7 +2,7 @@
 #include <QDebug>
 
 Capture::Capture( QObject *parent ) :
-    QObject( parent ) {
+    QObject{ parent } {
 
 }
 

diff --git a/lib/static/FpsChecker/FpsChecker.cpp b/lib/static/FpsChecker/FpsChecker.cpp
@@ -26,6 +26,14 @@ void FpsChecker::reset( ) {
     _counter = 0;
 }
 
+FpsChecker::FpsChecker( ) :
+    _counter{ 0 },
+    _sumTime{ 0 },
+    _startTime{ 0 }
+{
+
+}
+
 void FpsChecker::start( ) {
     _startTime = cv::getTickCount( );
 }

diff --git a/lib/static/FpsChecker/FpsChecker.h b/lib/static/FpsChecker/FpsChecker.h
@@ -6,16 +6,18 @@
 
 class FpsChecker {
 public:
+    FpsChecker( );
+
     void start( );
     void stop( );
 
     int fps( ) const;
 
     void reset( );
 private:
-    int64 _counter{ 0 };
-    int64 _sumTime{ 0 };
-    int64 _startTime{ 0 };
+    int64 _counter;
+    int64 _sumTime;
+    int64 _startTime;
 
     int64  getTimeTicks( ) const;
     double getTimeMicro( ) const;

diff --git a/lib/static/VideoReceiver/VideoReceiver.cpp b/lib/static/VideoReceiver/VideoReceiver.cpp
@@ -3,10 +3,11 @@
 #include <QDebug>
 
 VideoReciever::VideoReciever( QObject *parent ) :
-    QThread( parent ),
-    _imgSize    { -1 },
-    _port       { 10000 },
-    _interval   { 5 }
+    QThread         { parent },
+    _imgSize        { -1 },
+    _port           { 10000 },
+    _interval       { 5 },
+    _workInProgress { false }
 {
 
 }

diff --git a/lib/static/VideoReceiver/VideoReceiver.h b/lib/static/VideoReceiver/VideoReceiver.h
@@ -29,7 +29,7 @@ class VideoReciever : public QThread {
     QByteArray  _imgBuffer;
     quint16     _port;
     double      _interval;
-    bool        _workInProgress{ false };
+    bool        _workInProgress;
 
     mutable QMutex _mutex;
 };

diff --git a/lib/static/VideoTransmitter/VideoTransmitter.cpp b/lib/static/VideoTransmitter/VideoTransmitter.cpp
@@ -1,9 +1,11 @@
 #include "VideoTransmitter.h"
 
 VideoTransmitter::VideoTransmitter( QString host, quint16 port, QObject *parent ) :
-    QObject{ parent },
-    _host{ host },
-    _port{ port }
+    QObject     { parent },
+    _packetSize { 8192 },
+    _quality    { 55 },
+    _host       { host },
+    _port       { port }
 {
 
 }

diff --git a/lib/static/VideoTransmitter/VideoTransmitter.h b/lib/static/VideoTransmitter/VideoTransmitter.h
@@ -10,6 +10,7 @@ class VideoTransmitter : public QObject {
     Q_OBJECT
 public:
     VideoTransmitter( QString host = "localhost", quint16 port = 10000, QObject *parent = nullptr );
+    VideoTransmitter( ) = delete;
     void setQuality( const int quality );
     void host( const QString &host );
     void port( const quint16 port );
@@ -19,8 +20,8 @@ class VideoTransmitter : public QObject {
 public slots:
     void sendFrameData( const std::vector<uchar> &imgData );
 private:
-    int             _packetSize { 8192 };
-    int             _quality    { 55 };
+    int             _packetSize;
+    int             _quality;
     QUdpSocket      _socket;
     QHostAddress    _host;
     quint16         _port;

diff --git a/test/CvReceiverTest/MainWindow.cpp b/test/CvReceiverTest/MainWindow.cpp
@@ -3,10 +3,13 @@
 #include <MatSerialization.h>
 
 MainWindow::MainWindow( QWidget *parent ) :
-    QMainWindow( parent ),
-    ui( new Ui::MainWindow )
+    QMainWindow { parent },
+    ui          { new Ui::MainWindow },
+    _isListen   { false },
+    _btnListen  { "Start" },
+    _port       { "10000" }
 {
-    ui->setupUi(this);
+    ui->setupUi( this );
 
     connect( &_receiver, SIGNAL( imgDataReceived( QByteArray ) ),
              this, SLOT( onReceiveData( QByteArray ) ) );

diff --git a/test/CvReceiverTest/MainWindow.h b/test/CvReceiverTest/MainWindow.h
@@ -24,9 +24,9 @@ class MainWindow : public QMainWindow {
 private:
     Ui::MainWindow  *ui;
     VideoReciever   _receiver;
-    bool            _isListen   { false };
-    QPushButton     _btnListen  { "Start" };
-    QLineEdit       _port       { "10000" };
+    bool            _isListen;
+    QPushButton     _btnListen;
+    QLineEdit       _port;
     FpsChecker      _fpsChecker;
 
     QTimer          _tmrUpdate;

diff --git a/test/CvTransmitterTest/MainWindow.cpp b/test/CvTransmitterTest/MainWindow.cpp
@@ -6,8 +6,25 @@
 #include <iostream>
 
 MainWindow::MainWindow( QWidget *parent ) :
-    QMainWindow( parent ),
-    ui( new Ui::MainWindow )
+    QMainWindow     { parent },
+    ui              { new Ui::MainWindow },
+    _cameraIsOpen   { false },
+    _showFrameWindow{ false },
+    _grayScale      { false },
+    _link           { false },
+    _resizeFrame    { false },
+    _qual           { 50 },
+    _cameraId       { "0" },
+    _host           { "127.0.0.1" },
+    _port           { "10000" },
+    _showFrameWin   { "Show frame window" },
+    _toGrayscale    { "Convert BGR2RGB" },
+    _resize         { "Resize to 320x240" },
+    _quality        { "50" },
+    _width          { "640" },
+    _height         { "480" },
+    _fps            { "30" },
+    _btnStart       { "Start" }
 {
     ui->setupUi( this );
     initInterface( );

diff --git a/test/CvTransmitterTest/MainWindow.h b/test/CvTransmitterTest/MainWindow.h
@@ -28,32 +28,32 @@ class MainWindow : public QMainWindow {
 private:
     Ui::MainWindow      *ui;
 
-    bool                _cameraIsOpen   { false };
-    bool                _showFrameWindow{ false };
-    bool                _grayScale      { false };
-    bool                _link           { false };
-    bool                _resizeFrame    { false };
-    int                 _qual           { 50 };
+    bool                _cameraIsOpen;
+    bool                _showFrameWindow;
+    bool                _grayScale;
+    bool                _link;
+    bool                _resizeFrame;
+    int                 _qual;
 
     Capture             _capture;
     QTimer              _tmrFrameUpdate;
     VideoTransmitter    _transmitter;
 
-    QLineEdit           _cameraId    { "0" };
-    QLineEdit           _host        { "192.168.1.51" };
-    QLineEdit           _port        { "10000" };
+    QLineEdit           _cameraId;
+    QLineEdit           _host;
+    QLineEdit           _port;
     QTextEdit           _log;
-    QCheckBox           _showFrameWin{ "Show frame window" };
-    QCheckBox           _toGrayscale { "Convert BGR2RGB" };
-    QCheckBox           _resize      { "Resize to 320x240" };
-    QLineEdit           _quality     { "50" };
+    QCheckBox           _showFrameWin;
+    QCheckBox           _toGrayscale;
+    QCheckBox           _resize;
+    QLineEdit           _quality;
 
-    QLineEdit           _width       { "640" };
-    QLineEdit           _height      { "480" };
+    QLineEdit           _width;
+    QLineEdit           _height;
 
-    QLineEdit           _fps         { "30" };
+    QLineEdit           _fps;
 
-    QPushButton         _btnStart    { "Start" };
+    QPushButton         _btnStart;
 
     FpsChecker          _fpsChecker;
     void initInterface( );

diff --git a/test/VideoCaptureTest/mainwindow.cpp b/test/VideoCaptureTest/mainwindow.cpp
@@ -7,8 +7,13 @@
 #include <QTimer>
 
 MainWindow::MainWindow( QWidget *parent ) :
-    QMainWindow( parent ),
-    ui( new Ui::MainWindow )
+    QMainWindow     { parent },
+    ui              { new Ui::MainWindow },
+    _start          { false },
+    _camIndex       { "0" },
+    _camFps         { "30" },
+    _showCameraWin  { "Show Camera Win" },
+    _btnStart       { "Start" }
 {
     ui->setupUi( this );
     _showCameraWin.setChecked( true );

diff --git a/test/VideoCaptureTest/mainwindow.h b/test/VideoCaptureTest/mainwindow.h
@@ -23,12 +23,12 @@ class MainWindow : public QMainWindow {
     Capture     _capture;
     FpsChecker  _fpsChecker;
     QTimer      _tmrFrameUpdate;
-    bool        _start{ false };
+    bool        _start;
 
-    QLineEdit   _camIndex       { "0" };
-    QLineEdit   _camFps         { "30" };
-    QCheckBox   _showCameraWin  { "Show Camera Win" };
-    QPushButton _btnStart       { "Start" };
+    QLineEdit   _camIndex;
+    QLineEdit   _camFps;
+    QCheckBox   _showCameraWin;
+    QPushButton _btnStart;
     void initInterface( );
 private slots:
     void onNewCvFrame( );