From 4858ee3a36625d85a94d6e32678886e357c14d62 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 8 Nov 2015 03:51:48 +0000 Subject: [PATCH] Implement new enums in ViewArea to adopt new tools and separate internal and external implementation --- app/PlaYUVerApp.cpp | 27 +++-- app/PlaYUVerApp.h | 1 + app/VideoSubWindow.h | 2 +- app/ViewArea.cpp | 243 +++++++++++++++++++++++-------------------- app/ViewArea.h | 110 +++++++++++--------- 5 files changed, 211 insertions(+), 172 deletions(-) diff --git a/app/PlaYUVerApp.cpp b/app/PlaYUVerApp.cpp index 6f980d7..76d3c31 100644 --- a/app/PlaYUVerApp.cpp +++ b/app/PlaYUVerApp.cpp @@ -231,7 +231,7 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo ) connect( subWindow, SIGNAL( scrollBarMoved_SWindow( const QPoint ) ), m_appModuleVideo, SLOT( moveAllScrollBars( const QPoint ) ) ); videoSubWindow->zoomToFit(); - videoSubWindow->getViewArea()->setTool( ( ViewArea::eTool )m_uiViewTool ); + videoSubWindow->getViewArea()->setTool( m_uiViewTool ); updateZoomFactorSBox(); addStreamInfoToRecentList( videoSubWindow->getStreamInfo() ); @@ -707,21 +707,31 @@ Void PlaYUVerApp::createActions() m_mapperTools = new QSignalMapper( this ); connect( m_mapperTools, SIGNAL( mapped(int) ), this, SLOT( setTool(int) ) ); - m_uiViewTool = ViewArea::NavigationTool; + m_uiViewTool = ViewArea::NavigationView; - m_arrayActions[NAVIGATION_TOOL_ACT] = new QAction( tr( "&Navigation Tool" ), this ); + m_arrayActions[NAVIGATION_TOOL_ACT] = new QAction( tr( "Navigation Tool" ), this ); m_arrayActions[NAVIGATION_TOOL_ACT]->setCheckable( true ); m_arrayActions[NAVIGATION_TOOL_ACT]->setChecked( true ); + m_arrayActions[NAVIGATION_TOOL_ACT]->setShortcut( Qt::CTRL + Qt::Key_1 ); actionGroupTools->addAction( m_arrayActions[NAVIGATION_TOOL_ACT] ); connect( m_arrayActions[NAVIGATION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools, SLOT( map() ) ); - m_mapperTools->setMapping( m_arrayActions[NAVIGATION_TOOL_ACT], ViewArea::NavigationTool ); + m_mapperTools->setMapping( m_arrayActions[NAVIGATION_TOOL_ACT], ViewArea::NavigationView ); - m_arrayActions[SELECTION_TOOL_ACT] = new QAction( "&Selection Tool", this ); + m_arrayActions[SELECTION_TOOL_ACT] = new QAction( "Selection Tool", this ); m_arrayActions[SELECTION_TOOL_ACT]->setCheckable( true ); m_arrayActions[SELECTION_TOOL_ACT]->setChecked( false ); + m_arrayActions[SELECTION_TOOL_ACT]->setShortcut( Qt::CTRL + Qt::Key_2 ); actionGroupTools->addAction( m_arrayActions[SELECTION_TOOL_ACT] ); connect( m_arrayActions[SELECTION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools, SLOT( map() ) ); - m_mapperTools->setMapping( m_arrayActions[SELECTION_TOOL_ACT], ViewArea::NormalSelectionTool ); + m_mapperTools->setMapping( m_arrayActions[SELECTION_TOOL_ACT], ViewArea::NormalSelectionView ); + + m_arrayActions[BLOCK_SELECTION_TOOL_ACT] = new QAction( "Block Selection Tool", this ); + m_arrayActions[BLOCK_SELECTION_TOOL_ACT]->setCheckable( true ); + m_arrayActions[BLOCK_SELECTION_TOOL_ACT]->setChecked( false ); + m_arrayActions[BLOCK_SELECTION_TOOL_ACT]->setShortcut( Qt::CTRL + Qt::Key_3 ); + actionGroupTools->addAction( m_arrayActions[BLOCK_SELECTION_TOOL_ACT] ); + connect( m_arrayActions[BLOCK_SELECTION_TOOL_ACT], SIGNAL( triggered() ), m_mapperTools, SLOT( map() ) ); + m_mapperTools->setMapping( m_arrayActions[BLOCK_SELECTION_TOOL_ACT], ViewArea::BlockSelectionView ); m_appModuleVideo->createActions(); m_appModuleQuality->createActions(); @@ -771,6 +781,7 @@ Void PlaYUVerApp::createMenus() m_arrayMenu[VIEW_MENU] = menuBar()->addMenu( tr( "&View" ) ); m_arrayMenu[VIEW_MENU]->addAction( m_arrayActions[NAVIGATION_TOOL_ACT] ); m_arrayMenu[VIEW_MENU]->addAction( m_arrayActions[SELECTION_TOOL_ACT] ); + //m_arrayMenu[VIEW_MENU]->addAction( m_arrayActions[BLOCK_SELECTION_TOOL_ACT] ); m_arrayMenu[VIEW_MENU]->addSeparator(); m_arrayMenu[VIEW_MENU]->addAction( m_arrayActions[ZOOM_IN_ACT] ); m_arrayMenu[VIEW_MENU]->addAction( m_arrayActions[ZOOM_OUT_ACT] ); @@ -932,8 +943,8 @@ Void PlaYUVerApp::readSettings() m_cLastOpenPath = appSettings.value( "MainWindow/LastOpenPath", QDir::homePath() ).toString(); - m_uiViewTool = appSettings.value( "MainWindow/SelectedTool", ViewArea::NavigationTool ).toUInt(); - setTool( ( ViewArea::eTool )m_uiViewTool ); + m_uiViewTool = appSettings.value( "MainWindow/SelectedTool", ViewArea::NavigationView ).toUInt(); + setTool( m_uiViewTool ); QVariant value = appSettings.value( "MainWindow/RecentFileList" ); m_aRecentFileStreamInfo = value.value(); diff --git a/app/PlaYUVerApp.h b/app/PlaYUVerApp.h index be14e14..770df20 100644 --- a/app/PlaYUVerApp.h +++ b/app/PlaYUVerApp.h @@ -238,6 +238,7 @@ private: ZOOM_FIT_ALL_ACT, NAVIGATION_TOOL_ACT, SELECTION_TOOL_ACT, + BLOCK_SELECTION_TOOL_ACT, UPDATE_ACT, ABOUT_ACT, ABOUTQT_ACT, diff --git a/app/VideoSubWindow.h b/app/VideoSubWindow.h index 3ea074c..9b57c43 100644 --- a/app/VideoSubWindow.h +++ b/app/VideoSubWindow.h @@ -213,7 +213,7 @@ public: Void setTool( UInt uiTool ) { - m_cViewArea->setTool( ( ViewArea::eTool )uiTool ); + m_cViewArea->setTool( uiTool ); } /** diff --git a/app/ViewArea.cpp b/app/ViewArea.cpp index 36be7fe..ace4a6f 100644 --- a/app/ViewArea.cpp +++ b/app/ViewArea.cpp @@ -60,7 +60,7 @@ ViewArea::ViewArea( QWidget *parent ) : m_xOffset = 0; m_yOffset = 0; m_mode = NormalMode; - m_tool = NavigationTool; + m_eTool = NavigationTool; m_gridVisible = false; m_snapToGrid = false; m_blockTrackEnable = false; @@ -72,12 +72,12 @@ ViewArea::ViewArea( QWidget *parent ) : connect( &m_zoomWinTimer, SIGNAL( timeout() ), this, SLOT( update() ) ); } -void ViewArea::startZoomWinTimer() +Void ViewArea::startZoomWinTimer() { m_zoomWinTimer.start(); } -void ViewArea::setImage( PlaYUVerFrame* pcFrame ) +Void ViewArea::setImage( PlaYUVerFrame* pcFrame ) { m_pcCurrFrame = pcFrame; m_uiPixelHalfScale = 1 << ( m_pcCurrFrame->getBitsPel() - 1 ); @@ -86,7 +86,7 @@ void ViewArea::setImage( PlaYUVerFrame* pcFrame ) setImage( QPixmap::fromImage( qimg ) ); } -void ViewArea::setImage( const QPixmap &pixmap ) +Void ViewArea::setImage( const QPixmap &pixmap ) { m_pixmap = pixmap; m_mask = QBitmap( pixmap.width(), pixmap.height() ); @@ -98,7 +98,7 @@ void ViewArea::setImage( const QPixmap &pixmap ) initZoomWinRect(); } -void ViewArea::clear() +Void ViewArea::clear() { m_pixmap = QPixmap(); m_mask = QBitmap(); @@ -108,7 +108,34 @@ void ViewArea::clear() updateGeometry(); } -void ViewArea::clearMask() +Void ViewArea::setTool( UInt view ) +{ + switch( view ) + { + case NavigationView: + m_eTool = NavigationTool; + break; + case NormalSelectionView: + m_eTool = SelectionTool; + m_snapToGrid = false; + m_blockTrackEnable = false; + break; + case BlockSelectionView: + m_eTool = SelectionTool; + m_snapToGrid = true; + m_blockTrackEnable = true; + break; + } + + if( m_eTool != SelectionTool ) + { + m_selectedArea = QRect(); + emit selectionChanged( m_selectedArea ); + } + update(); +} + +Void ViewArea::clearMask() { m_mask.clear(); } @@ -191,108 +218,97 @@ Double ViewArea::scaleZoomFactor( Double scale, QPoint center, QSize minimumSize return new_scale; } -void ViewArea::setMode( ViewMode mode ) -{ - if( m_mode == mode ) - return; +//Void ViewArea::setMode( Int mode ) +//{ +// if( m_mode == mode ) +// return; +// +// m_mode = mode; +// update(); +//} +// +//Void ViewArea::setNormalMode() +//{ +// setMode( NormalMode ); +//} +// +//Void ViewArea::setMaskMode() +//{ +// setMode( MaskMode ); +//} +// +//Void ViewArea::setMaskColor( const QColor &color ) +//{ +// m_maskColor = color; +// update(); +//} +// +//Void ViewArea::setMaskTool() +//{ +// setMode( MaskMode ); +// setTool( MaskTool ); +// m_blockTrackEnable = true; +//} +// +//Void ViewArea::setEraserTool() +//{ +// setMode( MaskMode ); +// setTool( EraserTool ); +// m_blockTrackEnable = true; +//} +// +//Void ViewArea::setSelectionTool() +//{ +// setMode( NormalMode ); +// setTool( SelectionTool ); +// m_blockTrackEnable = false; +//} +// +//Void ViewArea::setBlockSelectionTool() +//{ +// setMode( NormalMode ); +// setTool( BlockSelectionTool ); +// m_blockTrackEnable = true; +//} - m_mode = mode; - update(); -} - -void ViewArea::setNormalMode() -{ - setMode( NormalMode ); -} - -void ViewArea::setMaskMode() -{ - setMode( MaskMode ); -} - -void ViewArea::setMaskColor( const QColor &color ) -{ - m_maskColor = color; - update(); -} - -void ViewArea::setTool( eTool tool ) -{ - m_snapToGrid = tool == BlockSelectionTool; - if( tool == BlockSelectionTool ) - { - tool = NormalSelectionTool; - } - m_tool = tool; - -} - -void ViewArea::setMaskTool() -{ - setMode( MaskMode ); - setTool( MaskTool ); - m_blockTrackEnable = true; -} - -void ViewArea::setEraserTool() -{ - setMode( MaskMode ); - setTool( EraserTool ); - m_blockTrackEnable = true; -} - -void ViewArea::setNormalSelectionTool() -{ - setMode( NormalMode ); - setTool( NormalSelectionTool ); - m_blockTrackEnable = false; -} - -void ViewArea::setBlockSelectionTool() -{ - setMode( NormalMode ); - setTool( BlockSelectionTool ); - m_blockTrackEnable = true; -} - -void ViewArea::setGridVisible( bool enable ) +Void ViewArea::setGridVisible( bool enable ) { m_gridVisible = enable; update(); } -void ViewArea::setSnapToGrid( bool enable ) +Void ViewArea::setSnapToGrid( bool enable ) { m_snapToGrid = enable; } -void ViewArea::setSelectedArea( QRect &rect ) -{ - if( rect.isNull() ) - { - update(); - return; - } +//Void ViewArea::setSelectedArea( QRect &rect ) +//{ +// if( rect.isNull() ) +// { +// update(); +// return; +// } +// +// QRect updateRect; +// // setNormalMode(); +// +// if( m_selectedArea.isNull() ) +// { +// m_selectedArea = rect.normalized(); +// updateRect = m_selectedArea; +// } +// else +// { +// updateRect = m_selectedArea; +// m_selectedArea = rect.normalized(); +// updateRect = updateRect.united( m_selectedArea ); +// } +// updateRect.adjust( 0, 0, 1, 1 ); +// update( updateRect.normalized() ); +//} - QRect updateRect; - setNormalMode(); - - if( m_selectedArea.isNull() ) - { - m_selectedArea = rect.normalized(); - updateRect = m_selectedArea; - } - else - { - updateRect = m_selectedArea; - m_selectedArea = rect.normalized(); - updateRect = updateRect.united( m_selectedArea ); - } - updateRect.adjust( 0, 0, 1, 1 ); - update( updateRect.normalized() ); -} - -void ViewArea::initZoomWinRect() +Void ViewArea::initZoomWinRect() { int iMinX = 80; int iMinY = 80; @@ -342,7 +358,7 @@ void ViewArea::initZoomWinRect() //////////////////////////////////////////////////////////////////////////////// // Geometry Updates //////////////////////////////////////////////////////////////////////////////// -void ViewArea::updateSize() +Void ViewArea::updateSize() { int w = m_pixmap.width() * m_zoomFactor; int h = m_pixmap.height() * m_zoomFactor; @@ -361,7 +377,7 @@ void ViewArea::updateSize() updateOffset(); } -void ViewArea::updateOffset() +Void ViewArea::updateOffset() { if( width() > m_pixmap.width() * m_zoomFactor ) { @@ -384,7 +400,7 @@ void ViewArea::updateOffset() //////////////////////////////////////////////////////////////////////////////// // Resize Event //////////////////////////////////////////////////////////////////////////////// -void ViewArea::resizeEvent( QResizeEvent *event ) +Void ViewArea::resizeEvent( QResizeEvent *event ) { if( size().isEmpty() || m_pixmap.isNull() ) return; @@ -397,7 +413,7 @@ void ViewArea::resizeEvent( QResizeEvent *event ) // Paint Event //////////////////////////////////////////////////////////////////////////////// -void ViewArea::paintEvent( QPaintEvent *event ) +Void ViewArea::paintEvent( QPaintEvent *event ) { QRect winRect = event->rect(); @@ -704,7 +720,7 @@ void ViewArea::paintEvent( QPaintEvent *event ) //////////////////////////////////////////////////////////////////////////////// // Mouse Events //////////////////////////////////////////////////////////////////////////////// -void ViewArea::wheelEvent( QWheelEvent *event ) +Void ViewArea::wheelEvent( QWheelEvent *event ) { Double scale; Double usedScale; @@ -727,7 +743,7 @@ void ViewArea::wheelEvent( QWheelEvent *event ) } } -void ViewArea::mousePressEvent( QMouseEvent *event ) +Void ViewArea::mousePressEvent( QMouseEvent *event ) { event->accept(); @@ -773,7 +789,7 @@ void ViewArea::mousePressEvent( QMouseEvent *event ) m_newShape = true; - if( tool() == NormalSelectionTool ) + if( tool() == SelectionTool ) { m_blockTrackEnable = false; return; @@ -794,12 +810,12 @@ void ViewArea::mousePressEvent( QMouseEvent *event ) } } -void ViewArea::mouseMoveEvent( QMouseEvent *event ) +Void ViewArea::mouseMoveEvent( QMouseEvent *event ) { event->accept(); #ifndef _MSC_VER - // Add this code line to avoid slow navigation with some specific mouses + // Add this code line to aVoid slow navigation with some specific mouses // This seems to always appear on windows if( qApp->hasPendingEvents()) return; @@ -836,7 +852,7 @@ void ViewArea::mouseMoveEvent( QMouseEvent *event ) updateRect = viewToWindow( m_selectedArea ); - if( tool() == NormalSelectionTool ) + if( tool() == SelectionTool ) { // If the selection is only vertical or horizontal then we have one // of the dimentions null. @@ -893,7 +909,7 @@ void ViewArea::mouseMoveEvent( QMouseEvent *event ) m_selectedArea = m_selectedArea.united( m_grid.rectContains( actualPos ) ); } */ - if( tool() == NormalSelectionTool ) + if( tool() == SelectionTool ) { // Intercept the selected area with the image area to limit the // selection only to the image area, preventing it to come outside @@ -936,7 +952,7 @@ void ViewArea::mouseMoveEvent( QMouseEvent *event ) } } -void ViewArea::mouseReleaseEvent( QMouseEvent *event ) +Void ViewArea::mouseReleaseEvent( QMouseEvent *event ) { event->accept(); @@ -948,7 +964,7 @@ void ViewArea::mouseReleaseEvent( QMouseEvent *event ) { unsetCursor(); } - else if( tool() == NormalSelectionTool ) + else if( tool() == SelectionTool ) { // Normal Mode ------------------------------------------------------ if( mode() == NormalMode ) @@ -956,9 +972,6 @@ void ViewArea::mouseReleaseEvent( QMouseEvent *event ) if( vpos == m_lastPos ) { m_selectedArea = QRect(); - - if( tool() == BlockSelectionTool ) - m_blockTrackEnable = true; } emit selectionChanged( m_selectedArea ); @@ -1047,7 +1060,7 @@ QRect ViewArea::viewToWindow( const QRect& rc ) const //////////////////////////////////////////////////////////////////////////////// // Masks Management //////////////////////////////////////////////////////////////////////////////// -void ViewArea::updateMask( const QRect &rect ) +Void ViewArea::updateMask( const QRect &rect ) { switch( tool() ) { @@ -1076,7 +1089,7 @@ void ViewArea::updateMask( const QRect &rect ) } } -void ViewArea::setInputStream( PlaYUVerStream *stream ) +Void ViewArea::setInputStream( PlaYUVerStream *stream ) { m_pStream = stream; } diff --git a/app/ViewArea.h b/app/ViewArea.h index 52326bf..ef4a489 100644 --- a/app/ViewArea.h +++ b/app/ViewArea.h @@ -50,35 +50,34 @@ Q_OBJECT public: - enum ViewMode + enum ViewModes { - NormalMode, - MaskMode, + NavigationView, + NormalSelectionView, + BlockSelectionView, }; - typedef enum - { - NavigationTool, - NormalSelectionTool, - BlockSelectionTool, - MaskTool, - EraserTool - } eTool; ViewArea( QWidget *parent = 0 ); - void setImage( PlaYUVerFrame* pcFrame ); - void setImage( const QPixmap &pixmap ); - void setMode( ViewMode mode ); - void setMaskColor( const QColor &color = QColor() ); + Void setImage( PlaYUVerFrame* pcFrame ); + Void setImage( const QPixmap &pixmap ); + Void setMode( Int mode ); + Void setMaskColor( const QColor &color = QColor() ); /** * Clears any contents. */ - void clear(); + Void clear(); + + /** + * Select tool from the menu + */ + Void setTool( UInt view ); + /** * Clears any mask content. */ - void clearMask(); + Void clearMask(); QPixmap image() const { @@ -96,14 +95,7 @@ public: { return m_grid; } - ViewMode mode() const - { - return m_mode; - } - eTool tool() const - { - return m_tool; - } + QColor maskColor() const { return m_maskColor; @@ -114,15 +106,13 @@ public: return m_zoomFactor; } - void setInputStream( PlaYUVerStream *stream ); + Void setInputStream( PlaYUVerStream *stream ); PlaYUVerStream* getInputStream(); // Scale function. Return used scale value (it may change when it touches the min or max zoom value) Double scaleZoomFactor( Double scale, QPoint center, QSize minimumSize ); - void setTool( eTool tool ); -// QSize sizeHint() const; Q_SIGNALS: void selectionChanged( const QRect &rect ); @@ -131,34 +121,58 @@ Q_SIGNALS: void zoomFactorChanged_byWheel( const double factor, const QPoint center ); public Q_SLOTS: - void setNormalMode(); - void setMaskMode(); - void setMaskTool(); - void setEraserTool(); - void setNormalSelectionTool(); - void setBlockSelectionTool(); +// Void setNormalMode(); +// Void setMaskMode(); +// Void setMaskTool(); +// Void setEraserTool(); +// Void setNormalSelectionTool(); +// Void setBlockSelectionTool(); void setGridVisible( bool enable ); void setSnapToGrid( bool enable ); - void setSelectedArea( QRect &rect ); +// void setSelectedArea( QRect &rect ); protected: - void paintEvent( QPaintEvent *event ); - void resizeEvent( QResizeEvent * event ); - void mousePressEvent( QMouseEvent *event ); - void mouseMoveEvent( QMouseEvent *event ); - void mouseReleaseEvent( QMouseEvent *event ); - void wheelEvent( QWheelEvent *event ); + Void paintEvent( QPaintEvent *event ); + Void resizeEvent( QResizeEvent * event ); + Void mousePressEvent( QMouseEvent *event ); + Void mouseMoveEvent( QMouseEvent *event ); + Void mouseReleaseEvent( QMouseEvent *event ); + Void wheelEvent( QWheelEvent *event ); - void updateSize(); - void updateOffset(); + Void updateSize(); + Void updateOffset(); private: - void initZoomWinRect(); - void startZoomWinTimer(); + enum ViewMode + { + NormalMode, + MaskMode, + }; + + enum Tool + { + NavigationTool, + SelectionTool, + MaskTool, + EraserTool + }; + + ViewMode mode() const + { + return m_mode; + } + + Tool tool() const + { + return m_eTool; + } + + Void initZoomWinRect(); + Void startZoomWinTimer(); bool isPosValid( const QPoint &pos ) const; - void updateMask( const QRect &rect ); - void setZoomFactor( double ); + Void updateMask( const QRect &rect ); + Void setZoomFactor( double ); QPoint windowToView( const QPoint& pt ) const; QRect windowToView( const QRect& rc ) const; @@ -175,7 +189,7 @@ private: QPoint m_lastWindowPos; GridManager m_grid; ViewMode m_mode; - eTool m_tool; + Tool m_eTool; QColor m_maskColor; double m_zoomFactor; int m_xOffset;