X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fimages%2Fimage-impl.cpp;h=8357fcfa8928e4f5e928dc1e414a47b2c0d4f1bb;hb=698c38bd1a76158dd449639aaf014d7046dd3ae4;hp=218622c9089efae2869e10f4a768a457865cc2bb;hpb=a2df635bf375961d1806e484c36438123eaba911;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/images/image-impl.cpp b/dali/internal/event/images/image-impl.cpp index 218622c..8357fcf 100644 --- a/dali/internal/event/images/image-impl.cpp +++ b/dali/internal/event/images/image-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -18,16 +18,15 @@ // CLASS HEADER #include +// EXTERNAL INCLUDES +#include // for strcmp + // INTERNAL INCLUDES #include #include #include -#include #include -#include -#include -#include #include using namespace Dali::Integration; @@ -41,111 +40,23 @@ namespace Internal namespace { -BaseHandle CreateImage() -{ - ImagePtr image = Image::New(); - return Dali::Image(image.Get()); -} - -TypeRegistration mType( typeid(Dali::Image), typeid(Dali::BaseHandle), CreateImage ); - -Dali::SignalConnectorType signalConnector1(mType, Dali::Image::SIGNAL_IMAGE_LOADING_FINISHED, &Image::DoConnectSignal); -Dali::SignalConnectorType signalConnector2(mType, Dali::Image::SIGNAL_IMAGE_UPLOADED, &Image::DoConnectSignal); - -} - -Image::Image( LoadPolicy loadPol, ReleasePolicy releasePol ) -: mImageFactory(ThreadLocalStorage::Get().GetImageFactory()), - mWidth(0), - mHeight(0), - mConnectionCount(0), - mLoadPolicy(loadPol), - mReleasePolicy(releasePol) -{ -} - -ImagePtr Image::New() -{ - ImagePtr image = new Image; - image->Initialize(); - return image; -} - -ImagePtr Image::New( const std::string& filename, const Dali::ImageAttributes& attributes, LoadPolicy loadPol, ReleasePolicy releasePol ) -{ - ImagePtr image; - if( IsNinePatchFileName(filename) ) - { - image = NinePatchImage::New( filename, attributes, loadPol, releasePol ); - } - else - { - image = new Image( loadPol, releasePol ); - image->Initialize(); - - // consider the requested size as natural size, 0 means we don't (yet) know it - image->mWidth = attributes.GetWidth(); - image->mHeight = attributes.GetHeight(); - image->mRequest = image->mImageFactory.RegisterRequest( filename, &attributes ); - - if( Dali::Image::Immediate == loadPol ) - { - // Trigger loading of the image on a as soon as it can be done - image->mTicket = image->mImageFactory.Load( image->mRequest.Get() ); - image->mTicket->AddObserver( *image ); - } - } - DALI_LOG_SET_OBJECT_STRING( image, filename ); - - return image; -} - -ImagePtr Image::New( NativeImage& nativeImg ) -{ - ImagePtr image = new Image; - image->Initialize(); - - ResourceClient &resourceClient = ThreadLocalStorage::Get().GetResourceClient(); - - image->mWidth = nativeImg.GetWidth(); - image->mHeight = nativeImg.GetHeight(); +// Signals - const ResourceTicketPtr& ticket = resourceClient.AddNativeImage( nativeImg ); - DALI_ASSERT_DEBUG( dynamic_cast( ticket.Get() ) && "Resource ticket not ImageTicket subclass for image resource.\n" ); - image->mTicket = static_cast(ticket.Get()); - image->mTicket->AddObserver( *image ); +const char* const SIGNAL_IMAGE_UPLOADED = "uploaded"; - return image; -} +TypeRegistration mType( typeid( Dali::Image ), typeid( Dali::BaseHandle ), NULL ); -Image::~Image() -{ - if( mTicket ) - { - mTicket->RemoveObserver( *this ); - if( Stage::IsInstalled() ) - { - mImageFactory.ReleaseTicket( mTicket.Get() ); - } - } +Dali::SignalConnectorType signalConnector1( mType, SIGNAL_IMAGE_UPLOADED, &Image::DoConnectSignal ); - if( Stage::IsInstalled() ) - { - UnregisterObject(); - } } bool Image::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { bool connected( true ); - DALI_ASSERT_DEBUG( dynamic_cast( object ) && "Resource ticket not ImageTicket subclass for image resource.\n" ); + DALI_ASSERT_DEBUG( dynamic_cast( object ) && "Failed to downcast from BaseObject to Image.\n" ); Image* image = static_cast(object); - if( Dali::Image::SIGNAL_IMAGE_LOADING_FINISHED == signalName ) - { - image->LoadingFinishedSignal().Connect( tracker, functor ); - } - else if(Dali::Image::SIGNAL_IMAGE_UPLOADED == signalName) + if( 0 == strcmp( signalName.c_str(), SIGNAL_IMAGE_UPLOADED ) ) { image->UploadedSignal().Connect( tracker, functor ); } @@ -158,138 +69,34 @@ bool Image::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra return connected; } -ResourceId Image::GetResourceId() const -{ - ResourceId ret = mTicket ? mTicket->GetId() : 0; - - return ret; -} - -const Dali::ImageAttributes& Image::GetAttributes() const -{ - if( mTicket ) - { - return mImageFactory.GetActualAttributes( mTicket ); - } - else - { - return mImageFactory.GetRequestAttributes( mRequest ); - } -} - -const std::string& Image::GetFilename() const -{ - return mImageFactory.GetRequestPath( mRequest ); -} - -void Image::Reload() -{ - if ( mRequest ) - { - ResourceTicketPtr ticket = mImageFactory.Reload( mRequest.Get() ); - SetTicket( ticket.Get() ); - } -} - -void Image::ResourceLoadingFailed(const ResourceTicket& ticket) -{ - mLoadingFinishedV2.Emit( Dali::Image( this ) ); -} - -void Image::ResourceLoadingSucceeded(const ResourceTicket& ticket) -{ - mLoadingFinishedV2.Emit( Dali::Image( this ) ); -} - -void Image::ResourceUploaded(const ResourceTicket& ticket) -{ - mUploadedV2.Emit( Dali::Image( this ) ); -} - -void Image::ResourceSavingSucceeded( const ResourceTicket& ticket ) -{ - // do nothing -} - -void Image::ResourceSavingFailed( const ResourceTicket& ticket ) -{ - // do nothing -} - unsigned int Image::GetWidth() const { - // if width is 0, it means we've not yet loaded the image - if( 0u == mWidth ) - { - Size size; - mImageFactory.GetImageSize( mRequest, mTicket, size ); - mWidth = size.width; - // The app will probably ask for the height immediately, so don't waste the synchronous file IO that ImageFactory may have just done: - DALI_ASSERT_DEBUG( 0 == mHeight || unsigned(size.height) == mHeight ); - if( 0 == mHeight ) - { - mHeight = size.height; - } - } return mWidth; } unsigned int Image::GetHeight() const { - if( 0u == mHeight ) - { - Size size; - mImageFactory.GetImageSize( mRequest, mTicket, size ); - mHeight = size.height; - DALI_ASSERT_DEBUG( 0 == mWidth || unsigned(size.width) == mWidth ); - if( 0 == mWidth ) - { - mWidth = size.width; - } - } return mHeight; } Vector2 Image::GetNaturalSize() const { - Vector2 naturalSize(mWidth, mHeight); - if( 0u == mWidth || 0u == mHeight ) - { - mImageFactory.GetImageSize( mRequest, mTicket, naturalSize ); - mWidth = naturalSize.width; - mHeight = naturalSize.height; - } - return naturalSize; + return Vector2( static_cast( mWidth ), static_cast( mHeight ) ); } -void Image::Connect() +Image::Image() +: mTexture(), + mWidth( 0 ), + mHeight( 0 ), + mConnectionCount( 0 ) { - ++mConnectionCount; - - if( mConnectionCount == 1 ) - { - // ticket was thrown away when related actors went offstage or image loading on demand - if( !mTicket ) - { - ResourceTicketPtr newTicket = mImageFactory.Load( mRequest.Get() ); - SetTicket( newTicket.Get() ); - } - } } -void Image::Disconnect() +Image::~Image() { - if( !mTicket ) - { - return; - } - - DALI_ASSERT_DEBUG( mConnectionCount > 0 ); - --mConnectionCount; - if( mConnectionCount == 0 && mReleasePolicy == Dali::Image::Unused ) + if( Stage::IsInstalled() ) { - // release image memory when it's not visible anymore (decrease ref. count of texture) - SetTicket( NULL ); + UnregisterObject(); } } @@ -298,91 +105,6 @@ void Image::Initialize() RegisterObject(); } -void Image::SetTicket( ResourceTicket* ticket ) -{ - if( ticket == mTicket.Get() ) - { - return; - } - - if( mTicket ) - { - mTicket->RemoveObserver( *this ); - mImageFactory.ReleaseTicket( mTicket.Get() ); - } - - if( ticket ) - { - mTicket.Reset( ticket ); - mTicket->AddObserver( *this ); - } - else - { - mTicket.Reset(); - } -} - -bool Image::IsNinePatchFileName( const std::string& filename ) -{ - bool match = false; - - std::string::const_reverse_iterator iter = filename.rbegin(); - enum { SUFFIX, HASH, HASH_DOT, DONE } state = SUFFIX; - while(iter < filename.rend()) - { - switch(state) - { - case SUFFIX: - { - if(*iter == '.') - { - state = HASH; - } - else if(!isalnum(*iter)) - { - state = DONE; - } - } - break; - case HASH: - { - if( *iter == '#' || *iter == '9' ) - { - state = HASH_DOT; - } - else - { - state = DONE; - } - } - break; - case HASH_DOT: - { - if(*iter == '.') - { - match = true; - } - state = DONE; // Stop testing characters - } - break; - case DONE: - { - } - break; - } - - // Satisfy prevent - if( state == DONE ) - { - break; - } - - ++iter; - } - return match; -} - - } // namespace Internal } // namespace Dali