X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fimage-scaling-irregular-grid%2Fimage-scaling-irregular-grid-example.cpp;h=05bfccd1bac4189eb6bbbe948b13fff4e5a8abaf;hb=cc86309efaef5f77c85ece1199f95e08534e4a32;hp=dc982f84d31f7823a257d9da0142e211be713b8b;hpb=28946d814d1f11fddcc23a887a0e318133147549;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index dc982f8..05bfccd 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -46,6 +46,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include "grid-flags.h" @@ -165,43 +166,34 @@ const char* IMAGE_PATHS[] = { NULL }; const unsigned NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u; +const unsigned int INITIAL_IMAGES_TO_LOAD = 10; /** - * Creates an Image + * Creates an ImageView * * @param[in] filename The path of the image. * @param[in] width The width of the image in pixels. * @param[in] height The height of the image in pixels. * @param[in] fittingMode The mode to use when scaling the image to fit the desired dimensions. */ -Image CreateImage(const std::string& filename, unsigned int width, unsigned int height, Dali::FittingMode::Type fittingMode ) +ImageView CreateImageView(const std::string& filename, int width, int height, Dali::FittingMode::Type fittingMode ) { -#ifdef DEBUG_PRINT_DIAGNOSTICS - fprintf( stderr, "CreateImage(%s, %u, %u, fittingMode=%u)\n", filename.c_str(), width, height, unsigned( fittingMode ) ); -#endif - Image image = ResourceImage::New( filename, ImageDimensions( width, height ), fittingMode, Dali::SamplingMode::BOX_THEN_LINEAR ); - return image; -} + ImageView imageView = ImageView::New(); -/** - * Creates an ImageView - * - * @param[in] filename The path of the image. - * @param[in] width The width of the image in pixels. - * @param[in] height The height of the image in pixels. - * @param[in] fittingMode The mode to use when scaling the image to fit the desired dimensions. - */ -ImageView CreateImageView(const std::string& filename, unsigned int width, unsigned int height, Dali::FittingMode::Type fittingMode ) -{ - Image img = CreateImage( filename, width, height, fittingMode ); - ImageView actor = ImageView::New( img ); - actor.SetName( filename ); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetAnchorPoint(AnchorPoint::CENTER); + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = filename; + map[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = width; + map[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = height; + map[Toolkit::ImageVisual::Property::FITTING_MODE] = fittingMode; + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map ); + + imageView.SetProperty( Dali::Actor::Property::NAME, filename ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + imageView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); - return actor; + return imageView; } /** Cycle the scaling mode options. */ @@ -268,7 +260,8 @@ public: ImageScalingIrregularGridController( Application& application ) : mApplication( application ), - mScrolling( false ) + mScrolling( false ), + mImagesLoaded( 0 ) { std::cout << "ImageScalingIrregularGridController::ImageScalingIrregularGridController" << std::endl; @@ -282,6 +275,21 @@ public: } /** + * Called everytime an ImageView has loaded it's image + */ + void ResourceReadySignal( Toolkit::Control control ) + { + mImagesLoaded++; + // To allow fast startup, we only place a small number of ImageViews on stage first + if ( mImagesLoaded == INITIAL_IMAGES_TO_LOAD ) + { + // Adding the ImageViews to the stage will trigger loading of the Images + mGridActor.Add( mOffStageImageViews ); + } + } + + + /** * One-time setup in response to Application InitSignal. */ void Create( Application& application ) @@ -307,13 +315,18 @@ public: // Create an image scaling toggle button. (right of toolbar) Toolkit::PushButton toggleScalingButton = Toolkit::PushButton::New(); - toggleScalingButton.SetUnselectedImage( TOGGLE_SCALING_IMAGE ); - toggleScalingButton.SetSelectedImage( TOGGLE_SCALING_IMAGE_SELECTED ); + toggleScalingButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE ); + toggleScalingButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE_SELECTED ); toggleScalingButton.ClickedSignal().Connect( this, &ImageScalingIrregularGridController::OnToggleScalingTouched ); mToolBar.AddControl( toggleScalingButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); SetTitle( APPLICATION_TITLE ); + mOffStageImageViews = Actor::New(); + mOffStageImageViews.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mOffStageImageViews.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + mOffStageImageViews.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + // Build the main content of the widow: PopulateContentLayer( DEFAULT_SCALING_MODE ); } @@ -334,8 +347,8 @@ public: mScrollView.ScrollStartedSignal().Connect( this, &ImageScalingIrregularGridController::OnScrollStarted ); mScrollView.ScrollCompletedSignal().Connect( this, &ImageScalingIrregularGridController::OnScrollCompleted ); - mScrollView.SetAnchorPoint(AnchorPoint::CENTER); - mScrollView.SetParentOrigin(ParentOrigin::CENTER); + mScrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); + mScrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); mScrollView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); @@ -358,15 +371,15 @@ public: // Create the scroll bar mScrollBarVertical = ScrollBar::New(Toolkit::ScrollBar::Vertical); - mScrollBarVertical.SetParentOrigin(ParentOrigin::TOP_RIGHT); - mScrollBarVertical.SetAnchorPoint(AnchorPoint::TOP_RIGHT); + mScrollBarVertical.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_RIGHT); + mScrollBarVertical.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_RIGHT); mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::HEIGHT); mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH); mScrollView.Add(mScrollBarVertical); mScrollBarHorizontal = ScrollBar::New(Toolkit::ScrollBar::Horizontal); - mScrollBarHorizontal.SetParentOrigin(ParentOrigin::BOTTOM_LEFT); - mScrollBarHorizontal.SetAnchorPoint(AnchorPoint::TOP_LEFT); + mScrollBarHorizontal.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_LEFT); + mScrollBarHorizontal.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); mScrollBarHorizontal.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH); mScrollBarHorizontal.SetOrientation(Quaternion(Radian( 1.5f * Math::PI ), Vector3::ZAXIS)); mScrollView.Add(mScrollBarHorizontal); @@ -440,8 +453,8 @@ public: Actor gridActor = Actor::New(); gridActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - gridActor.SetParentOrigin( ParentOrigin::CENTER ); - gridActor.SetAnchorPoint( AnchorPoint::CENTER ); + gridActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + gridActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); // Work out the constants of the grid and cell dimensions and positions: const float cellWidth = fieldWidth / gridWidth; @@ -450,8 +463,9 @@ public: outFieldHeight = actualGridHeight * cellHeight; const Vector2 gridOrigin = Vector2( -fieldWidth * 0.5f, -outFieldHeight * 0.5 ); + unsigned int count = 0; // Build the image actors in their right locations in their parent's frame: - for( std::vector::const_iterator i = placedImages.begin(), end = placedImages.end(); i != end; ++i ) + for( std::vector::const_iterator i = placedImages.begin(), end = placedImages.end(); i != end; ++i, ++count ) { const PositionedImage& imageSource = *i; const Vector2 imageSize = imageSource.imageGridDims * cellSize - Vector2( GRID_CELL_PADDING * 2, GRID_CELL_PADDING * 2 ); @@ -461,12 +475,21 @@ public: ImageView image = CreateImageView( imageSource.configuration.path, imageSize.x, imageSize.y, fittingMode ); image.SetPosition( Vector3( imagePosition.x, imagePosition.y, 0 ) ); image.SetSize( imageSize ); - image.TouchedSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage ); + image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage ); + image.ResourceReadySignal().Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal ); mFittingModes[image.GetId()] = fittingMode; mResourceUrls[image.GetId()] = imageSource.configuration.path; mSizes[image.GetId()] = imageSize; - - gridActor.Add( image ); + if ( count < INITIAL_IMAGES_TO_LOAD ) + { + gridActor.Add( image ); + } + else + { + // Store the ImageView in an offstage actor until the inital batch of ImageViews have finished loading their images + // Required + mOffStageImageViews.Add( image ); + } } return gridActor; @@ -475,14 +498,13 @@ public: /** * Upon Touching an image (Release), change its scaling mode and make it spin, provided we're not scrolling. * @param[in] actor The actor touched - * @param[in] event The TouchEvent. + * @param[in] event The Touch information. */ - bool OnTouchImage( Actor actor, const TouchEvent& event ) + bool OnTouchImage( Actor actor, const TouchData& event ) { - if( (event.points.size() > 0) && (!mScrolling) ) + if( ( event.GetPointCount() > 0 ) && ( !mScrolling ) ) { - TouchPoint point = event.points[0]; - if(point.state == TouchPoint::Up) + if( event.GetState( 0 ) == PointState::UP ) { // Spin the image a few times: Animation animation = Animation::New(SPIN_DURATION); @@ -494,13 +516,18 @@ public: Dali::FittingMode::Type newMode = NextMode( mFittingModes[id] ); const Vector2 imageSize = mSizes[actor.GetId()]; - const std::string& url = mResourceUrls[id]; - Image newImage = CreateImage( url, imageSize.width + 0.5f, imageSize.height + 0.5f, newMode ); ImageView imageView = ImageView::DownCast( actor ); - if(imageView) + if( imageView) { - imageView.SetImage( newImage ); + Property::Map map; + map[Visual::Property::TYPE] = Visual::IMAGE; + map[ImageVisual::Property::URL] = mResourceUrls[id]; + map[ImageVisual::Property::DESIRED_WIDTH] = imageSize.width + 0.5f; + map[ImageVisual::Property::DESIRED_HEIGHT] = imageSize.height + 0.5f; + map[ImageVisual::Property::FITTING_MODE] = newMode; + imageView.SetProperty( ImageView::Property::IMAGE, map ); } + mFittingModes[id] = newMode; } } @@ -542,8 +569,16 @@ public: const Vector2 imageSize = mSizes[ id ]; Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] ); - Image newImage = CreateImage( mResourceUrls[ id ], imageSize.width, imageSize.height, newMode ); - gridImageView.SetImage( newImage ); + + Property::Map map; + map[Visual::Property::TYPE] = Visual::IMAGE; + map[ImageVisual::Property::URL] = mResourceUrls[id]; + map[ImageVisual::Property::DESIRED_WIDTH] = imageSize.width; + map[ImageVisual::Property::DESIRED_HEIGHT] = imageSize.height; + map[ImageVisual::Property::FITTING_MODE] = newMode; + gridImageView.SetProperty( ImageView::Property::IMAGE, map ); + + mFittingModes[ id ] = newMode; @@ -597,6 +632,7 @@ private: Toolkit::ToolBar mToolBar; ///< The View's Toolbar. TextLabel mTitleActor; ///< The Toolbar's Title. Actor mGridActor; ///< The container for the grid of images + Actor mOffStageImageViews; ///< ImageViews held off stage until the inital batch have loaded their images ScrollView mScrollView; ///< ScrollView UI Component ScrollBar mScrollBarVertical; ScrollBar mScrollBarHorizontal; @@ -604,21 +640,13 @@ private: std::map mFittingModes; ///< Stores the current scaling mode of each image, keyed by image actor id. std::map mResourceUrls; ///< Stores the url of each image, keyed by image actor id. std::map mSizes; ///< Stores the current size of each image, keyed by image actor id. + unsigned int mImagesLoaded; ///< How many images have been loaded }; -void RunTest( Application& application ) -{ - ImageScalingIrregularGridController test( application ); - - application.MainLoop(); -} - -/** Entry point for Linux & Tizen applications */ int DALI_EXPORT_API main( int argc, char **argv ) { Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); - - RunTest( application ); - + ImageScalingIrregularGridController test( application ); + application.MainLoop(); return 0; }