X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fanimated-images%2Fanimated-images-example.cpp;h=9db95e44c271427c908f46e00a43847a3687994f;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=3d83326fbd1f08a0e85bad4088317160da14926f;hpb=2d809107e588c9046358e3f1c1d5cb51455d5365;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/animated-images/animated-images-example.cpp b/examples/animated-images/animated-images-example.cpp index 3d83326..9db95e4 100644 --- a/examples/animated-images/animated-images-example.cpp +++ b/examples/animated-images/animated-images-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -17,6 +17,7 @@ #include #include +#include #include using namespace Dali; @@ -24,45 +25,42 @@ using namespace Dali::Toolkit; namespace { -const char * const PLAY_ICON_UNSELECTED( DEMO_IMAGE_DIR "icon-play.png" ); -const char * const PLAY_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" ); +const char* const PLAY_ICON_UNSELECTED(DEMO_IMAGE_DIR "icon-play.png"); +const char* const PLAY_ICON_SELECTED(DEMO_IMAGE_DIR "icon-play-selected.png"); const unsigned int ANIMATED_IMAGE_COUNT = 2; -const char * ANIMATED_GIF_URLS[ ANIMATED_IMAGE_COUNT ] = -{ - DEMO_IMAGE_DIR "dog-anim.gif", - DEMO_IMAGE_DIR "dali-logo-anim.gif" -}; +const char* ANIMATED_IMAGE_URLS[ANIMATED_IMAGE_COUNT] = + { + DEMO_IMAGE_DIR "dog-anim.webp", + DEMO_IMAGE_DIR "dali-logo-anim.gif"}; -const char * ANIMATED_ARRAY_URL_FORMATS[ ANIMATED_IMAGE_COUNT ] = -{ - DEMO_IMAGE_DIR "dog-anim-%03d.png", // Images are named dog-anim-001.png, dog-anim-002.png, etc. - DEMO_IMAGE_DIR "dali-logo-anim-%03d.png" // Images are named dali-logo-anim-001.png, dali-logo-anim-002.png, etc. +const char* ANIMATED_ARRAY_URL_FORMATS[ANIMATED_IMAGE_COUNT] = + { + DEMO_IMAGE_DIR "dog-anim-%03d.png", // Images are named dog-anim-001.png, dog-anim-002.png, etc. + DEMO_IMAGE_DIR "dali-logo-anim-%03d.png" // Images are named dali-logo-anim-001.png, dali-logo-anim-002.png, etc. }; -int ANIMATED_ARRAY_NUMBER_OF_FRAMES[ ANIMATED_IMAGE_COUNT ] = -{ - 8, - 15 -}; +int ANIMATED_ARRAY_NUMBER_OF_FRAMES[ANIMATED_IMAGE_COUNT] = + { + 8, + 15}; -const char * GIF_RADIO_BUTTON_NAME( "Gif" ); -const char * ARRAY_RADIO_BUTTON_NAME( "Array" ); +const char* ANIMATION_RADIO_BUTTON_NAME("Animation Image"); +const char* ARRAY_RADIO_BUTTON_NAME("Array"); /// Structure to specify the layout information for the animated images views. struct ImageLayoutInfo { Vector3 anchorPoint; Vector3 parentOrigin; - float yPosition; + float yPosition; }; -ImageLayoutInfo IMAGE_LAYOUT_INFO[ ANIMATED_IMAGE_COUNT ] = -{ - { AnchorPoint::BOTTOM_CENTER, ParentOrigin::CENTER, -80.0f }, - { AnchorPoint::TOP_CENTER, ParentOrigin::CENTER, 80.0f } -}; +ImageLayoutInfo IMAGE_LAYOUT_INFO[ANIMATED_IMAGE_COUNT] = + { + {AnchorPoint::BOTTOM_CENTER, ParentOrigin::CENTER, -80.0f}, + {AnchorPoint::TOP_CENTER, ParentOrigin::CENTER, 80.0f}}; } // unnamed namespace @@ -71,83 +69,81 @@ ImageLayoutInfo IMAGE_LAYOUT_INFO[ ANIMATED_IMAGE_COUNT ] = * * - It displays two animated images, an animated dog and an animated DALi logo. * - The images are loaded paused, a play button is overlayed on top of the images to play the animated image. - * - Radio buttons at the bottom allow the user to change between Animated GIFs and a collection of Image Arrays. + * - Radio buttons at the bottom allow the user to change between Animated Images and a collection of Image Arrays. */ class AnimatedImageController : public ConnectionTracker { public: - /** * @brief Constructor. * @param[in] application A reference to the Application class */ - AnimatedImageController( Application& application ) - : mApplication( application ), - mImageType( ImageType::GIF ) + AnimatedImageController(Application& application) + : mApplication(application), + mImageType(ImageType::ANIMATED_IMAGE) { // Connect to the Application's Init signal - mApplication.InitSignal().Connect( this, &AnimatedImageController::Create ); + mApplication.InitSignal().Connect(this, &AnimatedImageController::Create); } private: - /** * @brief The image types supported by the application. */ enum class ImageType { - GIF, ///< Displays Animated GIF Files. - IMAGE_ARRAY ///< Displays an array of URLs that are used as an animated image. + ANIMATED_IMAGE, ///< Displays Animated Image Files. + IMAGE_ARRAY ///< Displays an array of URLs that are used as an animated image. }; /** * @brief Called to initialise the application content. * @param[in] application A reference to the Application class */ - void Create( Application& application ) + void Create(Application& application) { - // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit. - Stage stage = Stage::GetCurrent(); - stage.SetBackgroundColor( Color::WHITE ); - stage.KeyEventSignal().Connect( this, &AnimatedImageController::OnKeyEvent ); + // Set the window background color and connect to the window's key signal to allow Back and Escape to exit. + Window window = application.GetWindow(); + window.SetBackgroundColor(Color::WHITE); + window.KeyEventSignal().Connect(this, &AnimatedImageController::OnKeyEvent); // Create the animated image-views - CreateAnimatedImageViews(); + CreateAnimatedImageViews(window); - // Create radio buttons to change between GIF images and Image Arrays - CreateRadioButtonLayout(); + // Create radio buttons to change between Animated images and Image Arrays + CreateRadioButtonLayout(window); // Create a tap gesture detector to use to pause the animated images mTapDetector = TapGestureDetector::New(); - mTapDetector.DetectedSignal().Connect( this, &AnimatedImageController::OnTap ); + mTapDetector.DetectedSignal().Connect(this, &AnimatedImageController::OnTap); } /** * @brief Creates and lays out radio buttons to allow changing between the different image types. */ - void CreateRadioButtonLayout() + void CreateRadioButtonLayout(Window& window) { - mGifButton = CreateRadioButton( GIF_RADIO_BUTTON_NAME, true ); - mArrayButton = CreateRadioButton( ARRAY_RADIO_BUTTON_NAME, false ); - - Toolkit::TableView radioButtonLayout = Toolkit::TableView::New( 1, 2 ); - radioButtonLayout.SetName( "RadioButtonsLayout" ); - radioButtonLayout.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT ); - radioButtonLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - radioButtonLayout.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); - radioButtonLayout.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); - radioButtonLayout.SetFitHeight( 0 ); - radioButtonLayout.AddChild( mGifButton, TableView::CellPosition( 0, 0 ) ); - radioButtonLayout.AddChild( mArrayButton, TableView::CellPosition( 0, 1 ) ); - radioButtonLayout.SetCellAlignment( TableView::CellPosition( 0, 0 ), - HorizontalAlignment::CENTER, - VerticalAlignment::CENTER ); - radioButtonLayout.SetCellAlignment( TableView::CellPosition( 0, 1 ), - HorizontalAlignment::CENTER, - VerticalAlignment::CENTER ); - radioButtonLayout.SetY( -10.0f ); - - Stage::GetCurrent().Add( radioButtonLayout ); + mAnimatedImageButton = CreateRadioButton(ANIMATION_RADIO_BUTTON_NAME, true); + mArrayButton = CreateRadioButton(ARRAY_RADIO_BUTTON_NAME, false); + + Toolkit::TableView radioButtonLayout = Toolkit::TableView::New(1, 2); + radioButtonLayout.SetProperty(Dali::Actor::Property::NAME, "RadioButtonsLayout"); + radioButtonLayout.SetResizePolicy(ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT); + radioButtonLayout.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + radioButtonLayout.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER); + radioButtonLayout.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER); + radioButtonLayout.SetFitHeight(0); + radioButtonLayout.AddChild(mAnimatedImageButton, TableView::CellPosition(0, 0)); + radioButtonLayout.AddChild(mArrayButton, TableView::CellPosition(0, 1)); + radioButtonLayout.SetCellAlignment(TableView::CellPosition(0, 0), + HorizontalAlignment::CENTER, + VerticalAlignment::CENTER); + radioButtonLayout.SetCellAlignment(TableView::CellPosition(0, 1), + HorizontalAlignment::CENTER, + VerticalAlignment::CENTER); + radioButtonLayout.SetProperty(Actor::Property::POSITION_Y, -10.0f); + + window.Add(radioButtonLayout); } /** @@ -156,41 +152,41 @@ private: * @param[in] selected Whether the button is selected * @return The created radio-button */ - RadioButton CreateRadioButton( const char * const name, bool selected ) + RadioButton CreateRadioButton(const char* const name, bool selected) { - RadioButton radioButton = Toolkit::RadioButton::New( name ); - radioButton.SetProperty( Button::Property::SELECTED, selected ); - radioButton.ClickedSignal().Connect( this, &AnimatedImageController::OnRadioButtonClicked ); + RadioButton radioButton = Toolkit::RadioButton::New(name); + radioButton.SetProperty(Button::Property::SELECTED, selected); + radioButton.ClickedSignal().Connect(this, &AnimatedImageController::OnRadioButtonClicked); return radioButton; } /** * @brief Creates the required animated image views. */ - void CreateAnimatedImageViews() + void CreateAnimatedImageViews(Window window) { - for( unsigned int index = 0; index < ANIMATED_IMAGE_COUNT; ++index ) + for(unsigned int index = 0; index < ANIMATED_IMAGE_COUNT; ++index) { - Stage stage = Stage::GetCurrent(); - - Control& control = ( index == 0 ) ? mActorDog : mActorLogo; - if( control ) + Control& control = (index == 0) ? mActorDog : mActorLogo; + if(control) { - // Remove the previous control from the stage, it's resources (and children) will be deleted automatically + // Remove the previous control from the window, it's resources (and children) will be deleted automatically control.Unparent(); } // Create and lay out the image view according to the index control = Toolkit::ImageView::New(); - control.SetProperty( Toolkit::ImageView::Property::IMAGE, SetupViewProperties( mImageType, index ) ); - control.SetAnchorPoint( IMAGE_LAYOUT_INFO[ index ].anchorPoint ); - control.SetParentOrigin( IMAGE_LAYOUT_INFO[ index ].parentOrigin ); - control.SetY( IMAGE_LAYOUT_INFO[ index ].yPosition ); + control.SetProperty(Toolkit::ImageView::Property::IMAGE, SetupViewProperties(mImageType, index)); + control.SetProperty(Actor::Property::ANCHOR_POINT, IMAGE_LAYOUT_INFO[index].anchorPoint); + control.SetProperty(Actor::Property::PARENT_ORIGIN, IMAGE_LAYOUT_INFO[index].parentOrigin); + control.SetProperty(Actor::Property::POSITION_Y, IMAGE_LAYOUT_INFO[index].yPosition); + + control.SetProperty(Actor::Property::SIZE, Vector2(300, 300)); - // We do not want the animated image playing when it's added to the stage. - PauseAnimatedImage( control ); + // We do not want the animated image playing when it's added to the window. + PauseAnimatedImage(control); - stage.Add( control ); + window.Add(control); } } @@ -199,16 +195,16 @@ private: * @details Also sets up the control so it can be paused when tapped. * @param[in] control The animated image to play */ - void PlayAnimatedImage( Control& control ) + void PlayAnimatedImage(Control& control) { - DevelControl::DoAction( control, - ImageView::Property::IMAGE, - DevelAnimatedImageVisual::Action::PLAY, - Property::Value() ); + DevelControl::DoAction(control, + ImageView::Property::IMAGE, + DevelAnimatedImageVisual::Action::PLAY, + Property::Value()); - if( mTapDetector ) + if(mTapDetector) { - mTapDetector.Attach( control ); + mTapDetector.Attach(control); } } @@ -218,25 +214,25 @@ private: * the button is tapped. * @param[in] control The animated image to pause */ - void PauseAnimatedImage( Control& control ) + void PauseAnimatedImage(Control& control) { - DevelControl::DoAction( control, - ImageView::Property::IMAGE, - DevelAnimatedImageVisual::Action::PAUSE, - Property::Value() ); + DevelControl::DoAction(control, + ImageView::Property::IMAGE, + DevelAnimatedImageVisual::Action::PAUSE, + Property::Value()); // Create a push button, and add it as child of the control Toolkit::PushButton animateButton = Toolkit::PushButton::New(); - animateButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON_UNSELECTED ); - animateButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED ); - animateButton.SetParentOrigin( ParentOrigin::CENTER ); - animateButton.SetAnchorPoint( AnchorPoint::CENTER ); - animateButton.ClickedSignal().Connect( this, &AnimatedImageController::OnPlayButtonClicked ); - control.Add( animateButton ); - - if( mTapDetector ) + animateButton.SetProperty(Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON_UNSELECTED); + animateButton.SetProperty(Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED); + animateButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + animateButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); + animateButton.ClickedSignal().Connect(this, &AnimatedImageController::OnPlayButtonClicked); + control.Add(animateButton); + + if(mTapDetector) { - mTapDetector.Detach( control ); + mTapDetector.Detach(control); } } @@ -246,10 +242,10 @@ private: * @param[in] button The button that has been clicked * @return We return true to state that we handled the event */ - bool OnPlayButtonClicked( Toolkit::Button button ) + bool OnPlayButtonClicked(Toolkit::Button button) { - Control control = ( button.GetParent() == mActorDog ) ? mActorDog : mActorLogo; - PlayAnimatedImage( control ); + Control control = (button.GetParent() == mActorDog) ? mActorDog : mActorLogo; + PlayAnimatedImage(control); button.Unparent(); @@ -261,10 +257,10 @@ private: * @details This method is used to pause the tapped animated image view. * @param[in] actor The actor that's tapped */ - void OnTap( Dali::Actor actor, const Dali::TapGesture& /* tap */ ) + void OnTap(Dali::Actor actor, const Dali::TapGesture& /* tap */) { - Control control = ( actor == mActorDog ) ? mActorDog : mActorLogo; - PauseAnimatedImage( control ); + Control control = (actor == mActorDog) ? mActorDog : mActorLogo; + PauseAnimatedImage(control); } /** @@ -274,11 +270,11 @@ private: * @return We return true to state that we handled the event. * */ - bool OnRadioButtonClicked( Toolkit::Button button ) + bool OnRadioButtonClicked(Toolkit::Button button) { - mImageType = ( button == mGifButton ) ? ImageType::GIF : ImageType::IMAGE_ARRAY; + mImageType = (button == mAnimatedImageButton) ? ImageType::ANIMATED_IMAGE : ImageType::IMAGE_ARRAY; - CreateAnimatedImageViews(); + CreateAnimatedImageViews(mApplication.GetWindow()); return true; } @@ -290,9 +286,9 @@ private: */ void OnKeyEvent(const KeyEvent& event) { - if(event.state == KeyEvent::Down) + if(event.GetState() == KeyEvent::DOWN) { - if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) + if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK)) { mApplication.Quit(); } @@ -305,12 +301,12 @@ private: * @param[in] index The index * @return The set up property value */ - Property::Value SetupViewProperties( ImageType type, int index ) + Property::Value SetupViewProperties(ImageType type, int index) { Property::Map map; - AddUrl( map, type, index ); - AddCache( map, type, index ); + AddUrl(map, type, index); + AddCache(map, type, index); return Property::Value(map); } @@ -320,27 +316,27 @@ private: * @param[in] type The Image type * @param[in] index The index */ - void AddUrl( Property::Map& map, ImageType type, int index ) + void AddUrl(Property::Map& map, ImageType type, int index) { - if( type == ImageType::GIF ) + if(type == ImageType::ANIMATED_IMAGE) { - map.Add( Toolkit::ImageVisual::Property::URL, Property::Value( ANIMATED_GIF_URLS[ index ] ) ); + map.Add(Toolkit::ImageVisual::Property::URL, Property::Value(ANIMATED_IMAGE_URLS[index])); } else { Property::Array frameUrls; - for( int i = 1; i <= ANIMATED_ARRAY_NUMBER_OF_FRAMES[ index ]; ++i ) + for(int i = 1; i <= ANIMATED_ARRAY_NUMBER_OF_FRAMES[index]; ++i) { char* buffer; - int len = asprintf( &buffer, ANIMATED_ARRAY_URL_FORMATS[ index ], i ); - if( len > 0 ) + int len = asprintf(&buffer, ANIMATED_ARRAY_URL_FORMATS[index], i); + if(len > 0) { - std::string frameUrl( buffer ); - free( buffer ); - frameUrls.Add( Property::Value( frameUrl ) ); + std::string frameUrl(buffer); + free(buffer); + frameUrls.Add(Property::Value(frameUrl)); } } - map.Add( Toolkit::ImageVisual::Property::URL, Property::Value( frameUrls ) ); + map.Add(Toolkit::ImageVisual::Property::URL, Property::Value(frameUrls)); } } @@ -350,36 +346,36 @@ private: * @param[in] type The Image type * @param[in] index The index */ - void AddCache( Property::Map& map, ImageType type, int index ) + void AddCache(Property::Map& map, ImageType type, int index) { - if( type == ImageType::IMAGE_ARRAY ) + if(type == ImageType::IMAGE_ARRAY) { map - .Add( Toolkit::ImageVisual::Property::BATCH_SIZE, 4 ) - .Add( Toolkit::ImageVisual::Property::CACHE_SIZE, 10 ) - .Add( Toolkit::ImageVisual::Property::FRAME_DELAY, 150 ); + .Add(Toolkit::ImageVisual::Property::BATCH_SIZE, 4) + .Add(Toolkit::ImageVisual::Property::CACHE_SIZE, 10) + .Add(Toolkit::ImageVisual::Property::FRAME_DELAY, 150); } } private: - Application& mApplication; ///< A reference to the application. + Application& mApplication; ///< A reference to the application. Toolkit::ImageView mActorDog; ///< The current dog image view. Toolkit::ImageView mActorLogo; ///< The current logo image view. - Toolkit::RadioButton mGifButton; ///< The Gif Radio Button. - Toolkit::RadioButton mArrayButton; ///< The Array Radio Button. + Toolkit::RadioButton mAnimatedImageButton; ///< The Animated Image Radio Button. + Toolkit::RadioButton mArrayButton; ///< The Array Radio Button. TapGestureDetector mTapDetector; ///< The tap detector. ImageType mImageType; ///< The current Image type. }; -int DALI_EXPORT_API main( int argc, char **argv ) +int DALI_EXPORT_API main(int argc, char** argv) { - Application application = Application::New( &argc, &argv ); + Application application = Application::New(&argc, &argv); - AnimatedImageController test( application ); + AnimatedImageController test(application); application.MainLoop();