FCL/sf/app/photos: comparison ui/widgets/glxzoomwidget/src/glxzoomwidget.cpp

equal deleted inserted replaced

-:ccee5c4b0de4
+:45459746d5e8
 const int MAXZVALUE = 100;
 const int MINZVALUE = 0;
 const int NOOFSTEPSZI = 24;
 const int NOOFSTEPSZO = 18;
 const float MAXDTZOOMIN = 3.5;
+const int NO_OF_STEPS_FOR_SPRINGBACK_AT_MAX = 12;
+const int NO_OF_STEPS_FOR_SPRINGBACK_AT_MIN = 5;
 GlxZoomWidget::GlxZoomWidget(QGraphicsItem *parent):HbScrollArea(parent),
 mModel(NULL), mMinZValue(MINZVALUE),
 mMaxZValue(MAXZVALUE), mTimerId(0),
 mImageDecodeRequestSend(false),
 setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 	//AA: signal and slot to perform double tap animation
 //after every step redraw, signal is emitted to perform the next step
 	connect( this, SIGNAL( stepZoom() ), this, SLOT( animateDoubleTap() ), Qt::QueuedConnection );
+	mDoubleTap = false;
 }
 GlxZoomWidget::~GlxZoomWidget()
 {
 }
 if(mImageDecoder) {
 resetDecoder();
 }
 mZoomItem->setPixmap(QPixmap());
+	mBlackBackgroundItem->setParentItem(this);
 }
 void GlxZoomWidget::activate()
 {
 }
 }
 }
 if (pinchG->state() == Qt::GestureFinished) {
 //For giving a spring effect when user has zoomed more than normal.
-if(mStepCurrentSize.width() > mMaxScaleDecSize.width())   {
+		  mPinchGestureOngoing = false;
 //scale the image to limited size
-qreal value = mMaxScaleDecSize.width()/mCurrentSize.width();
+		if(mCurrentSize.width() > mMaxScaleDecSize.width() )
-QPointF center(mWindowSize.width()/2, mWindowSize.height()/2);
+{
-QPointF sceneGestureCenter = source->sceneTransform().map(center);
+	  QPointF center(mWindowSize.width()/2, mWindowSize.height()/2);
-zoomImage(value, sceneGestureCenter);
+		       m_AnimRefPoint = source->sceneTransform().map(center);
-}
+		       springEffectAtMax();
-mPinchGestureOngoing = false;
+return true;
-//finalize the transforms to the geometry else panning will not work
+		}
-finalizeWidgetTransform();
-//push the Zoom widget to background when zoomed image size nears FS image
+		if(mCurrentSize.width() < mMinDecScaleSize.width())
-if(mStepCurrentSize.width() <= mMinDecScaleSize.width()*1.3)  {
+{
-mBlackBackgroundItem->hide();
+QPointF center(mWindowSize.width()/2, mWindowSize.height()/2);
-//push the widget back to background
+m_AnimRefPoint = source->sceneTransform().map(center);
-setZValue(mMinZValue);
+springEffectAtMin();
-mZoomOngoing = false;
+return true;
-emit zoomWidgetMovedBackground(mFocusIndex);
 //do not reset the transform here as it will then zoom-in the widget to decoded image size
 }
+//finalize the transforms to the geometry else panning will not work
+finalizeWidgetTransform();
 }
 //gesture accepted
 return true;
 }
 //gesture rejected
 if(!mPinchGestureOngoing) {
 return false;
 }
 return true;
+}
+void GlxZoomWidget::springEffectAtMax()
+{
+//set the no. of steps for double tap animation
+mdoubletapSteps = NO_OF_STEPS_FOR_SPRINGBACK_AT_MAX;
+//initiale variable for double tap animation
+mIncSF = 1;
+//For giving a spring effect when user has zoomed out more than normal.
+//Zoom out to mMaxScaleDecSize from the currentsize
+m_FinalAnimatedScaleFactor = mMaxScaleDecSize.width()/mCurrentSize.width();
+//calculate the step increment SF for each step
+msfInc = (1 - m_FinalAnimatedScaleFactor)/(mdoubletapSteps);
+//preserve the size when zoom out was initiated, requried for calculates applicable/req scale factor
+minitSize = mCurrentSize;
+animateDoubleTap();
+}
+void GlxZoomWidget::springEffectAtMin()
+{
+m_FinalAnimatedScaleFactor = mMinDecScaleSize.width()/mCurrentSize.width();
+//set the no. of steps for double tap animation
+mdoubletapSteps = NO_OF_STEPS_FOR_SPRINGBACK_AT_MIN;
+//initiale variable for double tap animation
+mIncSF = 1;
+//SF has to always greater than 1 for upscaling, hence range for zoomout is [1,m_FinalAnimatedScaleFactor]
+msfInc = (m_FinalAnimatedScaleFactor-1)/mdoubletapSteps;
+//preserve the size when zoom out was initiated, requried for calculates applicable/req scale factor
+minitSize = mCurrentSize;
+animateDoubleTap();
 }
 void GlxZoomWidget::zoomImage(qreal zoomFactor, QPointF center)
 {
 // Pinch event filtering for very small zoom factors
 void GlxZoomWidget::limitRequiredSize(QSizeF &requiredSize)
 {
 if(requiredSize.width() > mMaxScaleSize.width() ) {
 requiredSize = mMaxScaleSize ;
 }
-else if(requiredSize.width() < mMinDecScaleSize.width() ) {
+else if(requiredSize.width() < mMinScaleSize.width() ) {
-requiredSize = mMinDecScaleSize ;
+requiredSize = mMinScaleSize ;
 }
 }
 }
 void GlxZoomWidget::animateDoubleTap()
 {
+mDoubleTap = true;
 //calculate increamental scale factor based on the step and then calculate the applicable scale factor this step
 //increamental SF works on the ImageSize when double tap started, applicable(required) SF calculates the delate SF
 if(m_FinalAnimatedScaleFactor > 1) {
 //AA::zoomin case
 mIncSF += msfInc;
 }
 void GlxZoomWidget::animationTimeLineFinished()
 {
 	finalizeWidgetTransform();
 //push the Zoom widget to background when zoomed image size nears FS image
-if(mStepCurrentSize.width() <= mMinDecScaleSize.width()*1.3)  {
+	if(mDoubleTap && (mStepCurrentSize.width() <= mMinDecScaleSize.width()*1.3))  {
 mBlackBackgroundItem->hide();
 //push the widget back to background
 setZValue(mMinZValue);
 mZoomOngoing = false;
 emit zoomWidgetMovedBackground(mFocusIndex);
 //do not reset the transform here as it will then zoom-in the widget to decoded image size
-}
+			   mDoubleTap = false;
+}
+	if(mCurrentSize.width() == mMinDecScaleSize.width()) {
+	    	mBlackBackgroundItem->hide();
+	 	//push the widget back to background
+	         setZValue(mMinZValue);
+	         mZoomOngoing = false;
+	         emit zoomWidgetMovedBackground(mFocusIndex);
+	}
 }
 void GlxZoomWidget::timerEvent(QTimerEvent *event)
 {

changeset 69	45459746d5e8
parent 62	36d93b4dc635
child 71	27f2d7aec52a