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

Merge branch 'master' into ll-devel

Browse Source 
Conflicts:
	source/app/plaYUVerApp.cpp
This commit is contained in:
Luis Lucas committed 2014-03-29 02:00:24 +00:00
2 parents 6e9d2b7b28 9d4af957f9
commit 572f2f5bc7
32 files changed
+308 -576
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

README.md
+8 -5
View File
@@ -1,15 +1,18 @@
plaYUVer
========
plaYUVer is an open-source raw video player
plaYUVer is an open-source video player with the following features:
- support for libavformat and libavcodec;
- support for wide range of raw video formats;
- zoom and pixel information
- API for frame processing algorithms
Usage
Developers
----------------------------------------------------------------
Command line interface
./playuver
- João Carreira (jfmcarreira@gmail.com)
- Luís Lucas (luisfrlucas@gmail.com)
Install using cmake
config.h.in
+24 -1
View File
@@ -1,4 +1,27 @@
/* Input config.h file */
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file config.h.in
* \brief definition of the building options
*/
#ifndef __CONFIG_PLAYUVER_H__
#define __CONFIG_PLAYUVER_H__
source/app/ConfigureFormatDialog.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/ConfigureFormatDialog.h
+5 -4
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,8 +22,8 @@
* \brief Dialog box to set the sequence resolution
*/
#ifndef __CONFIGURERESOLUTIONDIALOG_H__
#define __CONFIGURERESOLUTIONDIALOG_H__
#ifndef __CONFIGUREFORMATDIALOG_H__
#define __CONFIGUREFORMATDIALOG_H__
#include "config.h"
@@ -127,4 +128,4 @@ private:
} // NAMESPACE
#endif // __CONFIGURERESOLUTIONDIALOG_H__
#endif // __CONFIGUREFORMATDIALOG_H__
source/app/GridManager.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/GridManager.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/InputStream.cpp
+9 -10
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
/**
* \file InputStream.cpp
* \brief Input handling
* \brief Input stream handling
*/
#include "config.h"
@@ -117,17 +118,15 @@ QStringList InputStream::supportedWriteFormatsList()
return formats;
}
Bool InputStream::needFormatDialog( QString filename )
Bool InputStream::guessFormat( QString filename, UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rFrameRate )
{
Bool bRet = false;
QString fileExtension = QFileInfo( filename ).completeSuffix();
if( !fileExtension.compare( QString( "yuv" ) ) )
{
return true;
}
else
{
return false;
bRet = true;
}
return bRet;
}
Void InputStream::init( QString filename, UInt width, UInt height, Int input_format, UInt frame_rate )
@@ -185,7 +184,7 @@ Void InputStream::init( QString filename, UInt width, UInt height, Int input_for
m_uiTotalFrameNum = ftell( m_pFile ) / ( frame_bytes_input );
fseek( m_pFile, 0, SEEK_SET );
m_cFormatName = QString::fromUtf8("rawvideo ");
m_cFormatName = QString::fromUtf8("Raw Video");
}
if( !getMem1D<Pel>( &m_pInputBuffer, m_pcCurrFrame->getBytesPerFrame() ) )
@@ -196,7 +195,7 @@ Void InputStream::init( QString filename, UInt width, UInt height, Int input_for
m_cStreamInformationString = QString( "[" );
m_cStreamInformationString.append( m_cFormatName );
m_cStreamInformationString.append( QString("/ "));
m_cStreamInformationString.append( QString(" / "));
m_cStreamInformationString.append( PlaYUVerFrame::supportedPixelFormatList().at( m_iPixelFormat ) );
m_cStreamInformationString.append( "] " );
m_cStreamInformationString.append( QFileInfo( m_cFilename ).fileName() );
source/app/InputStream.h
+4 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
/**
* \file InputStream.h
* \brief Input handling
* \brief Input stream handling
*/
#ifndef __INPUTSTREAM_H__
@@ -100,6 +101,7 @@ public:
};
Bool needFormatDialog( QString filename );
Bool guessFormat( QString filename, UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rFrameRate );
Void init( QString filename, UInt width, UInt height, Int input_format, UInt frame_rate );
Void close();
source/app/ModulesHandle.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/ModulesHandle.h
+2 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,7 +16,6 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file ModulesHandle.h
* \brief PlaYUVer modules handle
source/app/PlaYUVerModuleIf.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/PlaYUVerSettings.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/PlaYUVerSettings.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/PropertiesSidebar.cpp
+117 -406
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,261 +23,159 @@
*/
#include "config.h"
#include <cmath>
#include <QtGui>
#include <QtDebug>
#include "TypeDef.h"
#include "PropertiesSidebar.h"
#include "PlaYUVerFrame.h"
namespace plaYUVer
{
class PropertiesSidebarPrivate
{
public:
PropertiesSidebarPrivate()
{
channelCB = 0;
colorsCB = 0;
renderingCB = 0;
linHistoButton = 0;
logHistoButton = 0;
fullImageButton = 0;
selectionImageButton = 0;
minInterv = 0;
maxInterv = 0;
labelMeanValue = 0;
labelPixelsValue = 0;
labelStdDevValue = 0;
labelCountValue = 0;
labelMedianValue = 0;
labelPercentileValue = 0;
sizeValueLabel = 0;
colorSpaceValueLabel = 0;
depthValueLabel = 0;
alphaValueLabel = 0;
selectionArea = QRect();
inLoadingProcess = false;
}
bool inLoadingProcess;
QComboBox *channelCB;
QComboBox *colorsCB;
QComboBox *renderingCB;
QPushButton *linHistoButton;
QPushButton *logHistoButton;
QPushButton *fullImageButton;
QPushButton *selectionImageButton;
QButtonGroup *scaleButtonGroup;
QButtonGroup *renderingButtonGroup;
QSpinBox *minInterv;
QSpinBox *maxInterv;
QLabel *colorsLabel;
QLabel *labelMeanValue;
QLabel *labelPixelsValue;
QLabel *labelStdDevValue;
QLabel *labelCountValue;
QLabel *labelMedianValue;
QLabel *labelPercentileValue;
QLabel *formatValueLabel;
QLabel *sizeValueLabel;
QLabel *colorSpaceValueLabel;
QLabel *depthValueLabel;
QLabel *alphaValueLabel;
QRect selectionArea;
InputStream* m_pcStream;
PlaYUVerFrame *m_pcFrame;
};
////////////////////////////////////////////////////////////////////////////////
// Constructor
// StreamPropertiesSideBar
////////////////////////////////////////////////////////////////////////////////
PropertiesSidebar::PropertiesSidebar( QWidget* parent ) :
StreamPropertiesSideBar::StreamPropertiesSideBar( QWidget* parent ) :
QWidget( parent )
{
d = new PropertiesSidebarPrivate;
// -------------- Variables definition --------------
m_pcStream = NULL;
// Histogram area -----------------------------------------------------
// ----------------- GUI definition -----------------
QLabel *channelLabel = new QLabel( tr( "Channel:" ) );
channelLabel->setAlignment( Qt::AlignVCenter | Qt::AlignRight );
QGridLayout *mainLayout = new QGridLayout;
d->channelCB = new QComboBox;
d->channelCB->addItem( tr( "Luminance" ) );
d->channelCB->setItemIcon( 0, QIcon( ":/images/channel-luma.png" ) );
QLabel *formatLabel = new QLabel( tr( "File Format:" ) );
formatLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
labelFormatValue = new QLabel;
labelFormatValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
d->channelCB->setWhatsThis( tr( "<p>Select here the histogram channel to display:<p>"
"<b>Luminance</b>: Display luminance (perceived brightness).<p>"
"<b>Red</b>: Display the red image channel.<p>"
"<b>Green</b>: Display the green image channel.<p>"
"<b>Blue</b>: Display the blue image channel.<p>"
"<b>Alpha</b>: Display the alpha image channel. "
"This channel corresponds to the transparency value and "
"is supported by some image formats such as PNG or TIFF.<p>"
"<b>Colors</b>: Display all color channel values at "
"the same time." ) );
QLabel *sizeLabel = new QLabel( tr( "Size (pixels):" ) );
sizeLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
labelSizeValue = new QLabel;
labelSizeValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QString scaleWhatsThis( tr( "<p>Select here the histogram scale.<p>"
"If the image's maximal values are small, you can use the "
"linear scale.<p>Logarithmic scale can be used when the maximal"
" values are big; if it is used, all values (small and large) "
"will be visible on the graph." ) );
QLabel *colorSpaceLabel = new QLabel( tr( "Colorspace:" ) );
colorSpaceLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
labelColorSpaceValue = new QLabel;
labelColorSpaceValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
d->linHistoButton = new QPushButton;
d->linHistoButton->setToolTip( tr( "Linear" ) );
d->linHistoButton->setIcon( QIcon( ":/images/histogram-lin.png" ) );
d->linHistoButton->setWhatsThis( scaleWhatsThis );
d->linHistoButton->setCheckable( true );
d->linHistoButton->setAutoExclusive( true );
d->linHistoButton->setChecked( true );
QGridLayout *propertiesLayout = new QGridLayout;
propertiesLayout->addWidget( formatLabel, 0, 0 );
propertiesLayout->addWidget( labelFormatValue, 0, 1 );
propertiesLayout->addWidget( sizeLabel, 1, 0 );
propertiesLayout->addWidget( labelSizeValue, 1, 1 );
propertiesLayout->addWidget( colorSpaceLabel, 2, 0 );
propertiesLayout->addWidget( labelColorSpaceValue, 2, 1 );
d->logHistoButton = new QPushButton;
d->logHistoButton->setToolTip( tr( "Logarithmic" ) );
d->logHistoButton->setIcon( QIcon( ":/images/histogram-log.png" ) );
d->logHistoButton->setWhatsThis( scaleWhatsThis );
d->logHistoButton->setCheckable( true );
d->logHistoButton->setAutoExclusive( true );
QGroupBox *propertiesGroup = new QGroupBox( tr( "Properties" ) );
propertiesGroup->setLayout( propertiesLayout );
mainLayout->addWidget( propertiesGroup, 6, 0, 1, 4 );
QHBoxLayout *scaleLayout = new QHBoxLayout;
scaleLayout->addWidget( d->linHistoButton );
scaleLayout->addWidget( d->logHistoButton );
mainLayout->setRowStretch( 8, 10 );
setLayout( mainLayout );
setEnabled( false );
d->colorsLabel = new QLabel( tr( "Colors:" ) );
d->colorsLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
}
d->colorsCB = new QComboBox;
d->colorsCB->addItem( tr( "Red" ) );
d->colorsCB->addItem( tr( "Green" ) );
d->colorsCB->addItem( tr( "Blue" ) );
d->colorsCB->setEnabled( false );
d->colorsCB->setWhatsThis( tr( "<p>Select here the main color displayed with Colors Channel mode:"
"<p><b>Red</b>: Draw the red image channel in the foreground.<p>"
"<b>Green</b>: Draw the green image channel in the foreground.<p>"
"<b>Blue</b>: Draw the blue image channel in the foreground.<p>" ) );
StreamPropertiesSideBar::~StreamPropertiesSideBar()
{
d->colorsCB->hide();
d->colorsLabel->hide();
}
QString regionWhatsThis( tr( "<p>Select here from which region the histogram will be computed:"
"<p><b>Full Image</b>: Compute histogram using the full image."
"<p><b>Selection</b>: Compute histogram using the current image "
"selection." ) );
QSize StreamPropertiesSideBar::sizeHint() const
{
QSize isize = QSize( size().width(), size().height() );
isize += QSize( 80, 0 );
return isize;
}
d->fullImageButton = new QPushButton;
d->fullImageButton->setToolTip( tr( "Full Image" ) );
d->fullImageButton->setIcon( QIcon( ":/images/image-full.png" ) );
d->fullImageButton->setWhatsThis( regionWhatsThis );
d->fullImageButton->setCheckable( true );
d->fullImageButton->setAutoExclusive( true );
d->fullImageButton->setChecked( true );
Void StreamPropertiesSideBar::setData( InputStream* pcStream )
{
// Clear information.
labelFormatValue->clear();
labelSizeValue->clear();
labelColorSpaceValue->clear();
d->selectionImageButton = new QPushButton;
d->selectionImageButton->setToolTip( tr( "Selection" ) );
d->selectionImageButton->setIcon( QIcon( ":/images/image-selection.png" ) );
d->selectionImageButton->setWhatsThis( regionWhatsThis );
d->selectionImageButton->setCheckable( true );
d->selectionImageButton->setAutoExclusive( true );
if( !pcStream || !pcStream->getCurrFrame() )
{
setEnabled( false );
return;
}
else
{
m_pcStream = pcStream;
setEnabled( true );
QHBoxLayout *regionLayout = new QHBoxLayout;
regionLayout->addWidget( d->fullImageButton );
regionLayout->addWidget( d->selectionImageButton );
QString value;
labelFormatValue->setText( m_pcStream->getFormatName() );
uint width = m_pcStream->getWidth();
uint height = m_pcStream->getHeight();
value = QString( tr( "%1 x %2" ) ).arg( width ).arg( height );
labelSizeValue->setText( value );
value = QString( PlaYUVerFrame::supportedPixelFormatList().at( m_pcStream->getCurrFrame()->getPelFormat() ) );
labelColorSpaceValue->setText( value );
}
}
QGridLayout *topLayout = new QGridLayout;
topLayout->addWidget( channelLabel, 1, 0 );
topLayout->addWidget( d->channelCB, 1, 1 );
topLayout->addLayout( scaleLayout, 1, 3 );
topLayout->addWidget( d->colorsLabel, 2, 0 );
topLayout->addWidget( d->colorsCB, 2, 1 );
topLayout->addLayout( regionLayout, 2, 3 );
topLayout->setColumnStretch( 2, 10 );
////////////////////////////////////////////////////////////////////////////////
// FramePropertiesSideBar
////////////////////////////////////////////////////////////////////////////////
// -------------------------------------------------------------
FramePropertiesSideBar::FramePropertiesSideBar( QWidget* parent ) :
QWidget( parent )
{
// -------------- Variables definition --------------
m_pcFrame = NULL;
QLabel *rangeLabel = new QLabel( tr( "Range:" ) );
rangeLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
// ----------------- GUI definition -----------------
d->minInterv = new QSpinBox;
d->minInterv->setRange( 0, 255 );
d->minInterv->setSingleStep( 1 );
d->minInterv->setValue( 0 );
d->minInterv->setWhatsThis( tr( "<p>Select here the minimal intensity "
"value of the histogram selection." ) );
d->maxInterv = new QSpinBox;
d->maxInterv->setRange( 0, 255 );
d->maxInterv->setSingleStep( 1 );
d->maxInterv->setValue( 0 );
d->minInterv->setWhatsThis( tr( "<p>Select here the maximal intensity value"
" of the histogram selection." ) );
QHBoxLayout *rangeLayout = new QHBoxLayout;
rangeLayout->addWidget( rangeLabel );
rangeLayout->addWidget( d->minInterv );
rangeLayout->addWidget( d->maxInterv );
topLayout->addLayout( rangeLayout, 4, 0, 1, 4 );
// -------------------------------------------------------------
QGridLayout *mainLayout = new QGridLayout;
QLabel *pixelsLabel = new QLabel( tr( "Pixels:" ) );
pixelsLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->labelPixelsValue = new QLabel;
d->labelPixelsValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
labelPixelsValue = new QLabel;
labelPixelsValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *countLabel = new QLabel( tr( "Selected:" ) );
countLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->labelCountValue = new QLabel;
d->labelCountValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
labelCountValue = new QLabel;
labelCountValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *meanLabel = new QLabel( tr( "Mean:" ) );
meanLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->labelMeanValue = new QLabel;
d->labelMeanValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
labelMeanValue = new QLabel;
labelMeanValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *stdDevLabel = new QLabel( tr( "Std. deviation:" ) );
stdDevLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->labelStdDevValue = new QLabel;
d->labelStdDevValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
labelStdDevValue = new QLabel;
labelStdDevValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *medianLabel = new QLabel( tr( "Median:" ) );
medianLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->labelMedianValue = new QLabel;
d->labelMedianValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
labelMedianValue = new QLabel;
labelMedianValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *percentileLabel = new QLabel( tr( "Percentile:" ) );
percentileLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->labelPercentileValue = new QLabel;
d->labelPercentileValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
labelPercentileValue = new QLabel;
labelPercentileValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QGridLayout *statisticsLayout = new QGridLayout;
statisticsLayout->addWidget( pixelsLabel, 0, 0 );
statisticsLayout->addWidget( d->labelPixelsValue, 0, 1 );
statisticsLayout->addWidget( labelPixelsValue, 0, 1 );
statisticsLayout->addWidget( countLabel, 1, 0 );
statisticsLayout->addWidget( d->labelCountValue, 1, 1 );
statisticsLayout->addWidget( labelCountValue, 1, 1 );
statisticsLayout->addWidget( meanLabel, 2, 0 );
statisticsLayout->addWidget( d->labelMeanValue, 2, 1 );
statisticsLayout->addWidget( labelMeanValue, 2, 1 );
statisticsLayout->addWidget( stdDevLabel, 3, 0 );
statisticsLayout->addWidget( d->labelStdDevValue, 3, 1 );
statisticsLayout->addWidget( labelStdDevValue, 3, 1 );
statisticsLayout->addWidget( medianLabel, 4, 0 );
statisticsLayout->addWidget( d->labelMedianValue, 4, 1 );
statisticsLayout->addWidget( labelMedianValue, 4, 1 );
statisticsLayout->addWidget( percentileLabel, 5, 0 );
statisticsLayout->addWidget( d->labelPercentileValue, 5, 1 );
statisticsLayout->addWidget( labelPercentileValue, 5, 1 );
QGroupBox *statisticsGroup = new QGroupBox( tr( "Statistics" ) );
statisticsGroup->setLayout( statisticsLayout );
@@ -284,235 +183,47 @@ PropertiesSidebar::PropertiesSidebar( QWidget* parent ) :
"selected histogram part. These values are available for all "
"channels." ) );
topLayout->addWidget( statisticsGroup, 5, 0, 1, 4 );
// -------------------------------------------------------------
QLabel *formatLabel = new QLabel( tr( "File Format:" ) );
formatLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->formatValueLabel = new QLabel;
d->formatValueLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *sizeLabel = new QLabel( tr( "Size (pixels):" ) );
sizeLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->sizeValueLabel = new QLabel;
d->sizeValueLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *colorSpaceLabel = new QLabel( tr( "Colorspace:" ) );
colorSpaceLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->colorSpaceValueLabel = new QLabel;
d->colorSpaceValueLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *depthLabel = new QLabel( tr( "Color depth:" ) );
depthLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->depthValueLabel = new QLabel;
d->depthValueLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QLabel *alphaLabel = new QLabel( tr( "Alpha Channel:" ) );
alphaLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
d->alphaValueLabel = new QLabel;
d->alphaValueLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
QGridLayout *propertiesLayout = new QGridLayout;
propertiesLayout->addWidget( formatLabel, 0, 0 );
propertiesLayout->addWidget( d->formatValueLabel, 0, 1 );
propertiesLayout->addWidget( sizeLabel, 1, 0 );
propertiesLayout->addWidget( d->sizeValueLabel, 1, 1 );
propertiesLayout->addWidget( colorSpaceLabel, 2, 0 );
propertiesLayout->addWidget( d->colorSpaceValueLabel, 2, 1 );
propertiesLayout->addWidget( depthLabel, 4, 0 );
propertiesLayout->addWidget( d->depthValueLabel, 4, 1 );
propertiesLayout->addWidget( alphaLabel, 5, 0 );
propertiesLayout->addWidget( d->alphaValueLabel, 5, 1 );
QGroupBox *propertiesGroup = new QGroupBox( tr( "Properties" ) );
propertiesGroup->setLayout( propertiesLayout );
topLayout->addWidget( propertiesGroup, 6, 0, 1, 4 );
topLayout->setRowStretch( 8, 10 );
setLayout( topLayout );
mainLayout->addWidget( statisticsGroup, 5, 0, 1, 4 );
mainLayout->setRowStretch( 8, 10 );
setLayout( mainLayout );
setEnabled( false );
// -------------------------------------------------------------
connect( d->minInterv, SIGNAL( valueChanged (int) ), this, SLOT( slotMinValueChanged(int) ) );
connect( d->maxInterv, SIGNAL( valueChanged (int) ), this, SLOT( slotMaxValueChanged(int) ) );
}
FramePropertiesSideBar::~FramePropertiesSideBar()
{
}
////////////////////////////////////////////////////////////////////////////////
// Destructor
////////////////////////////////////////////////////////////////////////////////
PropertiesSidebar::~PropertiesSidebar()
QSize FramePropertiesSideBar::sizeHint() const
{
// If there is a currently histogram computation when dialog is closed,
// stop it before the d->image data are deleted automatically!
delete d;
QSize isize = QSize( size().width(), size().height() );
isize += QSize( 80, 0 );
return isize;
}
////////////////////////////////////////////////////////////////////////////////
// Set Data Function
////////////////////////////////////////////////////////////////////////////////
void PropertiesSidebar::setData( InputStream* m_pcStream )
Void FramePropertiesSideBar::setData( PlaYUVerFrame* pcFrame )
{
// We might be getting duplicate events from AlbumIconView,
// which will cause all sorts of duplicate work.
// More importantly, while the loading thread can handle this pretty well,
// this will completely mess up the timing of progress info in the histogram
// widget. So filter here, before the stopHistogramComputation!
// Clear information.
d->labelMeanValue->clear();
d->labelPixelsValue->clear();
d->labelStdDevValue->clear();
d->labelCountValue->clear();
d->labelMedianValue->clear();
d->labelPercentileValue->clear();
d->formatValueLabel->clear();
d->sizeValueLabel->clear();
d->colorSpaceValueLabel->clear();
d->depthValueLabel->clear();
d->alphaValueLabel->clear();
labelMeanValue->clear();
labelPixelsValue->clear();
labelStdDevValue->clear();
labelCountValue->clear();
labelMedianValue->clear();
labelPercentileValue->clear();
if( !m_pcStream || !m_pcStream->getCurrFrame() )
if( !pcFrame )
{
setEnabled( false );
return;
}
else
{
d->m_pcStream = m_pcStream;
d->m_pcFrame = m_pcStream->getCurrFrame();
if( d->m_pcFrame->getPelFormat() == PlaYUVerFrame::RGB8 && ( d->channelCB->count() == 1 ) )
{
d->channelCB->addItem( tr( "Red" ) );
d->channelCB->setItemIcon( 1, QIcon( ":/images/channel-red.png" ) );
d->channelCB->addItem( tr( "Green" ) );
d->channelCB->setItemIcon( 2, QIcon( ":/images/channel-green.png" ) );
d->channelCB->addItem( tr( "Blue" ) );
d->channelCB->setItemIcon( 3, QIcon( ":/images/channel-blue.png" ) );
d->channelCB->addItem( QIcon( ":/images/channel-all.png" ), tr( "Colors" ) );
d->colorsCB->show();
d->colorsLabel->show();
}
if( d->m_pcFrame->getPelFormat() != PlaYUVerFrame::RGB8 && ( d->channelCB->count() != 1 ) )
{
d->channelCB->clear();
d->channelCB->addItem( tr( "Luminance" ) );
d->channelCB->setItemIcon( 0, QIcon( ":/images/channel-luma.png" ) );
d->colorsCB->hide();
d->colorsLabel->hide();
}
m_pcFrame = pcFrame;
setEnabled( true );
if( d->m_pcFrame )
{
// If a selection area is done in Image Editor and if the current
// image is the same in Image Viewer, then compute too the histogram
// for this selection.
// d->histogramWidget->updateData( d->image.bits(),
// d->image.width(),
// d->image.height(),
// d->image.bitsPerChannel(),
// d->image.colorSpace() );
// d->maxInterv->blockSignals( true );
// if(d->image.bitsPerChannel()==16)
// d->maxInterv->setMaximum( 65535 );
// else
// d->maxInterv->setMaximum( 255 );
// d->maxInterv->blockSignals( false );
d->fullImageButton->hide();
d->selectionImageButton->hide();
updateInformations();
}
}
}
////////////////////////////////////////////////////////////////////////////////
// SLOTS
////////////////////////////////////////////////////////////////////////////////
void PropertiesSidebar::slotMinValueChanged( int min )
{
// Called when user changes values of spin box.
// Communicate the change to histogram widget.
// make the one control "push" the other
if( min == d->maxInterv->value() + 1 )
d->maxInterv->setValue( min );
d->maxInterv->setMinimum( min - 1 );
updateStatistiques();
}
void PropertiesSidebar::slotMaxValueChanged( int max )
{
if( max == d->minInterv->value() - 1 )
d->minInterv->setValue( max );
d->minInterv->setMaximum( max + 1 );
updateStatistiques();
}
void PropertiesSidebar::slotUpdateInterval( int min, int max )
{
// Called when value is set from within histogram widget.
// Block signals to prevent slotMinValueChanged and
// slotMaxValueChanged being called.
d->minInterv->blockSignals( true );
d->minInterv->setMaximum( max + 1 );
d->minInterv->setValue( min );
d->minInterv->blockSignals( false );
d->maxInterv->blockSignals( true );
d->maxInterv->setMinimum( min - 1 );
d->maxInterv->setValue( max );
d->maxInterv->blockSignals( false );
updateStatistiques();
}
void PropertiesSidebar::slotUpdateIntervRange( int range )
{
d->maxInterv->blockSignals( true );
d->maxInterv->setMaximum( range );
d->maxInterv->blockSignals( false );
}
////////////////////////////////////////////////////////////////////////////////
// Informations
////////////////////////////////////////////////////////////////////////////////
void PropertiesSidebar::updateInformations()
{
QString value;
uint width = d->m_pcFrame->getWidth();
uint height = d->m_pcFrame->getHeight();
value = QString( tr( "%1 x %2" ) ).arg( width ).arg( height );
d->sizeValueLabel->setText( value );
d->formatValueLabel->setText( d->m_pcStream->getFormatName() );
value = QString( PlaYUVerFrame::supportedPixelFormatList().at( d->m_pcFrame->getPelFormat() ) );
d->colorSpaceValueLabel->setText( value );
}
////////////////////////////////////////////////////////////////////////////////
// Statistiques
////////////////////////////////////////////////////////////////////////////////
void PropertiesSidebar::updateStatistiques()
{
}
} // NAMESPACE
source/app/PropertiesSidebar.h
+35 -50
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,9 +22,8 @@
* \brief Main side bar definition
*/
#ifndef PROPERTIESSIDEBAR_H
#define PROPERTIESSIDEBAR_H
#ifndef __PROPERTIESSIDEBAR_H__
#define __PROPERTIESSIDEBAR_H__
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
@@ -31,68 +31,53 @@
#include <QtGui>
#include <QWidget>
#endif
#include "InputStream.h"
class QRect;
#include "PlaYUVerFrame.h"
namespace plaYUVer
{
class PropertiesSidebarPrivate;
class PropertiesSidebar: public QWidget
class StreamPropertiesSideBar: public QWidget
{
Q_OBJECT
Q_OBJECT
public:
StreamPropertiesSideBar( QWidget* parent );
~StreamPropertiesSideBar();
PropertiesSidebar( QWidget* parent );
~PropertiesSidebar();
QSize sizeHint() const;
// void setData( SImage &img, const QRect &selectionArea = QRect() ); (Bug) Correction:
void setData( InputStream* m_pcStream );
Void setData( InputStream* m_pcStream );
private:
InputStream* m_pcStream;
public slots:
QLabel* labelFormatValue;
QLabel* labelSizeValue;
QLabel* labelColorSpaceValue;
};
class FramePropertiesSideBar: public QWidget
{
Q_OBJECT
public:
FramePropertiesSideBar( QWidget* parent );
~FramePropertiesSideBar();
private:
QSize sizeHint() const;
void updateInformations();
void updateStatistiques();
void setStopButton();
void setOkButton();
Void setData( PlaYUVerFrame* m_pcStream );
private:
PlaYUVerFrame *m_pcFrame;
private slots:
void slotMinValueChanged( int min );
void slotMaxValueChanged( int max );
void slotUpdateInterval( int min, int max );
void slotUpdateIntervRange( int range );
private:
enum ColorChannel
{
LuminosityChannel=0,
RedChannel,
GreenChannel,
BlueChannel,
AlphaChannel,
ColorChannels
};
enum AllColorsColorType
{
AllColorsRed=0,
AllColorsGreen,
AllColorsBlue
};
PropertiesSidebarPrivate* d;
QLabel *labelMeanValue;
QLabel *labelPixelsValue;
QLabel *labelStdDevValue;
QLabel *labelCountValue;
QLabel *labelMedianValue;
QLabel *labelPercentileValue;
};
} // NAMESPACE
#endif
#endif // __PROPERTIESSIDEBAR_H__
source/app/SubWindowHandle.cpp
+6 -3
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
*/
/**
* \file imageinterface.cpp
* \file SubWindowHandle.cpp
* \brief Sub windows handling
*/
@@ -74,9 +75,11 @@ SubWindowHandle::~SubWindowHandle()
Bool SubWindowHandle::loadFile( const QString &fileName )
{
UInt Width, Height, rFrameRate;
Int InputFormat;
ConfigureFormatDialog formatDialog( this );
if( m_pCurrStream->needFormatDialog( fileName ) )
if( m_pCurrStream->guessFormat( fileName, Width, Height, InputFormat, rFrameRate ) )
{
if( formatDialog.exec() == QDialog::Rejected )
{
source/app/SubWindowHandle.h
+21 -20
View File
@@ -1,28 +1,29 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file imageinterface.h
* \file SubWindowHandle.h
* \brief Sub windows handling
*/
#ifndef __IMAGEINTERFACE_H__
#define __IMAGEINTERFACE_H__
#ifndef __SUBWINDOWHANDLE_H__
#define __SUBWINDOWHANDLE_H__
#include "config.h"
@@ -147,4 +148,4 @@ public Q_SLOTS:
} // NAMESPACE
#endif // __IMAGEINTERFACE_H__
#endif // __SUBWINDOWHANDLE_H__
source/app/TypeDef.h
+2 -14
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -111,19 +112,6 @@ typedef UChar Pel; ///< 8-bit pixel type
// PlaYUVer definitions
// ====================================================================================================================
enum InputStreamFormats
{
NO_FMT = -1,
YUV420p,
YUV444p,
YUV422p,
YUV411p,
YUV410p,
GRAY,
RGB8,
NUMBER_FORMATS
};
enum ColorSpace
{
COLOR_INVALID = -1,
source/app/ViewArea.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/ViewArea.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/app/main.cpp
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
*/
/**
* \file main.cp
* \file main.cpp
* \brief main file
*/
source/app/plaYUVerApp.cpp
+22 -32
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -88,11 +89,10 @@ Void plaYUVerApp::closeEvent( QCloseEvent *event )
if( mdiArea->subWindowList().size() >= 1 )
{
QMessageBox msgBoxClose;
msgBoxClose.setText( "There are open files." );
msgBoxClose.setInformativeText( "Close all?" );
msgBoxClose.setStandardButtons( QMessageBox::Yes | QMessageBox::No );
QMessageBox msgBoxClose( QMessageBox::Question, "PlaYUVer",
"There are open files!", QMessageBox::Yes | QMessageBox::No, this );
msgBoxClose.setDefaultButton( QMessageBox::No );
msgBoxClose.setInformativeText( "Close all?" );
msgBoxCloseRet = msgBoxClose.exec();
}
switch( msgBoxCloseRet )
@@ -153,7 +153,7 @@ void plaYUVerApp::open()
SubWindowHandle *interfaceChild = new SubWindowHandle( this ); //createSubWindow();
if( interfaceChild->loadFile( fileName ) )
{
addSubWindow( interfaceChild );
mdiArea->addSubWindow( interfaceChild );
statusBar()->showMessage( tr( "File loaded" ), 2000 );
interfaceChild->show();
connect( interfaceChild->getViewArea(), SIGNAL( positionChanged(const QPoint &, InputStream *) ), this,
@@ -202,7 +202,8 @@ void plaYUVerApp::updateProperties()
if( subWindow )
{
m_pcPropertiesSidebar->setData( subWindow->getInputStream() );
m_pcStreamProperties->setData( subWindow->getInputStream() );
m_pcFrameProperties->setData( subWindow->getInputStream()->getCurrFrame() );
//m_pcPropertiesSidebar->setSelection( iface->currentViewArea()->selectedArea() );
}
}
@@ -372,7 +373,7 @@ void plaYUVerApp::dropEvent( QDropEvent *event )
SubWindowHandle *interfaceChild = new SubWindowHandle( this ); //createSubWindow();
if( interfaceChild->loadFile( fileName ) )
{
addSubWindow( interfaceChild );
mdiArea->addSubWindow( interfaceChild );
statusBar()->showMessage( tr( "File loaded" ), 2000 );
interfaceChild->show();
}
@@ -386,23 +387,6 @@ void plaYUVerApp::dropEvent( QDropEvent *event )
// ----------------------- Gui Functions -----------------------
SubWindowHandle *plaYUVerApp::createSubWindow()
{
SubWindowHandle *child = new SubWindowHandle;
mdiArea->addSubWindow( child );
return child;
}
void plaYUVerApp::addSubWindow( SubWindowHandle *child )
{
//connect( child, SIGNAL( areaSelected( QRect ) ), this, SLOT( setSelection( QRect ) ) );
// Add the interface to the mdiArea
mdiArea->addSubWindow( child );
return;
}
SubWindowHandle *plaYUVerApp::activeSubWindow()
{
if( QMdiSubWindow *activeSubWindow = mdiArea->activeSubWindow() )
@@ -730,14 +714,20 @@ Void plaYUVerApp::createToolBars()
Void plaYUVerApp::createDockWidgets()
{
// Image Properties Dock Window
// Properties Dock Window
m_arraySideBars.resize( TOTAL_SIDEBAR );
m_pcPropertiesSidebar = new PropertiesSidebar( this );
m_pcStreamProperties = new StreamPropertiesSideBar( this );
m_arraySideBars[STREAM_SIDEBAR] = new QDockWidget( tr( "Stream Information" ), this );
m_arraySideBars[STREAM_SIDEBAR]->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
m_arraySideBars[STREAM_SIDEBAR]->setWidget( m_pcStreamProperties );
addDockWidget( Qt::RightDockWidgetArea, m_arraySideBars[STREAM_SIDEBAR] );
m_pcDockPropertiesSidebar = new QDockWidget( tr( "Stream Information" ), this );
m_pcDockPropertiesSidebar->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
m_pcDockPropertiesSidebar->setWidget( m_pcPropertiesSidebar );
addDockWidget( Qt::RightDockWidgetArea, m_pcDockPropertiesSidebar );
m_pcFrameProperties = new FramePropertiesSideBar( this );
m_arraySideBars[FRAME_SIDEBAR] = new QDockWidget( tr( "Frame Information" ), this );
m_arraySideBars[FRAME_SIDEBAR]->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
m_arraySideBars[FRAME_SIDEBAR]->setWidget( m_pcFrameProperties );
addDockWidget( Qt::RightDockWidgetArea, m_arraySideBars[FRAME_SIDEBAR] );
}
source/app/plaYUVerApp.h
+13 -6
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVerApp project
* Copyright (C) 2014 by plaYUVerApp developers
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -114,8 +115,6 @@ private:
Void readSettings();
Void writeSettings();
Void addSubWindow( SubWindowHandle *child );
SubWindowHandle *createSubWindow();
SubWindowHandle *activeSubWindow();
QMdiSubWindow *findSubWindow( const QString &fileName );
@@ -144,8 +143,16 @@ private:
};
QVector<QMenu*> m_arrayMenu;
PropertiesSidebar *m_pcPropertiesSidebar;
QDockWidget *m_pcDockPropertiesSidebar;
enum SIDEBAR_LIST
{
STREAM_SIDEBAR = 0,
FRAME_SIDEBAR,
TOTAL_SIDEBAR,
};
QVector<QDockWidget*> m_arraySideBars;
StreamPropertiesSideBar* m_pcStreamProperties;
FramePropertiesSideBar* m_pcFrameProperties;
QToolBar *toolbarFile;
QToolBar *toolbarView;
source/lib/LibMemAlloc.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/lib/LibMemAlloc.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/lib/LibMemory.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/lib/PlaYUVerFrame.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/lib/PlaYUVerFrame.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/lib/ffmpeg/LibAvContextHandle.cpp
+3 -2
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -153,7 +154,7 @@ Bool LibAvContextHandle::initAvFormat( char* filename, UInt& width, UInt& height
const char *codec_name = avcodec_get_name(video_dec_ctx->codec_id);
sprintf(m_acCodecName, "%s ", codec_name);
sprintf(m_acCodecName, "%s", codec_name);
Double fr = 30;
if( video_stream->avg_frame_rate.den && video_stream->avg_frame_rate.num )
source/lib/ffmpeg/LibAvContextHandle.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/modules/FilterFrame.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
source/modules/FilterFrame.h
+2 -1
View File
@@ -1,5 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by plaYUVer developers
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by