FCL/sf/mw/hb: comparison src/hbcore/effects/hbeffectscale.cpp

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 #include <QVariantAnimation>
 HbEffectScaleAnimation::HbEffectScaleAnimation(
 HbEffectGroup *group,
 HbEffectScale *effect,
-int duration ) :
+int duration) :
 HbEffectAnimation(group),
 mEffect(effect),
 mCenter(0),
 mCurrentScaling(1.0)
 {
 setDuration(duration);
 }
 void HbEffectScaleAnimation::setCenter(qreal center)
 HbEffectScale::HbEffectScale(
 const QList<HbEffectFxmlParamData> &data,
 QGraphicsItem *item,
 HbEffectGroup *group) :
 HbEffectAbstract(0, item, group),
 mAnimationX(0),
 mAnimationY(0)
 {
 int durationX = 0;
 int durationY = 0;
 QEasingCurve curveX = QEasingCurve::Linear;
 QEasingCurve curveY = QEasingCurve::Linear;
 mStartYValue = 1.0f;
 mEndYValue = 1.0f;
 mCenterXValue = 0;
 mCenterYValue = 0;
-const HbEffectFxmlParamData* paramX = 0;
+const HbEffectFxmlParamData *paramX = 0;
-const HbEffectFxmlParamData* paramY = 0;
+const HbEffectFxmlParamData *paramY = 0;
-Q_FOREACH(const HbEffectFxmlParamData &param, data) {
+Q_FOREACH(const HbEffectFxmlParamData & param, data) {
-	    if (param.name() == FXML_KEYWORD_SCALE_X) {
+if (param.name() == FXML_KEYWORD_SCALE_X) {
 mKeyFrameListX = param.keyFrames();
-			// <start> for scale_x
+// <start> for scale_x
-			mStartWidth =  param.getAttribute(FXML_KEYWORD_START);
+mStartWidth =  param.getAttribute(FXML_KEYWORD_START);
-			mStartWidthRef = param.startRef();
+mStartWidthRef = param.startRef();
-			// <end> for scale_x
+// <end> for scale_x
-			mEndWidth = param.getAttribute(FXML_KEYWORD_END);
+mEndWidth = param.getAttribute(FXML_KEYWORD_END);
-			mEndWidthRef = param.endRef();
+mEndWidthRef = param.endRef();
-			// duration and curvepath
+// duration and curvepath
 HbEffectUtils::resolveFxmlDuration(durationX, param);
 HbEffectUtils::resolveFxmlCurveShape(curveX, param);
 // Only if "start ref" and "end ref" are not used, read parameter's "ref" attribute
 if (mStartWidthRef.isEmpty() && mEndWidthRef.isEmpty()) {
 mParamRefX = param.getAttribute(FXML_PARAM_REF);
 }
 paramX = &param;
-	    }
+} else if (param.name() == FXML_KEYWORD_SCALE_Y) {
-	    else if (param.name() == FXML_KEYWORD_SCALE_Y) {
 mKeyFrameListY = param.keyFrames();
-			// <start> for scale_y
+// <start> for scale_y
-			mStartHeight =  param.getAttribute(FXML_KEYWORD_START);
+mStartHeight =  param.getAttribute(FXML_KEYWORD_START);
-			mStartHeightRef = param.startRef();
+mStartHeightRef = param.startRef();
-			// <end> for scale_y
+// <end> for scale_y
-			mEndHeight = param.getAttribute(FXML_KEYWORD_END);
+mEndHeight = param.getAttribute(FXML_KEYWORD_END);
-			mEndHeightRef = param.endRef();
+mEndHeightRef = param.endRef();
 HbEffectUtils::resolveFxmlDuration(durationY, param);
 HbEffectUtils::resolveFxmlCurveShape(curveY, param);
 // Only if "start ref" and "end ref" are not used, read parameter's "ref" attribute
 if (mStartHeightRef.isEmpty() && mEndHeightRef.isEmpty()) {
 mParamRefY = param.getAttribute(FXML_PARAM_REF);
 }
 paramY = &param;
-	    }
+} else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_X) {
-	    else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_X) {
 mCenterX = param.getValue();
 mCenterXRef = param.getAttribute(FXML_PARAM_REF);
-}
+} else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_Y) {
-	    else if (param.name() == FXML_KEYWORD_SCALE_ORIGIN_Y) {
 mCenterY = param.getValue();
 mCenterYRef = param.getAttribute(FXML_PARAM_REF);
-	    }
+}
 }
 // Validate references. If start and end references are used, at least one of them must be a visual reference.
 if ((mStartWidthRef.isEmpty() || mStartWidthRef.startsWith(FXML_VISUAL) ||
 mEndWidthRef.isEmpty() || mEndWidthRef.startsWith(FXML_VISUAL)) &&
 (mStartHeightRef.isEmpty() || mStartHeightRef.startsWith(FXML_VISUAL) ||
 mEndHeightRef.isEmpty() || mEndHeightRef.startsWith(FXML_VISUAL))) {
 // references ok
 } else {
 // Invalid references - disable effect
 durationX = 0;
 durationY = 0;
 }
 }
 /* deletes the effect and rewinds the animation so that next animation can star,
 rewind is necessary as the general use case is that the effect is restarted before
 being complete, in which case the rewind would transform the item and prepare for
 the next effect.
 */
 HbEffectScale::~HbEffectScale()
 {
 const QRectF &extRect = group()->extRect();
 // start width
 if (!mStartWidth.isEmpty()) {
 value = HbEffectUtils::resolveFxmlRef(
 mStartWidthRef, mStartWidth, &valueOk, item(), HbEffectUtils::Size, extRect);
 if (valueOk) {
 mStartXValue = value;
 }
 }
 // start height
 }
 // end width
 if (!mEndWidth.isEmpty()) {
 value = HbEffectUtils::resolveFxmlRef(
 mEndWidthRef, mEndWidth, &valueOk, item(), HbEffectUtils::Size, extRect);
 if (valueOk) {
 mEndXValue = value;
 }
 }
 // end height
 if (!mEndHeight.isEmpty()) {
 value = HbEffectUtils::resolveFxmlRef(
 mEndHeightRef, mEndHeight, &valueOk, item(), HbEffectUtils::Size, extRect);
 if (valueOk) {
 mEndYValue = value;
 }
 }
 // CenterX
 value = HbEffectUtils::resolveFxmlRef(
 mCenterXRef, mCenterX, &valueOk, item(), HbEffectUtils::CenterMappedToTargetRect, extRect);
 if (valueOk) {
 mCenterXValue = value;
 }
 // CenterY
 value = HbEffectUtils::resolveFxmlRef(
 mCenterYRef, mCenterY, &valueOk, item(), HbEffectUtils::CenterMappedToTargetRect, extRect);
 if (valueOk) {
 mCenterYValue = value;
 }
 mAnimationX->setCenter(mCenterXValue);
 bool startEndRefUsed = !mStartWidthRef.isEmpty() && !mEndWidthRef.isEmpty();
 qreal paramRefValueX = 0.0;
 // Resolve SCALE_X parameter's "ref" value only if that's needed
 if (!startEndRefUsed) {
 paramRefValueX = HbEffectUtils::resolveFxmlRef(
 mParamRefX, "1", &valueOk, item(), HbEffectUtils::Size, extRect);
 }
 // Set keyframes in animation
-foreach(const HbKeyFrame &kf, mKeyFrameListX) {
+foreach(const HbKeyFrame & kf, mKeyFrameListX) {
 // If start and end references are used,
 // value at given step is (1-c)*startX + c*endX where c is the keyframe coefficient value
 if (startEndRefUsed) {
 value = (1 - kf.val) * mStartXValue + kf.val * mEndXValue;
 qreal paramRefValueY = 0.0;
 // Resolve SCALE_Y parameter's "ref" value only if that's needed
 if (!startEndRefUsed) {
 paramRefValueY = HbEffectUtils::resolveFxmlRef(
 mParamRefY, "1", &valueOk, item(), HbEffectUtils::Size, extRect);
 }
 // Set keyframes in animation
-foreach(const HbKeyFrame &kf, mKeyFrameListY) {
+foreach(const HbKeyFrame & kf, mKeyFrameListY) {
 // If start and end references are used,
 // value at given step is (1-c)*startY + c*endY where c is the keyframe coefficient value
 if (startEndRefUsed) {
 value = (1 - kf.val) * mStartYValue + kf.val * mEndYValue;
 }
 void HbEffectScale::updateItemTransform(QTransform &transform)
 {
 QTransform newTransform;
 // Handle centering for scaling the matrix
 newTransform.translate(mCenterXValue, mCenterYValue);
 // Get the current scaling factor from animation or use 1.0 if animation does not exist
 qreal currentScalingX = mAnimationX ? mAnimationX->mCurrentScaling : 1.0;
 qreal currentScalingY = mAnimationY ? mAnimationY->mCurrentScaling : 1.0;
 // Scale the transformation matrix to reach the new scaling factor.

changeset 5	627c4a0fd0e7
parent 1	f7ac710697a9