X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fimage-view-svg%2Fimage-view-svg-example.cpp;h=b62b6fe372abf97607de11e53cdedf11270bb25c;hb=2e182925204bf3ef9f2a36cbfbf998e79fbafaf5;hp=62cde6ec647328da17e2997b595b91f2584c3c59;hpb=9879c76252b384906ea35422547840350a72019c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp index 62cde6e..b62b6fe 100644 --- a/examples/image-view-svg/image-view-svg-example.cpp +++ b/examples/image-view-svg/image-view-svg-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ using namespace Dali; namespace { +const float MIN_SCALE = 0.6f; const float MAX_SCALE = 6.f; const char* SVG_IMAGES[] = @@ -37,9 +38,10 @@ const char* SVG_IMAGES[] = DEMO_IMAGE_DIR "Kid1.svg" }; const unsigned int NUM_SVG_IMAGES( sizeof( SVG_IMAGES ) / sizeof( SVG_IMAGES[0] ) ); -} +const unsigned int NUM_IMAGES_DISPLAYED = 4u; +} // unnamed namespace -// This example shows how to display svg images with ImageView +// This example shows how to display svg images with ImageView. // class ImageSvgController : public ConnectionTracker { @@ -48,7 +50,6 @@ public: ImageSvgController( Application& application ) : mApplication( application ), mScale( 1.f ), - mScaleAtPinchStart( 1.0f ), mIndex( 0 ) { // Connect to the Application's Init signal @@ -75,43 +76,43 @@ public: // Background, for receiving gestures mStageBackground = Actor::New(); - mStageBackground.SetAnchorPoint( AnchorPoint::TOP_CENTER ); - mStageBackground.SetParentOrigin( ParentOrigin::TOP_CENTER ); - mStageBackground.SetSize( stageSize.x, stageSize.y ); + mStageBackground.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); + mStageBackground.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); + mStageBackground.SetProperty( Actor::Property::SIZE, Vector2( stageSize.x, stageSize.y ) ); stage.Add(mStageBackground); // Push button, for changing the image set for displaying Toolkit::PushButton changeButton = Toolkit::PushButton::New(); changeButton.SetProperty( Toolkit::Button::Property::LABEL, "Next" ); - changeButton.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); - changeButton.SetParentOrigin( ParentOrigin::TOP_RIGHT ); + changeButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); + changeButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); stage.Add( changeButton ); changeButton.ClickedSignal().Connect( this, &ImageSvgController::OnChangeButtonClicked ); // Push button, for resetting the actor size and position Toolkit::PushButton resetButton = Toolkit::PushButton::New(); resetButton.SetProperty( Toolkit::Button::Property::LABEL, "Reset" ); - resetButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - resetButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + resetButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + resetButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); stage.Add( resetButton ); resetButton.ClickedSignal().Connect( this, &ImageSvgController::OnResetButtonClicked ); // Create and put imageViews to stage - for( unsigned int i=0; i<4u; i++) + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED; i++ ) { mSvgActor[i] = Toolkit::ImageView::New(SVG_IMAGES[mIndex+i]); - mSvgActor[i].SetSize( mActorSize ); + mSvgActor[i].SetProperty( Actor::Property::SIZE, mActorSize ); mSvgActor[i].TranslateBy( Vector3( 0.0, stageSize.height * 0.05, 0.0f ) ); stage.Add( mSvgActor[i] ); } - mSvgActor[0].SetParentOrigin( ParentOrigin::CENTER ); - mSvgActor[0].SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT ); - mSvgActor[1].SetParentOrigin( ParentOrigin::CENTER ); - mSvgActor[1].SetAnchorPoint( AnchorPoint::BOTTOM_LEFT ); - mSvgActor[2].SetParentOrigin( ParentOrigin::CENTER ); - mSvgActor[2].SetAnchorPoint( AnchorPoint::TOP_RIGHT ); - mSvgActor[3].SetParentOrigin( ParentOrigin::CENTER ); - mSvgActor[3].SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mSvgActor[0].SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mSvgActor[0].SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT ); + mSvgActor[1].SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mSvgActor[1].SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT ); + mSvgActor[2].SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mSvgActor[2].SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); + mSvgActor[3].SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mSvgActor[3].SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Connect pan gesture for moving the actors mPanGestureDetector = PanGestureDetector::New(); @@ -130,8 +131,8 @@ public: // Callback of push button, for changing image set bool OnChangeButtonClicked( Toolkit::Button button ) { - mIndex = (mIndex+4) % NUM_SVG_IMAGES; - for( unsigned int i=0; i<4u; i++) + mIndex = ( mIndex + NUM_IMAGES_DISPLAYED ) % NUM_SVG_IMAGES; + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED; i++ ) { mSvgActor[i].SetImage(SVG_IMAGES[mIndex+i]); } @@ -142,10 +143,10 @@ public: // Callback of push button, for resetting image size and position bool OnResetButtonClicked( Toolkit::Button button ) { - for( unsigned int i=0; i<4u; i++) + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED ; i++ ) { - mSvgActor[i].SetSize(mActorSize); - mSvgActor[i].SetPosition( Vector3::ZERO ); + mSvgActor[i].SetProperty( Actor::Property::SIZE, mActorSize); + mSvgActor[i].SetProperty( Actor::Property::POSITION, Vector3::ZERO ); mScale = 1.f; } @@ -157,7 +158,7 @@ public: { if( gesture.state == Gesture::Continuing ) { - for( unsigned int i=0; i<4u; i++) + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED; i++ ) { mSvgActor[i].TranslateBy(Vector3(gesture.displacement)); } @@ -167,18 +168,42 @@ public: // Callback of pinch gesture, for resizing the actors void OnPinch(Actor actor, const PinchGesture& gesture) { - if (gesture.state == Gesture::Started) - { - mScaleAtPinchStart = mScale; - } - if( gesture.state == Gesture::Finished ) + switch( gesture.state ) { - mScale = mScaleAtPinchStart * gesture.scale; - mScale = mScale > MAX_SCALE ? MAX_SCALE : mScale; - for( unsigned int i=0; i<4u; i++) + // Only scale the image when we start or continue pinching + + case Gesture::Started: + case Gesture::Continuing: + { + float scale = std::max( gesture.scale, MIN_SCALE / mScale ); + scale = std::min( MAX_SCALE / mScale, scale ); + + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED; i++ ) + { + mSvgActor[i].SetProperty( Actor::Property::SCALE, scale ); + } + break; + } + + case Gesture::Finished: { - mSvgActor[i].SetSize( mActorSize * mScale); + // Resize the image when pinching is complete, this will rasterize the SVG to the new size + + mScale = mScale * gesture.scale; + mScale = mScale > MAX_SCALE ? MAX_SCALE : mScale; + mScale = mScale < MIN_SCALE ? MIN_SCALE : mScale; + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED; i++ ) + { + mSvgActor[i].SetProperty( Actor::Property::SIZE, mActorSize * mScale ); + mSvgActor[i].SetProperty( Actor::Property::SCALE, 1.0f ); + } + break; } + + case Gesture::Cancelled: + case Gesture::Clear: + case Gesture::Possible: + break; } } @@ -198,10 +223,13 @@ public: const char* keyName = event.keyPressedName.c_str(); if( strcmp(keyName, "Left") == 0 ) { - mScale /= 1.1f; - for( unsigned int i=0; i<4u; i++) + if( mScale > MIN_SCALE ) + { + mScale /= 1.1f; + } + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED; i++ ) { - mSvgActor[i].SetSize( mActorSize * mScale); + mSvgActor[i].SetProperty( Actor::Property::SIZE, mActorSize * mScale ); } } else if( strcmp(keyName, "Right") == 0 ) @@ -210,9 +238,9 @@ public: { mScale *= 1.1f; } - for( unsigned int i=0; i<4u; i++) + for( unsigned int i = 0; i < NUM_IMAGES_DISPLAYED; i++ ) { - mSvgActor[i].SetSize( mActorSize * mScale); + mSvgActor[i].SetProperty( Actor::Property::SIZE, mActorSize * mScale ); } } } @@ -228,7 +256,6 @@ private: Toolkit::ImageView mSvgActor[4]; Vector2 mActorSize; float mScale; - float mScaleAtPinchStart; unsigned int mIndex; };