diff --git a/app/DialogSubWindowSelector.cpp b/app/DialogSubWindowSelector.cpp index 13dc94a..a4e2653 100644 --- a/app/DialogSubWindowSelector.cpp +++ b/app/DialogSubWindowSelector.cpp @@ -215,9 +215,7 @@ Void DialogSubWindowSelector::removeSubWindow() for( Int i = 0; i < selectedWindows.size(); i++ ) { QString currName = selectedWindows.at( i )->text(); - qDebug( ) << currName; Int indexCurrName = m_pcSelectedWindowListNames.indexOf( currName ); - qDebug( ) << indexCurrName; m_pcSelectedWindowListNames.removeAt( indexCurrName ); m_listSelectedWindows->removeItemWidget( selectedWindows[i] ); } diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp index 61f918d..ef2c2aa 100644 --- a/app/ModulesHandle.cpp +++ b/app/ModulesHandle.cpp @@ -125,7 +125,7 @@ SubWindowHandle* ModulesHandle::enableModuleIf( PlaYUVerAppModuleIf *pcCurrModul for( Int i = 0; i < m_pcMdiArea->subWindowList().size(); i++ ) { subWindow = qobject_cast( m_pcMdiArea->subWindowList().at( i ) ); - if( subWindow->windowTitle() == selectedWindows.at( j ) ) + if( subWindow->getWindowName() == selectedWindows.at( j ) ) { subWindowList.append( qobject_cast( m_pcMdiArea->subWindowList().at( i ) ) ); pcCurrModuleIf->m_pcSubWindow[j] = qobject_cast( m_pcMdiArea->subWindowList().at( i ) ); diff --git a/app/VideoSubWindow.h b/app/VideoSubWindow.h index 74999ce..31f5313 100644 --- a/app/VideoSubWindow.h +++ b/app/VideoSubWindow.h @@ -142,7 +142,10 @@ public: Void setRefSubWindow( VideoSubWindow* subWindow ) { - m_pcReferenceSubWindow = subWindow; + m_pcReferenceSubWindow = NULL; + if( subWindow ) + if( m_pcCurrFrame->haveSameFmt( subWindow->getCurrFrame() ) ) + m_pcReferenceSubWindow = subWindow; } VideoSubWindow* getRefSubWindow() { diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp index 44b996d..eb9ec74 100644 --- a/app/plaYUVerApp.cpp +++ b/app/plaYUVerApp.cpp @@ -1403,10 +1403,7 @@ Void plaYUVerApp::createDockWidgets() QMainWindow::tabifyDockWidget( m_arraySideBars[FRAME_DOCK], m_arraySideBars[STREAM_DOCK] ); //QMainWindow::setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North); - m_arraySideBars[QUALITY_DOCK] = new QDockWidget( tr( "Quality Measurement" ), this ); - m_arraySideBars[QUALITY_DOCK]->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea ); - m_arraySideBars[QUALITY_DOCK]->setWidget( m_appModuleQuality->createDock() ); - addDockWidget( Qt::RightDockWidgetArea, m_arraySideBars[QUALITY_DOCK] ); + addDockWidget( Qt::RightDockWidgetArea, m_appModuleQuality->createDock() ); } Void plaYUVerApp::createStatusBar()