X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fsuper-blur-view%2Fsuper-blur-view-impl.cpp;h=cd36331d3a6e282412bc7d330a35bc91503fb86e;hp=fa9839251c81d951be4f7fe8a65d47936e7e4477;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=e2eda444afbe82e9591fe198eef339227f90a616

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index fa98392..cd36331 100644
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -1,33 +1,37 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-//EXTERNAL INCLUDES
-#include <cmath>
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include "super-blur-view-impl.h"
 
-namespace //unnamed namespace
+// EXTERNAL INCLUDES
+#include <cmath>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/devel-api/scripting/scripting.h>
+#include <dali/integration-api/debug.h>
+
+namespace //Unnamed namespace
 {
 
 using namespace Dali;
 
-//Type registration
-TypeRegistration mType( typeid(Toolkit::SuperBlurView), typeid(Toolkit::Control), NULL );
-
 //Todo: make these properties instead of constants
 const unsigned int GAUSSIAN_BLUR_DEFAULT_NUM_SAMPLES = 11;
 const unsigned int GAUSSIAN_BLUR_NUM_SAMPLES_INCREMENTATION = 10;
@@ -49,20 +53,20 @@ struct ActorOpacityConstraint
     mRange = Vector2( index*rangeLength, (index+1.f)*rangeLength );
   }
 
-  float operator()( float current, const PropertyInput& blurProperty )
+  void operator()( float& current, const PropertyInputContainer& inputs )
   {
-    float blurStrength = blurProperty.GetFloat();
+    float blurStrength = inputs[0]->GetFloat();
     if(blurStrength <= mRange.x)
     {
-      return 1.f;
+      current = 1.f;
     }
     else if(blurStrength > mRange.y)
     {
-      return 0.f;
+      current = 0.f;
     }
     else
     {
-      return (mRange.y - blurStrength)/(mRange.y-mRange.x);
+      current = ( mRange.y - blurStrength) / ( mRange.y - mRange.x );
     }
   }
 
@@ -80,17 +84,36 @@ namespace Toolkit
 namespace Internal
 {
 
+namespace
+{
+
+const unsigned int DEFAULT_BLUR_LEVEL(5u); ///< The default blur level when creating SuperBlurView from the type registry
+
+BaseHandle Create()
+{
+  return Toolkit::SuperBlurView::New( DEFAULT_BLUR_LEVEL );
+}
+
+// Setup properties, signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN( Toolkit::SuperBlurView, Toolkit::Control, Create )
+
+DALI_PROPERTY_REGISTRATION( Toolkit, SuperBlurView, "image", MAP, IMAGE )
+
+DALI_TYPE_REGISTRATION_END()
+
+} // unnamed namespace
+
 SuperBlurView::SuperBlurView( unsigned int blurLevels )
-: ControlImpl( false ),
+: Control( ControlBehaviour( DISABLE_SIZE_NEGOTIATION ) ),
   mBlurLevels( blurLevels ),
   mBlurStrengthPropertyIndex(Property::INVALID_INDEX),
   mResourcesCleared( true ),
   mTargetSize( Vector2::ZERO )
 {
   DALI_ASSERT_ALWAYS( mBlurLevels > 0 && " Minimal blur level is one, otherwise no blur is needed" );
-  mGaussianBlurView.resize( blurLevels );
-  mBlurredImage.resize( blurLevels );
-  mImageActors.resize( blurLevels + 1 );
+  mGaussianBlurView.assign( blurLevels, NULL );
+  mBlurredImage.assign( blurLevels, FrameBufferImage() );
+  mImageActors.assign( blurLevels + 1, ImageActor() );
 }
 
 SuperBlurView::~SuperBlurView()
@@ -114,12 +137,13 @@ Toolkit::SuperBlurView SuperBlurView::New( unsigned int blurLevels )
 
 void SuperBlurView::OnInitialize()
 {
-  mBlurStrengthPropertyIndex = Self().RegisterProperty( "BLUR_STRENGTH",0.f );
+  mBlurStrengthPropertyIndex = Self().RegisterProperty( "blurStrength", 0.f );
 
   DALI_ASSERT_ALWAYS( mImageActors.size() == mBlurLevels+1 && "must synchronize the ImageActor group if blur levels got changed " );
   for(unsigned int i=0; i<=mBlurLevels;i++)
   {
     mImageActors[i] = ImageActor::New(  );
+    mImageActors[i].SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
     mImageActors[i].SetParentOrigin( ParentOrigin::CENTER );
     mImageActors[i].SetZ(-static_cast<float>(i)*0.01f);
     mImageActors[i].SetColorMode( USE_OWN_MULTIPLY_PARENT_ALPHA );
@@ -128,7 +152,9 @@ void SuperBlurView::OnInitialize()
 
   for(unsigned int i=0; i < mBlurLevels; i++)
   {
-    mImageActors[i].ApplyConstraint( Constraint::New<float>( Actor::COLOR_ALPHA, ParentSource( mBlurStrengthPropertyIndex ), ActorOpacityConstraint(mBlurLevels, i) ) );
+    Constraint constraint = Constraint::New<float>( mImageActors[i], Actor::Property::COLOR_ALPHA, ActorOpacityConstraint(mBlurLevels, i) );
+    constraint.AddSource( ParentSource( mBlurStrengthPropertyIndex ) );
+    constraint.Apply();
   }
 
   Self().SetSize(Stage::GetCurrent().GetSize());
@@ -226,29 +252,66 @@ void SuperBlurView::ClearBlurResource()
   }
 }
 
-void SuperBlurView::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void SuperBlurView::OnSizeSet( const Vector3& targetSize )
+{
+  if( mTargetSize != Vector2(targetSize) )
+  {
+    mTargetSize = Vector2(targetSize);
+
+    for(unsigned int i=0; i<mBlurLevels;i++)
+    {
+      float exponent = static_cast<float>(i+1);
+      mBlurredImage[i] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent),
+                                                GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::NEVER );
+    }
+  }
+}
+
+void SuperBlurView::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
 {
-  unsigned int numChildren = Self().GetChildCount();
+  Toolkit::SuperBlurView superBlurView = Toolkit::SuperBlurView::DownCast( Dali::BaseHandle( object ) );
 
-  for( unsigned int i=0; i<numChildren; ++i )
+  if( superBlurView )
   {
-    Self().GetChildAt(i).SetSize(size);
+    SuperBlurView& superBlurViewImpl( GetImpl( superBlurView ) );
+
+    if( propertyIndex == Toolkit::SuperBlurView::Property::IMAGE )
+    {
+      Dali::Image image = Scripting::NewImage( value );
+      if ( image )
+      {
+        superBlurViewImpl.SetImage( image );
+      }
+      else
+      {
+        DALI_LOG_ERROR( "Cannot create image from property value\n" );
+      }
+    }
   }
 }
 
-void SuperBlurView::OnControlSizeSet( const Vector3& targetSize )
+Property::Value SuperBlurView::GetProperty( BaseObject* object, Property::Index propertyIndex )
 {
-  if( mTargetSize != Vector2(targetSize) )
+  Property::Value value;
+
+  Toolkit::SuperBlurView pushButton = Toolkit::SuperBlurView::DownCast( Dali::BaseHandle( object ) );
+
+  if( pushButton )
   {
-    mTargetSize = Vector2(targetSize);
+    SuperBlurView& superBlurViewImpl( GetImpl( pushButton ) );
 
-    for(unsigned int i=0; i<mBlurLevels;i++)
+    if( propertyIndex == Toolkit::SuperBlurView::Property::IMAGE )
     {
-      float exponent = static_cast<float>(i+1);
-      mBlurredImage[i] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent),
-                                                GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::Never );
+      Property::Map map;
+      if( !superBlurViewImpl.mImageActors.empty() && superBlurViewImpl.mImageActors[0] )
+      {
+        Scripting::CreatePropertyMap( superBlurViewImpl.mImageActors[0], map );
+      }
+      value = Property::Value( map );
     }
   }
+
+  return value;
 }
 
 } // namespace Internal