projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JavaScript binding for new mesh APIs
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-set-property.cpp
diff --git
a/dali-toolkit/internal/builder/builder-set-property.cpp
b/dali-toolkit/internal/builder/builder-set-property.cpp
index
00d6ec6
..
c2d77a7
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/
dali-toolkit/internal/builder/builder-set-property.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,6
+17,9
@@
// EXTERNAL INCLUDES
#include <sstream>
// EXTERNAL INCLUDES
#include <sstream>
+#include <dali/public-api/object/property-array.h>
+#include <dali/public-api/object/property-map.h>
+#include <dali/devel-api/adaptor-framework/color-controller.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/builder/builder-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/builder/builder-impl.h>
@@
-99,7
+102,7
@@
Vector4 HexStringToVector4( const char* s )
/**
* A property value type can be forced when its unknown by a disambiguation convention in the json
* ie "myarray": [1,2,3,4] ; would be a vector but
/**
* A property value type can be forced when its unknown by a disambiguation convention in the json
* ie "myarray": [1,2,3,4] ; would be a vector but
- * "myarray": {
'type-cast':'array', 'value'
:[1,2,3,4]} would be an array
+ * "myarray": {
"type-cast":"array", "value"
:[1,2,3,4]} would be an array
* @param child The node whos string to search for a disambiguated type
* @param value The value to set
* @param overrideMap The user overriding constant map
* @param child The node whos string to search for a disambiguated type
* @param value The value to set
* @param overrideMap The user overriding constant map
@@
-205,18
+208,6
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
}
break;
}
}
break;
}
- case Property::UNSIGNED_INTEGER:
- {
- if( OptionalUnsignedInt v = replacer.IsUnsignedInteger( node) )
- {
- if( *v >= 0 ) // with a loss of resolution....
- {
- value = *v;
- done = true;
- }
- }
- break;
- }
case Property::VECTOR2:
{
if( OptionalVector2 v = replacer.IsVector2(node) )
case Property::VECTOR2:
{
if( OptionalVector2 v = replacer.IsVector2(node) )
@@
-351,24
+342,30
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
else if(node.Size())
{
value = Property::Value(Property::ARRAY);
else if(node.Size())
{
value = Property::Value(Property::ARRAY);
+ Property::Array* array = value.GetArray();
+
unsigned int i = 0;
TreeNode::ConstIterator iter(node.CBegin());
unsigned int i = 0;
TreeNode::ConstIterator iter(node.CBegin());
- for( ; i < node.Size(); ++i, ++iter)
+
+ if( array )
{
{
- Property::Value v;
- if( SetPropertyFromNode( (*iter).second, v, replacer ) )
+ for( ; i < node.Size(); ++i, ++iter)
{
{
- value.AppendItem(v);
+ Property::Value childValue;
+ if( SetPropertyFromNode( (*iter).second, childValue, replacer ) )
+ {
+ array->PushBack( childValue );
+ }
}
}
- }
- if( value.GetSize() == static_cast<int>(node.Size()) )
- {
- done = true;
- }
- else
- {
- done = false;
+ if( array->Count() == node.Size() )
+ {
+ done = true;
+ }
+ else
+ {
+ done = false;
+ }
}
}
break;
}
}
break;
@@
-382,29
+379,34
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
else if(node.Size())
{
value = Property::Value(Property::MAP);
else if(node.Size())
{
value = Property::Value(Property::MAP);
+ Property::Map* map = value.GetMap();
+
unsigned int i = 0;
TreeNode::ConstIterator iter(node.CBegin());
unsigned int i = 0;
TreeNode::ConstIterator iter(node.CBegin());
- for( ; i < node.Size(); ++i, ++iter)
+
+ if( map )
{
{
- Property::Value v;
- if( SetPropertyFromNode( (*iter).second, v, replacer ) )
+ for( ; i < node.Size(); ++i, ++iter)
{
{
- value.SetValue( (*iter).first, v );
+ Property::Value childValue;
+ if( SetPropertyFromNode( (*iter).second, childValue, replacer ) )
+ {
+ map->Insert( (*iter).first, childValue );
+ }
}
}
- }
- if( value.GetSize() == static_cast<int>(node.Size()) )
- {
- done = true;
- }
- else
- {
- done = false;
+ if( map->Count() == node.Size() )
+ {
+ done = true;
+ }
+ else
+ {
+ done = false;
+ }
}
}
break;
}
}
}
break;
}
- case Property::TYPE_COUNT:
case Property::NONE:
{
break;
case Property::NONE:
{
break;
@@
-489,14
+491,18
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Value& value,
else
{
value = Property::Value(Property::ARRAY);
else
{
value = Property::Value(Property::ARRAY);
- Property::
Value v
;
+ Property::
Array* array = value.GetArray()
;
-
for(TreeConstIter iter = node.CBegin(); iter != node.CEnd(); ++iter
)
+
if( array
)
{
{
-
if( SetPropertyFromNode( (*iter).second, v, replacer )
)
+
for(TreeConstIter iter = node.CBegin(); iter != node.CEnd(); ++iter
)
{
{
- value.AppendItem(v);
- done = true;
+ Property::Value childValue;
+ if( SetPropertyFromNode( (*iter).second, childValue, replacer ) )
+ {
+ array->PushBack( childValue );
+ done = true;
+ }
}
}
}
}
}
}
@@
-513,26
+519,36
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Value& value,
if( ((*iter).first) == 0 )
{
value = Property::Value(Property::ARRAY);
if( ((*iter).first) == 0 )
{
value = Property::Value(Property::ARRAY);
- Property::Value v;
- for(unsigned int i = 0; i < node.Size(); ++i, ++iter)
+ Property::Array* array = value.GetArray();
+
+ if( array )
{
{
-
if( SetPropertyFromNode( (*iter).second, v, replacer )
)
+
for(unsigned int i = 0; i < node.Size(); ++i, ++iter
)
{
{
- value.AppendItem(v);
- done = true;
+ Property::Value childValue;
+ if( SetPropertyFromNode( (*iter).second, childValue, replacer ) )
+ {
+ array->PushBack( childValue );
+ done = true;
+ }
}
}
}
else
{
value = Property::Value(Property::MAP);
}
}
}
else
{
value = Property::Value(Property::MAP);
- Property::Value v;
- for(unsigned int i = 0; i < node.Size(); ++i, ++iter)
+ Property::Map* map = value.GetMap();
+
+ if( map )
{
{
-
if( SetPropertyFromNode( (*iter).second, v, replacer )
)
+
for(unsigned int i = 0; i < node.Size(); ++i, ++iter
)
{
{
- value.SetValue((*iter).first, v);
- done = true;
+ Property::Value childValue;
+ if( SetPropertyFromNode( (*iter).second, childValue, replacer ) )
+ {
+ map->Insert( (*iter).first, childValue );
+ done = true;
+ }
}
}
}
}
}
}