Major changes on code

Remove Qt4 support
Change include headers
Change the include of QCustomPlot lib and updated code based on upstream
This commit is contained in:
2017-12-06 03:11:02 +00:00
parent 73d843abf5
commit 430bdc09cd
66 changed files with 38551 additions and 29387 deletions
+7 -8
View File
@@ -25,6 +25,9 @@
#include "PlaYUVerAppModuleIf.h"
#include "VideoSubWindow.h"
#include "VideoSubWindow.h"
#include <QApplication>
#include <QAction>
#include <QDockWidget>
PlaYUVerAppModuleIf::PlaYUVerAppModuleIf( QObject* parent, QAction* action, PlaYUVerModuleIf* module )
: m_bIsRunning( false )
@@ -38,8 +41,7 @@ PlaYUVerAppModuleIf::PlaYUVerAppModuleIf( QObject* parent, QAction* action, PlaY
, m_dMeasurementResult( 0 )
{
setParent( parent );
for( Int i = 0; i < MODULE_REQUIRES_MAX_NUM_FRAMES; i++ )
{
for( Int i = 0; i < MODULE_REQUIRES_MAX_NUM_FRAMES; i++ ) {
m_pcSubWindow[i] = NULL;
}
}
@@ -114,8 +116,7 @@ Void PlaYUVerAppModuleIf::run()
m_bIsRunning = true;
m_bSuccess = false;
std::vector<PlaYUVerFrame*> apcFrameList;
for( UInt i = 0; i < m_pcModule->m_uiNumberOfFrames; i++ )
{
for( UInt i = 0; i < m_pcModule->m_uiNumberOfFrames; i++ ) {
apcFrameList.push_back( m_pcSubWindow[i]->getCurrFrame() );
}
@@ -184,8 +185,7 @@ Void PlaYUVerAppModuleIf::destroy()
if( m_bIsRunning )
{
QApplication::setOverrideCursor( Qt::WaitCursor );
while( m_bIsRunning )
{
while( m_bIsRunning ) {
}
QApplication::restoreOverrideCursor();
}
@@ -203,8 +203,7 @@ Void PlaYUVerAppModuleIf::destroy()
m_pcDisplaySubWindow->closeSubWindow();
m_pcDisplaySubWindow = NULL;
for( Int i = 0; i < MODULE_REQUIRES_MAX_NUM_FRAMES; i++ )
{
for( Int i = 0; i < MODULE_REQUIRES_MAX_NUM_FRAMES; i++ ) {
if( m_pcSubWindow[i] )
{
m_pcSubWindow[i]->disableModule( this );