From 5b1d022a499d3d133a1bbf9c25b8a1bf61216764 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Fri, 11 Oct 2019 17:19:38 +0900 Subject: [PATCH] (Vector) Add GetLayerInfo method Change-Id: I870fa93b48de93788538bab5aa8a17356571255e --- .../adaptor-framework/vector-animation-renderer-plugin.h | 12 ++++++++++-- .../adaptor-framework/vector-animation-renderer.cpp | 5 +++++ dali/devel-api/adaptor-framework/vector-animation-renderer.h | 12 ++++++++++-- .../common/vector-animation-renderer-impl.cpp | 5 +++++ .../vector-animation/common/vector-animation-renderer-impl.h | 5 +++++ .../common/vector-animation-renderer-plugin-proxy.cpp | 8 ++++++++ .../common/vector-animation-renderer-plugin-proxy.h | 5 +++++ 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h index 6fa992d..a640f3c 100644 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h @@ -94,13 +94,21 @@ public: virtual float GetFrameRate() const = 0; /** - * @brief Gets the default size of the file,. + * @brief Gets the default size of the file. * - * @return The default size of the file + * @param[out] width The default width of the file + * @param[out] height The default height of the file */ virtual void GetDefaultSize( uint32_t& width, uint32_t& height ) const = 0; /** + * @brief Gets the layer information of all the child layers. + * + * @param[out] map The layer information + */ + virtual void GetLayerInfo( Property::Map& map ) const = 0; + + /** * @brief Connect to this signal to be notified when the texture upload is completed. * * @return The signal to connect to. diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp index e9fe5e0..f55d839 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.cpp @@ -89,6 +89,11 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height GetImplementation( *this ).GetDefaultSize( width, height ); } +void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const +{ + GetImplementation( *this ).GetLayerInfo( map ); +} + VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() { return GetImplementation( *this ).UploadCompletedSignal(); diff --git a/dali/devel-api/adaptor-framework/vector-animation-renderer.h b/dali/devel-api/adaptor-framework/vector-animation-renderer.h index 0c0a24a..5db1122 100755 --- a/dali/devel-api/adaptor-framework/vector-animation-renderer.h +++ b/dali/devel-api/adaptor-framework/vector-animation-renderer.h @@ -122,12 +122,20 @@ public: float GetFrameRate() const; /** - * @brief Gets the default size of the file,. + * @brief Gets the default size of the file. * - * @return The default size of the file + * @param[out] width The default width of the file + * @param[out] height The default height of the file */ void GetDefaultSize( uint32_t& width, uint32_t& height ) const; + /** + * @brief Gets the layer information of all the child layers. + * + * @param[out] map The layer information + */ + void GetLayerInfo( Property::Map& map ) const; + public: // Signals /** diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp index 885861f..b1e3a17 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.cpp @@ -95,6 +95,11 @@ void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height mPlugin.GetDefaultSize( width, height ); } +void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const +{ + mPlugin.GetLayerInfo( map ); +} + Dali::VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() { return mPlugin.UploadCompletedSignal(); diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h index 1bc7bac..5ede97e 100755 --- a/dali/internal/vector-animation/common/vector-animation-renderer-impl.h +++ b/dali/internal/vector-animation/common/vector-animation-renderer-impl.h @@ -87,6 +87,11 @@ public: void GetDefaultSize( uint32_t& width, uint32_t& height ) const; /** + * @copydoc Dali::VectorAnimationRenderer::GetLayerInfo() + */ + void GetLayerInfo( Property::Map& map ) const; + + /** * @copydoc Dali::VectorAnimationRenderer::UploadCompletedSignal() */ Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal(); diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp index b704c58..009312b 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp @@ -161,6 +161,14 @@ void VectorAnimationRendererPluginProxy::GetDefaultSize( uint32_t& width, uint32 } } +void VectorAnimationRendererPluginProxy::GetLayerInfo( Property::Map& map ) const +{ + if( mPlugin ) + { + mPlugin->GetLayerInfo( map ); + } +} + VectorAnimationRendererPlugin::UploadCompletedSignalType& VectorAnimationRendererPluginProxy::UploadCompletedSignal() { if( mPlugin ) diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h index 2c6267b..17ba06b 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h +++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.h @@ -83,6 +83,11 @@ public: void GetDefaultSize( uint32_t& width, uint32_t& height ) const; /** + * @copydoc Dali::VectorAnimationRendererPlugin::GetLayerInfo() + */ + void GetLayerInfo( Property::Map& map ) const; + + /** * @copydoc Dali::VectorAnimationRendererPlugin::UploadCompletedSignal() */ VectorAnimationRendererPlugin::UploadCompletedSignalType& UploadCompletedSignal(); -- 2.7.4