return ss.str();
}
+#if defined(DEBUG_ENABLED)
+
+std::string PropertyValueToString( const Property::Value& value )
+{
+ std::string ret;
+
+ switch( value.GetType() )
+ {
+ case Property::NONE:
+ {
+ ret = "NONE";
+ break;
+ } ///< No type
+ case Property::BOOLEAN:
+ {
+ ret = value.Get<bool>() ? "True" : "False";
+ break;
+ }
+ case Property::FLOAT:
+ {
+
+ ret = ToString( value.Get<float>() );
+ break;
+ }
+ case Property::INTEGER:
+ {
+ ret = ToString( value.Get<int>() );
+ break;
+ }
+ case Property::UNSIGNED_INTEGER:
+ {
+ ret = ToString( value.Get<unsigned int>() );
+ break;
+ }
+ case Property::VECTOR2:
+ {
+ ret = ToString( value.Get<Vector2>() );
+ break;
+ }
+ case Property::VECTOR3:
+ {
+ ret = ToString( value.Get<Vector3>() );
+ break;
+ }
+ case Property::VECTOR4:
+ {
+ ret = ToString( value.Get<Vector4>() );
+ break;
+ }
+ case Property::MATRIX3:
+ {
+ ret = ToString( value.Get<Matrix3>() );
+ break;
+ }
+ case Property::MATRIX:
+ {
+ ret = ToString( value.Get<Matrix>() );
+ break;
+ }
+ case Property::RECTANGLE:
+ {
+ ret = ToString( value.Get< Rect<int> >() );
+ break;
+ }
+ case Property::ROTATION:
+ {
+ break;
+ }
+ case Property::STRING:
+ {
+ ret = value.Get<std::string>();
+ break;
+ }
+ case Property::ARRAY:
+ {
+ ret = std::string("Array Size=") + ToString( value.Get<Property::Array>().size() );
+ break;
+ }
+ case Property::MAP:
+ {
+ ret = std::string("Map Size=") + ToString( value.Get<Property::Map>().Count() );
+ break;
+ }
+ case Property::TYPE_COUNT:
+ {
+ ret = "";
+ break;
+ }
+ }
+
+ return ret;
+}
+#endif // DEBUG_ENABLED
+
/*
* Recursively collects all stylesin a node (An array of style names).
*
{
DALI_ASSERT_ALWAYS(mParser.GetRoot() && "Builder script not loaded");
- PropertyValueMap overrideMap;
+ Property::Map overrideMap;
Replacement replacements(overrideMap, mReplacementMap);
OptionalChild add = IsChild(*mParser.GetRoot(), sectionName);
return anim;
}
-Animation Builder::CreateAnimation( const std::string& animationName, const PropertyValueMap& map, Dali::Actor sourceActor )
+Animation Builder::CreateAnimation( const std::string& animationName, const Property::Map& map, Dali::Actor sourceActor )
{
Replacement replacement(map, mReplacementMap);
return CreateAnimation( animationName, replacement, sourceActor);
}
-Animation Builder::CreateAnimation( const std::string& animationName, const PropertyValueMap& map )
+Animation Builder::CreateAnimation( const std::string& animationName, const Property::Map& map )
{
Replacement replacement(map, mReplacementMap);
return CreateAnimation( animationName, replacement, Stage::GetCurrent().GetRootLayer() );
}
-void Builder::AddConstants( const PropertyValueMap& map )
+void Builder::AddConstants( const Property::Map& map )
{
- for(PropertyValueMap::const_iterator iter = map.begin(); iter != map.end(); ++iter)
- {
- mReplacementMap[ (*iter).first ] = (*iter).second;
- }
+ mReplacementMap.Merge( map );
}
void Builder::AddConstant( const std::string& key, const Property::Value& value )
mReplacementMap[key] = value;
}
-const PropertyValueMap& Builder::GetConstants() const
+const Property::Map& Builder::GetConstants() const
{
return mReplacementMap;
}
const Property::Value& Builder::GetConstant( const std::string& key ) const
{
- PropertyValueMap::const_iterator iter = mReplacementMap.find( key );
- if( iter != mReplacementMap.end() )
+ Property::Value* match = mReplacementMap.Find( key );
+ if( match )
{
- return (*iter).second;
+ return (*match);
}
else
{
}
}
-void Builder::LoadConstants( const TreeNode& root, PropertyValueMap& intoMap )
+void Builder::LoadConstants( const TreeNode& root, Property::Map& intoMap )
{
Replacement replacer(intoMap);
}
#if defined(DEBUG_ENABLED)
- PropertyValueMap::const_iterator iter = intoMap.find( "CONFIG_SCRIPT_LOG_LEVEL" );
- if( iter != intoMap.end() && (*iter).second.GetType() == Property::STRING )
+ Property::Value* iter = intoMap.Find( "CONFIG_SCRIPT_LOG_LEVEL" );
+ if( iter && iter->GetType() == Property::STRING )
{
- std::string logLevel( (*iter).second.Get< std::string >() );
+ std::string logLevel( iter->Get< std::string >() );
if( logLevel == "NoLogging" )
{
gFilterScript->SetLogLevel( Integration::Log::NoLogging );
}
}
-BaseHandle Builder::Create( const std::string& templateName, const PropertyValueMap& map )
+BaseHandle Builder::Create( const std::string& templateName, const Property::Map& map )
{
Replacement replacement( map, mReplacementMap );
return Create( templateName, replacement );