FCL/sf/app/photos: comparison ui/views/fullscreenview/src/glxcoverflow.cpp

equal deleted inserted replaced

-:f291796e213d
+:fb37077c270f
 #include <QGraphicsSceneMouseEvent>
 #include <QDebug>
 #include <QGesture>
 #include <hbpangesture.h>
 #include <hbiconanimator.h>
+#include <hbinstance.h>
 //User Includes
 #include <glxmodelparm.h>
 #include <glxcoverflow.h>
 #include "glxviewids.h"
 #define GLX_COVERFLOW_SPEED  32
 #define GLX_BOUNCEBACK_SPEED 16
 #define GLX_BOUNCEBACK_DELTA 8
-GlxCoverFlow::GlxCoverFlow(QGraphicsItem *parent )
+GlxCoverFlow::GlxCoverFlow( QGraphicsItem *parent )
-: HbWidget(parent),
+: HbWidget( parent ),
-mSelItemIndex (0),
+mSelItemIndex ( 0 ),
-mRows(0),
+mRows( 0 ),
-mSelIndex (0),
+mSelIndex ( 0 ),
-mStripLen (0),
+mStripLen ( 0 ),
-mCurrentPos(0),
+mCurrentPos( 0 ),
-mItemSize (QSize(0,0)),
+mItemSize ( QSize( 0, 0 ) ),
-mModel ( NULL),
+mModel ( NULL ),
-mMoveDir(NO_MOVE),
+mMoveDir( NO_MOVE ),
 mSpeed ( GLX_COVERFLOW_SPEED ),
-	   mZoomOn(false),
+	   mZoomOn( false ),
-	   mMultitouchFilter(NULL),
+	   mMultitouchFilter( NULL ),
-mTimerId(0)
+mTimerId( 0 ),
-{
+mIsInit( false )
-//TO:DO through exception
+{
-qDebug("GlxCoverFlow::GlxCoverFlow");
+qDebug( "GlxCoverFlow::GlxCoverFlow" );
-grabGesture(Qt::PanGesture);
+grabGesture( Qt::PanGesture );
-grabGesture(Qt::TapGesture);
+grabGesture( Qt::TapGesture );
 connect( this, SIGNAL( autoLeftMoveSignal() ), this, SLOT( autoLeftMove() ), Qt::QueuedConnection );
 connect( this, SIGNAL( autoRightMoveSignal() ), this, SLOT( autoRightMove() ), Qt::QueuedConnection );
 }
 void GlxCoverFlow::setMultitouchFilter(QGraphicsItem* mtFilter)
 {
 	mMultitouchFilter = mtFilter;
 }
 void GlxCoverFlow::setCoverFlow()
 {
 qDebug("GlxCoverFlow::setCoverFlow");
 for ( qint8 i = 0; i < NBR_ICON_ITEM ; i++ ) {
 mIconItem[i] = new HbIconItem( this );
 mIconItem[i]->setSize( QSize( 0, 0 ) );
 mIconItem[i]->setAlignment( Qt::AlignCenter );
 mIconItem[i]->setObjectName( QString( "Cover%1" ).arg( i ) );
 }
-mUiOn = FALSE;
+mIsInit = true;
+mUiOn = false;
 mBounceBackDeltaX = GLX_BOUNCEBACK_DELTA;
 }
 void GlxCoverFlow::setItemSize(QSize &size)
 {
 mTimerId = startTimer(500);
 }
 else {
 killTimer(mTimerId);
 mTimerId = 0;
-emit doubleTapEventReceived(gesture->position());
+emit doubleTapEventReceived(hbInstance->allMainWindows().first()->mapToScene(gesture->position().toPoint()));
 }
 event->accept(gesture);
 }
 }
 }
 void GlxCoverFlow::panGesture ( const QPointF & delta )
 {
 qDebug("GlxCoverFlow::panGesture deltaX= %d", (int)delta.x());
-if(getSubState() == IMAGEVIEWER_S || getSubState() == FETCHER_S ) {
+if( !mIsInit || getSubState() == IMAGEVIEWER_S || getSubState() == FETCHER_S ) {
 return;
 }
-move((int) delta.x());
+move( ( int ) delta.x() );
 if( delta.x() > 0 ) {
 mMoveDir = RIGHT_MOVE;
 }
 else if ( delta.x() < 0) {
 mMoveDir = LEFT_MOVE;
 void GlxCoverFlow::autoLeftMove()
 {
 int width = mItemSize.width() ;
 qDebug("GlxCoverFlow::autoLeftMove current pos = %d mBounceBackDeltaX x = %d", mCurrentPos, mBounceBackDeltaX);
+if ( !mIsInit ) {
-if ( mSelIndex == ( mRows -1 )) {
+return;
+}
+if ( mSelIndex == ( mRows -1 ) ) {
 mSpeed = GLX_BOUNCEBACK_SPEED;
 }
 //for bounce back effect for last image ( it will do the back)
 if ( ( mCurrentPos + width ) > ( mStripLen + mBounceBackDeltaX ) && mMoveDir == NO_MOVE ) {
 mMoveDir = LEFT_MOVE;
 }
 void GlxCoverFlow::autoRightMove()
 {
 qDebug("GlxCoverFlow::autoRightMove ");
+if ( !mIsInit ) {
+return;
+}
 int width = mItemSize.width()  ;
 int diffX = mStripLen - mCurrentPos ;
 //slow the speed for bounce back effect
 if ( mSelIndex == 0 ) {
 mSpeed = GLX_BOUNCEBACK_SPEED;
 }
 //for bounce back effect for back image ( it will do the back)
 }
 void GlxCoverFlow::loadIconItems()
 {
 qDebug("GlxCoverFlow::loadIconItems ");
+if ( !mIsInit ) {
+return ;
+}
 int index = 0;
 stopAnimation();
 mSelIndex = getFocusIndex();
 qDebug("GlxCoverFlow::loadIconItems index = %d, width = %d", mSelIndex, size().width() );
 }
 void GlxCoverFlow::stopAnimation()
 {
 mIconItem[ mSelItemIndex ]->animator().stopAnimation();
+mIconItem[ mSelItemIndex ]->setIcon( getIcon( mSelIndex ) );
 }
 void GlxCoverFlow::updateIconItem (qint16 selIndex, qint16 selItemIndex, qint16 posX)
 {
 qDebug("GlxCoverFlow::updateIconItem selIndex = %d, selIconIndex = %d posX = %d", selIndex, selItemIndex, posX );
 void GlxCoverFlow::partiallyClean()
 {
 qDebug("GlxCoverFlow::partiallyClean Enter");
 clearCurrentModel(); //during the animation data update will not cause the crash
+mIsInit = false;
 for ( qint8 i = 0; i < NBR_ICON_ITEM ; i++ ) {
 if ( mSelItemIndex != i){
 delete mIconItem[i] ;
 mIconItem[i] = NULL;
 }
 }
 }
-void GlxCoverFlow::partiallyCreate(QAbstractItemModel *model, QSize itemSize)
+void GlxCoverFlow::partiallyCreate( QAbstractItemModel *model, QSize itemSize, int posY )
 {
-qDebug("GlxCoverFlow::resetpartiallyCreated");
+qDebug("GlxCoverFlow::resetpartiallyCreated poxY %d", posY );
 mIconItem[2]->setSize ( itemSize );
-mIconItem[2]->setPos ( QPointF ( 0, 0) );
+mIconItem[2]->setPos ( QPointF ( 0, posY ) );
 mModel = model ;
 mSelIndex = getFocusIndex();
 mIconItem[2]->setIcon( getIcon( mSelIndex ) ) ;
 mModel = NULL;
 }
 }
 void GlxCoverFlow::ClearCoverFlow()
 {
 qDebug("GlxCoverFlow::ClearCoverFlow  " );
+mIsInit = false;
 clearCurrentModel();
 for ( qint8 i = 0; i < NBR_ICON_ITEM ; i++ ) {
 if(mIconItem[i] != NULL ) {
 delete mIconItem[i] ;
 mIconItem[i] = NULL;
 }
 void GlxCoverFlow::zoomStarted(int index)
 {
 Q_UNUSED(index)
+emit coverFlowEvent( ZOOM_START_EVENT );
 stopAnimation();
 	mZoomOn = true;
 }
 void GlxCoverFlow::zoomFinished(int index)

changeset 55	fb37077c270f
parent 49	f291796e213d
child 61	743eb0b9959e