Update Quality menu and combine it with quality sidebar
This commit is contained in:
1 parent
6e8bb2c113
commit
c0490e803c
4 files changed
+54
-8
No files matched your search
@@ -44,6 +44,22 @@ QualityMeasurement::~QualityMeasurement()
|
||||
|
||||
Void QualityMeasurement::createActions()
|
||||
{
|
||||
m_actionGroupQualityMetric = new QActionGroup( this );
|
||||
m_actionGroupQualityMetric->setExclusive( true );
|
||||
|
||||
m_mapperQualityMetric = new QSignalMapper( this );
|
||||
|
||||
QStringList qualityMetrics = PlaYUVerFrame::supportedQualityMetricsList();
|
||||
QAction* currAction;
|
||||
for( Int i = 0; i < qualityMetrics.size(); i++ )
|
||||
{
|
||||
currAction = new QAction( qualityMetrics.at( i ), this );
|
||||
currAction->setCheckable( true );
|
||||
m_actionGroupQualityMetric->addAction( currAction );
|
||||
connect( currAction, SIGNAL( triggered() ), m_mapperQualityMetric, SLOT( map() ) );
|
||||
m_mapperQualityMetric->setMapping( currAction, i );
|
||||
}
|
||||
|
||||
m_arrayActions.resize( TOTAL_ACT );
|
||||
m_arrayActions[SELECT_REF_ACT] = new QAction( "Select Reference", this );
|
||||
connect( m_arrayActions[SELECT_REF_ACT], SIGNAL( triggered() ), this, SLOT( slotSelectReference() ) );
|
||||
@@ -52,6 +68,10 @@ Void QualityMeasurement::createActions()
|
||||
QMenu* QualityMeasurement::createMenu()
|
||||
{
|
||||
m_pcMenuQuality = new QMenu( "Quality", this );
|
||||
QMenu* metricsSubMenu = m_pcMenuQuality->addMenu( "Quality Metrics" );
|
||||
metricsSubMenu->addActions( m_actionGroupQualityMetric->actions() );
|
||||
//m_pcMenuQuality->addActions( m_actionGroupQualityMetric->actions() );
|
||||
//m_pcMenuQuality->addSeparator();
|
||||
m_pcMenuQuality->addAction( m_arrayActions[SELECT_REF_ACT] );
|
||||
return m_pcMenuQuality;
|
||||
}
|
||||
@@ -63,6 +83,9 @@ QDockWidget* QualityMeasurement::createDock()
|
||||
m_pcQualityMeasurementDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
|
||||
m_pcQualityMeasurementDock->setWidget( m_pcQualityMeasurementSideBar );
|
||||
|
||||
connect( m_pcQualityMeasurementSideBar, SIGNAL( signalQualityMetricChanged(int) ), this, SLOT( slotQualityMetricChanged(int) ) );
|
||||
connect( m_mapperQualityMetric, SIGNAL( mapped(int) ), this, SLOT( slotQualityMetricChanged(int) ) );
|
||||
|
||||
return m_pcQualityMeasurementDock;
|
||||
}
|
||||
|
||||
@@ -77,6 +100,13 @@ Void QualityMeasurement::update( VideoSubWindow* currSubWindow )
|
||||
m_pcQualityMeasurementSideBar->updateCurrentWindow( currSubWindow );
|
||||
}
|
||||
|
||||
Void QualityMeasurement::slotQualityMetricChanged( Int idx )
|
||||
{
|
||||
m_actionGroupQualityMetric->actions().at( idx )->setChecked( true );
|
||||
m_pcQualityMeasurementSideBar->updateQualityMetric( idx );
|
||||
m_pcQualityMeasurementDock->show();
|
||||
}
|
||||
|
||||
Void QualityMeasurement::slotSelectReference()
|
||||
{
|
||||
DialogSubWindowSelector dialogWindowSelection( this, m_pcMainWindowMdiArea, 1, 1 );
|
||||
|
||||
@@ -63,12 +63,16 @@ private:
|
||||
TOTAL_ACT,
|
||||
};
|
||||
QVector<QAction*> m_arrayActions;
|
||||
QActionGroup* m_actionGroupQualityMetric;
|
||||
QSignalMapper* m_mapperQualityMetric;
|
||||
|
||||
QMenu* m_pcMenuQuality;
|
||||
|
||||
QDockWidget* m_pcQualityMeasurementDock;
|
||||
QualityMeasurementSidebar* m_pcQualityMeasurementSideBar;
|
||||
|
||||
private Q_SLOTS:
|
||||
void slotQualityMetricChanged( int );
|
||||
void slotSelectReference();
|
||||
|
||||
};
|
||||
|
||||
@@ -98,7 +98,7 @@ QualityMeasurementSidebar::QualityMeasurementSidebar( QWidget* parent, QMdiArea
|
||||
setLayout( mainLayout );
|
||||
|
||||
connect( m_comboBoxRef, SIGNAL( activated(int) ), this, SLOT( slotReferenceChanged(int) ) );
|
||||
connect( m_comboBoxMetric, SIGNAL( currentIndexChanged(int) ), this, SLOT( slotQualityMetricChanged() ) );
|
||||
connect( m_comboBoxMetric, SIGNAL( currentIndexChanged(int) ), this, SLOT( slotQualityMetricChanged(int) ) );
|
||||
|
||||
}
|
||||
|
||||
@@ -202,6 +202,16 @@ Void QualityMeasurementSidebar::updateSidebarData()
|
||||
|
||||
}
|
||||
|
||||
Void QualityMeasurementSidebar::updateQualityMetric( Int idx )
|
||||
{
|
||||
m_comboBoxMetric->setCurrentIndex( idx );
|
||||
QString labelQuality = PlaYUVerFrame::supportedQualityMetricsList().at( idx );
|
||||
m_ppcLabelQualityLabel[LUMA]->setText( labelQuality + " Y" );
|
||||
m_ppcLabelQualityLabel[CHROMA_U]->setText( labelQuality + " U" );
|
||||
m_ppcLabelQualityLabel[CHROMA_V]->setText( labelQuality + " V" );
|
||||
updateSidebarData();
|
||||
}
|
||||
|
||||
Void QualityMeasurementSidebar::slotReferenceChanged( Int index )
|
||||
{
|
||||
if( index > -1 && m_pcCurrentVideoSubWindow )
|
||||
@@ -224,13 +234,11 @@ Void QualityMeasurementSidebar::slotReferenceChanged( Int index )
|
||||
}
|
||||
}
|
||||
|
||||
Void QualityMeasurementSidebar::slotQualityMetricChanged()
|
||||
Void QualityMeasurementSidebar::slotQualityMetricChanged( Int idx )
|
||||
{
|
||||
QString labelQuality = PlaYUVerFrame::supportedQualityMetricsList().at( m_comboBoxMetric->currentIndex() );
|
||||
m_ppcLabelQualityLabel[LUMA]->setText( labelQuality + " Y" );
|
||||
m_ppcLabelQualityLabel[CHROMA_U]->setText( labelQuality + " U" );
|
||||
m_ppcLabelQualityLabel[CHROMA_V]->setText( labelQuality + " V" );
|
||||
updateSidebarData();
|
||||
emit signalQualityMetricChanged( idx );
|
||||
//updateQualityMetric( idx );
|
||||
}
|
||||
|
||||
} // NAMESPACE
|
||||
|
||||
@@ -53,6 +53,7 @@ public:
|
||||
Void updateSubWindowList();
|
||||
Void updateCurrentWindow( VideoSubWindow * );
|
||||
Void updateSidebarData();
|
||||
Void updateQualityMetric( Int );
|
||||
|
||||
private:
|
||||
QMdiArea* m_pcMainWindowMdiArea;
|
||||
@@ -73,9 +74,12 @@ private:
|
||||
|
||||
HistogramWidget *histogramWidget;
|
||||
|
||||
Q_SIGNALS:
|
||||
void signalQualityMetricChanged( int );
|
||||
|
||||
private Q_SLOTS:
|
||||
void slotReferenceChanged( int );
|
||||
void slotQualityMetricChanged();
|
||||
void slotQualityMetricChanged( int );
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user