From fc54d025272a8d69b9e1fbf727b7907b5cf52439 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Tue, 16 Dec 2014 01:35:54 +0000
Subject: [PATCH] Improve quality menu

---
 app/plaYUVerApp.cpp | 13 +++----------
 app/plaYUVerApp.h   |  2 --
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp
index 8eaf215..44b996d 100644
--- a/app/plaYUVerApp.cpp
+++ b/app/plaYUVerApp.cpp
@@ -466,7 +466,7 @@ Void plaYUVerApp::updateStreamProperties()
     else
       m_arrayActions[PLAY_ACT]->setIcon( style()->standardIcon( QStyle::SP_MediaPlay ) );
 
-    m_pcQualityMeasurement->updateSidebarData();
+    m_appModuleQuality->update( m_pcCurrentVideoSubWindow );
     return;
   }
   m_pcStreamProperties->setData( NULL );
@@ -636,9 +636,7 @@ Void plaYUVerApp::seekEvent( Int direction )
     {
       m_pcCurrentVideoSubWindow->seekRelativeEvent( direction > 0 ? true : false );
     }
-    m_pcQualityMeasurement->updateSidebarData();
     updateStreamProperties();
-
   }
 }
 
@@ -657,7 +655,6 @@ Void plaYUVerApp::seekSliderEvent( Int new_frame_num )
     {
       m_pcCurrentVideoSubWindow->seekAbsoluteEvent( ( UInt )new_frame_num );
     }
-    m_pcQualityMeasurement->updateSidebarData();
     updateStreamProperties();
   }
 }
@@ -801,14 +798,12 @@ Void plaYUVerApp::chageSubWindowSelection()
         {
           m_pcCurrentVideoSubWindow->setRefSubWindow( NULL );
         }
-        m_pcQualityMeasurement->updateCurrentWindow( m_pcCurrentVideoSubWindow );
       }
       updateZoomFactorSBox();
     }
   }
   updateStreamProperties();
   m_appModuleQuality->update( m_pcCurrentVideoSubWindow );
-  m_pcQualityMeasurement->updateSubWindowList();
   updateMenus();
 }
 
@@ -1408,12 +1403,10 @@ Void plaYUVerApp::createDockWidgets()
   QMainWindow::tabifyDockWidget( m_arraySideBars[FRAME_DOCK], m_arraySideBars[STREAM_DOCK] );
 //QMainWindow::setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North);
 
-  m_pcQualityMeasurement = new QualityMeasurementSidebar( this, mdiArea );
   m_arraySideBars[QUALITY_DOCK] = new QDockWidget( tr( "Quality Measurement" ), this );
   m_arraySideBars[QUALITY_DOCK]->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
-  m_arraySideBars[QUALITY_DOCK]->setWidget( m_pcQualityMeasurement );
+  m_arraySideBars[QUALITY_DOCK]->setWidget( m_appModuleQuality->createDock() );
   addDockWidget( Qt::RightDockWidgetArea, m_arraySideBars[QUALITY_DOCK] );
-
 }
 
 Void plaYUVerApp::createStatusBar()
@@ -1455,7 +1448,7 @@ Void plaYUVerApp::writeSettings()
   settings.setLastOpenPath( m_cLastOpenPath );
   settings.setSelectedTool( ( Int )m_appTool );
   settings.setRecentFileList( m_aRecentFileStreamInfo );
-  settings.setDockVisibility( m_pcStreamProperties->isVisible(), m_pcFrameProperties->isVisible(), m_pcQualityMeasurement->isVisible() );
+  settings.setDockVisibility( m_pcStreamProperties->isVisible(), m_pcFrameProperties->isVisible(), true );
   settings.setPlayingSettings( m_arrayActions[VIDEO_LOOP_ACT]->isChecked() );
 }
 
diff --git a/app/plaYUVerApp.h b/app/plaYUVerApp.h
index 83f27a8..2395c5d 100644
--- a/app/plaYUVerApp.h
+++ b/app/plaYUVerApp.h
@@ -39,7 +39,6 @@
 #include "SubWindowHandle.h"
 #include "VideoSubWindow.h"
 #include "QualityMeasurement.h"
-#include "QualityMeasurementSidebar.h"
 #include "ModulesHandle.h"
 #include "PropertiesSidebar.h"
 #include "AboutDialog.h"
@@ -252,7 +251,6 @@ private:
 
   StreamPropertiesSideBar* m_pcStreamProperties;
   FramePropertiesSideBar* m_pcFrameProperties;
-  QualityMeasurementSidebar* m_pcQualityMeasurement;
 
   /**
    * Array of tool bars for the main app