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

Fix minor problems in modules handle

Browse Source
This commit is contained in:
jfmcarreira committed 2015-01-09 20:05:13 +00:00
1 parent 771bc5725c
commit b09fdc4020
3 files changed
+16 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/ModulesHandle.cpp
+10 -7
View File
@@ -234,6 +234,7 @@ Void ModulesHandle::activateModule()
Void ModulesHandle::enableModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf )
{
VideoSubWindow* pcModuleSubWindow = NULL;
Bool bShowModulesNewWindow = m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked();
VideoSubWindow* pcVideoSubWindow = qobject_cast<VideoSubWindow *>( m_pcMdiArea->activeSubWindow() );
@@ -300,15 +301,16 @@ Void ModulesHandle::enableModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf )
{
if( ( pcCurrModuleIf->m_pcModule->m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
{
VideoSubWindow* interfaceChild = new VideoSubWindow( m_pcParent, true );
interfaceChild->setWindowName( windowName );
pcModuleSubWindow = new VideoSubWindow( m_pcParent, true );
pcModuleSubWindow->setWindowShortName( windowName );
pcModuleSubWindow->setWindowName( windowName );
connect( interfaceChild, SIGNAL( updateStatusBar( const QString& ) ), m_pcParent, SLOT( updateStatusBar( const QString& ) ) );
connect( interfaceChild, SIGNAL( zoomChanged() ), m_pcParent, SLOT( updateZoomFactorSBox() ) );
connect( pcModuleSubWindow, SIGNAL( updateStatusBar( const QString& ) ), m_pcParent, SLOT( updateStatusBar( const QString& ) ) );
connect( pcModuleSubWindow, SIGNAL( zoomChanged() ), m_pcParent, SLOT( updateZoomFactorSBox() ) );
pcCurrModuleIf->m_pcDisplaySubWindow = interfaceChild;
pcCurrModuleIf->m_pcDisplaySubWindow = pcModuleSubWindow;
pcCurrModuleIf->m_pcDisplaySubWindow->enableModule( pcCurrModuleIf, true );
m_pcMdiArea->addSubWindow( interfaceChild );
m_pcMdiArea->addSubWindow( pcModuleSubWindow );
}
}
else if( pcCurrModuleIf->m_pcModule->m_iModuleType == FRAME_MEASUREMENT_MODULE )
@@ -337,7 +339,8 @@ Void ModulesHandle::enableModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf )
pcCurrModuleIf->m_pcModule->create( pcCurrModuleIf->m_pcSubWindow[0]->getCurrFrame() );
applyModuleIf( pcCurrModuleIf, false );
QCoreApplication::processEvents();
//pcModuleSubWindow->show();
return;
}
app/VideoSubWindow.h
+5
View File
@@ -139,6 +139,7 @@ public:
if( m_pcCurrFrame->haveSameFmt( subWindow->getCurrFrame() ) )
m_pcReferenceSubWindow = subWindow;
}
VideoSubWindow* getRefSubWindow()
{
return m_pcReferenceSubWindow;
@@ -171,6 +172,10 @@ public:
QSize sizeHint() const;
Void setWindowShortName( const QString& name)
{
m_cWindowShortName = name;
}
QString getWindowShortName()
{
return m_cWindowShortName;
app/plaYUVerApp.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ plaYUVerApp::plaYUVerApp()
mdiArea = new PlaYUVerMdiArea;
setCentralWidget( mdiArea );
mdiArea->setActivationOrder( QMdiArea::ActivationHistoryOrder );
//mdiArea->setActivationOrder( QMdiArea::ActivationHistoryOrder );
mapperWindow = new QSignalMapper( this );
connect( mapperWindow, SIGNAL( mapped(QWidget*) ), this, SLOT( setActiveSubWindow(QWidget*) ) );