Merge branch 'dev_modules_api'
This commit is contained in:
commit
b819dfd2c1
4 files changed
+30
-4
No files matched your search
+2
-1
@@ -39,11 +39,12 @@ FILE( GLOB RESOURCES_FILES ${RSC_DIR}/*.qrc )
|
|||||||
######################################################################################
|
######################################################################################
|
||||||
# Variables
|
# Variables
|
||||||
######################################################################################
|
######################################################################################
|
||||||
ADD_OPTION(CMAKE_BUILD_TYPE "Build type" Debug )
|
ADD_OPTION(CMAKE_BUILD_TYPE "Build type" "Release" )
|
||||||
ADD_OPTION(USE_QT4 "Build with QT4" OFF )
|
ADD_OPTION(USE_QT4 "Build with QT4" OFF )
|
||||||
ADD_OPTION(USE_OPENCV "Add OpenCV support" OFF )
|
ADD_OPTION(USE_OPENCV "Add OpenCV support" OFF )
|
||||||
ADD_OPTION(USE_FFMPEG "Add FFMPEG support" OFF )
|
ADD_OPTION(USE_FFMPEG "Add FFMPEG support" OFF )
|
||||||
|
|
||||||
|
SET(CMAKE_BUILD_TYPE Release)
|
||||||
|
|
||||||
######################################################################################
|
######################################################################################
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
|||||||
@@ -73,7 +73,8 @@ QMenu* ModulesHandle::createMenus( QMenuBar *MainAppMenuBar )
|
|||||||
{
|
{
|
||||||
PlaYUVerModuleIf* currModuleIf;
|
PlaYUVerModuleIf* currModuleIf;
|
||||||
QAction* currAction;
|
QAction* currAction;
|
||||||
Bool bCategoryExists = false;
|
QMenu* currSubMenu;
|
||||||
|
Bool bCategoryExists;
|
||||||
Int iNumberCategories = 0;
|
Int iNumberCategories = 0;
|
||||||
|
|
||||||
m_pcActionMapper = new QSignalMapper( this );
|
m_pcActionMapper = new QSignalMapper( this );
|
||||||
@@ -83,10 +84,30 @@ QMenu* ModulesHandle::createMenus( QMenuBar *MainAppMenuBar )
|
|||||||
|
|
||||||
//m_arrayModulesActions.resize( m_uiModulesCount );
|
//m_arrayModulesActions.resize( m_uiModulesCount );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for( Int i = 0; i < m_pcPlaYUVerModules.size(); i++ )
|
for( Int i = 0; i < m_pcPlaYUVerModules.size(); i++ )
|
||||||
{
|
{
|
||||||
currModuleIf = m_pcPlaYUVerModules.at( i );
|
currModuleIf = m_pcPlaYUVerModules.at( i );
|
||||||
|
|
||||||
|
currSubMenu = NULL;
|
||||||
|
if( currModuleIf->m_cModuleDef.m_pchModuleCategory )
|
||||||
|
{
|
||||||
|
for( Int j = 0; j < m_pcModulesSubMenuList.size(); j++ )
|
||||||
|
{
|
||||||
|
if( m_pcModulesSubMenuList.at( j )->title() == QString( currModuleIf->m_cModuleDef.m_pchModuleCategory ) )
|
||||||
|
{
|
||||||
|
currSubMenu = m_pcModulesSubMenuList.at( j );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if( !currSubMenu )
|
||||||
|
{
|
||||||
|
currSubMenu = m_pcModulesMenu->addMenu( currModuleIf->m_cModuleDef.m_pchModuleCategory );
|
||||||
|
m_pcModulesSubMenuList.append( currSubMenu );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
currAction = new QAction( tr( currModuleIf->m_cModuleDef.m_pchModuleName ), parent() );
|
currAction = new QAction( tr( currModuleIf->m_cModuleDef.m_pchModuleName ), parent() );
|
||||||
currAction->setStatusTip( tr( currModuleIf->m_cModuleDef.m_pchModuleTooltip ) );
|
currAction->setStatusTip( tr( currModuleIf->m_cModuleDef.m_pchModuleTooltip ) );
|
||||||
currAction->setCheckable( true );
|
currAction->setCheckable( true );
|
||||||
@@ -94,7 +115,10 @@ QMenu* ModulesHandle::createMenus( QMenuBar *MainAppMenuBar )
|
|||||||
m_pcActionMapper->setMapping( currAction, i );
|
m_pcActionMapper->setMapping( currAction, i );
|
||||||
m_arrayModulesActions.append( currAction );
|
m_arrayModulesActions.append( currAction );
|
||||||
|
|
||||||
m_pcModulesMenu->addAction( currAction );
|
if( currSubMenu )
|
||||||
|
currSubMenu->addAction( currAction );
|
||||||
|
else
|
||||||
|
m_pcModulesMenu->addAction( currAction );
|
||||||
|
|
||||||
currModuleIf->m_pcAction = currAction;
|
currModuleIf->m_pcAction = currAction;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ private:
|
|||||||
UInt m_uiModulesCount;
|
UInt m_uiModulesCount;
|
||||||
Int m_uiModuleSelected;
|
Int m_uiModuleSelected;
|
||||||
QMenu* m_pcModulesMenu;
|
QMenu* m_pcModulesMenu;
|
||||||
|
QList<QMenu*> m_pcModulesSubMenuList;
|
||||||
QList<PlaYUVerModuleIf*> m_pcPlaYUVerModules;
|
QList<PlaYUVerModuleIf*> m_pcPlaYUVerModules;
|
||||||
QSignalMapper* m_pcActionMapper;
|
QSignalMapper* m_pcActionMapper;
|
||||||
QVector<QAction*> m_arrayModulesActions;
|
QVector<QAction*> m_arrayModulesActions;
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ namespace plaYUVer
|
|||||||
|
|
||||||
PlaYUVerModuleDefinition FilterFrameDef = {
|
PlaYUVerModuleDefinition FilterFrameDef = {
|
||||||
FRAME_LEVEL_MODULE,
|
FRAME_LEVEL_MODULE,
|
||||||
"Filters"
|
"Filters",
|
||||||
"Y_Filter",
|
"Y_Filter",
|
||||||
"Filter Y matrix of YUV frame",
|
"Filter Y matrix of YUV frame",
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in new issue
Block a user