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

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 HbEffectTranslateAnimation::HbEffectTranslateAnimation(
 HbEffectGroup *group,
 HbEffectTranslate *effect,
 int duration) :
 HbEffectAnimation(group),
 effect(effect)
 {
 setDuration(duration);
 }
 void HbEffectTranslateAnimation::setOriginalPos(qreal pos)
 HbEffectTranslate::HbEffectTranslate(
 const QList<HbEffectFxmlParamData> &data,
 QGraphicsItem *item,
 HbEffectGroup *group) :
 HbEffectAbstract(0, item, group),
 mAnimationX(0),
 mAnimationY(0)
 {
 // Default values if something is not passed in FXML
 int durationX = 0;
 int durationY = 0;
 QEasingCurve curveShapeX = QEasingCurve::Linear;
 QEasingCurve curveShapeY = QEasingCurve::Linear;
-const HbEffectFxmlParamData* paramX = 0;
+const HbEffectFxmlParamData *paramX = 0;
-const HbEffectFxmlParamData* paramY = 0;
+const HbEffectFxmlParamData *paramY = 0;
 // Handle FXML parameters
-Q_FOREACH(const HbEffectFxmlParamData &param, data) {
+Q_FOREACH(const HbEffectFxmlParamData & param, data) {
-	    if (param.name() == FXML_KEYWORD_TRANSLATION_X) {
+if (param.name() == FXML_KEYWORD_TRANSLATION_X) {
 mKeyFrameListX = param.keyFrames();
 HbEffectUtils::resolveFxmlDuration(durationX, param);
 HbEffectUtils::resolveFxmlCurveShape(curveShapeX, param);
-			mStartXRef = param.startRef();
+mStartXRef = param.startRef();
-			mEndXRef = param.endRef();
+mEndXRef = param.endRef();
-			mStartX = param.getAttribute(FXML_KEYWORD_START);
+mStartX = param.getAttribute(FXML_KEYWORD_START);
-			mEndX = param.getAttribute(FXML_KEYWORD_END);
+mEndX = param.getAttribute(FXML_KEYWORD_END);
 // Only if "start ref" and "end ref" are not used, read parameter's "ref" attribute
 if (mStartXRef.isEmpty() && mEndXRef.isEmpty()) {
 mParamRefX = param.getAttribute(FXML_PARAM_REF);
 }
 paramX = &param;
-	    }
+} else if (param.name() == FXML_KEYWORD_TRANSLATION_Y) {
-	    else if (param.name() == FXML_KEYWORD_TRANSLATION_Y) {
 mKeyFrameListY = param.keyFrames();
 HbEffectUtils::resolveFxmlDuration(durationY, param);
 HbEffectUtils::resolveFxmlCurveShape(curveShapeY, param);
-			mStartYRef = param.startRef();
+mStartYRef = param.startRef();
-			mEndYRef = param.endRef();
+mEndYRef = param.endRef();
-			mStartY = param.getAttribute(FXML_KEYWORD_START);
+mStartY = param.getAttribute(FXML_KEYWORD_START);
-			mEndY = param.getAttribute(FXML_KEYWORD_END);
+mEndY = param.getAttribute(FXML_KEYWORD_END);
 // Only if "start ref" and "end ref" are not used, read parameter's "ref" attribute
 if (mStartYRef.isEmpty() && mEndYRef.isEmpty()) {
 mParamRefY = param.getAttribute(FXML_PARAM_REF);
 }
 paramY = &param;
-	    }
+}
 }
 if (durationX > 0) {
 mAnimationX = new HbEffectTranslateAnimation(group, this, durationX);
 mAnimationX->addLooping(paramX);
 mAnimationY->mCurve = curveShapeY;
 }
 }
 /*  Deletes the effect and rewinds the animation so that next animation can start,
 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,otherwise would result in flicker.
 */
 HbEffectTranslate::~HbEffectTranslate()
 {
 const QRectF &extRect = group()->extRect();
 // StartX
 qreal value = HbEffectUtils::resolveFxmlRef(
 mStartXRef, mStartX, &valueOk, item(), HbEffectUtils::Position, extRect);
 if (valueOk) {
 mStartXValue = value;
 } else {
 // Failed to resolve parameters, use item's current position.
 mStartXValue = item()->pos().x();
 }
 // StartY
 value = HbEffectUtils::resolveFxmlRef(
 mStartYRef, mStartY, &valueOk, item(), HbEffectUtils::Position, extRect);
 if (valueOk) {
 mStartYValue = value;
 } else {
 // Failed to resolve parameters, use item's current position.
 mStartYValue = item()->pos().y();
 }
 // EndX
 value = HbEffectUtils::resolveFxmlRef(
 mEndXRef, mEndX, &valueOk, item(), HbEffectUtils::Position, extRect);
 if (valueOk) {
 mEndXValue = value;
 } else {
 // Failed to resolve parameters, use item's current position.
 mEndXValue = item()->pos().x();
 }
 // EndY
 value = HbEffectUtils::resolveFxmlRef(
 mEndYRef, mEndY, &valueOk, item(), HbEffectUtils::Position, extRect);
 if (valueOk) {
 mEndYValue = value;
 } else {
 // Failed to resolve parameters, use item's current position.
 mEndYValue = item()->pos().y();
 mAnimationX->setEndValue(QVariant(mEndXValue));
 bool startEndRefUsed = !mStartXRef.isEmpty() && !mEndXRef.isEmpty();
 // 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;
 }
 // Otherwise c defines the value
 else {
 value = HbEffectUtils::resolveFxmlRef(
 mParamRefX, QString().setNum(kf.val), &valueOk, item(), HbEffectUtils::Position, extRect);
 if (!valueOk) {
 // Default to item's position if failed
 value = item()->pos().x();
 }
 }
 mAnimationY->setEndValue(QVariant(mEndYValue));
 bool startEndRefUsed = !mStartYRef.isEmpty() && !mEndYRef.isEmpty();
 // 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;
 }
 // Otherwise c defines the relative value to parameter's reference
 else {
 value = HbEffectUtils::resolveFxmlRef(
 mParamRefY, QString().setNum(kf.val), &valueOk, item(), HbEffectUtils::Position, extRect);
 if (!valueOk) {
 // Default to item's position if failed
 value = item()->pos().y();
 }
 }
 }
 }
 }
 void HbEffectTranslate::setStartState(QTransform &transform)
 {
 qreal translateX = mAnimationX ? mStartXValue - mAnimationX->originalPos : 0;
 qreal translateY = mAnimationY ? mStartYValue - mAnimationY->originalPos : 0;
 QTransform newTransform;
 newTransform.translate(translateX, translateY);

changeset 5	627c4a0fd0e7
parent 1	f7ac710697a9