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

Undo erroneous merge changes.

Browse Source
This commit is contained in:
Luis Lucas
2014-02-08 19:27:41 +00:00
parent a515b56527
commit 2c854c07e1
1 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/SubWindowHandle.cpp
+5 -32
View File
@@ -31,42 +31,21 @@ namespace plaYUVer
SubWindowHandle::SubWindowHandle( QWidget * parent ) :
QMdiSubWindow( parent )
{
setParent( parent );
setAttribute( Qt::WA_DeleteOnClose );
setBackgroundRole( QPalette::Light );
// Create a new scroll area inside the sub-window
m_cScrollArea = new QScrollArea;
m_cScrollArea = new QScrollArea( this );
setWidget( m_cScrollArea );
// Create a new interface to show images
m_cViewArea = new ViewArea;
m_cViewArea = new ViewArea( m_cScrollArea );
// Define the cViewArea as the widget inside the scroll area
m_cScrollArea->setWidget( m_cViewArea );
// Create Layout for the playing config
QHBoxLayout *pcHeadLayout = new QHBoxLayout;
pcHeadLayout->setObjectName( QStringLiteral( "HeadLayout" ) );
QSpacerItem * headerSpacer0 = new QSpacerItem( 30, 2, QSizePolicy::Fixed, QSizePolicy::Minimum );
m_pcFrameSlider = new QSlider( this );
m_pcFrameSlider->setObjectName( QStringLiteral( "FrameSlider" ) );
m_pcFrameSlider->setOrientation( Qt::Horizontal );
m_pcFrameSlider->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
m_pcFrameSlider->setEnabled( true );
m_pcFrameSlider->setTracking( true );
QSpacerItem * headerSpacer1 = new QSpacerItem( 30, 2, QSizePolicy::Fixed, QSizePolicy::Minimum );
pcHeadLayout->addSpacerItem( headerSpacer0 );
pcHeadLayout->addWidget( m_pcFrameSlider, 5 );
pcHeadLayout->addSpacerItem( headerSpacer1 );
//setWidget( m_cScrollArea );
QLayout *pcMainLayout = layout();
pcMainLayout->addWidget( m_cScrollArea );
pcMainLayout->addItem( pcHeadLayout );
connect( m_pcFrameSlider, SIGNAL( valueChanged(int) ), this, SLOT( seekSliderEvent() ) );
m_cWindowName = QString( " " );
m_bIsPlaying = true;
m_dScaleFactor = 1;
@@ -122,6 +101,7 @@ bool SubWindowHandle::loadFile( const QString &fileName )
m_cWindowName = QString( " " );
m_cWindowName = m_pCurrStream->getStreamInformationString();
m_cCurrFileName = fileName;
setWindowTitle( m_cWindowName );
@@ -159,13 +139,6 @@ bool SubWindowHandle::save()
return true;
}
void SubWindowHandle::seekSliderEvent()
{
m_currStream.seekInput( m_pcFrameSlider->sliderPosition() );
m_currStream.readFrame();
m_cViewArea->setImage( QPixmap::fromImage( m_currStream.getFrameQImage() ) );
}
bool SubWindowHandle::playEvent()
{
bool iRet = true;