FCL/sf/app/photos: comparison photosgallery/viewframework/views/zoomview/src/glxzoommathsengine.cpp

equal deleted inserted replaced

-:78ad99c24f08
+:420f6808bf21
 TPoint(iCenter).iY - halfScreenHeight) ;
 GLX_LOG_INFO2(" Zoom(): Center before Zoom= [%d,%d] ", iCenter.iX, iCenter.iY );
 GLX_LOG_INFO2(" Zoom(): viewPortTopLeft  Before Zoom  = [%d,%d] ", TInt(viewPortTopLeft.iX),
 TInt(viewPortTopLeft.iY)  );
-TInt oldZoomRatio = iZoomRatio ;
+TReal oldZoomRatio = iZoomRatio ;
-TInt newZoomRatio = NewZoomRatio(aExpectedZoomRatio, aRelativeZoomFactor, aZoomMode, aThresholdReached);
+TReal newZoomRatio = NewZoomRatio(aExpectedZoomRatio, aRelativeZoomFactor, aZoomMode, aThresholdReached);
 // we have an offcenter focus for our zoom in certain cases ( e.g pinch operation) or a double tap at an offcenter point.
 // In such a case the zoom happens around that point. So we need to translate (move) the
-// center in such a way that the relative position of the zoom facus does not change.
+// center in such a way that the relative position of the zoom focus does not change.
 // centerTranslationfactor is the vector representation of that amount.
-if (NULL != apZoomFocus)
+if ( (NULL != apZoomFocus) )
 {
-centerTranslationfactor.iX = (((apZoomFocus->iX - halfScreenWidth) * newZoomRatio)/oldZoomRatio) + (halfScreenWidth - apZoomFocus->iX);
+centerTranslationfactor.iX = (((apZoomFocus->iX - halfScreenWidth   ) * newZoomRatio)/oldZoomRatio) + (halfScreenWidth  - apZoomFocus->iX);
-centerTranslationfactor.iY = (((apZoomFocus->iY - halfScreenHeight) * newZoomRatio)/oldZoomRatio) + (halfScreenHeight - apZoomFocus->iY);
+centerTranslationfactor.iY = (((apZoomFocus->iY - halfScreenHeight  ) * newZoomRatio)/oldZoomRatio) + (halfScreenHeight - apZoomFocus->iY);
 }
-GLX_LOG_INFO1(" Zoom: newZoomRatio = %d.   ", newZoomRatio );
+GLX_LOG_INFO1(" Zoom: newZoomRatio = %x.   ", newZoomRatio );
 TSize imageDimension = TSize(iActualImageSize);
 imageDimension.iWidth =  (imageDimension.iWidth  * newZoomRatio)/100;
 imageDimension.iHeight = (imageDimension.iHeight * newZoomRatio)/100;
 // [TODO] Suggest the use of overloaded operators so that points can be operated upon by vectors.
 // specifically in this case to enable a point to be multiplied by a dimension resulting from the ratio of two dimension
 iCenter.iX = (iCenter.iX * imageDimension.iWidth )/iImageVirtualSize.iWidth  ;
 iCenter.iY = (iCenter.iY * imageDimension.iHeight)/iImageVirtualSize.iHeight ;
 //HEIGHT Calculation
 // TODO: Hive center corrections into an different function.
 // If the image might have become smaller than the screen DUE to or AFTER the above calculations
 if((imageDimension.iHeight < iScreenSize.iHeight - BORDER_HEIGHT))
 {
 {
 //The Image is panned and while zooming out ,the center has to be possistioned to center of the screen.
 iCenter.iX =(imageDimension.iWidth/2);
 }
 }
 viewPortTopLeft.iX = iCenter.iX - halfScreenWidth;
 viewPortTopLeft.iY = iCenter.iY - halfScreenHeight;
 iImageVirtualSize = imageDimension;
 }
 // if centerTranslationfactor exists that means we have an off center zoom, then
 // pan that way to get the new center.
 Pan(centerTranslationfactor, viewPortTopLeft, EGlxPanIncrementUniform) ;
 //-------------------------------------------------------------------------------------
 // NewZoomRatio: Calculates the Zoom Ratio
 //-------------------------------------------------------------------------------------
 //
-TInt TGlxZoomAndPanMathsEngine::NewZoomRatio(
+TReal TGlxZoomAndPanMathsEngine::NewZoomRatio(
 TInt aExpectedZoomRatio,
 TInt aRelativeZoomFactor,
 TZoomMode aZoomMode,
 TBool *aThresholdReached)
 {
 TRACER("TGlxZoomAndPanMathsEngine::NewZoomRatio ");
-GLX_LOG_INFO1("NewZoomRatio: Old Zoom Ratio = %d .   ",TInt(iZoomRatio)   );
+GLX_LOG_INFO1("NewZoomRatio: Old Zoom Ratio = %x .   ",iZoomRatio   );
 GLX_LOG_INFO1("NewZoomRatio: Expected Zoom Ratio  = %d .   ",aExpectedZoomRatio    );
 GLX_LOG_INFO1("NewZoomRatio: Relative Zoom Factor = %d .   ",aRelativeZoomFactor   );
 // We ignore zoommode and aRelativeZoomFactor if we have a aExpectedZoomRatio.
 // We ignore zoommode if we have a aRelativeZoomFactor.
 }
 else if (normalizedRelativeZoomFactor > KGlxMaxRelativeZoomPercent)
 {
 normalizedRelativeZoomFactor = KGlxMaxRelativeZoomPercent;
 }
 iZoomRatio =  (iZoomRatio * normalizedRelativeZoomFactor)/100 ;
 }
 else
 {
 if(EZoomIn == aZoomMode)
 GLX_LOG_INFO1("NewZoomRatio: Min Threshold Reached iInitialZoomRatio = %d .", iMinZoomRatio );
 *aThresholdReached = ETrue;
 }
 }
-GLX_LOG_INFO1("NewZoomRatio: New Zoom Ratio = %d.   ",TInt(iZoomRatio)   );
+GLX_LOG_INFO1("NewZoomRatio: New Zoom Ratio = %x.   ",iZoomRatio   );
 return iZoomRatio;
 }
 //-------------------------------------------------------------------------------------

branch	RCL_3
changeset 35	420f6808bf21
parent 32	78ad99c24f08
child 47	f9e827349359