diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index c17db2e..bd2475c 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -12,6 +12,7 @@ set(plaYUver_App_SRCS ViewArea.cpp ModulesHandle.cpp PlaYUVerAppModuleIf.cpp + QualityMeasurement.cpp GridManager.cpp Settings.cpp # Sub Window diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp index 9af648a..8eaf215 100644 --- a/app/plaYUVerApp.cpp +++ b/app/plaYUVerApp.cpp @@ -57,6 +57,8 @@ plaYUVerApp::plaYUVerApp() m_pcModulesHandle = new ModulesHandle( this, mdiArea ); + m_appModuleQuality = new QualityMeasurement( this, mdiArea ); + createActions(); createToolBars(); createDockWidgets(); @@ -805,6 +807,7 @@ Void plaYUVerApp::chageSubWindowSelection() } } updateStreamProperties(); + m_appModuleQuality->update( m_pcCurrentVideoSubWindow ); m_pcQualityMeasurement->updateSubWindowList(); updateMenus(); } @@ -1210,6 +1213,8 @@ Void plaYUVerApp::createActions() connect( m_arrayActions[SELECTION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools, SLOT( map() ) ); m_mapperTools->setMapping( m_arrayActions[SELECTION_TOOL_ACT], ViewArea::NormalSelectionTool ); + m_appModuleQuality->createActions(); + // ------------ Window ------------ m_arrayActions[TILE_WINDOWS_ACT] = new QAction( tr( "Tile" ), this ); @@ -1310,6 +1315,9 @@ Void plaYUVerApp::createMenus() m_arrayMenu[VIDEO_MENU]->addAction( m_arrayActions[VIDEO_LOOP_ACT] ); m_arrayMenu[VIDEO_MENU]->addAction( m_arrayActions[VIDEO_LOCK_SELECTION_ACT] ); + QMenu* QualityMenu = m_appModuleQuality->createMenu(); + menuBar()->addMenu( QualityMenu ); + QMenu* modules_menu = m_pcModulesHandle->createMenus( menuBar() ); connect( modules_menu, SIGNAL( triggered(QAction *) ), this, SLOT( ModuleHandling(QAction *) ) ); diff --git a/app/plaYUVerApp.h b/app/plaYUVerApp.h index 22e0ae3..83f27a8 100644 --- a/app/plaYUVerApp.h +++ b/app/plaYUVerApp.h @@ -38,9 +38,10 @@ #include "lib/PlaYUVerDefs.h" #include "SubWindowHandle.h" #include "VideoSubWindow.h" +#include "QualityMeasurement.h" +#include "QualityMeasurementSidebar.h" #include "ModulesHandle.h" #include "PropertiesSidebar.h" -#include "QualityMeasurementSidebar.h" #include "AboutDialog.h" #include "WidgetFrameNumber.h" @@ -208,6 +209,14 @@ private: QSignalMapper *mapperSeekVideo; QSignalMapper *mapperWindow; + /** + * App modules + * Video + * Quality + * Modules + */ + QualityMeasurement* m_appModuleQuality; + /** * Array of menus for the main app * @param position description: