X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-signals.cpp;h=ed22ef35a4678999426e9037768ab881066f165a;hp=804deb359e3e5d4e0c4ee187d7714745784a2135;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=2071317d301e9d5af326a3a2efcd2996263fbead diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp index 804deb3..ed22ef3 100644 --- a/dali-toolkit/internal/builder/builder-signals.cpp +++ b/dali-toolkit/internal/builder/builder-signals.cpp @@ -16,11 +16,11 @@ */ // EXTERNAL INCLUDES -#include #include #include #include #include + #include #include @@ -54,7 +54,7 @@ struct ChildActorAction std::string actorName; std::string actionName; std::string childName; - PropertyValueContainer parameters; + Property::Map parameters; void operator()(void) { @@ -115,7 +115,7 @@ struct GenericAction { std::string actorName; std::string actionName; - PropertyValueContainer parameters; + Property::Map parameters; void operator()(void) { @@ -128,6 +128,16 @@ struct GenericAction }; }; +struct QuitAction +{ + Dali::IntrusivePtr builder; + + void operator()(void) + { + builder->EmitQuitSignal(); + } +}; + // Delay an animation play; ie wait as its not on stage yet struct DelayedAnimationPlay { @@ -376,37 +386,80 @@ Property::Value GetPropertyValue(const TreeNode &child) * Gets Parmeter list from child * params is be cleared before insertion */ -void GetParameters(const TreeNode& child, PropertyValueContainer& params) +void GetParameters(const TreeNode& child, Property::Map& params) { if( OptionalChild c = IsChild(child, "parameters") ) { const TreeNode& node = *c; - if(0 == node.Size()) - { - GetPropertyValue(node); - } - else - { - params.clear(); - params.reserve(node.Size()); + params.Clear(); - for(TreeNode::ConstIterator iter(node.CBegin()); iter != node.CEnd(); ++iter) - { - params.push_back( GetPropertyValue( (*iter).second ) ); - } + for(TreeNode::ConstIterator iter(node.CBegin()); iter != node.CEnd(); ++iter) + { + params[ (*iter).first ] = GetPropertyValue( (*iter).second ); } } } -void DoNothing(void) {}; +// Shim for the property notifcation signal +template +struct PropertyNotifcationSignalShim +{ + T mFunctor; + + PropertyNotifcationSignalShim(T& functor) : mFunctor(functor) {} + + void operator()(PropertyNotification& /* source */) + { + mFunctor(); + } +}; + +// Specializations for the different signal connection calls between actor & PropertyNotification +template +struct SignalConnector {}; + +// Actor specialization +template <> +struct SignalConnector { + Actor& mActor; + ConnectionTracker* mTracker; + const std::string& mName; + + SignalConnector(ConnectionTracker* tracker, Actor& actor, const std::string& name) + : mActor(actor), mTracker(tracker), mName(name) {} + + template + void Connect(T& functor) + { + mActor.ConnectSignal( mTracker, mName, functor); + } +}; + +// PropertyNotification specialization +template <> +struct SignalConnector +{ + PropertyNotification& mNotification; + ConnectionTracker* mTracker; + + SignalConnector(ConnectionTracker* tracker, PropertyNotification ¬ification) + : mNotification(notification), mTracker(tracker) {} + + template + void Connect(T& functor) + { + mNotification.NotifySignal().Connect( mTracker, PropertyNotifcationSignalShim(functor) ); + } +}; /** - * Get an action as boost function callback + * Set an action functor on a signal */ -boost::function GetAction(const TreeNode &root, const TreeNode &child, Actor actor, boost::function quitAction, Dali::Toolkit::Internal::Builder* const builder) +template +void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder, SignalConnector& connector) { - OptionalString childActorName(IsString( IsChild(&child, "child-actor")) ); + OptionalString childActorName(IsString( IsChild(&child, "childActor")) ); OptionalString actorName(IsString( IsChild(&child, "actor")) ); OptionalString propertyName(IsString( IsChild(&child, "property")) ); OptionalChild valueChild( IsChild(&child, "value") ); @@ -414,8 +467,6 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi OptionalString actionName = IsString( IsChild(&child, "action") ); DALI_ASSERT_ALWAYS(actionName && "Signal must have an action"); - boost::function callback = DoNothing; - if(childActorName) { ChildActorAction action; @@ -423,7 +474,7 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi action.childName = *childActorName; action.actionName = *actionName; GetParameters(child, action.parameters); - callback = action; + connector.Connect( action ); } else if(actorName) { @@ -437,7 +488,7 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi { DALI_SCRIPT_WARNING("Cannot set property for set property action\n"); } - callback = action; + connector.Connect( action ); } else { @@ -445,12 +496,14 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi action.actorName = *actorName; action.actionName = *actionName; GetParameters(child, action.parameters); - callback = action; + connector.Connect( action ); } } else if("quit" == *actionName) { - callback = quitAction; + QuitAction action; + action.builder = builder; + connector.Connect( action ); } else if("play" == *actionName) { @@ -464,7 +517,7 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi action.animNode = animNode; action.builder = builder; // @todo; put constants into the map - callback = action; + connector.Connect( action ); } else { @@ -543,12 +596,9 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi action.ranges.push_back(*range); action.wrapRanges.push_back(wrap); } - - callback = action; + connector.Connect(action); } } - - } else if("removeConstraints" == *actionName ) { @@ -582,7 +632,7 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi } } } - callback = action; + connector.Connect(action); } } else @@ -592,10 +642,8 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi action.actorName = actor.GetName(); action.actionName = *actionName; GetParameters(child, action.parameters); - callback = action; + connector.Connect( action ); } - - return callback; } @@ -654,7 +702,7 @@ Actor SetupPropertyNotification(const TreeNode &child, Actor actor, Dali::Toolki /** * Setup signals and actions on an actor */ -Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor, boost::function quitAction, Dali::Toolkit::Internal::Builder* const builder ) +Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder ) { DALI_ASSERT_ALWAYS(actor); @@ -671,9 +719,8 @@ Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const OptionalString name( IsString( IsChild( key_child.second, "name")) ); DALI_ASSERT_ALWAYS(name && "Signal must have a name"); - boost::function callback = GetAction(root, key_child.second, actor, quitAction, builder ); - - actor.ConnectSignal(tracker, *name, callback); + SignalConnector connector(tracker, actor, *name); + SetActionOnSignal(root, key_child.second, actor, builder, connector); } } @@ -683,7 +730,7 @@ Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const /** * Setup Property notifications for an actor */ -Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor, boost::function quitAction, Dali::Toolkit::Internal::Builder* const builder ) +Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder ) { DALI_ASSERT_ALWAYS(actor); @@ -695,10 +742,6 @@ Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode &root { const TreeNode::KeyNodePair& key_child = *iter; - // Actor actions reference by pointer because of circular reference actor->signal - // So this callback should only go onto the actor maintained list. - boost::function callback = GetAction(root, key_child.second, actor, quitAction, builder ); - OptionalString prop(IsString( IsChild(key_child.second, "property")) ); DALI_ASSERT_ALWAYS(prop && "Notification signal must specify a property"); @@ -712,33 +755,38 @@ Actor SetupPropertyNotification(ConnectionTracker* tracker, const TreeNode &root { PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop), LessThanCondition(1.f) ); - notification.NotifySignal().Connect( tracker, FunctorDelegate::New(callback) ); + SignalConnector connector(tracker, notification); + SetActionOnSignal(root, key_child.second, actor, builder, connector); } else if("LessThan" == *cond) { PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop), LessThanCondition(GetConditionArg0(key_child.second)) ); - notification.NotifySignal().Connect( tracker, FunctorDelegate::New(callback) ); + SignalConnector connector(tracker, notification); + SetActionOnSignal(root, key_child.second, actor, builder, connector); } else if("GreaterThan" == *cond) { PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop), GreaterThanCondition(GetConditionArg0(key_child.second)) ); - notification.NotifySignal().Connect( tracker, FunctorDelegate::New(callback) ); + SignalConnector connector(tracker, notification); + SetActionOnSignal(root, key_child.second, actor, builder, connector); } else if("Inside" == *cond) { PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop), InsideCondition(GetConditionArg0(key_child.second), GetConditionArg1(key_child.second)) ); - notification.NotifySignal().Connect( tracker, FunctorDelegate::New(callback) ); + SignalConnector connector(tracker, notification); + SetActionOnSignal(root, key_child.second, actor, builder, connector); } else if("Outside" == *cond) { PropertyNotification notification = actor.AddPropertyNotification( actor.GetPropertyIndex(*prop), OutsideCondition(GetConditionArg0(key_child.second), GetConditionArg1(key_child.second)) ); - notification.NotifySignal().Connect( tracker, FunctorDelegate::New(callback) ); + SignalConnector connector(tracker, notification); + SetActionOnSignal(root, key_child.second, actor, builder, connector); } else {