jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev_MultiFrameModules'

Browse Source
This commit is contained in:
jfmcarreira
2014-05-16 12:43:45 +01:00
parent 2f32fa09ef 069d18a7e4
commit 6967077204
10 changed files with 202 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/app/ModulesHandle.cpp
+27 -20
View File
@@ -62,8 +62,6 @@ void ModulesHandle::selectModule( int index )
SubWindowHandle* ModulesHandle::toggleSelectedModuleIf()
{
Bool bShowModulesNewWindow = m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked();
SubWindowHandle* pcSubWindow = qobject_cast<SubWindowHandle *>( m_pcMdiArea->activeSubWindow() );
SubWindowHandle* interfaceChild = NULL;
PlaYUVerModuleIf* currModuleIf = NULL;
@@ -76,32 +74,41 @@ SubWindowHandle* ModulesHandle::toggleSelectedModuleIf()
if( currModuleIf->m_pcAction->isChecked() )
{
currModuleIf->m_pcDisplaySubWindow = NULL;
if( ( currModuleIf->m_cModuleDef.m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
{
QString windowName;
interfaceChild = new SubWindowHandle( m_pcParent );
windowName.append( pcSubWindow->userFriendlyCurrentFile() );
windowName.append( " [" );
windowName.append( currModuleIf->m_cModuleDef.m_pchModuleName );
windowName.append( "]" );
interfaceChild->setWindowName( windowName );
connect( interfaceChild->getViewArea(), SIGNAL( positionChanged(const QPoint &, PlaYUVerFrame *) ), this,
SLOT( updatePixelValueStatusBar(const QPoint &, PlaYUVerFrame *) ) );
currModuleIf->m_pcDisplaySubWindow = interfaceChild;
currModuleIf->m_pcDisplaySubWindow->setModule( currModuleIf );
}
currModuleIf->m_pcSubWindow[0] = pcSubWindow;
pcSubWindow->enableModule( currModuleIf );
enableModuleIf( currModuleIf );
}
else
{
QCoreApplication::processEvents();
destroyModuleIf( currModuleIf );
}
return interfaceChild;
}
SubWindowHandle* ModulesHandle::enableModuleIf( PlaYUVerModuleIf *currModuleIf )
{
Bool bShowModulesNewWindow = m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked();
SubWindowHandle* pcSubWindow = qobject_cast<SubWindowHandle *>( m_pcMdiArea->activeSubWindow() );
SubWindowHandle* interfaceChild = NULL;
currModuleIf->m_pcDisplaySubWindow = NULL;
if( ( currModuleIf->m_cModuleDef.m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
{
QString windowName;
interfaceChild = new SubWindowHandle( m_pcParent );
windowName.append( pcSubWindow->userFriendlyCurrentFile() );
windowName.append( " [" );
windowName.append( currModuleIf->m_cModuleDef.m_pchModuleName );
windowName.append( "]" );
interfaceChild->setWindowName( windowName );
connect( interfaceChild->getViewArea(), SIGNAL( positionChanged(const QPoint &, PlaYUVerFrame *) ), this,
SLOT( updatePixelValueStatusBar(const QPoint &, PlaYUVerFrame *) ) );
currModuleIf->m_pcDisplaySubWindow = interfaceChild;
currModuleIf->m_pcDisplaySubWindow->setModule( currModuleIf );
}
currModuleIf->m_pcSubWindow[0] = pcSubWindow;
pcSubWindow->enableModule( currModuleIf );
return interfaceChild;
}
PlaYUVerFrame* ModulesHandle::applyModuleIf( PlaYUVerModuleIf *pcCurrModuleIf )
{
PlaYUVerFrame* processedFrame = NULL;