Bugfix when showing the module result in a new window

This commit is contained in:
jfmcarreira committed 2014-05-17 18:18:48 +01:00
1 parent 5f50f60a33
commit 1099d4bb9d
3 files changed
+12 -6

No files matched your search

+8 -3
View File
@@ -172,10 +172,10 @@ Void ModulesHandle::destroyAllModulesIf()
}
}
PlaYUVerFrame* ModulesHandle::applyModuleIf( PlaYUVerModuleIf *pcCurrModuleIf )
Bool ModulesHandle::applyModuleIf( PlaYUVerModuleIf *pcCurrModuleIf )
{
PlaYUVerFrame* processedFrame = NULL;
Bool bRet = false;
switch( pcCurrModuleIf->m_cModuleDef.m_uiNumberOfFrames )
{
case MODULE_REQUIRES_ONE_FRAME:
@@ -190,10 +190,15 @@ PlaYUVerFrame* ModulesHandle::applyModuleIf( PlaYUVerModuleIf *pcCurrModuleIf )
break;
}
if( pcCurrModuleIf->m_pcDisplaySubWindow )
{
pcCurrModuleIf->m_pcDisplaySubWindow->setCurrFrame( processedFrame );
bRet = true;
}
else
{
pcCurrModuleIf->m_pcSubWindow[0]->setCurrFrame( processedFrame );
return processedFrame;
}
return bRet;
}
QMenu* ModulesHandle::createMenus( QMenuBar *MainAppMenuBar )
+1 -1
View File
@@ -55,7 +55,7 @@ public:
Void updateMenus( Bool hasSubWindow );
SubWindowHandle* toggleSelectedModuleIf();
static PlaYUVerFrame* applyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf );
static Bool applyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf );
static Void destroyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf );
private:
+3 -2
View File
@@ -143,14 +143,15 @@ Void SubWindowHandle::setCurrFrame( PlaYUVerFrame* pcCurrFrame )
Void SubWindowHandle::refreshFrame()
{
Bool bSetFrame = true;
if( m_pCurrStream )
{
m_pcCurrFrame = m_pCurrStream->getCurrFrame();
if( m_pcCurrentModule )
{
ModulesHandle::applyModuleIf( m_pcCurrentModule );
bSetFrame = ModulesHandle::applyModuleIf( m_pcCurrentModule );
}
else
if( bSetFrame )
{
m_cViewArea->setImage( m_pcCurrFrame );
}