From fdd725307a1d7c1a5af7e1d190418138f7463ea7 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 3 Oct 2014 10:41:22 +0100 Subject: [PATCH 1/9] Add an workout to fit in windows --- cmake/Install.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 722a762..de1f342 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -70,7 +70,7 @@ IF( WIN32 ) SET(CPACK_GENERATOR "ZIP") SET(OS "Windows") - + SET(GITBRANCH "devel") # temp work around #EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${DAY}) #string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${DAY} ${${DAY}}) From 6f1de1e1c35ee9974837e9c05dfcce598204439a Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 3 Oct 2014 10:42:19 +0100 Subject: [PATCH 2/9] Fix last commit --- cmake/Install.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index de1f342..129e43f 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -70,7 +70,7 @@ IF( WIN32 ) SET(CPACK_GENERATOR "ZIP") SET(OS "Windows") - SET(GITBRANCH "devel") # temp work around + SET(GIT_BRANCH "devel") # temp work around #EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${DAY}) #string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${DAY} ${${DAY}}) From b36e33a2691cad55ecfbc46a7ea0206376094788 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 3 Oct 2014 11:03:49 +0100 Subject: [PATCH 3/9] Fix branch name replace for deb name --- cmake/Install.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 722a762..90bbf6d 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -93,8 +93,9 @@ IF( PLAYUVER_LONGVERSIONNAME ) SET( PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME} ) ELSE() # message(STATUS ${GIT_BRANCH} ) - STRING(REPLACE "master" "stable" __version_name_deb ${GIT_BRANCH} ) - STRING(REPLACE "devel" "latest" __version_name_deb ${GIT_BRANCH} ) + SET( __version_name_deb ${GIT_BRANCH} ) + STRING(REPLACE "master" "stable" __version_name_deb ${__version_name_deb} ) + STRING(REPLACE "devel" "latest" __version_name_deb ${__version_name_deb} ) message(STATUS ${GIT_BRANCH} ) SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${__version_name_deb}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) SET( PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME} ) From 88b20af2abe25ef7834dd444501031fe52d8112e Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 3 Oct 2014 12:39:26 +0100 Subject: [PATCH 4/9] Update Readme --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f002e50..25e5841 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,9 @@ plaYUVer is an open-source video player with the following features: - Advanced frame zoom with easy to use pan function - Usefull information in status bar, *e.g.*, pixel information - Usefull sidebars with stream and frame information, *e.g.*, frame histogram +- Constant growing libs for stream and frame processing (PlaYUVerStream PlaYUVerFrame) - Advanced API for frame/video processing algorithms - -Builds ----------------------------------------------------------------- -Download update build for windows and linux from our SourceForge project page +- Frame level quality measurement API based on the PlaYUVerFrame class Developers @@ -22,7 +20,12 @@ Developers - Lui­s Lucas (luisfrlucas@gmail.com) -Install using cmake +Builds +---------------------------------------------------------------- +Download update build for windows and linux from our SourceForge project page + + +Build/Install using cmake ---------------------------------------------------------------- 1. The following are required for compilation: From 89a3300e48f81f025630c29943955c78384cafbe Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 3 Oct 2014 12:39:26 +0100 Subject: [PATCH 5/9] Update Readme --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f002e50..25e5841 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,9 @@ plaYUVer is an open-source video player with the following features: - Advanced frame zoom with easy to use pan function - Usefull information in status bar, *e.g.*, pixel information - Usefull sidebars with stream and frame information, *e.g.*, frame histogram +- Constant growing libs for stream and frame processing (PlaYUVerStream PlaYUVerFrame) - Advanced API for frame/video processing algorithms - -Builds ----------------------------------------------------------------- -Download update build for windows and linux from our SourceForge project page +- Frame level quality measurement API based on the PlaYUVerFrame class Developers @@ -22,7 +20,12 @@ Developers - Lui­s Lucas (luisfrlucas@gmail.com) -Install using cmake +Builds +---------------------------------------------------------------- +Download update build for windows and linux from our SourceForge project page + + +Build/Install using cmake ---------------------------------------------------------------- 1. The following are required for compilation: From a5ff85068a1961bcd772861aac520f8490eca255 Mon Sep 17 00:00:00 2001 From: jcarreira Date: Fri, 3 Oct 2014 12:44:00 +0100 Subject: [PATCH 6/9] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25e5841..852856f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -plaYUVer +PlaYUVer - Enhanced raw video player ======== + plaYUVer is an open-source video player with the following features: - Support for libavformat and libavcodec; - Support for wide range of raw video formats; @@ -17,7 +18,7 @@ Developers ---------------------------------------------------------------- - Joao Carreira (jfmcarreira@gmail.com) -- Lui­s Lucas (luisfrlucas@gmail.com) +- LuiĀ­s Lucas (luisfrlucas@gmail.com) Builds From c829529d8eacf1182b9d71a5996436b8f83496e9 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 3 Oct 2014 12:55:40 +0100 Subject: [PATCH 7/9] Do not highlight when drag and drop --- source/app/plaYUVerApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 7698c1b..170398d 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -887,7 +887,7 @@ Void plaYUVerApp::updatePixelValueStatusBar( const QPoint & pos, PlaYUVerFrame* Void plaYUVerApp::dragEnterEvent( QDragEnterEvent *event ) { //setText(tr("")); - setBackgroundRole( QPalette::Highlight ); + mdiArea->setBackgroundRole( QPalette::Highlight ); event->acceptProposedAction(); } From eae7521dcc0701dab20b605ca802ed61953eb897 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 3 Oct 2014 12:55:40 +0100 Subject: [PATCH 8/9] Do not highlight when drag and drop --- source/app/plaYUVerApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 02c4d8d..7e5b3d7 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -862,7 +862,7 @@ Void plaYUVerApp::updatePixelValueStatusBar( const QPoint & pos, PlaYUVerFrame* Void plaYUVerApp::dragEnterEvent( QDragEnterEvent *event ) { //setText(tr("")); - setBackgroundRole( QPalette::Highlight ); + mdiArea->setBackgroundRole( QPalette::Highlight ); event->acceptProposedAction(); } From ba2b3bfca5dc3eab0d4b8ce2aacc7700e2abb234 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 4 Oct 2014 12:47:49 +0100 Subject: [PATCH 9/9] Minor code arrangements --- source/app/plaYUVerApp.cpp | 2 +- source/app/plaYUVerApp.h | 34 +++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 170398d..f88c1c0 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -1278,7 +1278,7 @@ Void plaYUVerApp::createMenus() m_arrayMenu[DOCK_VIEW_MENU] = createPopupMenu(); if( m_arrayMenu[DOCK_VIEW_MENU] ) { - actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] ); + QAction *actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] ); actionPopupMenu->setText( tr( "&Toolbars/Docks" ) ); } diff --git a/source/app/plaYUVerApp.h b/source/app/plaYUVerApp.h index 44e8c85..e4da072 100644 --- a/source/app/plaYUVerApp.h +++ b/source/app/plaYUVerApp.h @@ -57,7 +57,9 @@ protected: private Q_SLOTS: - //! File functions + /** + * File functions slots + */ void open(); void save(); void format(); @@ -67,7 +69,9 @@ private Q_SLOTS: void closeActiveWindow(); void closeAll(); - //! Playing functions + /** + * Playing functions slots + */ void play(); void pause(); void stop(); @@ -90,13 +94,10 @@ private Q_SLOTS: void normalSize(); void zoomToFit(); - //! Show a message box with some information about the plaYUVerApp App void about(); void chageSubWindowSelection(); - void updateWindowMenu(); - - //! Drag and drop functions + void updateWindowMenu();s void dragEnterEvent( QDragEnterEvent *event ); void dropEvent( QDropEvent *event ); @@ -130,7 +131,7 @@ private: QPainter painter( viewport() ); QSize logoSize = 2 * size() / 3; - QPixmap pixFinalLogo = m_pixmapLogo.scaled(logoSize,Qt::KeepAspectRatio); + QPixmap pixFinalLogo = m_pixmapLogo.scaled( logoSize, Qt::KeepAspectRatio ); // Calculate the logo position - the bottom right corner of the mdi area. int x = width() / 2 - pixFinalLogo.width() / 2; @@ -138,11 +139,9 @@ private: painter.drawPixmap( x, y, pixFinalLogo ); } private: - // Store the logo image. QPixmap m_pixmapLogo; }; - //QMdiArea *mdiArea; PlaYUVerMdiArea *mdiArea; SubWindowHandle *m_pcCurrentSubWindow; ModulesHandle *m_pcModulesHandle; @@ -157,7 +156,9 @@ private: Void zoomToFitAll(); - //! Playing functions + /** + * Playing functions + */ UInt64 getMaxFrameNumber(); Void startPlay(); Void setTimerStatus(); @@ -188,6 +189,8 @@ private: QLabel *m_pcTotalFrameNumLabel; QDoubleSpinBox *m_pcZoomFactorSBox; + + QSignalMapper *mapperZoom; QSignalMapper *mapperSeekVideo; QSignalMapper *mapperWindow; @@ -212,6 +215,9 @@ private: }; QVector m_arrayMenu; + /** + * Array of side bars for the main app + */ enum SIDEBAR_LIST { STREAM_DOCK = 0, @@ -225,6 +231,9 @@ private: FramePropertiesSideBar* m_pcFrameProperties; QualityMeasurementSidebar* m_pcQualityMeasurement; + /** + * Array of tool bars for the main app + */ enum TOOLBAR_LIST { FILE_TOOLBAR = 0, @@ -234,6 +243,9 @@ private: }; QVector m_arrayToolBars; + /** + * Array of actions for the main app + */ enum APP_ACTION_LIST { OPEN_ACT = 0, @@ -270,7 +282,7 @@ private: TOTAL_ACT, }; QVector m_arrayActions; - QAction *actionPopupMenu; + //QAction *actionPopupMenu; // Tools Actions; QActionGroup *actionGroupTools;