jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Format entire project with clang-format

Browse Source
This commit is contained in:
jfmcarreira committed 2017-09-20 18:34:45 +01:00
1 parent 1833ca12ec
commit a1482370e8
88 files changed
+1910 -1961
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.clang-format
+3 -3
View File
@@ -2,7 +2,7 @@
Language: Cpp
# BasedOnStyle: Chromium
ColumnLimit: 100
AccessModifierOffset: -1
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
@@ -36,7 +36,7 @@ BraceWrapping:
BreakBeforeBinaryOperators: None
#BreakBeforeBraces: Attach
BreakBeforeBraces: Allman
#BreakBeforeInheritanceComma: true
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BreakConstructorInitializersBeforeComma: true
@@ -59,7 +59,7 @@ IncludeCategories:
- Regex: '.*'
Priority: 3
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseLabels: true
IndentCaseLabels: false
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
app/AboutDialog.h
+1 -1
View File
@@ -33,7 +33,7 @@ class AboutDialog : public QDialog
{
Q_OBJECT
public:
public:
AboutDialog( QWidget* parent = 0 );
};
app/ConfigureFormatDialog.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ QDataStream& operator>>( QDataStream& in, PlaYUVerStdResolutionVector& array )
class AddCustomFormat : public QDialog
{
public:
public:
AddCustomFormat( QWidget* parent = NULL ) : QDialog( parent, Qt::Dialog | Qt::WindowTitleHint )
{
setWindowModality( Qt::ApplicationModal );
@@ -130,7 +130,7 @@ class AddCustomFormat : public QDialog
return stdResolution;
}
private:
private:
QLineEdit* m_lineEdtName;
QSpinBox* m_spinWidth;
QSpinBox* m_spinHeight;
app/ConfigureFormatDialog.h
+3 -3
View File
@@ -49,7 +49,7 @@ class ConfigureFormatDialog : public QDialog
{
Q_OBJECT
public:
public:
ConfigureFormatDialog( QWidget* parent = 0 );
Int runConfigureFormatDialog( const QString& Filename,
UInt& rWidth,
@@ -62,13 +62,13 @@ class ConfigureFormatDialog : public QDialog
Void readSettings();
Void writeSettings();
private Q_SLOTS:
private Q_SLOTS:
void slotStandardResolutionSelected( int );
void slotResolutionChange();
void slotColorSpaceChange( int );
void slotBitsChange( int );
private:
private:
QStringList standardResolutionNames;
QVector<QSize> standardResolutionSizes;
PlaYUVerStdResolutionVector aRCustomFileFormats;
app/DialogSubWindowSelector.h
+4 -3
View File
@@ -52,7 +52,7 @@ class DialogSubWindowSelector : public QDialog
{
Q_OBJECT
public:
public:
DialogSubWindowSelector( QWidget* parent,
PlaYUVerSubWindowHandle* windowManager,
UInt uiCategory,
@@ -61,7 +61,8 @@ class DialogSubWindowSelector : public QDialog
Void selectSubWindow( SubWindowAbstract* subWindow );
QList<SubWindowAbstract*> getSelectedWindows() { return m_apcSelectedSubWindowList; }
private:
private:
UInt m_uiCategory;
Int m_iMinSelectedWindows;
Int m_iMaxSlectedWindows;
@@ -82,7 +83,7 @@ class DialogSubWindowSelector : public QDialog
Void updateSubWindowList();
Void update();
private Q_SLOTS:
private Q_SLOTS:
void toggleSubWindow( int );
void addAllSubWindow();
void removeAllSubWindow();
app/FramePropertiesDock.cpp
+34 -34
View File
@@ -530,31 +530,31 @@ Void FramePropertiesDock::slotChannelChanged( Int channel )
switch( channel )
{
case FirstChannel:
histogramWidget->m_channelType = HistogramWidget::FirstChannelHistogram;
colorsCB->setEnabled( false );
break;
case SecondChannel:
histogramWidget->m_channelType = HistogramWidget::SecondChannelHistogram;
colorsCB->setEnabled( false );
break;
case ThirdChannel:
histogramWidget->m_channelType = HistogramWidget::ThirdChannelHistogram;
colorsCB->setEnabled( false );
break;
case AlphaChannel:
histogramWidget->m_channelType = HistogramWidget::AlphaChannelHistogram;
colorsCB->setEnabled( false );
break;
case ColorChannels:
histogramWidget->m_channelType = HistogramWidget::ColorChannelsHistogram;
colorsCB->setEnabled( true );
break;
default: // Luminance.
// histogramWidget->m_channelType = HistogramWidget::LumaHistogram;
histogramWidget->m_channelType = HistogramWidget::FirstChannelHistogram;
colorsCB->setEnabled( false );
break;
case FirstChannel:
histogramWidget->m_channelType = HistogramWidget::FirstChannelHistogram;
colorsCB->setEnabled( false );
break;
case SecondChannel:
histogramWidget->m_channelType = HistogramWidget::SecondChannelHistogram;
colorsCB->setEnabled( false );
break;
case ThirdChannel:
histogramWidget->m_channelType = HistogramWidget::ThirdChannelHistogram;
colorsCB->setEnabled( false );
break;
case AlphaChannel:
histogramWidget->m_channelType = HistogramWidget::AlphaChannelHistogram;
colorsCB->setEnabled( false );
break;
case ColorChannels:
histogramWidget->m_channelType = HistogramWidget::ColorChannelsHistogram;
colorsCB->setEnabled( true );
break;
default: // Luminance.
// histogramWidget->m_channelType = HistogramWidget::LumaHistogram;
histogramWidget->m_channelType = HistogramWidget::FirstChannelHistogram;
colorsCB->setEnabled( false );
break;
}
histogramWidget->update();
updateStatistiques();
@@ -570,15 +570,15 @@ Void FramePropertiesDock::slotColorsChanged( Int color )
{
switch( color )
{
case AllColorsGreen:
histogramWidget->m_colorType = HistogramWidget::SecondChannelColor;
break;
case AllColorsBlue:
histogramWidget->m_colorType = HistogramWidget::ThirdChannelColor;
break;
default: // Red.
histogramWidget->m_colorType = HistogramWidget::FirstChannelColor;
break;
case AllColorsGreen:
histogramWidget->m_colorType = HistogramWidget::SecondChannelColor;
break;
case AllColorsBlue:
histogramWidget->m_colorType = HistogramWidget::ThirdChannelColor;
break;
default: // Red.
histogramWidget->m_colorType = HistogramWidget::FirstChannelColor;
break;
}
histogramWidget->update();
app/FramePropertiesDock.h
+3 -3
View File
@@ -40,7 +40,7 @@
class FramePropertiesDock : public QWidget
{
Q_OBJECT
public:
public:
FramePropertiesDock( QWidget* parent, Bool* pbMainPlaySwitch );
~FramePropertiesDock();
@@ -51,7 +51,7 @@ class FramePropertiesDock : public QWidget
Void reset();
Void stopHistogram();
private:
private:
enum ColorChannel
{
LuminosityChannel = 0,
@@ -107,7 +107,7 @@ class FramePropertiesDock : public QWidget
Void updateStatistiques();
Void updateDataHistogram();
private Q_SLOTS:
private Q_SLOTS:
void slotRefreshOptions( int range );
void slotHistogramComputationFailed( void );
void slotChannelChanged( int channel );
app/GridManager.cpp
+54 -54
View File
@@ -65,71 +65,71 @@ void GridManager::drawGrid( QPixmap& image, const QRect& area, QPainter* painter
style = Solid;
switch( style )
{
case IntersectionDot:
case IntersectionCross:
case IntersectionDot:
case IntersectionCross:
{
painter->setPen( mainPen );
// Draw crosses or dots on intersections
for( int x = offsetx; x <= area.right(); x += hSpacing )
{
painter->setPen( mainPen );
// Draw crosses or dots on intersections
for( int x = offsetx; x <= area.right(); x += hSpacing )
{
if( x >= imageWidth )
break;
if( x >= imageWidth )
break;
for( int y = offsety; y <= area.bottom(); y += vSpacing )
{
if( y >= imageHeight )
break;
if( x >= area.x() && y >= area.y() )
{
if( style == IntersectionDot )
painter->drawPoint( x, y ); // Dot
else
{ // Crosses:
painter->drawLine( x, y - 1, x, y + 1 ); // Ver.line
painter->drawLine( x - 1, y, x + 1, y ); // Hor.line
}
}
}
}
break;
}
case Dashed:
{
// Change pen to the dashed line
mainPen.setStyle( Qt::DashLine );
}
default: // Solid:
{
painter->setPen( mainPen );
// Draw vertical line
for( int x = offsetx; x <= area.right(); x += hSpacing )
{
if( x >= imageWidth )
break;
if( x >= area.x() )
{
// Always draw the full line otherwise the line stippling
// varies with the location of view area and we get glitchy
// patterns.
painter->drawLine( x, 0, x, imageHeight - 1 );
}
}
// Draw horizontal line
for( int y = offsety; y <= area.bottom(); y += vSpacing )
{
if( y >= imageHeight )
break;
if( y >= area.y() )
if( x >= area.x() && y >= area.y() )
{
painter->drawLine( 0, y, imageWidth - 1, y );
if( style == IntersectionDot )
painter->drawPoint( x, y ); // Dot
else
{ // Crosses:
painter->drawLine( x, y - 1, x, y + 1 ); // Ver.line
painter->drawLine( x - 1, y, x + 1, y ); // Hor.line
}
}
}
break;
}
break;
}
case Dashed:
{
// Change pen to the dashed line
mainPen.setStyle( Qt::DashLine );
}
default: // Solid:
{
painter->setPen( mainPen );
// Draw vertical line
for( int x = offsetx; x <= area.right(); x += hSpacing )
{
if( x >= imageWidth )
break;
if( x >= area.x() )
{
// Always draw the full line otherwise the line stippling
// varies with the location of view area and we get glitchy
// patterns.
painter->drawLine( x, 0, x, imageHeight - 1 );
}
}
// Draw horizontal line
for( int y = offsety; y <= area.bottom(); y += vSpacing )
{
if( y >= imageHeight )
break;
if( y >= area.y() )
{
painter->drawLine( 0, y, imageWidth - 1, y );
}
}
break;
}
}
}
app/GridManager.h
+2 -2
View File
@@ -41,7 +41,7 @@ class QPainter;
*/
class GridManager
{
public:
public:
enum Style
{
IntersectionDot = 0,
@@ -92,7 +92,7 @@ class GridManager
*/
QPoint nearPos( int x = -1, int y = -1 );
private:
private:
UInt m_uiHSpace;
UInt m_uiVSpace;
QColor m_cGridColor;
app/HistogramWidget.cpp
+197 -197
View File
@@ -33,11 +33,11 @@
class HistogramWorker : public QThread
{
private:
private:
QObject* m_parent;
PlaYUVerFrame* m_pcFrame;
public:
public:
HistogramWorker( QObject* parent )
{
m_pcFrame = NULL;
@@ -76,7 +76,7 @@ class HistogramWorker : public QThread
*/
class EventData : public QEvent
{
public:
public:
EventData() : QEvent( QEvent::User )
{
starting = false;
@@ -105,7 +105,7 @@ const QBrush g_eColorPallet[][3] = {
class HistogramWidgetPrivate
{
public:
public:
enum RepaintType
{
HistogramNone = 0, // No current histogram values calculation.
@@ -515,39 +515,39 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
switch( m_channelType )
{
case HistogramWidget::FirstChannelHistogram: // Y channel.
max = frame->getMaximum( LUMA );
break;
case HistogramWidget::SecondChannelHistogram: // Cb channel.
max = frame->getMaximum( CHROMA_U );
break;
case HistogramWidget::ThirdChannelHistogram: // Cr channel.
max = frame->getMaximum( CHROMA_V );
break;
case HistogramWidget::AlphaChannelHistogram: // Alpha channel.
max = frame->getMaximum( COLOR_A );
break;
case HistogramWidget::FirstChannelHistogram: // Y channel.
max = frame->getMaximum( LUMA );
break;
case HistogramWidget::SecondChannelHistogram: // Cb channel.
max = frame->getMaximum( CHROMA_U );
break;
case HistogramWidget::ThirdChannelHistogram: // Cr channel.
max = frame->getMaximum( CHROMA_V );
break;
case HistogramWidget::AlphaChannelHistogram: // Alpha channel.
max = frame->getMaximum( COLOR_A );
break;
case HistogramWidget::ColorChannelsHistogram: // All color channels.
max = qMax( qMax( frame->getMaximum( LUMA ), frame->getMaximum( CHROMA_U ) ),
frame->getMaximum( CHROMA_V ) );
break;
// case HistogramWidget::LumaHistogram: // Luminance.
// max = frame->getMaximum( LUMA );
// break;
case HistogramWidget::ColorChannelsHistogram: // All color channels.
max = qMax( qMax( frame->getMaximum( LUMA ), frame->getMaximum( CHROMA_U ) ),
frame->getMaximum( CHROMA_V ) );
break;
// case HistogramWidget::LumaHistogram: // Luminance.
// max = frame->getMaximum( LUMA );
// break;
}
switch( m_scaleType )
{
case HistogramWidget::LinScaleHistogram:
break;
case HistogramWidget::LinScaleHistogram:
break;
case HistogramWidget::LogScaleHistogram:
if( max > 0.0 )
max = log( max );
else
max = 1.0;
break;
case HistogramWidget::LogScaleHistogram:
if( max > 0.0 )
max = log( max );
else
max = 1.0;
break;
}
// From Qt 4.0, QWidget automatically double-buffers its painting,
@@ -579,26 +579,26 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
switch( m_channelType )
{
case HistogramWidget::FirstChannelHistogram: // Y channel.
v = frame->getHistogramValue( LUMA, i++ );
break;
case HistogramWidget::SecondChannelHistogram: // Cb channel.
v = frame->getHistogramValue( CHROMA_U, i++ );
break;
case HistogramWidget::ThirdChannelHistogram: // Cr channel.
v = frame->getHistogramValue( CHROMA_V, i++ );
break;
case HistogramWidget::AlphaChannelHistogram: // Alpha channel.
v = frame->getHistogramValue( COLOR_A, i++ );
break;
case HistogramWidget::ColorChannelsHistogram: // All color.
vr = frame->getHistogramValue( LUMA, i );
vg = frame->getHistogramValue( CHROMA_U, i );
vb = frame->getHistogramValue( CHROMA_V, i++ );
break;
// case HistogramWidget::LumaHistogram: // Luminance.
// v = frame->getHistogramValue( LUMA, i++ );
// break;
case HistogramWidget::FirstChannelHistogram: // Y channel.
v = frame->getHistogramValue( LUMA, i++ );
break;
case HistogramWidget::SecondChannelHistogram: // Cb channel.
v = frame->getHistogramValue( CHROMA_U, i++ );
break;
case HistogramWidget::ThirdChannelHistogram: // Cr channel.
v = frame->getHistogramValue( CHROMA_V, i++ );
break;
case HistogramWidget::AlphaChannelHistogram: // Alpha channel.
v = frame->getHistogramValue( COLOR_A, i++ );
break;
case HistogramWidget::ColorChannelsHistogram: // All color.
vr = frame->getHistogramValue( LUMA, i );
vg = frame->getHistogramValue( CHROMA_U, i );
vb = frame->getHistogramValue( CHROMA_V, i++ );
break;
// case HistogramWidget::LumaHistogram: // Luminance.
// v = frame->getHistogramValue( LUMA, i++ );
// break;
}
if( m_channelType != HistogramWidget::ColorChannelsHistogram )
@@ -621,48 +621,48 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
{
switch( m_scaleType )
{
case HistogramWidget::LinScaleHistogram:
y = (int)( ( wHeight * value ) / max );
break;
case HistogramWidget::LinScaleHistogram:
y = (int)( ( wHeight * value ) / max );
break;
case HistogramWidget::LogScaleHistogram:
if( value <= 0.0 )
value = 1.0;
y = (int)( ( wHeight * log( value ) ) / max );
break;
case HistogramWidget::LogScaleHistogram:
if( value <= 0.0 )
value = 1.0;
y = (int)( ( wHeight * log( value ) ) / max );
break;
default:
y = 0;
break;
default:
y = 0;
break;
}
}
else
{
switch( m_scaleType )
{
case HistogramWidget::LinScaleHistogram:
yr = (int)( ( wHeight * value_r ) / max );
yg = (int)( ( wHeight * value_g ) / max );
yb = (int)( ( wHeight * value_b ) / max );
break;
case HistogramWidget::LinScaleHistogram:
yr = (int)( ( wHeight * value_r ) / max );
yg = (int)( ( wHeight * value_g ) / max );
yb = (int)( ( wHeight * value_b ) / max );
break;
case HistogramWidget::LogScaleHistogram:
if( value_r <= 0.0 )
value_r = 1.0;
if( value_g <= 0.0 )
value_g = 1.0;
if( value_b <= 0.0 )
value_b = 1.0;
yr = (int)( ( wHeight * log( value_r ) ) / max );
yg = (int)( ( wHeight * log( value_g ) ) / max );
yb = (int)( ( wHeight * log( value_b ) ) / max );
break;
case HistogramWidget::LogScaleHistogram:
if( value_r <= 0.0 )
value_r = 1.0;
if( value_g <= 0.0 )
value_g = 1.0;
if( value_b <= 0.0 )
value_b = 1.0;
yr = (int)( ( wHeight * log( value_r ) ) / max );
yg = (int)( ( wHeight * log( value_g ) ) / max );
yb = (int)( ( wHeight * log( value_b ) ) / max );
break;
default:
yr = 0;
yg = 0;
yb = 0;
break;
default:
yr = 0;
yg = 0;
yb = 0;
break;
}
}
@@ -721,17 +721,17 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
// colors channel mode?
switch( m_colorType )
{
case HistogramWidget::FirstChannelColor:
p1.drawLine( x, wHeight, x, wHeight - yr );
break;
case HistogramWidget::FirstChannelColor:
p1.drawLine( x, wHeight, x, wHeight - yr );
break;
case HistogramWidget::SecondChannelColor:
p1.drawLine( x, wHeight, x, wHeight - yg );
break;
case HistogramWidget::SecondChannelColor:
p1.drawLine( x, wHeight, x, wHeight - yg );
break;
default:
p1.drawLine( x, wHeight, x, wHeight - yb );
break;
default:
p1.drawLine( x, wHeight, x, wHeight - yb );
break;
}
}
else
@@ -740,56 +740,56 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
// colors channel mode?
switch( m_colorType )
{
case HistogramWidget::FirstChannelColor:
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
case HistogramWidget::FirstChannelColor:
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
break;
break;
case HistogramWidget::SecondChannelColor:
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
case HistogramWidget::SecondChannelColor:
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
break;
break;
default:
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
default:
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
break;
break;
}
if( x == wWidth / 4 || x == wWidth / 2 || x == 3 * wWidth / 4 )
@@ -805,65 +805,65 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
// colors channel mode?
switch( m_colorType )
{
case HistogramWidget::FirstChannelColor:
p1.setPen( QPen( Qt::green, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( Qt::blue, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( Qt::red, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
case HistogramWidget::FirstChannelColor:
p1.setPen( QPen( Qt::green, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( Qt::blue, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( Qt::red, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
break;
break;
case HistogramWidget::SecondChannelColor:
p1.setPen( QPen( Qt::blue, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( Qt::red, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( Qt::green, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
case HistogramWidget::SecondChannelColor:
p1.setPen( QPen( Qt::blue, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( Qt::red, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( Qt::green, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
break;
break;
default:
p1.setPen( QPen( Qt::red, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( Qt::green, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( Qt::blue, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
default:
p1.setPen( QPen( Qt::red, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][FirstChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yr );
p1.setPen( QPen( Qt::green, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][SecondChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yg );
p1.setPen( QPen( Qt::blue, 1, Qt::SolidLine ) );
p1.setPen( QPen( g_eColorPallet[pallet][ThirdChannelColor], 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight, x, wHeight - yb );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
p1.setPen( QPen( Qt::white, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - qMax( qMax( yr, yg ), yb ), x, 0 );
p1.setPen( QPen( Qt::gray, 1, Qt::SolidLine ) );
p1.drawLine( x, wHeight - yr - 1, x, wHeight - yr );
p1.drawLine( x, wHeight - yg - 1, x, wHeight - yg );
p1.drawLine( x, wHeight - yb - 1, x, wHeight - yb );
break;
break;
}
if( x == wWidth / 4 || x == wWidth / 2 || x == 3 * wWidth / 4 )
@@ -884,26 +884,26 @@ Void HistogramWidget::paintEvent( QPaintEvent* )
{
switch( m_channelType )
{
case HistogramWidget::FirstChannelHistogram:
guidePos = d->colorGuide.red();
break;
case HistogramWidget::FirstChannelHistogram:
guidePos = d->colorGuide.red();
break;
case HistogramWidget::SecondChannelHistogram:
guidePos = d->colorGuide.green();
break;
case HistogramWidget::SecondChannelHistogram:
guidePos = d->colorGuide.green();
break;
case HistogramWidget::ThirdChannelHistogram:
guidePos = d->colorGuide.blue();
break;
case HistogramWidget::ThirdChannelHistogram:
guidePos = d->colorGuide.blue();
break;
// case HistogramWidget::LumaHistogram:
// guidePos = qMax( qMax( d->colorGuide.red(), d->colorGuide.green()
// ), d->colorGuide.blue() );
// break;
default: // Alpha.
guidePos = -1;
break;
default: // Alpha.
guidePos = -1;
break;
}
if( guidePos != -1 )
app/HistogramWidget.h
+9 -9
View File
@@ -41,7 +41,7 @@ class HistogramWidget : public QWidget
{
Q_OBJECT
public:
public:
enum HistogramChannel
{
/** Luminance */
@@ -95,7 +95,7 @@ class HistogramWidget : public QWidget
};
Q_DECLARE_FLAGS( HistogramOptions, HistogramOption )
public:
public:
/**
* Constructor without image data. Needed to use @p updateData() method
* after to create instance.
@@ -122,7 +122,7 @@ class HistogramWidget : public QWidget
Void reset();
public:
public:
/** Channel type to draw */
Int m_channelType;
/** Scale to use for drawing */
@@ -141,30 +141,30 @@ class HistogramWidget : public QWidget
// PlaYUVerFrameStats* m_selectionHistogram;
PlaYUVerFrame* m_selectionImage;
Q_SIGNALS:
Q_SIGNALS:
void signalIntervalChanged( int min, int max );
void signalMaximumValueChanged( int );
void signalHistogramComputationDone( int );
void signalHistogramComputationFailed( void );
public Q_SLOTS:
public Q_SLOTS:
void slotMinValueChanged( int min );
void slotMaxValueChanged( int max );
protected slots:
protected slots:
void slotBlinkTimerDone( void );
protected:
protected:
Void paintEvent( QPaintEvent* );
Void mousePressEvent( QMouseEvent* e );
Void mouseReleaseEvent( QMouseEvent* e );
Void mouseMoveEvent( QMouseEvent* e );
private:
private:
Void customEvent( QEvent* event );
Void notifyValuesChanged();
private:
private:
HistogramWidgetPrivate* d;
};
app/ModuleHandleDock.cpp
+1 -3
View File
@@ -53,9 +53,7 @@ ModuleHandleDock::ModuleHandleDock( QWidget* parent, PlaYUVerAppModuleIf* module
setEnabled( true );
}
ModuleHandleDock::~ModuleHandleDock()
{
}
ModuleHandleDock::~ModuleHandleDock() {}
Void ModuleHandleDock::setModulueReturnValue( Double value )
{
app/ModuleHandleDock.h
+3 -3
View File
@@ -39,7 +39,7 @@ class PlaYUVerAppModuleIf;
class ModuleHandleDock : public QWidget
{
Q_OBJECT
public:
public:
ModuleHandleDock( QWidget* parent, PlaYUVerAppModuleIf* moduleIf );
~ModuleHandleDock();
@@ -47,14 +47,14 @@ class ModuleHandleDock : public QWidget
QSize sizeHint() const;
private:
private:
PlaYUVerAppModuleIf* m_pcCurrModuleIf;
Bool m_bIsVisible;
QLabel* labelModulueValueLabel;
QLabel* labelModulueReturnValue;
public Q_SLOTS:
public Q_SLOTS:
void visibilityChangedSlot( bool );
};
app/ModulesHandle.cpp
+11 -13
View File
@@ -43,9 +43,7 @@ ModulesHandle::ModulesHandle( QWidget* parent,
setParent( m_pcParent );
}
ModulesHandle::~ModulesHandle()
{
}
ModulesHandle::~ModulesHandle() {}
Void ModulesHandle::createActions()
{
@@ -232,16 +230,16 @@ Void ModulesHandle::processOpt( Int index )
PlaYUVerAppModuleIf* pcCurrModule = pcCurrentModule;
switch( index )
{
case INVALID_OPT:
break;
case SWAP_FRAMES_ACT:
swapModulesWindowsIf( pcCurrModule );
break;
case APPLY_ALL_ACT:
applyAllModuleIf( pcCurrModule );
break;
default:
Q_ASSERT( 0 );
case INVALID_OPT:
break;
case SWAP_FRAMES_ACT:
swapModulesWindowsIf( pcCurrModule );
break;
case APPLY_ALL_ACT:
applyAllModuleIf( pcCurrModule );
break;
default:
Q_ASSERT( 0 );
}
}
emit changed();
app/ModulesHandle.h
+4 -4
View File
@@ -47,7 +47,7 @@ class SubWindowHandle;
class ModulesHandle : public QWidget
{
Q_OBJECT
public:
public:
ModulesHandle( QWidget*, PlaYUVerSubWindowHandle*, VideoHandle* );
~ModulesHandle();
@@ -65,7 +65,7 @@ class ModulesHandle : public QWidget
Bool isPlaying = false,
Bool disableThreads = false );
private:
private:
QWidget* m_pcParent;
PlaYUVerSubWindowHandle* m_pcMainWindowManager;
VideoHandle* m_appModuleVideo;
@@ -103,10 +103,10 @@ class ModulesHandle : public QWidget
Void customEvent( QEvent* event );
Q_SIGNALS:
Q_SIGNALS:
void changed();
private Q_SLOTS:
private Q_SLOTS:
void loadExternalModule();
void activateModule();
void processOpt( int index );
app/ModulesHandleOptDialog.cpp
+3 -2
View File
@@ -34,7 +34,7 @@
class OpionConfiguration : public QWidget
{
public:
public:
OpionConfiguration( OptionBase* option )
{
m_pcChecked = NULL;
@@ -68,7 +68,8 @@ class OpionConfiguration : public QWidget
return m_pcValue->text();
}
const String& getName() { return m_cName; }
private:
private:
QLineEdit* m_pcValue;
QCheckBox* m_pcChecked;
QLabel* m_pcDescription;
app/ModulesHandleOptDialog.h
+2 -2
View File
@@ -40,11 +40,11 @@ class ModulesHandleOptDialog : public QDialog
{
Q_OBJECT
public:
public:
ModulesHandleOptDialog( QWidget* parent, PlaYUVerAppModuleIf* pcCurrModuleIf );
Int runConfiguration();
private:
private:
PlaYUVerAppModuleIf* m_pcCurrModuleIf;
QVector<OpionConfiguration*> m_apcOptionList;
};
app/PlaYUVerApp.cpp
+23 -22
View File
@@ -152,28 +152,28 @@ Void PlaYUVerApp::closeEvent( QCloseEvent* event )
}
switch( msgBoxCloseRet )
{
case QMessageBox::Yes:
mayCloseAll = true;
for( Int i = 0; i < subWindowList.size(); i++ )
{
mayCloseAll &= subWindowList.at( i )->mayClose();
}
case QMessageBox::Yes:
mayCloseAll = true;
for( Int i = 0; i < subWindowList.size(); i++ )
{
mayCloseAll &= subWindowList.at( i )->mayClose();
}
if( mayCloseAll )
{
// m_pcPlayingTimer->stop();
closeAll();
writeSettings();
event->accept();
}
else
{
event->ignore();
}
break;
case QMessageBox::No:
default:
if( mayCloseAll )
{
// m_pcPlayingTimer->stop();
closeAll();
writeSettings();
event->accept();
}
else
{
event->ignore();
}
break;
case QMessageBox::No:
default:
event->ignore();
}
}
@@ -392,7 +392,8 @@ Void PlaYUVerApp::reload()
Void PlaYUVerApp::reloadAll()
{
UInt windowCategoryOrder[] = {
SubWindowAbstract::VIDEO_STREAM_SUBWINDOW, SubWindowAbstract::MODULE_SUBWINDOW,
SubWindowAbstract::VIDEO_STREAM_SUBWINDOW,
SubWindowAbstract::MODULE_SUBWINDOW,
SubWindowAbstract::MODULE_SUBWINDOW,
};
@@ -720,7 +721,7 @@ Void PlaYUVerApp::createActions()
m_appModuleExtensions->createActions();
m_pcWindowHandle->createActions();
// ------------ About ------------
// ------------ About ------------
#ifdef USE_FERVOR
m_arrayActions[UPDATE_ACT] = new QAction( tr( "&Update" ), this );
app/PlaYUVerApp.h
+5 -5
View File
@@ -69,19 +69,19 @@ class PlaYUVerApp : public QMainWindow
{
Q_OBJECT
public:
public:
PlaYUVerApp();
Bool parseArgs( Int argc, Char* argv[] );
Void loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo = NULL );
public Q_SLOTS:
public Q_SLOTS:
void printMessage( const QString& msg );
void printMessage( const QString& msg, UInt logLevel );
protected:
protected:
Void closeEvent( QCloseEvent* event );
private Q_SLOTS:
private Q_SLOTS:
void about();
@@ -115,7 +115,7 @@ class PlaYUVerApp : public QMainWindow
void update();
void updateZoomFactorSBox();
private:
private:
PlaYUVerAppAdaptor* m_pDBusAdaptor;
PlaYUVerOptions* m_pcCmdParser;
/**
app/PlaYUVerAppAdaptor.cpp
+3 -3
View File
@@ -30,10 +30,10 @@ PlaYUVerAppAdaptor::PlaYUVerAppAdaptor( PlaYUVerApp* app )
: QDBusAbstractAdaptor( app ), m_app( app )
{
// application dbus interface
Bool isRegistered = QDBusConnection::sessionBus().registerObject( QStringLiteral( PLAYUVER_DBUS_PATH ), this,
QDBusConnection::ExportAllSlots );
Bool isRegistered = QDBusConnection::sessionBus().registerObject(
QStringLiteral( PLAYUVER_DBUS_PATH ), this, QDBusConnection::ExportAllSlots );
Q_ASSERT( isRegistered == true );
Q_ASSERT( isRegistered == true );
}
PlaYUVerAppAdaptor::~PlaYUVerAppAdaptor()
app/PlaYUVerAppAdaptor.h
+6 -6
View File
@@ -40,9 +40,9 @@ class PlaYUVerApp;
class PlaYUVerAppAdaptor : public QDBusAbstractAdaptor
{
Q_OBJECT
Q_CLASSINFO( "D-Bus Interface", PLAYUVER_DBUS_SESSION_NAME )
Q_CLASSINFO( "D-Bus Interface", PLAYUVER_DBUS_SESSION_NAME )
Q_PROPERTY( QString activeSession READ activeSession )
public:
public:
PlaYUVerAppAdaptor( PlaYUVerApp* app );
~PlaYUVerAppAdaptor();
/**
@@ -50,7 +50,7 @@ class PlaYUVerAppAdaptor : public QDBusAbstractAdaptor
*/
// void emitExiting();
// void emitDocumentClosed(const QString &token);
public Q_SLOTS:
public Q_SLOTS:
/**
* open a file with given url and encoding
* will get view created
@@ -65,7 +65,7 @@ class PlaYUVerAppAdaptor : public QDBusAbstractAdaptor
*/
void activate();
Q_SIGNALS:
Q_SIGNALS:
/**
* Notify the world that this kate instance is exiting.
* All apps should stop using the dbus interface of this instance after this
@@ -73,10 +73,10 @@ class PlaYUVerAppAdaptor : public QDBusAbstractAdaptor
*/
// void exiting();
// void documentClosed(const QString &token);
public:
public:
QString activeSession();
private:
private:
PlaYUVerApp* m_app;
};
app/PlaYUVerAppModuleIf.cpp
+17 -17
View File
@@ -152,23 +152,23 @@ Void PlaYUVerAppModuleIf::show()
{
switch( m_pcModule->m_iModuleType )
{
case FRAME_PROCESSING_MODULE:
if( m_pcDisplaySubWindow )
{
m_pcDisplaySubWindow->setCurrFrame( m_pcProcessedFrame );
m_pcDisplaySubWindow->setFillWindow( false );
m_pcDisplaySubWindow->clearWindowBusy();
}
else
{
m_pcSubWindow[0]->setCurrFrame( m_pcProcessedFrame );
m_pcSubWindow[0]->setFillWindow( false );
m_pcSubWindow[0]->clearWindowBusy();
}
break;
case FRAME_MEASUREMENT_MODULE:
m_pcModuleDock->setModulueReturnValue( m_dMeasurementResult );
break;
case FRAME_PROCESSING_MODULE:
if( m_pcDisplaySubWindow )
{
m_pcDisplaySubWindow->setCurrFrame( m_pcProcessedFrame );
m_pcDisplaySubWindow->setFillWindow( false );
m_pcDisplaySubWindow->clearWindowBusy();
}
else
{
m_pcSubWindow[0]->setCurrFrame( m_pcProcessedFrame );
m_pcSubWindow[0]->setFillWindow( false );
m_pcSubWindow[0]->clearWindowBusy();
}
break;
case FRAME_MEASUREMENT_MODULE:
m_pcModuleDock->setModulueReturnValue( m_dMeasurementResult );
break;
}
}
app/PlaYUVerAppModuleIf.h
+4 -4
View File
@@ -52,7 +52,7 @@ class PlaYUVerAppModuleIf
friend class ModuleHandleDock;
friend class ModulesHandleOptDialog;
private:
private:
Bool m_bIsRunning;
Bool m_bSuccess;
@@ -70,10 +70,10 @@ class PlaYUVerAppModuleIf
PlaYUVerFrame* m_pcProcessedFrame;
Double m_dMeasurementResult;
public:
public:
class EventData : public QEvent
{
public:
public:
EventData( bool success, PlaYUVerAppModuleIf* module ) : QEvent( QEvent::User )
{
m_bSuccess = success;
@@ -101,7 +101,7 @@ class PlaYUVerAppModuleIf
Void show();
Void destroy();
protected:
protected:
virtual void run();
};
app/PlaYUVerMdiSubWindow.h
+3 -3
View File
@@ -33,13 +33,13 @@ class PlaYUVerMdiSubWindow : public QMdiSubWindow
{
Q_OBJECT
public:
public:
PlaYUVerMdiSubWindow( QWidget* parent = 0 );
Q_SIGNALS:
Q_SIGNALS:
void aboutToClose( PlaYUVerMdiSubWindow* );
protected:
protected:
QSize sizeHint() const;
void closeEvent( QCloseEvent* event );
};
app/PlaYUVerSubWindowHandle.cpp
+7 -7
View File
@@ -42,7 +42,7 @@
class PlaYUVerMdiArea : public QMdiArea
{
public:
public:
PlaYUVerMdiArea( QWidget* parent = 0 )
: QMdiArea( parent ), m_pixmapLogo( ":/images/playuver-backgroud-logo.png" )
{
@@ -57,7 +57,7 @@ class PlaYUVerMdiArea : public QMdiArea
update();
}
protected:
protected:
void paintEvent( QPaintEvent* event )
{
QMdiArea::paintEvent( event );
@@ -76,7 +76,7 @@ class PlaYUVerMdiArea : public QMdiArea
// QPoint bottomLeftCorner( 0, viewport()->height() );
}
private:
private:
QVector<QString> m_acLogMessages;
QPixmap m_pixmapLogo;
};
@@ -177,8 +177,8 @@ Void PlaYUVerSubWindowHandle::setWindowMode( Int iWindowMode )
// m_pcApp->resize( m_cMdiModeWindowSize );
if( m_pcActiveWindow )
{
m_pcApp->setWindowTitle( QApplication::applicationName() + " :: " +
m_pcActiveWindow->getWindowName() );
m_pcApp->setWindowTitle( QApplication::applicationName() +
" :: " + m_pcActiveWindow->getWindowName() );
}
}
m_iWindowMode = iWindowMode;
@@ -215,8 +215,8 @@ Void PlaYUVerSubWindowHandle::updateActiveSubWindow( SubWindowAbstract* window )
}
if( m_pcActiveWindow )
{
m_pcApp->setWindowTitle( QApplication::applicationName() + " :: " +
m_pcActiveWindow->getWindowName() );
m_pcApp->setWindowTitle( QApplication::applicationName() +
" :: " + m_pcActiveWindow->getWindowName() );
}
}
}
app/PlaYUVerSubWindowHandle.h
+4 -4
View File
@@ -46,7 +46,7 @@ class PlaYUVerSubWindowHandle : public QWidget
{
Q_OBJECT
public:
public:
PlaYUVerSubWindowHandle( QWidget* parent );
Void processLogMsg( const QString& msg );
@@ -71,7 +71,7 @@ class PlaYUVerSubWindowHandle : public QWidget
MDISUBWINDOWMODE = 1,
};
private:
private:
PlaYUVerApp* m_pcApp;
Int m_iWindowMode;
QList<SubWindowAbstract*> m_apcSubWindowList;
@@ -111,7 +111,7 @@ class PlaYUVerSubWindowHandle : public QWidget
Void resetWindowMode();
Void removeSubWindow( Int windowIdx );
public Q_SLOTS:
public Q_SLOTS:
void setWindowMode( int iWindowMode );
void updateActiveSubWindow( SubWindowAbstract* window = 0 );
void setActiveSubWindow( QWidget* window );
@@ -123,7 +123,7 @@ class PlaYUVerSubWindowHandle : public QWidget
void cascadeSubWindows();
void updateMenu();
Q_SIGNALS:
Q_SIGNALS:
void changed();
void windowActivated();
};
app/PlotSubWindow.cpp
+1 -3
View File
@@ -135,9 +135,7 @@ Void PlotSubWindow::zoomToFit()
normalSize();
}
Void PlotSubWindow::zoomToFactor( Double factor, QPoint center )
{
}
Void PlotSubWindow::zoomToFactor( Double factor, QPoint center ) {}
Void PlotSubWindow::scaleView( Double scale, QPoint center )
{
app/PlotSubWindow.h
+2 -2
View File
@@ -40,7 +40,7 @@ class PlotSubWindow : public SubWindowAbstract
{
Q_OBJECT
private:
private:
QCustomPlot* m_cPlotArea;
QVector<QColor> m_arrayColorList;
@@ -55,7 +55,7 @@ class PlotSubWindow : public SubWindowAbstract
Double m_dScaleFactor;
Int m_iNumberPlots;
public:
public:
PlotSubWindow( const QString& windowTitle, QWidget* parent = NULL );
~PlotSubWindow();
app/ProgressBar.h
+2 -2
View File
@@ -35,12 +35,12 @@ class ProgressBar : public QWidget
{
Q_OBJECT
public:
public:
ProgressBar( QWidget* parent, UInt maxValue );
Void incrementProgress( UInt );
private:
private:
UInt m_uiTotalProgress;
UInt m_uiProgress;
QProgressBar* m_pcProgressBar;
app/QualityHandle.cpp
+2 -4
View File
@@ -39,9 +39,7 @@ QualityHandle::QualityHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowMa
{
}
QualityHandle::~QualityHandle()
{
}
QualityHandle::~QualityHandle() {}
Void QualityHandle::createActions()
{
@@ -190,7 +188,7 @@ Void QualityHandle::measureQuality( QVector<VideoSubWindow*> apcWindowList )
ProgressBar* pcProgressBar = new ProgressBar( m_pcParet, numberOfFrames );
padQualityValues = new QVector<Double>[ numberOfWindows + 1 ];
padQualityValues = new QVector<Double>[numberOfWindows + 1];
PlaYUVerFrame* pcReferenceFrame;
PlaYUVerFrame* pcCurrFrame;
app/QualityHandle.h
+4 -4
View File
@@ -42,7 +42,7 @@ class VideoSubWindow;
class QualityHandle : public QWidget
{
Q_OBJECT
public:
public:
QualityHandle( QWidget*, PlaYUVerSubWindowHandle* );
~QualityHandle();
@@ -56,7 +56,7 @@ class QualityHandle : public QWidget
Void update( VideoSubWindow* currSubWindow );
private:
private:
QWidget* m_pcParet;
PlaYUVerSubWindowHandle* m_pcMainWindowManager;
@@ -81,10 +81,10 @@ class QualityHandle : public QWidget
QFuture<Void> m_cMeasurementResult;
Void measureQuality( QVector<VideoSubWindow*> apcWindowList );
Q_SIGNALS:
Q_SIGNALS:
void changed();
private Q_SLOTS:
private Q_SLOTS:
void slotQualityMetricChanged( int );
void slotSelectCurrentAsReference();
void slotPlotQualitySingle();
app/QualityMeasurementSidebar.cpp
+1 -3
View File
@@ -103,9 +103,7 @@ QualityMeasurementSidebar::QualityMeasurementSidebar( QWidget* parent,
SLOT( slotQualityMetricChanged( int ) ) );
}
QualityMeasurementSidebar::~QualityMeasurementSidebar()
{
}
QualityMeasurementSidebar::~QualityMeasurementSidebar() {}
QSize QualityMeasurementSidebar::sizeHint() const
{
app/QualityMeasurementSidebar.h
+4 -4
View File
@@ -43,7 +43,7 @@ class VideoSubWindow;
class QualityMeasurementSidebar : public QWidget
{
Q_OBJECT
public:
public:
QualityMeasurementSidebar( QWidget*, PlaYUVerSubWindowHandle* );
~QualityMeasurementSidebar();
@@ -56,7 +56,7 @@ class QualityMeasurementSidebar : public QWidget
Void updateSidebarData();
Void updateQualityMetric( Int );
private:
private:
PlaYUVerSubWindowHandle* m_pcMainWindowManager;
QVector<VideoSubWindow*> m_pcVideoWindowList;
@@ -75,10 +75,10 @@ class QualityMeasurementSidebar : public QWidget
HistogramWidget* histogramWidget;
Q_SIGNALS:
Q_SIGNALS:
void signalQualityMetricChanged( int );
private Q_SLOTS:
private Q_SLOTS:
void slotReferenceChanged( int );
void slotQualityMetricChanged( int );
};
app/SeekStreamDialog.h
+2 -2
View File
@@ -38,11 +38,11 @@ class SeekStreamDialog : public QDialog
{
Q_OBJECT
public:
public:
SeekStreamDialog( PlaYUVerStream* pcCurrStream, QWidget* parent = 0 );
Int runDialog();
private:
private:
QSpinBox* m_spinFrameNum;
Int m_iSelectedFrameNum;
};
app/SubWindowAbstract.h
+5 -5
View File
@@ -54,14 +54,14 @@ class SubWindowAbstract : public QWidget
{
Q_OBJECT
private:
private:
QHBoxLayout* m_pcLayout;
UInt m_uiCategory;
QString m_cWindowName;
PlaYUVerMdiSubWindow* m_cSubWindow;
public:
public:
enum SubWindowCategory
{
SUBWINDOW = 0,
@@ -134,13 +134,13 @@ class SubWindowAbstract : public QWidget
Void setSubWindow( PlaYUVerMdiSubWindow* subWindow ) { m_cSubWindow = subWindow; }
Void closeSubWindow();
protected:
protected:
void focusInEvent( QFocusEvent* event );
void closeEvent( QCloseEvent* event );
Void setWidget( QWidget* widget );
Q_SIGNALS:
Q_SIGNALS:
/**
* Notify that zoom factor was changed by internal event (e.g. by mouse wheel)
*/
@@ -158,7 +158,7 @@ class SubWindowAbstract : public QWidget
void aboutToActivate( SubWindowAbstract* );
void aboutToClose( SubWindowAbstract* );
public Q_SLOTS:
public Q_SLOTS:
void onDestroyed();
};
app/VideoHandle.cpp
+1 -3
View File
@@ -54,9 +54,7 @@ VideoHandle::VideoHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManage
m_acPlayingSubWindows.clear();
}
VideoHandle::~VideoHandle()
{
}
VideoHandle::~VideoHandle() {}
Void VideoHandle::createActions()
{
app/VideoHandle.h
+4 -4
View File
@@ -51,7 +51,7 @@ class WidgetFrameNumber;
class VideoHandle : public QWidget
{
Q_OBJECT
public:
public:
VideoHandle( QWidget*, PlaYUVerSubWindowHandle* );
~VideoHandle();
@@ -70,7 +70,7 @@ class VideoHandle : public QWidget
Void openSubWindow( VideoSubWindow* subWindow );
private:
private:
QWidget* m_pcParet;
PlaYUVerSubWindowHandle* m_pcMainWindowManager;
enum
@@ -126,10 +126,10 @@ class VideoHandle : public QWidget
UInt64 getMaxFrameNumber();
Void setTimerStatus();
Q_SIGNALS:
Q_SIGNALS:
void changed();
private Q_SLOTS:
private Q_SLOTS:
void update();
void updateSelectionArea( QRect area );
void closeSubWindow( SubWindowAbstract* subWindow );
app/VideoSubWindow.cpp
+16 -15
View File
@@ -84,13 +84,13 @@ Int findPlaYUVerStreamInfo( PlaYUVerStreamInfoVector array, QString filename )
class VideoInformation : public QWidget
{
private:
private:
QList<QStaticText> m_cTopLeftTextList;
QFont m_cTopLeftTextFont;
QFont m_cCenterTextFont;
Bool m_bBusyWindow;
public:
public:
VideoInformation( QWidget* parent ) : QWidget( parent ), m_bBusyWindow( false )
{
setPalette( Qt::transparent );
@@ -107,7 +107,8 @@ class VideoInformation : public QWidget
}
}
Void setBusyWindow( Bool bFlag ) { m_bBusyWindow = bFlag; }
protected:
protected:
void paintEvent( QPaintEvent* event )
{
QPainter painter( this );
@@ -207,18 +208,18 @@ Void VideoSubWindow::keyPressEvent( QKeyEvent* event )
Bool bRet = false;
switch( event->key() )
{
case Qt::Key_A:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_LEFT );
break;
case Qt::Key_D:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_RIGHT );
break;
case Qt::Key_W:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_UP );
break;
case Qt::Key_S:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_DOWN );
break;
case Qt::Key_A:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_LEFT );
break;
case Qt::Key_D:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_RIGHT );
break;
case Qt::Key_W:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_UP );
break;
case Qt::Key_S:
bRet = m_pcCurrentDisplayModule->getModule()->keyPressed( MODULE_KEY_DOWN );
break;
}
if( bRet )
{
app/VideoSubWindow.h
+4 -4
View File
@@ -63,7 +63,7 @@ class VideoSubWindow : public SubWindowAbstract
{
Q_OBJECT
private:
private:
Bool m_bWindowBusy;
QScrollArea* m_pcScrollArea;
@@ -118,7 +118,7 @@ class VideoSubWindow : public SubWindowAbstract
QSize getScrollSize();
public:
public:
enum VideoSubWindowCategories
{
VIDEO_STREAM_SUBWINDOW = SubWindowAbstract::VIDEO_STREAM_SUBWINDOW,
@@ -200,12 +200,12 @@ class VideoSubWindow : public SubWindowAbstract
Void clearWindowBusy() { m_bWindowBusy = false; }
Void setFillWindow( Bool bFlag );
protected:
protected:
Void keyPressEvent( QKeyEvent* event );
Void resizeEvent( QResizeEvent* event );
// void closeEvent( QCloseEvent *event );
public Q_SLOTS:
public Q_SLOTS:
void updateWindowOnTimeout();
void adjustScrollBarByScale( double scale, QPoint center );
void adjustScrollBarByOffset( QPoint Offset );
app/ViewArea.cpp
+58 -58
View File
@@ -103,21 +103,21 @@ Void ViewArea::setTool( UInt view )
{
switch( view )
{
case NavigationView:
m_eTool = NavigationTool;
m_snapToGrid = false;
m_blockTrackEnable = false;
break;
case NormalSelectionView:
m_eTool = SelectionTool;
m_snapToGrid = false;
m_blockTrackEnable = false;
break;
case BlockSelectionView:
m_eTool = SelectionTool;
m_snapToGrid = true;
m_blockTrackEnable = false;
break;
case NavigationView:
m_eTool = NavigationTool;
m_snapToGrid = false;
m_blockTrackEnable = false;
break;
case NormalSelectionView:
m_eTool = SelectionTool;
m_snapToGrid = false;
m_blockTrackEnable = false;
break;
case BlockSelectionView:
m_eTool = SelectionTool;
m_snapToGrid = true;
m_blockTrackEnable = false;
break;
}
if( m_eTool != SelectionTool )
@@ -514,9 +514,9 @@ Void ViewArea::paintEvent( QPaintEvent* event )
paInter.setPen( QColor( Qt::black ) );
paInter.drawText( pixelRect, Qt::AlignCenter,
"Y: " + QString::number( sPixelValue.Y() ) + "\n" + "U: " +
QString::number( sPixelValue.Cb() ) + "\n" + "V: " +
QString::number( sPixelValue.Cr() ) );
"Y: " + QString::number( sPixelValue.Y() ) + "\n" +
"U: " + QString::number( sPixelValue.Cb() ) + "\n" +
"V: " + QString::number( sPixelValue.Cr() ) );
}
if( frFormat == PlaYUVerPixel::COLOR_GRAY )
{
@@ -541,9 +541,9 @@ Void ViewArea::paintEvent( QPaintEvent* event )
paInter.setPen( QColor( Qt::black ) );
paInter.drawText( pixelRect, Qt::AlignCenter,
"R: " + QString::number( sPixelValue.R() ) + "\n" + "G: " +
QString::number( sPixelValue.G() ) + "\n" + "B: " +
QString::number( sPixelValue.B() ) );
"R: " + QString::number( sPixelValue.R() ) + "\n" +
"G: " + QString::number( sPixelValue.G() ) + "\n" +
"B: " + QString::number( sPixelValue.B() ) );
}
}
}
@@ -692,22 +692,22 @@ Void ViewArea::paintEvent( QPaintEvent* event )
{
switch( tool() )
{
case MaskTool:
{
if( m_maskColor.isValid() )
color = m_maskColor;
else
color = imageMaskColor;
case MaskTool:
{
if( m_maskColor.isValid() )
color = m_maskColor;
else
color = imageMaskColor;
break;
}
case EraserTool:
{
color = eraserColor;
break;
}
default:
color = selectionColor; // ?Problems!
break;
}
case EraserTool:
{
color = eraserColor;
break;
}
default:
color = selectionColor; // ?Problems!
}
color.setAlpha( 120 );
@@ -1077,27 +1077,27 @@ Void ViewArea::updateMask( const QRect& rect )
{
switch( tool() )
{
case MaskTool:
{
// Add rect to the mask
QPainter paInter( &m_mask );
paInter.setBrush( Qt::color1 );
paInter.setPen( Qt::NoPen );
paInter.drawRect( rect );
paInter.end();
break;
}
case EraserTool:
{
// Clears rect area in the mask
QPainter paInter( &m_mask );
paInter.setBrush( Qt::color0 );
paInter.setPen( Qt::NoPen );
paInter.drawRect( rect );
paInter.end();
break;
}
default: /* Do Nothing */
;
case MaskTool:
{
// Add rect to the mask
QPainter paInter( &m_mask );
paInter.setBrush( Qt::color1 );
paInter.setPen( Qt::NoPen );
paInter.drawRect( rect );
paInter.end();
break;
}
case EraserTool:
{
// Clears rect area in the mask
QPainter paInter( &m_mask );
paInter.setBrush( Qt::color0 );
paInter.setPen( Qt::NoPen );
paInter.drawRect( rect );
paInter.end();
break;
}
default: /* Do Nothing */
;
}
}
app/ViewArea.h
+5 -5
View File
@@ -45,7 +45,7 @@ class ViewArea : public QWidget
{
Q_OBJECT
public:
public:
enum ViewModes
{
NavigationView,
@@ -88,13 +88,13 @@ class ViewArea : public QWidget
// min or max zoom value)
Double scaleZoomFactor( Double scale, QPoint center, QSize minimumSize );
Q_SIGNALS:
Q_SIGNALS:
void selectionChanged( const QRect& rect );
void positionChanged( const QPoint& pos );
void scrollBarMoved( QPoint offset );
void zoomFactorChanged_byWheel( const double factor, const QPoint center );
public Q_SLOTS:
public Q_SLOTS:
// Void setNormalMode();
// Void setMaskMode();
// Void setMaskTool();
@@ -104,7 +104,7 @@ class ViewArea : public QWidget
void setSnapToGrid( bool enable );
// void setSelectedArea( QRect &rect );
protected:
protected:
Void paintEvent( QPaintEvent* event );
Void resizeEvent( QResizeEvent* event );
Void mousePressEvent( QMouseEvent* event );
@@ -115,7 +115,7 @@ class ViewArea : public QWidget
Void updateSize();
Void updateOffset();
private:
private:
enum ViewMode
{
NormalMode,
app/WidgetFrameNumber.h
+2 -2
View File
@@ -36,13 +36,13 @@
class WidgetFrameNumber : public QWidget
{
public:
public:
WidgetFrameNumber( QWidget* parent = 0 );
Void setCurrFrameNum( Int number );
Void setTotalFrameNum( Int number );
Void clear();
private:
private:
QLabel* m_pcCurrFrameNumLabel;
QLabel* m_pcTotalFrameNumLabel;
};
app/external/qcustomplot.cpp
Vendored
+1026 -1061
View File
File diff suppressed because it is too large. Load diff
app/external/qcustomplot.h
Vendored
+144 -142
View File
@@ -256,23 +256,23 @@ inline void setMarginValue( QMargins& margins, QCP::MarginSide side, int value )
{
switch( side )
{
case QCP::msLeft:
margins.setLeft( value );
break;
case QCP::msRight:
margins.setRight( value );
break;
case QCP::msTop:
margins.setTop( value );
break;
case QCP::msBottom:
margins.setBottom( value );
break;
case QCP::msAll:
margins = QMargins( value, value, value, value );
break;
default:
break;
case QCP::msLeft:
margins.setLeft( value );
break;
case QCP::msRight:
margins.setRight( value );
break;
case QCP::msTop:
margins.setTop( value );
break;
case QCP::msBottom:
margins.setBottom( value );
break;
case QCP::msAll:
margins = QMargins( value, value, value, value );
break;
default:
break;
}
}
@@ -288,16 +288,16 @@ inline int getMarginValue( const QMargins& margins, QCP::MarginSide side )
{
switch( side )
{
case QCP::msLeft:
return margins.left();
case QCP::msRight:
return margins.right();
case QCP::msTop:
return margins.top();
case QCP::msBottom:
return margins.bottom();
default:
break;
case QCP::msLeft:
return margins.left();
case QCP::msRight:
return margins.right();
case QCP::msTop:
return margins.top();
case QCP::msBottom:
return margins.bottom();
default:
break;
}
return 0;
}
@@ -312,7 +312,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( QCP::Interactions )
class QCP_LIB_DECL QCPScatterStyle
{
Q_GADGET
public:
public:
/*!
Defines the shape used for scatter points.
@@ -407,7 +407,7 @@ class QCP_LIB_DECL QCPScatterStyle
void drawShape( QCPPainter* painter, QPointF pos ) const;
void drawShape( QCPPainter* painter, double x, double y ) const;
protected:
protected:
// property members:
double mSize;
ScatterShape mShape;
@@ -424,7 +424,7 @@ Q_DECLARE_TYPEINFO( QCPScatterStyle, Q_MOVABLE_TYPE );
class QCP_LIB_DECL QCPPainter : public QPainter
{
Q_GADGET
public:
public:
/*!
Defines special modes the painter can operate in. They disable or enable
certain subsets of
@@ -476,7 +476,7 @@ class QCP_LIB_DECL QCPPainter : public QPainter
// non-virtual methods:
void makeNonCosmetic();
protected:
protected:
// property members:
PainterModes mModes;
bool mIsAntialiasing;
@@ -496,7 +496,7 @@ class QCP_LIB_DECL QCPLayer : public QObject
Q_PROPERTY( QList<QCPLayerable*> children READ children )
Q_PROPERTY( bool visible READ visible WRITE setVisible )
/// \endcond
public:
public:
QCPLayer( QCustomPlot* parentPlot, const QString& layerName );
~QCPLayer();
@@ -509,7 +509,7 @@ class QCP_LIB_DECL QCPLayer : public QObject
// setters:
void setVisible( bool visible );
protected:
protected:
// property members:
QCustomPlot* mParentPlot;
QString mName;
@@ -521,7 +521,7 @@ class QCP_LIB_DECL QCPLayer : public QObject
void addChild( QCPLayerable* layerable, bool prepend );
void removeChild( QCPLayerable* layerable );
private:
private:
Q_DISABLE_COPY( QCPLayer )
friend class QCustomPlot;
@@ -538,7 +538,7 @@ class QCP_LIB_DECL QCPLayerable : public QObject
Q_PROPERTY( QCPLayer* layer READ layer WRITE setLayer NOTIFY layerChanged )
Q_PROPERTY( bool antialiased READ antialiased WRITE setAntialiased )
/// \endcond
public:
public:
QCPLayerable( QCustomPlot* plot, QString targetLayer = "", QCPLayerable* parentLayerable = 0 );
~QCPLayerable();
@@ -560,10 +560,10 @@ class QCP_LIB_DECL QCPLayerable : public QObject
// non-property methods:
bool realVisibility() const;
signals:
signals:
void layerChanged( QCPLayer* newLayer );
protected:
protected:
// property members:
bool mVisible;
QCustomPlot* mParentPlot;
@@ -592,7 +592,7 @@ class QCP_LIB_DECL QCPLayerable : public QObject
bool localAntialiased,
QCP::AntialiasedElement overrideElement ) const;
private:
private:
Q_DISABLE_COPY( QCPLayerable )
friend class QCustomPlot;
@@ -601,7 +601,7 @@ class QCP_LIB_DECL QCPLayerable : public QObject
class QCP_LIB_DECL QCPRange
{
public:
public:
double lower, upper;
QCPRange();
@@ -743,7 +743,7 @@ inline const QCPRange operator/( const QCPRange& range, double value )
class QCP_LIB_DECL QCPMarginGroup : public QObject
{
Q_OBJECT
public:
public:
QCPMarginGroup( QCustomPlot* parentPlot );
~QCPMarginGroup();
@@ -755,7 +755,7 @@ class QCP_LIB_DECL QCPMarginGroup : public QObject
bool isEmpty() const;
void clear();
protected:
protected:
// non-property members:
QCustomPlot* mParentPlot;
QHash<QCP::MarginSide, QList<QCPLayoutElement*>> mChildren;
@@ -765,7 +765,7 @@ class QCP_LIB_DECL QCPMarginGroup : public QObject
void addChild( QCP::MarginSide side, QCPLayoutElement* element );
void removeChild( QCP::MarginSide side, QCPLayoutElement* element );
private:
private:
Q_DISABLE_COPY( QCPMarginGroup )
friend class QCPLayoutElement;
@@ -783,7 +783,7 @@ class QCP_LIB_DECL QCPLayoutElement : public QCPLayerable
Q_PROPERTY( QSize minimumSize READ minimumSize WRITE setMinimumSize )
Q_PROPERTY( QSize maximumSize READ maximumSize WRITE setMaximumSize )
/// \endcond
public:
public:
/*!
Defines the phases of the update process, that happens just before a replot.
At each phase,
@@ -839,7 +839,7 @@ class QCP_LIB_DECL QCPLayoutElement : public QCPLayerable
// reimplemented virtual methods:
virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const;
protected:
protected:
// property members:
QCPLayout* mParentLayout;
QSize mMinimumSize, mMaximumSize;
@@ -861,7 +861,7 @@ class QCP_LIB_DECL QCPLayoutElement : public QCPLayerable
virtual void draw( QCPPainter* painter ) { Q_UNUSED( painter ) }
virtual void parentPlotInitialized( QCustomPlot* parentPlot );
private:
private:
Q_DISABLE_COPY( QCPLayoutElement )
friend class QCustomPlot;
@@ -872,7 +872,7 @@ class QCP_LIB_DECL QCPLayoutElement : public QCPLayerable
class QCP_LIB_DECL QCPLayout : public QCPLayoutElement
{
Q_OBJECT
public:
public:
explicit QCPLayout();
// reimplemented virtual methods:
@@ -891,7 +891,7 @@ class QCP_LIB_DECL QCPLayout : public QCPLayoutElement
bool remove( QCPLayoutElement* element );
void clear();
protected:
protected:
// introduced virtual methods:
virtual void updateLayout();
@@ -904,7 +904,7 @@ class QCP_LIB_DECL QCPLayout : public QCPLayoutElement
QVector<double> stretchFactors,
int totalSize ) const;
private:
private:
Q_DISABLE_COPY( QCPLayout )
friend class QCPLayoutElement;
};
@@ -921,7 +921,7 @@ class QCP_LIB_DECL QCPLayoutGrid : public QCPLayout
Q_PROPERTY( int columnSpacing READ columnSpacing WRITE setColumnSpacing )
Q_PROPERTY( int rowSpacing READ rowSpacing WRITE setRowSpacing )
/// \endcond
public:
public:
explicit QCPLayoutGrid();
virtual ~QCPLayoutGrid();
@@ -959,7 +959,7 @@ class QCP_LIB_DECL QCPLayoutGrid : public QCPLayout
void insertRow( int newIndex );
void insertColumn( int newIndex );
protected:
protected:
// property members:
QList<QList<QCPLayoutElement*>> mElements;
QList<double> mColumnStretchFactors;
@@ -970,14 +970,14 @@ class QCP_LIB_DECL QCPLayoutGrid : public QCPLayout
void getMinimumRowColSizes( QVector<int>* minColWidths, QVector<int>* minRowHeights ) const;
void getMaximumRowColSizes( QVector<int>* maxColWidths, QVector<int>* maxRowHeights ) const;
private:
private:
Q_DISABLE_COPY( QCPLayoutGrid )
};
class QCP_LIB_DECL QCPLayoutInset : public QCPLayout
{
Q_OBJECT
public:
public:
/*!
Defines how the placement and sizing is handled for a certain element in a
QCPLayoutInset.
@@ -1017,21 +1017,21 @@ class QCP_LIB_DECL QCPLayoutInset : public QCPLayout
void addElement( QCPLayoutElement* element, Qt::Alignment alignment );
void addElement( QCPLayoutElement* element, const QRectF& rect );
protected:
protected:
// property members:
QList<QCPLayoutElement*> mElements;
QList<InsetPlacement> mInsetPlacement;
QList<Qt::Alignment> mInsetAlignment;
QList<QRectF> mInsetRect;
private:
private:
Q_DISABLE_COPY( QCPLayoutInset )
};
class QCP_LIB_DECL QCPLineEnding
{
Q_GADGET
public:
public:
/*!
Defines the type of ending decoration for line-like items, e.g. an arrow.
@@ -1093,7 +1093,7 @@ class QCP_LIB_DECL QCPLineEnding
void draw( QCPPainter* painter, const QVector2D& pos, const QVector2D& dir ) const;
void draw( QCPPainter* painter, const QVector2D& pos, double angle ) const;
protected:
protected:
// property members:
EndingStyle mStyle;
double mWidth, mLength;
@@ -1112,7 +1112,7 @@ class QCP_LIB_DECL QCPGrid : public QCPLayerable
Q_PROPERTY( QPen subGridPen READ subGridPen WRITE setSubGridPen )
Q_PROPERTY( QPen zeroLinePen READ zeroLinePen WRITE setZeroLinePen )
/// \endcond
public:
public:
QCPGrid( QCPAxis* parentAxis );
// getters:
@@ -1130,7 +1130,7 @@ class QCP_LIB_DECL QCPGrid : public QCPLayerable
void setSubGridPen( const QPen& pen );
void setZeroLinePen( const QPen& pen );
protected:
protected:
// property members:
bool mSubGridVisible;
bool mAntialiasedSubGrid, mAntialiasedZeroLine;
@@ -1209,7 +1209,7 @@ class QCP_LIB_DECL QCPAxis : public QCPLayerable
Q_PROPERTY( QCPLineEnding upperEnding READ upperEnding WRITE setUpperEnding )
Q_PROPERTY( QCPGrid* grid READ grid )
/// \endcond
public:
public:
/*!
Defines at which side of the axis rect the axis will appear. This also
affects how the tick
@@ -1415,7 +1415,7 @@ class QCP_LIB_DECL QCPAxis : public QCPLayerable
}
static AxisType opposite( AxisType type );
signals:
signals:
void ticksRequest();
void rangeChanged( const QCPRange& newRange );
void rangeChanged( const QCPRange& newRange, const QCPRange& oldRange );
@@ -1423,7 +1423,7 @@ class QCP_LIB_DECL QCPAxis : public QCPLayerable
void selectionChanged( const QCPAxis::SelectableParts& parts );
void selectableChanged( const QCPAxis::SelectableParts& parts );
protected:
protected:
// property members:
// axis base:
AxisType mAxisType;
@@ -1506,7 +1506,7 @@ class QCP_LIB_DECL QCPAxis : public QCPLayerable
QColor getTickLabelColor() const;
QColor getLabelColor() const;
private:
private:
Q_DISABLE_COPY( QCPAxis )
friend class QCustomPlot;
@@ -1519,7 +1519,7 @@ Q_DECLARE_METATYPE( QCPAxis::SelectablePart )
class QCPAxisPainterPrivate
{
public:
public:
explicit QCPAxisPainterPrivate( QCustomPlot* parentPlot );
virtual ~QCPAxisPainterPrivate();
@@ -1556,7 +1556,7 @@ class QCPAxisPainterPrivate
QVector<double> tickPositions;
QVector<QString> tickLabels;
protected:
protected:
struct CachedLabel
{
QPointF offset;
@@ -1609,7 +1609,7 @@ class QCP_LIB_DECL QCPAbstractPlottable : public QCPLayerable
Q_PROPERTY( bool selectable READ selectable WRITE setSelectable NOTIFY selectableChanged )
Q_PROPERTY( bool selected READ selected WRITE setSelected NOTIFY selectionChanged )
/// \endcond
public:
public:
QCPAbstractPlottable( QCPAxis* keyAxis, QCPAxis* valueAxis );
// getters:
@@ -1652,11 +1652,11 @@ class QCP_LIB_DECL QCPAbstractPlottable : public QCPLayerable
void rescaleKeyAxis( bool onlyEnlarge = false ) const;
void rescaleValueAxis( bool onlyEnlarge = false ) const;
signals:
signals:
void selectionChanged( bool selected );
void selectableChanged( bool selectable );
protected:
protected:
/*!
Represents negative and positive sign domain for passing to \ref getKeyRange
and \ref getValueRange.
@@ -1707,7 +1707,7 @@ class QCP_LIB_DECL QCPAbstractPlottable : public QCPLayerable
void applyErrorBarsAntialiasingHint( QCPPainter* painter ) const;
double distSqrToLine( const QPointF& start, const QPointF& end, const QPointF& point ) const;
private:
private:
Q_DISABLE_COPY( QCPAbstractPlottable )
friend class QCustomPlot;
@@ -1717,7 +1717,7 @@ class QCP_LIB_DECL QCPAbstractPlottable : public QCPLayerable
class QCP_LIB_DECL QCPItemAnchor
{
public:
public:
QCPItemAnchor( QCustomPlot* parentPlot,
QCPAbstractItem* parentItem,
const QString name,
@@ -1728,7 +1728,7 @@ class QCP_LIB_DECL QCPItemAnchor
QString name() const { return mName; }
virtual QPointF pixelPoint() const;
protected:
protected:
// property members:
QString mName;
@@ -1745,7 +1745,7 @@ class QCP_LIB_DECL QCPItemAnchor
void removeChild( QCPItemPosition* pos ); // called from pos when its parent
// anchor is reset or pos deleted
private:
private:
Q_DISABLE_COPY( QCPItemAnchor )
friend class QCPItemPosition;
@@ -1753,7 +1753,7 @@ class QCP_LIB_DECL QCPItemAnchor
class QCP_LIB_DECL QCPItemPosition : public QCPItemAnchor
{
public:
public:
/*!
Defines the ways an item position can be specified. Thus it defines what the
numbers passed to
@@ -1811,7 +1811,7 @@ class QCP_LIB_DECL QCPItemPosition : public QCPItemAnchor
void setAxisRect( QCPAxisRect* axisRect );
void setPixelPoint( const QPointF& pixelPoint );
protected:
protected:
// property members:
PositionType mPositionType;
QPointer<QCPAxis> mKeyAxis, mValueAxis;
@@ -1821,7 +1821,8 @@ class QCP_LIB_DECL QCPItemPosition : public QCPItemAnchor
// reimplemented virtual methods:
virtual QCPItemPosition* toQCPItemPosition() { return this; }
private:
private:
Q_DISABLE_COPY( QCPItemPosition )
};
@@ -1834,7 +1835,7 @@ class QCP_LIB_DECL QCPAbstractItem : public QCPLayerable
Q_PROPERTY( bool selectable READ selectable WRITE setSelectable NOTIFY selectableChanged )
Q_PROPERTY( bool selected READ selected WRITE setSelected NOTIFY selectionChanged )
/// \endcond
public:
public:
QCPAbstractItem( QCustomPlot* parentPlot );
virtual ~QCPAbstractItem();
@@ -1861,11 +1862,11 @@ class QCP_LIB_DECL QCPAbstractItem : public QCPLayerable
QCPItemAnchor* anchor( const QString& name ) const;
bool hasAnchor( const QString& name ) const;
signals:
signals:
void selectionChanged( bool selected );
void selectableChanged( bool selectable );
protected:
protected:
// property members:
bool mClipToAxisRect;
QPointer<QCPAxisRect> mClipAxisRect;
@@ -1894,7 +1895,7 @@ class QCP_LIB_DECL QCPAbstractItem : public QCPLayerable
QCPItemPosition* createPosition( const QString& name );
QCPItemAnchor* createAnchor( const QString& name, int anchorId );
private:
private:
Q_DISABLE_COPY( QCPAbstractItem )
friend class QCustomPlot;
@@ -1918,7 +1919,7 @@ class QCP_LIB_DECL QCustomPlot : public QWidget
Q_PROPERTY( Qt::KeyboardModifier multiSelectModifier READ multiSelectModifier WRITE
setMultiSelectModifier )
/// \endcond
public:
public:
/*!
Defines how a layer should be inserted relative to an other layer.
@@ -2081,7 +2082,7 @@ class QCP_LIB_DECL QCustomPlot : public QWidget
QCPAxis *xAxis, *yAxis, *xAxis2, *yAxis2;
QCPLegend* legend;
signals:
signals:
void mouseDoubleClick( QMouseEvent* event );
void mousePress( QMouseEvent* event );
void mouseMove( QMouseEvent* event );
@@ -2103,7 +2104,7 @@ class QCP_LIB_DECL QCustomPlot : public QWidget
void beforeReplot();
void afterReplot();
protected:
protected:
// property members:
QRect mViewport;
QCPLayoutGrid* mPlotLayout;
@@ -2164,7 +2165,7 @@ class QCP_LIB_DECL QCustomPlot : public QWidget
class QCP_LIB_DECL QCPColorGradient
{
Q_GADGET
public:
public:
/*!
Defines the color spaces in which color interpolation between gradient stops
can be performed.
@@ -2258,7 +2259,7 @@ class QCP_LIB_DECL QCPColorGradient
void clearColorStops();
QCPColorGradient inverted() const;
protected:
protected:
void updateColorBuffer();
// property members:
@@ -2283,7 +2284,7 @@ class QCP_LIB_DECL QCPAxisRect : public QCPLayoutElement
Q_PROPERTY( Qt::Orientations rangeDrag READ rangeDrag WRITE setRangeDrag )
Q_PROPERTY( Qt::Orientations rangeZoom READ rangeZoom WRITE setRangeZoom )
/// \endcond
public:
public:
explicit QCPAxisRect( QCustomPlot* parentPlot, bool setupDefaultAxes = true );
virtual ~QCPAxisRect();
@@ -2343,7 +2344,7 @@ class QCP_LIB_DECL QCPAxisRect : public QCPLayoutElement
virtual void update( UpdatePhase phase );
virtual QList<QCPLayoutElement*> elements( bool recursive ) const;
protected:
protected:
// property members:
QBrush mBackgroundBrush;
QPixmap mBackgroundPixmap;
@@ -2375,7 +2376,7 @@ class QCP_LIB_DECL QCPAxisRect : public QCPLayoutElement
void drawBackground( QCPPainter* painter );
void updateAxesOffset( QCPAxis::AxisType type );
private:
private:
Q_DISABLE_COPY( QCPAxisRect )
friend class QCustomPlot;
@@ -2393,7 +2394,7 @@ class QCP_LIB_DECL QCPAbstractLegendItem : public QCPLayoutElement
Q_PROPERTY( bool selectable READ selectable WRITE setSelectable NOTIFY selectionChanged )
Q_PROPERTY( bool selected READ selected WRITE setSelected NOTIFY selectableChanged )
/// \endcond
public:
public:
explicit QCPAbstractLegendItem( QCPLegend* parent );
// getters:
@@ -2415,11 +2416,11 @@ class QCP_LIB_DECL QCPAbstractLegendItem : public QCPLayoutElement
// reimplemented virtual methods:
virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const;
signals:
signals:
void selectionChanged( bool selected );
void selectableChanged( bool selectable );
protected:
protected:
// property members:
QCPLegend* mParentLegend;
QFont mFont;
@@ -2440,7 +2441,7 @@ class QCP_LIB_DECL QCPAbstractLegendItem : public QCPLayoutElement
bool* selectionStateChanged );
virtual void deselectEvent( bool* selectionStateChanged );
private:
private:
Q_DISABLE_COPY( QCPAbstractLegendItem )
friend class QCPLegend;
@@ -2449,12 +2450,13 @@ class QCP_LIB_DECL QCPAbstractLegendItem : public QCPLayoutElement
class QCP_LIB_DECL QCPPlottableLegendItem : public QCPAbstractLegendItem
{
Q_OBJECT
public:
public:
QCPPlottableLegendItem( QCPLegend* parent, QCPAbstractPlottable* plottable );
// getters:
QCPAbstractPlottable* plottable() { return mPlottable; }
protected:
protected:
// property members:
QCPAbstractPlottable* mPlottable;
@@ -2489,7 +2491,7 @@ class QCP_LIB_DECL QCPLegend : public QCPLayoutGrid
Q_PROPERTY( QFont selectedFont READ selectedFont WRITE setSelectedFont )
Q_PROPERTY( QColor selectedTextColor READ selectedTextColor WRITE setSelectedTextColor )
/// \endcond
public:
public:
/*!
Defines the selectable parts of a legend
@@ -2557,11 +2559,11 @@ class QCP_LIB_DECL QCPLegend : public QCPLayoutGrid
void clearItems();
QList<QCPAbstractLegendItem*> selectedItems() const;
signals:
signals:
void selectionChanged( QCPLegend::SelectableParts parts );
void selectableChanged( QCPLegend::SelectableParts parts );
protected:
protected:
// property members:
QPen mBorderPen, mIconBorderPen;
QBrush mBrush;
@@ -2591,7 +2593,7 @@ class QCP_LIB_DECL QCPLegend : public QCPLayoutGrid
QPen getBorderPen() const;
QBrush getBrush() const;
private:
private:
Q_DISABLE_COPY( QCPLegend )
friend class QCustomPlot;
@@ -2612,7 +2614,7 @@ class QCP_LIB_DECL QCPPlotTitle : public QCPLayoutElement
Q_PROPERTY( bool selectable READ selectable WRITE setSelectable NOTIFY selectableChanged )
Q_PROPERTY( bool selected READ selected WRITE setSelected NOTIFY selectionChanged )
/// \endcond
public:
public:
explicit QCPPlotTitle( QCustomPlot* parentPlot );
explicit QCPPlotTitle( QCustomPlot* parentPlot, const QString& text );
@@ -2636,11 +2638,11 @@ class QCP_LIB_DECL QCPPlotTitle : public QCPLayoutElement
// reimplemented virtual methods:
virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const;
signals:
signals:
void selectionChanged( bool selected );
void selectableChanged( bool selectable );
protected:
protected:
// property members:
QString mText;
QFont mFont;
@@ -2666,28 +2668,28 @@ class QCP_LIB_DECL QCPPlotTitle : public QCPLayoutElement
QFont mainFont() const;
QColor mainTextColor() const;
private:
private:
Q_DISABLE_COPY( QCPPlotTitle )
};
class QCPColorScaleAxisRectPrivate : public QCPAxisRect
{
Q_OBJECT
public:
public:
explicit QCPColorScaleAxisRectPrivate( QCPColorScale* parentColorScale );
protected:
protected:
QCPColorScale* mParentColorScale;
QImage mGradientImage;
bool mGradientImageInvalidated;
// re-using some methods of QCPAxisRect to make them available to friend class
// QCPColorScale
using QCPAxisRect::calculateAutoMargin;
using QCPAxisRect::mousePressEvent;
using QCPAxisRect::mouseMoveEvent;
using QCPAxisRect::mousePressEvent;
using QCPAxisRect::mouseReleaseEvent;
using QCPAxisRect::wheelEvent;
using QCPAxisRect::update;
using QCPAxisRect::wheelEvent;
virtual void draw( QCPPainter* painter );
void updateGradientImage();
Q_SLOT void axisSelectionChanged( QCPAxis::SelectableParts selectedParts );
@@ -2709,7 +2711,7 @@ class QCP_LIB_DECL QCPColorScale : public QCPLayoutElement
Q_PROPERTY( bool rangeDrag READ rangeDrag WRITE setRangeDrag )
Q_PROPERTY( bool rangeZoom READ rangeZoom WRITE setRangeZoom )
/// \endcond
public:
public:
explicit QCPColorScale( QCustomPlot* parentPlot );
virtual ~QCPColorScale();
@@ -2741,12 +2743,12 @@ class QCP_LIB_DECL QCPColorScale : public QCPLayoutElement
// reimplemented virtual methods:
virtual void update( UpdatePhase phase );
signals:
signals:
void dataRangeChanged( QCPRange newRange );
void dataScaleTypeChanged( QCPAxis::ScaleType scaleType );
void gradientChanged( QCPColorGradient newGradient );
protected:
protected:
// property members:
QCPAxis::AxisType mType;
QCPRange mDataRange;
@@ -2766,7 +2768,7 @@ class QCP_LIB_DECL QCPColorScale : public QCPLayoutElement
virtual void mouseReleaseEvent( QMouseEvent* event );
virtual void wheelEvent( QWheelEvent* event );
private:
private:
Q_DISABLE_COPY( QCPColorScale )
friend class QCPColorScaleAxisRectPrivate;
@@ -2776,7 +2778,7 @@ class QCP_LIB_DECL QCPColorScale : public QCPLayoutElement
class QCP_LIB_DECL QCPData
{
public:
public:
QCPData();
QCPData( double key, double value );
double key, value;
@@ -2809,7 +2811,7 @@ class QCP_LIB_DECL QCPGraph : public QCPAbstractPlottable
Q_PROPERTY( QCPGraph* channelFillGraph READ channelFillGraph WRITE setChannelFillGraph )
Q_PROPERTY( bool adaptiveSampling READ adaptiveSampling WRITE setAdaptiveSampling )
/// \endcond
public:
public:
/*!
Defines how the graph's line is represented visually in the plot. The line
is drawn with the
@@ -2926,7 +2928,7 @@ class QCP_LIB_DECL QCPGraph : public QCPAbstractPlottable
void rescaleValueAxis( bool onlyEnlarge,
bool includeErrorBars ) const; // overloads base class interface
protected:
protected:
// property members:
QCPDataMap* mData;
QPen mErrorPen;
@@ -2991,7 +2993,7 @@ class QCP_LIB_DECL QCPGraph : public QCPAbstractPlottable
class QCP_LIB_DECL QCPCurveData
{
public:
public:
QCPCurveData();
QCPCurveData( double t, double key, double value );
double t, key, value;
@@ -3018,7 +3020,7 @@ class QCP_LIB_DECL QCPCurve : public QCPAbstractPlottable
Q_PROPERTY( QCPScatterStyle scatterStyle READ scatterStyle WRITE setScatterStyle )
Q_PROPERTY( LineStyle lineStyle READ lineStyle WRITE setLineStyle )
/// \endcond
public:
public:
/*!
Defines how the curve's line is represented visually in the plot. The line
is drawn with the
@@ -3064,7 +3066,7 @@ class QCP_LIB_DECL QCPCurve : public QCPAbstractPlottable
virtual void clearData();
virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const;
protected:
protected:
// property members:
QCPCurveDataMap* mData;
QCPScatterStyle mScatterStyle;
@@ -3092,7 +3094,7 @@ class QCP_LIB_DECL QCPCurve : public QCPAbstractPlottable
class QCP_LIB_DECL QCPBarData
{
public:
public:
QCPBarData();
QCPBarData( double key, double value );
double key, value;
@@ -3118,7 +3120,7 @@ class QCP_LIB_DECL QCPBars : public QCPAbstractPlottable
Q_PROPERTY( QCPBars* barBelow READ barBelow )
Q_PROPERTY( QCPBars* barAbove READ barAbove )
/// \endcond
public:
public:
explicit QCPBars( QCPAxis* keyAxis, QCPAxis* valueAxis );
virtual ~QCPBars();
@@ -3148,7 +3150,7 @@ class QCP_LIB_DECL QCPBars : public QCPAbstractPlottable
virtual void clearData();
virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const;
protected:
protected:
// property members:
QCPBarDataMap* mData;
double mWidth;
@@ -3189,7 +3191,7 @@ class QCP_LIB_DECL QCPStatisticalBox : public QCPAbstractPlottable
Q_PROPERTY( QPen medianPen READ medianPen WRITE setMedianPen )
Q_PROPERTY( QCPScatterStyle outlierStyle READ outlierStyle WRITE setOutlierStyle )
/// \endcond
public:
public:
explicit QCPStatisticalBox( QCPAxis* keyAxis, QCPAxis* valueAxis );
// getters:
@@ -3231,7 +3233,7 @@ class QCP_LIB_DECL QCPStatisticalBox : public QCPAbstractPlottable
virtual void clearData();
virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const;
protected:
protected:
// property members:
QVector<double> mOutliers;
double mKey, mMinimum, mLowerQuartile, mMedian, mUpperQuartile, mMaximum;
@@ -3258,7 +3260,7 @@ class QCP_LIB_DECL QCPStatisticalBox : public QCPAbstractPlottable
class QCP_LIB_DECL QCPColorMapData
{
public:
public:
QCPColorMapData( int keySize,
int valueSize,
const QCPRange& keyRange,
@@ -3294,7 +3296,7 @@ class QCP_LIB_DECL QCPColorMapData
void coordToCell( double key, double value, int* keyIndex, int* valueIndex ) const;
void cellToCoord( int keyIndex, int valueIndex, double* key, double* value ) const;
protected:
protected:
// property members:
int mKeySize, mValueSize;
QCPRange mKeyRange, mValueRange;
@@ -3319,7 +3321,7 @@ class QCP_LIB_DECL QCPColorMap : public QCPAbstractPlottable
Q_PROPERTY( bool tightBoundary READ tightBoundary WRITE setTightBoundary )
Q_PROPERTY( QCPColorScale* colorScale READ colorScale WRITE setColorScale )
/// \endcond
public:
public:
explicit QCPColorMap( QCPAxis* keyAxis, QCPAxis* valueAxis );
virtual ~QCPColorMap();
@@ -3349,12 +3351,12 @@ class QCP_LIB_DECL QCPColorMap : public QCPAbstractPlottable
virtual void clearData();
virtual double selectTest( const QPointF& pos, bool onlySelectable, QVariant* details = 0 ) const;
signals:
signals:
void dataRangeChanged( QCPRange newRange );
void dataScaleTypeChanged( QCPAxis::ScaleType scaleType );
void gradientChanged( QCPColorGradient newGradient );
protected:
protected:
// property members:
QCPRange mDataRange;
QCPAxis::ScaleType mDataScaleType;
@@ -3388,7 +3390,7 @@ class QCP_LIB_DECL QCPItemStraightLine : public QCPAbstractItem
Q_PROPERTY( QPen pen READ pen WRITE setPen )
Q_PROPERTY( QPen selectedPen READ selectedPen WRITE setSelectedPen )
/// \endcond
public:
public:
QCPItemStraightLine( QCustomPlot* parentPlot );
virtual ~QCPItemStraightLine();
@@ -3405,7 +3407,7 @@ class QCP_LIB_DECL QCPItemStraightLine : public QCPAbstractItem
QCPItemPosition* const point1;
QCPItemPosition* const point2;
protected:
protected:
// property members:
QPen mPen, mSelectedPen;
@@ -3431,7 +3433,7 @@ class QCP_LIB_DECL QCPItemLine : public QCPAbstractItem
Q_PROPERTY( QCPLineEnding head READ head WRITE setHead )
Q_PROPERTY( QCPLineEnding tail READ tail WRITE setTail )
/// \endcond
public:
public:
QCPItemLine( QCustomPlot* parentPlot );
virtual ~QCPItemLine();
@@ -3452,7 +3454,7 @@ class QCP_LIB_DECL QCPItemLine : public QCPAbstractItem
QCPItemPosition* const start;
QCPItemPosition* const end;
protected:
protected:
// property members:
QPen mPen, mSelectedPen;
QCPLineEnding mHead, mTail;
@@ -3476,7 +3478,7 @@ class QCP_LIB_DECL QCPItemCurve : public QCPAbstractItem
Q_PROPERTY( QCPLineEnding head READ head WRITE setHead )
Q_PROPERTY( QCPLineEnding tail READ tail WRITE setTail )
/// \endcond
public:
public:
QCPItemCurve( QCustomPlot* parentPlot );
virtual ~QCPItemCurve();
@@ -3499,7 +3501,7 @@ class QCP_LIB_DECL QCPItemCurve : public QCPAbstractItem
QCPItemPosition* const endDir;
QCPItemPosition* const end;
protected:
protected:
// property members:
QPen mPen, mSelectedPen;
QCPLineEnding mHead, mTail;
@@ -3520,7 +3522,7 @@ class QCP_LIB_DECL QCPItemRect : public QCPAbstractItem
Q_PROPERTY( QBrush brush READ brush WRITE setBrush )
Q_PROPERTY( QBrush selectedBrush READ selectedBrush WRITE setSelectedBrush )
/// \endcond
public:
public:
QCPItemRect( QCustomPlot* parentPlot );
virtual ~QCPItemRect();
@@ -3547,7 +3549,7 @@ class QCP_LIB_DECL QCPItemRect : public QCPAbstractItem
QCPItemAnchor* const bottomLeft;
QCPItemAnchor* const left;
protected:
protected:
enum AnchorIndex
{
aiTop,
@@ -3589,7 +3591,7 @@ class QCP_LIB_DECL QCPItemText : public QCPAbstractItem
Q_PROPERTY( double rotation READ rotation WRITE setRotation )
Q_PROPERTY( QMargins padding READ padding WRITE setPadding )
/// \endcond
public:
public:
QCPItemText( QCustomPlot* parentPlot );
virtual ~QCPItemText();
@@ -3635,7 +3637,7 @@ class QCP_LIB_DECL QCPItemText : public QCPAbstractItem
QCPItemAnchor* const bottomLeft;
QCPItemAnchor* const left;
protected:
protected:
enum AnchorIndex
{
aiTopLeft,
@@ -3682,7 +3684,7 @@ class QCP_LIB_DECL QCPItemEllipse : public QCPAbstractItem
Q_PROPERTY( QBrush brush READ brush WRITE setBrush )
Q_PROPERTY( QBrush selectedBrush READ selectedBrush WRITE setSelectedBrush )
/// \endcond
public:
public:
QCPItemEllipse( QCustomPlot* parentPlot );
virtual ~QCPItemEllipse();
@@ -3712,7 +3714,7 @@ class QCP_LIB_DECL QCPItemEllipse : public QCPAbstractItem
QCPItemAnchor* const left;
QCPItemAnchor* const center;
protected:
protected:
enum AnchorIndex
{
aiTopLeftRim,
@@ -3749,7 +3751,7 @@ class QCP_LIB_DECL QCPItemPixmap : public QCPAbstractItem
Q_PROPERTY( QPen pen READ pen WRITE setPen )
Q_PROPERTY( QPen selectedPen READ selectedPen WRITE setSelectedPen )
/// \endcond
public:
public:
QCPItemPixmap( QCustomPlot* parentPlot );
virtual ~QCPItemPixmap();
@@ -3777,7 +3779,7 @@ class QCP_LIB_DECL QCPItemPixmap : public QCPAbstractItem
QCPItemAnchor* const bottomLeft;
QCPItemAnchor* const left;
protected:
protected:
enum AnchorIndex
{
aiTop,
@@ -3821,7 +3823,7 @@ class QCP_LIB_DECL QCPItemTracer : public QCPAbstractItem
Q_PROPERTY( double graphKey READ graphKey WRITE setGraphKey )
Q_PROPERTY( bool interpolating READ interpolating WRITE setInterpolating )
/// \endcond
public:
public:
/*!
The different visual appearances a tracer item can have. Some styles size
may be controlled with \ref setSize.
@@ -3874,7 +3876,7 @@ class QCP_LIB_DECL QCPItemTracer : public QCPAbstractItem
QCPItemPosition* const position;
protected:
protected:
// property members:
QPen mPen, mSelectedPen;
QBrush mBrush, mSelectedBrush;
@@ -3901,7 +3903,7 @@ class QCP_LIB_DECL QCPItemBracket : public QCPAbstractItem
Q_PROPERTY( double length READ length WRITE setLength )
Q_PROPERTY( BracketStyle style READ style WRITE setStyle )
/// \endcond
public:
public:
enum BracketStyle
{
bsSquare ///< A brace with angled edges
@@ -3935,7 +3937,7 @@ class QCP_LIB_DECL QCPItemBracket : public QCPAbstractItem
QCPItemPosition* const right;
QCPItemAnchor* const center;
protected:
protected:
// property members:
enum AnchorIndex
{
app/main.cpp
+2 -1
View File
@@ -56,7 +56,8 @@ int main( int argc, char* argv[] )
* use dbus, if available
* allows for resuse of running Kate instances
*/
if (QDBusConnectionInterface * const sessionBusInterface = QDBusConnection::sessionBus().interface())
if( QDBusConnectionInterface* const sessionBusInterface =
QDBusConnection::sessionBus().interface() )
{
Bool force_new = false;
QStringList filenameList;
lib/LibMemory.h
+3 -3
View File
@@ -104,7 +104,7 @@ Int getMem2D( T*** array2D, Int dim0, Int dim1 )
template <typename T>
Int getMem3D( T**** array3D, Int dim0, Int dim1, Int dim2 )
{
Int i, mem_size = dim0 * sizeof( T ** );
Int i, mem_size = dim0 * sizeof( T** );
if( ( ( *array3D ) = (T***)xMallocMem( dim0 * sizeof( T** ) ) ) == NULL )
printf( "get_mem3Dint: array3D" );
@@ -120,7 +120,7 @@ Int getMem3D( T**** array3D, Int dim0, Int dim1, Int dim2 )
template <typename T>
Int getMem4D( T***** array4D, Int dim0, Int dim1, Int dim2, Int dim3 )
{
int i, mem_size = dim0 * sizeof( int *** );
int i, mem_size = dim0 * sizeof( int*** );
if( ( ( *array4D ) = (T****)xMallocMem( dim0 * sizeof( T*** ) ) ) == NULL )
printf( "get_mem4Dint: array4D" );
@@ -136,7 +136,7 @@ Int getMem4D( T***** array4D, Int dim0, Int dim1, Int dim2, Int dim3 )
template <typename T>
Int getMem5D( T****** array5D, Int dim0, Int dim1, Int dim2, Int dim3, Int dim4 )
{
int i, mem_size = dim0 * sizeof( T **** );
int i, mem_size = dim0 * sizeof( T**** );
if( ( ( *array5D ) = (T*****)xMallocMem( dim0 * sizeof( T**** ) ) ) == NULL )
printf( "get_mem5Dint: array5D" );
lib/PlaYUVerFrame.cpp
+79 -79
View File
@@ -40,7 +40,9 @@
std::vector<String> PlaYUVerFrame::supportedColorSpacesListNames()
{
return std::vector<String>{
"YUV", "RGB", "GRAY",
"YUV",
"RGB",
"GRAY",
};
}
@@ -84,9 +86,8 @@ static Int getImgMemory( Pel**** array3D,
Int dim0 = 3;
Int i;
UInt64 total_mem_size = 0;
UInt64 mem_size =
( dim1 * dim2 +
CHROMASHIFT( dim1, log2ChromaHeight ) * CHROMASHIFT( dim2, log2ChromaWidth ) * 2 );
UInt64 mem_size = ( dim1 * dim2 + CHROMASHIFT( dim1, log2ChromaHeight ) *
CHROMASHIFT( dim2, log2ChromaWidth ) * 2 );
total_mem_size += getMem2D<Pel*>( array3D, dim0, dim1 );
@@ -601,9 +602,8 @@ Void PlaYUVerFrame::frameFromBuffer( Byte* Buff, Int iEndianness )
{
ratioW = i > 1 ? d->m_pcPelFormat->log2ChromaWidth : 0;
ratioH = i > 1 ? d->m_pcPelFormat->log2ChromaHeight : 0;
ppBuff[i] =
ppBuff[i - 1] +
CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
ppBuff[i] = ppBuff[i - 1] + CHROMASHIFT( d->m_uiHeight, ratioH ) *
CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
}
for( ch = 0; ch < d->m_pcPelFormat->numberChannels; ch++ )
@@ -663,9 +663,8 @@ Void PlaYUVerFrame::frameToBuffer( Byte* output_buffer, Int iEndianness )
{
ratioW = i > 1 ? d->m_pcPelFormat->log2ChromaWidth : 0;
ratioH = i > 1 ? d->m_pcPelFormat->log2ChromaHeight : 0;
ppBuff[i] =
ppBuff[i - 1] +
CHROMASHIFT( d->m_uiHeight, ratioH ) * CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
ppBuff[i] = ppBuff[i - 1] + CHROMASHIFT( d->m_uiHeight, ratioH ) *
CHROMASHIFT( d->m_uiWidth, ratioW ) * bytesPixel;
}
for( ch = 0; ch < d->m_pcPelFormat->numberChannels; ch++ )
@@ -864,60 +863,60 @@ Int getRealHistoChannel( Int colorSpace, Int channel )
switch( colorSpace )
{
case PlaYUVerPixel::COLOR_GRAY:
if( channel != LUMA )
case PlaYUVerPixel::COLOR_GRAY:
if( channel != LUMA )
{
return -1;
}
histoChannel = 0;
break;
case PlaYUVerPixel::COLOR_RGB:
if( channel != COLOR_R && channel != COLOR_G && channel != COLOR_B && channel != LUMA )
{
return -1;
}
else
{
// if( channel == LUMA )
// {
// histoChannel = 3;
// }
// else
{
return -1;
histoChannel = channel;
}
histoChannel = 0;
break;
case PlaYUVerPixel::COLOR_RGB:
if( channel != COLOR_R && channel != COLOR_G && channel != COLOR_B && channel != LUMA )
}
break;
case PlaYUVerPixel::COLOR_ARGB:
if( channel != COLOR_R && channel != COLOR_G && channel != COLOR_B && channel != COLOR_A &&
channel != LUMA )
{
return -1;
}
else
{
if( channel == LUMA )
{
return -1;
}
else
{
// if( channel == LUMA )
// {
// histoChannel = 3;
// }
// else
{
histoChannel = channel;
}
}
break;
case PlaYUVerPixel::COLOR_ARGB:
if( channel != COLOR_R && channel != COLOR_G && channel != COLOR_B && channel != COLOR_A &&
channel != LUMA )
{
return -1;
}
else
{
if( channel == LUMA )
{
histoChannel = 4;
}
else
{
histoChannel = channel;
}
}
break;
case PlaYUVerPixel::COLOR_YUV:
if( channel != LUMA && channel != CHROMA_U && channel != CHROMA_V )
{
return -1;
histoChannel = 4;
}
else
{
histoChannel = channel;
}
break;
default:
histoChannel = -1;
}
break;
case PlaYUVerPixel::COLOR_YUV:
if( channel != LUMA && channel != CHROMA_U && channel != CHROMA_V )
{
return -1;
}
else
{
histoChannel = channel;
}
break;
default:
histoChannel = -1;
}
return histoChannel;
}
@@ -1188,9 +1187,8 @@ Bool PlaYUVerFrame::toMat( cv::Mat& cvMat, Bool convertToGray )
{
Bool bRet = false;
#ifdef USE_OPENCV
if( convertToGray &&
!( d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_YUV ||
d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_GRAY ) )
if( convertToGray && !( d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_YUV ||
d->m_pcPelFormat->colorSpace == PlaYUVerPixel::COLOR_GRAY ) )
{
return bRet;
}
@@ -1238,14 +1236,14 @@ Bool PlaYUVerFrame::fromMat( cv::Mat& cvMat )
{
switch( cvMat.channels() )
{
case 1:
d->m_iPixelFormat = findPixelFormat( "GRAY" );
break;
case 3:
d->m_iPixelFormat = findPixelFormat( "BGR24" );
break;
default:
return false;
case 1:
d->m_iPixelFormat = findPixelFormat( "GRAY" );
break;
case 3:
d->m_iPixelFormat = findPixelFormat( "BGR24" );
break;
default:
return false;
}
}
d->init( cvMat.cols, cvMat.rows, d->m_iPixelFormat, 8 );
@@ -1290,7 +1288,9 @@ Bool PlaYUVerFrame::fromMat( cv::Mat& cvMat )
std::vector<String> PlaYUVerFrame::supportedQualityMetricsList()
{
return std::vector<String>{
"PSNR", "MSE", "SSIM",
"PSNR",
"MSE",
"SSIM",
};
}
@@ -1298,17 +1298,17 @@ Double PlaYUVerFrame::getQuality( Int Metric, PlaYUVerFrame* Org, Int component
{
switch( Metric )
{
case PSNR_METRIC:
return getPSNR( Org, component );
break;
case MSE_METRIC:
return getMSE( Org, component );
break;
case SSIM_METRIC:
return getSSIM( Org, component );
break;
default:
assert( 0 );
case PSNR_METRIC:
return getPSNR( Org, component );
break;
case MSE_METRIC:
return getMSE( Org, component );
break;
case SSIM_METRIC:
return getSSIM( Org, component );
break;
default:
assert( 0 );
};
return 0;
}
lib/PlaYUVerFrame.h
+2 -2
View File
@@ -45,7 +45,7 @@ struct PlaYUVerFramePrivate;
*/
class PlaYUVerFrame
{
public:
public:
/** ColorSpace Enum
* List of supported pixel formats - do not change order
*/
@@ -263,7 +263,7 @@ class PlaYUVerFrame
/** @} */
private:
private:
PlaYUVerFramePrivate* d;
};
lib/PlaYUVerModuleIf.h
+2 -2
View File
@@ -42,7 +42,7 @@
#define REGISTER_CLASS_MAKER( X ) \
extern "C" PlaYUVerModuleIf* Maker() { return new X; }
#define REGISTER_CLASS_FACTORY( X ) \
public: \
public: \
static PlaYUVerModuleIf* Create() { return new X(); } \
void Delete() { delete this; }
#define _BASIC_MODULE_API_2_CHECK_ \
@@ -120,7 +120,7 @@ enum Module_Key_Supported
*/
class PlaYUVerModuleIf
{
public:
public:
Int m_iModuleAPI;
Int m_iModuleType;
const Char* m_pchModuleCategory;
lib/PlaYUVerOptions.cpp
+10 -10
View File
@@ -59,7 +59,7 @@ struct ParseFailure : public std::exception
/** Type specific option storage */
class BoolOption : public OptionBase
{
public:
public:
BoolOption( const String& name, const String& desc ) : OptionBase( name, desc )
{
is_binary = true;
@@ -71,7 +71,7 @@ class BoolOption : public OptionBase
template <typename T>
class StandardOption : public OptionBase
{
public:
public:
StandardOption( const String& name, T& storage, const String& desc )
: OptionBase( name, desc ), opt_storage( storage )
{
@@ -158,7 +158,7 @@ inline void StandardOption<std::vector<String>>::parse( const String& arg )
/** Option class for argument handling using a user provided function */
struct FunctionOption : public OptionBase
{
public:
public:
typedef Void( Func )( PlaYUVerOptions&, const String& );
FunctionOption( const String& name, PlaYUVerOptions& parent_, Func* func_, const String& desc )
@@ -173,7 +173,7 @@ struct FunctionOption : public OptionBase
arg_count++;
}
private:
private:
PlaYUVerOptions& parent;
void ( *func )( PlaYUVerOptions&, const String& );
};
@@ -774,12 +774,12 @@ Void PlaYUVerOptions::listModules()
printf( " %-40s", ModuleNameString );
switch( pcCurrModuleIf->m_iModuleType )
{
case FRAME_PROCESSING_MODULE:
printf( " Processing " );
break;
case FRAME_MEASUREMENT_MODULE:
printf( " Measurement " );
break;
case FRAME_PROCESSING_MODULE:
printf( " Processing " );
break;
case FRAME_MEASUREMENT_MODULE:
printf( " Measurement " );
break;
}
printf( " %s", pcCurrModuleIf->m_pchModuleTooltip );
pcCurrModuleIf->Delete();
lib/PlaYUVerOptions.h
+3 -3
View File
@@ -50,7 +50,7 @@
*/
class OptionBase
{
public:
public:
OptionBase( const String& name, const String& desc )
: arg_count( 0 ), opt_string( name ), opt_desc( desc )
{
@@ -68,7 +68,7 @@ class OptionBase
class PlaYUVerOptions
{
public:
public:
struct Option
{
Option() : opt( 0 ) {}
@@ -134,7 +134,7 @@ class PlaYUVerOptions
Bool checkListingOpts();
Void listModules();
private:
private:
typedef std::map<String, OptionsList> OptionMap;
OptionMap opt_long_map;
OptionMap opt_short_map;
lib/PlaYUVerPixel.cpp
+1 -3
View File
@@ -54,9 +54,7 @@ PlaYUVerPixel::PlaYUVerPixel( const Int& ColorSpace, const Pel& c0, const Pel& c
PixelComponents[3] = 0;
}
PlaYUVerPixel::~PlaYUVerPixel()
{
}
PlaYUVerPixel::~PlaYUVerPixel() {}
Int PlaYUVerPixel::ColorSpaceType()
{
lib/PlaYUVerPixel.h
+2 -2
View File
@@ -65,7 +65,7 @@ static inline Void rgbToYuv( const Int& iR,
*/
class PlaYUVerPixel
{
public:
public:
static const UInt MAX_NUMBER_COMPONENTS = 5;
/** ColorSpace list
@@ -119,7 +119,7 @@ class PlaYUVerPixel
*/
PlaYUVerPixel ConvertPixel( ColorSpace eOutputSpace );
private:
private:
Int m_iColorSpace;
Pel PixelComponents[MAX_NUMBER_COMPONENTS];
};
lib/PlaYUVerStream.h
+2 -2
View File
@@ -76,7 +76,7 @@ typedef struct
*/
class PlaYUVerStream
{
public:
public:
static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
@@ -152,7 +152,7 @@ class PlaYUVerStream
Bool isInit() { return m_bInit; }
Void getDuration( Int* duration_array );
private:
private:
Bool m_bInit;
CreateStreamHandlerFn m_pfctCreateHandler;
PlaYUVerStreamHandlerIf* m_pcHandler;
lib/PlaYUVerStreamHandlerIf.h
+4 -3
View File
@@ -31,7 +31,7 @@
class PlaYUVerFrame;
#define REGISTER_STREAM_HANDLER( X ) \
public: \
public: \
static PlaYUVerStreamHandlerIf* Create() { return new X(); } \
void Delete() { delete this; }
/**
@@ -43,7 +43,7 @@ class PlaYUVerStreamHandlerIf
{
friend class PlaYUVerStream;
public:
public:
PlaYUVerStreamHandlerIf()
{
m_bIsInput = true;
@@ -68,7 +68,8 @@ class PlaYUVerStreamHandlerIf
Void setBytesPerFrame( UInt64 uiNBytes ) { m_uiNBytesPerFrame = uiNBytes; }
String getFormatName() { return m_strFormatName; }
String getCodecName() { return m_strCodecName; }
protected:
protected:
Bool m_bIsInput;
String m_cFilename;
UInt m_uiWidth;
lib/StreamHandlerLibav.cpp
+21 -21
View File
@@ -119,7 +119,7 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
m_cStream = m_cFmtCtx->streams[m_iStreamIdx];
/* find decoder for the stream */
/* find decoder for the stream */
#ifdef FF_USER_CODEC_PARAM
AVCodecParameters* codec_param = m_cStream->codecpar;
@@ -164,24 +164,24 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
*/
switch( pix_fmt )
{
case AV_PIX_FMT_YUVJ420P:
pix_fmt = AV_PIX_FMT_YUV420P;
break;
case AV_PIX_FMT_YUVJ422P:
pix_fmt = AV_PIX_FMT_YUV422P;
break;
case AV_PIX_FMT_YUVJ444P:
pix_fmt = AV_PIX_FMT_YUV444P;
break;
case AV_PIX_FMT_GRAY16LE:
m_uiBitsPerPixel = 16;
m_iEndianness = 1;
pix_fmt = AV_PIX_FMT_GRAY8;
break;
case AV_PIX_FMT_GRAY16BE:
m_uiBitsPerPixel = 16;
m_iEndianness = 0;
pix_fmt = AV_PIX_FMT_GRAY8;
case AV_PIX_FMT_YUVJ420P:
pix_fmt = AV_PIX_FMT_YUV420P;
break;
case AV_PIX_FMT_YUVJ422P:
pix_fmt = AV_PIX_FMT_YUV422P;
break;
case AV_PIX_FMT_YUVJ444P:
pix_fmt = AV_PIX_FMT_YUV444P;
break;
case AV_PIX_FMT_GRAY16LE:
m_uiBitsPerPixel = 16;
m_iEndianness = 1;
pix_fmt = AV_PIX_FMT_GRAY8;
break;
case AV_PIX_FMT_GRAY16BE:
m_uiBitsPerPixel = 16;
m_iEndianness = 0;
pix_fmt = AV_PIX_FMT_GRAY8;
}
m_strFormatName = uppercase( strFilename.substr( strFilename.find_last_of( "." ) + 1 ) );
@@ -234,9 +234,9 @@ Bool StreamHandlerLibav::openHandler( String strFilename, Bool bInput )
}
#if( ( LIBAVCODEC_VERSION_MAJOR >= 56 ) && ( LIBAVCODEC_VERSION_MINOR >= 0 ) )
m_cFrame = av_frame_alloc();
m_cFrame = av_frame_alloc();
#else
m_cFrame = avcodec_alloc_frame();
m_cFrame = avcodec_alloc_frame();
#endif
if( !m_cFrame )
{
lib/StreamHandlerLibav.h
+2 -2
View File
@@ -58,7 +58,7 @@ class StreamHandlerLibav : public PlaYUVerStreamHandlerIf
{
REGISTER_STREAM_HANDLER( StreamHandlerLibav )
public:
public:
static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
@@ -76,7 +76,7 @@ class StreamHandlerLibav : public PlaYUVerStreamHandlerIf
UChar* m_pchFrameBuffer;
UInt64 m_uiFrameBufferSize;
private:
private:
AVFormatContext* m_cFmtCtx;
AVStream* m_cStream;
Int m_iStreamIdx;
lib/StreamHandlerOpenCV.h
+2 -2
View File
@@ -39,7 +39,7 @@ class StreamHandlerOpenCV : public PlaYUVerStreamHandlerIf
{
REGISTER_STREAM_HANDLER( StreamHandlerOpenCV )
public:
public:
static std::vector<PlaYUVerSupportedFormat> supportedReadFormats();
static std::vector<PlaYUVerSupportedFormat> supportedWriteFormats();
@@ -53,7 +53,7 @@ class StreamHandlerOpenCV : public PlaYUVerStreamHandlerIf
Bool read( PlaYUVerFrame* pcFrame );
Bool write( PlaYUVerFrame* pcFrame );
private:
private:
cv::VideoCapture* pcVideoCapture;
};
lib/StreamHandlerPortableMap.h
+2 -2
View File
@@ -34,7 +34,7 @@ class StreamHandlerPortableMap : public PlaYUVerStreamHandlerIf
{
REGISTER_STREAM_HANDLER( StreamHandlerPortableMap )
public:
public:
StreamHandlerPortableMap() {}
~StreamHandlerPortableMap() {}
Bool openHandler( String strFilename, Bool bInput );
@@ -45,7 +45,7 @@ class StreamHandlerPortableMap : public PlaYUVerStreamHandlerIf
Bool read( PlaYUVerFrame* pcFrame );
Bool write( PlaYUVerFrame* pcFrame );
private:
private:
FILE* m_pFile; /**< The input file pointer >*/
Int m_iMagicNumber;
Int m_iMaxValue;
lib/StreamHandlerRaw.h
+2 -2
View File
@@ -36,10 +36,10 @@ class StreamHandlerRaw : public PlaYUVerStreamHandlerIf
{
REGISTER_STREAM_HANDLER( StreamHandlerRaw )
private:
private:
FILE* m_pFile; /**< The input file pointer >*/
public:
public:
StreamHandlerRaw() {}
~StreamHandlerRaw() {}
Bool openHandler( String strFilename, Bool bInput );
modules/AbsoluteFrameDifference.h
+2 -2
View File
@@ -32,10 +32,10 @@ class AbsoluteFrameDifference : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( AbsoluteFrameDifference )
private:
private:
PlaYUVerFrame* m_pcFrameDifference;
public:
public:
AbsoluteFrameDifference();
virtual ~AbsoluteFrameDifference() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/DisparityStereoBM.h
+2 -2
View File
@@ -36,7 +36,7 @@ class DisparityStereoBM : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( DisparityStereoBM )
private:
private:
PlaYUVerFrame* m_pcDisparityFrame;
Int m_uiNumberOfDisparities;
UInt m_uiBlockSize;
@@ -46,7 +46,7 @@ class DisparityStereoBM : public PlaYUVerModuleIf
cv::Ptr<cv::StereoBM> m_cStereoBM;
#endif
public:
public:
DisparityStereoBM();
virtual ~DisparityStereoBM() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/DisparityStereoSGBM.h
+2 -2
View File
@@ -55,7 +55,7 @@ class DisparityStereoSGBM : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( DisparityStereoSGBM )
private:
private:
PlaYUVerFrame* m_pcDisparityFrame;
Bool m_bUseHH;
Int m_uiNumberOfDisparities;
@@ -66,7 +66,7 @@ class DisparityStereoSGBM : public PlaYUVerModuleIf
cv::StereoSGBM m_cStereoMatch;
#endif
public:
public:
DisparityStereoSGBM();
virtual ~DisparityStereoSGBM() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/DisparityStereoVar.h
+2 -2
View File
@@ -36,11 +36,11 @@ class DisparityStereoVar : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( DisparityStereoVar )
private:
private:
PlaYUVerFrame* m_pcDisparityFrame;
cv::StereoVar m_cStereoVar;
public:
public:
DisparityStereoVar();
virtual ~DisparityStereoVar() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/EightBitsSampling.h
+2 -2
View File
@@ -32,10 +32,10 @@ class EightBitsSampling : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( EightBitsSampling )
private:
private:
PlaYUVerFrame* m_pcSubSampledFrame;
public:
public:
EightBitsSampling();
virtual ~EightBitsSampling() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/FilterComponent.h
+5 -5
View File
@@ -30,10 +30,10 @@
class FilterComponentModule : public PlaYUVerModuleIf
{
private:
private:
PlaYUVerFrame* m_pcFilteredFrame;
public:
public:
FilterComponentModule();
virtual ~FilterComponentModule() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList ) = 0;
@@ -47,7 +47,7 @@ class FilterComponentModule : public PlaYUVerModuleIf
class FilterComponentLuma : public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentLuma )
public:
public:
FilterComponentLuma();
virtual ~FilterComponentLuma() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -57,7 +57,7 @@ class FilterComponentLuma : public FilterComponentModule
class FilterComponentChromaU : public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentChromaU )
public:
public:
FilterComponentChromaU();
virtual ~FilterComponentChromaU() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -67,7 +67,7 @@ class FilterComponentChromaU : public FilterComponentModule
class FilterComponentChromaV : public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentChromaV )
public:
public:
FilterComponentChromaV();
virtual ~FilterComponentChromaV() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/FrameBinarization.h
+2 -2
View File
@@ -32,11 +32,11 @@ class FrameBinarization : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameBinarization )
private:
private:
PlaYUVerFrame* m_pcBinFrame;
UInt m_uiThreshold;
public:
public:
FrameBinarization();
virtual ~FrameBinarization() {}
Void create( PlaYUVerFrame* );
modules/FrameCrop.h
+2 -2
View File
@@ -32,14 +32,14 @@ class FrameCrop : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameCrop )
private:
private:
PlaYUVerFrame* m_pcCropedFrame;
UInt m_uiXPosition;
UInt m_uiYPosition;
Int m_iXSize;
Int m_iYSize;
public:
public:
FrameCrop();
virtual ~FrameCrop() {}
Void create( PlaYUVerFrame* );
modules/FrameDifference.h
+2 -2
View File
@@ -32,13 +32,13 @@ class FrameDifference : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameDifference )
private:
private:
UInt m_uiBitsPixel;
Int m_iDiffBitShift;
Int m_iMaxDiffValue;
PlaYUVerFrame* m_pcFrameDifference;
public:
public:
FrameDifference();
virtual ~FrameDifference() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/FrameMask.cpp
+9 -9
View File
@@ -68,15 +68,15 @@ Bool FrameMask::create( std::vector<PlaYUVerFrame*> apcFrameList )
}
switch( iColorSpace )
{
case PlaYUVerPixel::COLOR_GRAY:
iPelFmt = PlaYUVerFrame::GRAY;
break;
case PlaYUVerPixel::COLOR_YUV:
iPelFmt = PlaYUVerFrame::YUV444p;
break;
case PlaYUVerPixel::COLOR_RGB:
iPelFmt = PlaYUVerFrame::RGB24;
break;
case PlaYUVerPixel::COLOR_GRAY:
iPelFmt = PlaYUVerFrame::GRAY;
break;
case PlaYUVerPixel::COLOR_YUV:
iPelFmt = PlaYUVerFrame::YUV444p;
break;
case PlaYUVerPixel::COLOR_RGB:
iPelFmt = PlaYUVerFrame::RGB24;
break;
}
m_pcFrameProcessed = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
modules/FrameMask.h
+2 -2
View File
@@ -32,11 +32,11 @@ class FrameMask : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameMask )
private:
private:
Int m_iWeight;
PlaYUVerFrame* m_pcFrameProcessed;
public:
public:
FrameMask();
virtual ~FrameMask() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/FrameShift.h
+2 -2
View File
@@ -32,12 +32,12 @@ class FrameShift : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameShift )
private:
private:
PlaYUVerFrame* m_pcProcessedFrame;
Int m_iShiftHor;
Int m_iShiftVer;
public:
public:
FrameShift();
virtual ~FrameShift() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/InterFrameVariance.h
+2 -2
View File
@@ -32,11 +32,11 @@ class InterFrameVariance : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( InterFrameVariance )
private:
private:
PlaYUVerFrame* m_pcFrameVariance;
Double** m_pVariance;
public:
public:
InterFrameVariance();
virtual ~InterFrameVariance() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/LumaAverage.cpp
+2 -6
View File
@@ -42,9 +42,7 @@ LumaAverage::LumaAverage()
// Several requirements should be "or" between each others.
}
Void LumaAverage::create( PlaYUVerFrame* frame )
{
}
Void LumaAverage::create( PlaYUVerFrame* frame ) {}
Double LumaAverage::measure( PlaYUVerFrame* frame )
{
@@ -59,6 +57,4 @@ Double LumaAverage::measure( PlaYUVerFrame* frame )
return average / Double( frame->getHeight() * frame->getWidth() );
}
Void LumaAverage::destroy()
{
}
Void LumaAverage::destroy() {}
modules/LumaAverage.h
+2 -2
View File
@@ -32,8 +32,8 @@ class LumaAverage : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( LumaAverage )
private:
public:
private:
public:
LumaAverage();
virtual ~LumaAverage() {}
Void create( PlaYUVerFrame* );
modules/MeasureOpticalFlowDualTVL1.cpp
+2 -2
View File
@@ -24,12 +24,12 @@
#include "MeasureOpticalFlowDualTVL1.h"
using cv::Scalar;
using cv::Mat;
using cv::Mat_;
using cv::Ptr;
using cv::Point;
using cv::Point2f;
using cv::Ptr;
using cv::Scalar;
MeasureOpticalFlowDualTVL1::MeasureOpticalFlowDualTVL1()
{
modules/MeasureOpticalFlowDualTVL1.h
+2 -2
View File
@@ -35,7 +35,7 @@ class MeasureOpticalFlowDualTVL1 : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( MeasureOpticalFlowDualTVL1 )
private:
private:
Bool m_bShowReconstruction;
Int m_iStep;
cv::Ptr<cv::DenseOpticalFlow> m_cTvl1;
@@ -47,7 +47,7 @@ class MeasureOpticalFlowDualTVL1 : public PlaYUVerModuleIf
Void drawFlow();
Void compensateFlow();
public:
public:
MeasureOpticalFlowDualTVL1();
virtual ~MeasureOpticalFlowDualTVL1() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/OpticalFlow.cpp
+2 -2
View File
@@ -31,12 +31,12 @@
// Opencv
#include <opencv2/optflow.hpp>
using cv::Scalar;
using cv::Mat;
using cv::Mat_;
using cv::Ptr;
using cv::Point;
using cv::Point2f;
using cv::Ptr;
using cv::Scalar;
OpticalFlowModule::OpticalFlowModule()
{
modules/OpticalFlow.h
+6 -6
View File
@@ -34,7 +34,7 @@
class OpticalFlowModule : public PlaYUVerModuleIf
{
protected:
protected:
Bool m_bShowReconstruction;
Int m_iStep;
cv::Ptr<cv::DenseOpticalFlow> m_cOpticalFlow;
@@ -46,7 +46,7 @@ class OpticalFlowModule : public PlaYUVerModuleIf
Void compensateFlow();
Bool commonCreate( std::vector<PlaYUVerFrame*> apcFrameList );
public:
public:
OpticalFlowModule();
virtual ~OpticalFlowModule() {}
PlaYUVerFrame* process( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -56,7 +56,7 @@ class OpticalFlowModule : public PlaYUVerModuleIf
class OpticalFlowDualTVL1 : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalFlowDualTVL1 )
public:
public:
OpticalFlowDualTVL1();
virtual ~OpticalFlowDualTVL1() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -65,7 +65,7 @@ class OpticalFlowDualTVL1 : public OpticalFlowModule
class OpticalFlowSparseToDense : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalFlowSparseToDense )
public:
public:
OpticalFlowSparseToDense();
virtual ~OpticalFlowSparseToDense() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -74,7 +74,7 @@ class OpticalFlowSparseToDense : public OpticalFlowModule
class OpticalFlowFarneback : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalFlowFarneback )
public:
public:
OpticalFlowFarneback();
virtual ~OpticalFlowFarneback() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -83,7 +83,7 @@ class OpticalFlowFarneback : public OpticalFlowModule
class OpticalDeepFlow : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalDeepFlow )
public:
public:
OpticalDeepFlow();
virtual ~OpticalDeepFlow() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
modules/PlaYUVerModuleFactory.cpp
+1 -4
View File
@@ -34,10 +34,7 @@
// Generated by cmake
#include "ModulesListHeader.h"
PlaYUVerModuleFactory::PlaYUVerModuleFactory()
{
REGISTER_ALL_MODULES
}
PlaYUVerModuleFactory::PlaYUVerModuleFactory(){REGISTER_ALL_MODULES}
PlaYUVerModuleFactory::~PlaYUVerModuleFactory()
{
modules/PlaYUVerModuleFactory.h
+2 -2
View File
@@ -38,12 +38,12 @@ typedef std::map<const char*, CreateModuleFn> PlaYUVerModuleFactoryMap;
// Factory for creating instances of PlaYUVerModuleIf
class PlaYUVerModuleFactory
{
private:
private:
PlaYUVerModuleFactory();
PlaYUVerModuleFactory& operator=( const PlaYUVerModuleFactory& ) { return *this; }
PlaYUVerModuleFactoryMap m_FactoryMap;
public:
public:
~PlaYUVerModuleFactory();
static PlaYUVerModuleFactory* Get()
modules/SetChromaHalfScale.h
+2 -2
View File
@@ -32,10 +32,10 @@ class SetChromaHalfScale : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( SetChromaHalfScale )
private:
private:
PlaYUVerFrame* m_pcProcessedFrame;
public:
public:
SetChromaHalfScale();
virtual ~SetChromaHalfScale() {}
Void create( PlaYUVerFrame* );
modules/WeightedPSNR.cpp
+1 -3
View File
@@ -111,6 +111,4 @@ Double WeightedPSNR::measure( std::vector<PlaYUVerFrame*> apcFrameList )
return dPSNR;
}
Void WeightedPSNR::destroy()
{
}
Void WeightedPSNR::destroy() {}
modules/WeightedPSNR.h
+2 -2
View File
@@ -32,10 +32,10 @@ class WeightedPSNR : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( WeightedPSNR )
private:
private:
UInt m_uiComponent;
public:
public:
WeightedPSNR();
virtual ~WeightedPSNR() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
tools/PlaYUVerTools.cpp
+14 -14
View File
@@ -437,20 +437,20 @@ Int PlaYUVerTools::QualityOperation()
String metric_fmt = " ";
switch( m_uiQualityMetric )
{
case PlaYUVerFrame::PSNR_METRIC:
//"PSNR_0_0"
metric_fmt += " %6.3f ";
break;
case PlaYUVerFrame::SSIM_METRIC:
//"SSIM_0_0"
metric_fmt += " %6.4f ";
break;
case PlaYUVerFrame::MSE_METRIC:
//"MSE_0_0"
metric_fmt += "%7.2f";
break;
default:
metric_fmt += " %6.3f ";
case PlaYUVerFrame::PSNR_METRIC:
//"PSNR_0_0"
metric_fmt += " %6.3f ";
break;
case PlaYUVerFrame::SSIM_METRIC:
//"SSIM_0_0"
metric_fmt += " %6.4f ";
break;
case PlaYUVerFrame::MSE_METRIC:
//"MSE_0_0"
metric_fmt += "%7.2f";
break;
default:
metric_fmt += " %6.3f ";
}
metric_fmt += " ";
tools/PlaYUVerTools.h
+2 -2
View File
@@ -38,7 +38,7 @@ class PlaYUVerModuleIf;
class PlaYUVerTools : public PlaYUVerToolsCmdParser
{
public:
public:
PlaYUVerTools();
~PlaYUVerTools();
@@ -46,7 +46,7 @@ class PlaYUVerTools : public PlaYUVerToolsCmdParser
Int Process();
Int Close();
private:
private:
Bool m_bVerbose;
UInt m_uiOperation;
tools/PlaYUVerToolsCmdParser.cpp
+1 -3
View File
@@ -41,9 +41,7 @@ PlaYUVerToolsCmdParser::PlaYUVerToolsCmdParser()
m_cOptions.addDefaultOptions();
}
PlaYUVerToolsCmdParser::~PlaYUVerToolsCmdParser()
{
}
PlaYUVerToolsCmdParser::~PlaYUVerToolsCmdParser() {}
Void PlaYUVerToolsCmdParser::log( UInt level, const char* fmt, ... )
{
tools/PlaYUVerToolsCmdParser.h
+3 -2
View File
@@ -31,7 +31,7 @@
class PlaYUVerToolsCmdParser
{
public:
public:
PlaYUVerToolsCmdParser();
~PlaYUVerToolsCmdParser();
@@ -53,7 +53,8 @@ class PlaYUVerToolsCmdParser
Int parseToolsArgs( Int argc, Char* argv[] );
PlaYUVerOptions& Opts() { return m_cOptions; }
protected:
protected:
PlaYUVerOptions m_cOptions;
UInt m_uiLogLevel;