const unsigned int DRAW_MODE_VALUES_COUNT = sizeof( DRAW_MODE_VALUES ) / sizeof( DRAW_MODE_VALUES[0] );
-
//////////////////////////////////////////////////////////////////////////////
// Helpers for string to enum comparisons for Image and ImageAttributes
//////////////////////////////////////////////////////////////////////////////
}
}
+/// Helper method to create ResourceImage using property
+ResourceImage NewResourceImage( const Property::Value& map )
+{
+ ResourceImage image = ResourceImage::DownCast( NewImage( map ) );
+ return image;
+}
+
+/// Helper method to create ResourceImage using property
+BufferImage NewBufferImage( const Property::Value& map )
+{
+ BufferImage image = BufferImage::DownCast( NewImage( map ) );
+ return image;
+}
+
/// Helper method to create ImageAttributes using an Image
ImageAttributes NewImageAttributes( const Property::Value& map )
{
- Image image = NewImage( map );
+ ResourceImage image = ResourceImage::DownCast( NewImage( map ) );
return image.GetAttributes();
}
}
-//////////////////////////////////////////////////////////////////////////////
-
int UtcDaliScriptingNewImage(void)
{
TestApplication application;
// Filename only
{
- Image image = NewImage( map );
- DALI_TEST_EQUALS( "TEST_FILE", image.GetFilename(), TEST_LOCATION );
+ ResourceImage image = ResourceImage::DownCast( NewImage( map ) );
+ DALI_TEST_EQUALS( "TEST_FILE", image.GetUrl(), TEST_LOCATION );
}
// load-policy
{
const StringEnum< int > values[] =
{
- { "IMMEDIATE", Image::Immediate },
- { "ON_DEMAND", Image::OnDemand }
+ { "IMMEDIATE", ResourceImage::IMMEDIATE },
+ { "ON_DEMAND", ResourceImage::ON_DEMAND }
};
- TestEnumStrings< Image::LoadPolicy, Image >( map, values, ( sizeof( values ) / sizeof ( values[0] ) ), &Image::GetLoadPolicy, &NewImage );
+ TestEnumStrings< ResourceImage::LoadPolicy, ResourceImage >( map, values, ( sizeof( values ) / sizeof ( values[0] ) ), &ResourceImage::GetLoadPolicy, &NewResourceImage );
}
// release-policy
{
const StringEnum< int > values[] =
{
- { "UNUSED", Image::Unused },
- { "NEVER", Image::Never }
+ { "UNUSED", Image::UNUSED },
+ { "NEVER", Image::NEVER }
};
TestEnumStrings< Image::ReleasePolicy, Image >( map, values, ( sizeof( values ) / sizeof ( values[0] ) ), &Image::GetReleasePolicy, &NewImage );
}
//map.erase( map.end() - 2, map.end() );
- // pixel-format
- map[ "pixel-format" ] = "";
- {
- const StringEnum< int > values[] =
- {
- { "A8", Pixel::A8 },
- { "L8", Pixel::L8 },
- { "LA88", Pixel::LA88 },
- { "RGB565", Pixel::RGB565 },
- { "BGR565", Pixel::BGR565 },
- { "RGBA4444", Pixel::RGBA4444 },
- { "BGRA4444", Pixel::BGRA4444 },
- { "RGBA5551", Pixel::RGBA5551 },
- { "BGRA5551", Pixel::BGRA5551 },
- { "RGB888", Pixel::RGB888 },
- { "RGB8888", Pixel::RGB8888 },
- { "BGR8888", Pixel::BGR8888 },
- { "RGBA8888", Pixel::RGBA8888 },
- { "BGRA8888", Pixel::BGRA8888 },
- { "COMPRESSED_R11_EAC", Pixel::COMPRESSED_R11_EAC },
- { "COMPRESSED_SIGNED_R11_EAC", Pixel::COMPRESSED_SIGNED_R11_EAC },
- { "COMPRESSED_RG11_EAC", Pixel::COMPRESSED_RG11_EAC },
- { "COMPRESSED_SIGNED_RG11_EAC", Pixel::COMPRESSED_SIGNED_RG11_EAC },
- { "COMPRESSED_RGB8_ETC2", Pixel::COMPRESSED_RGB8_ETC2 },
- { "COMPRESSED_SRGB8_ETC2", Pixel::COMPRESSED_SRGB8_ETC2 },
- { "COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2", Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 },
- { "COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2", Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 },
- { "COMPRESSED_RGBA8_ETC2_EAC", Pixel::COMPRESSED_RGBA8_ETC2_EAC },
- { "COMPRESSED_SRGB8_ALPHA8_ETC2_EAC", Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC },
- { "COMPRESSED_RGB8_ETC1", Pixel::COMPRESSED_RGB8_ETC1 },
- { "COMPRESSED_RGB_PVRTC_4BPPV1", Pixel::COMPRESSED_RGB_PVRTC_4BPPV1 },
- { "A8", Pixel::A8 }, // Checked already but reset so that BitmapImage works
- };
- TestEnumStrings< Pixel::Format, ImageAttributes >( map, values, ( sizeof( values ) / sizeof ( values[0] ) ), &ImageAttributes::GetPixelFormat, &NewImageAttributes );
- }
-
// scaling-mode
map[ "scaling-mode" ] = "";
{
Image image = NewImage( map );
DALI_TEST_CHECK( FrameBufferImage::DownCast( image ) );
}
- // type BitMapImage
- map[ "type" ] = "BitmapImage";
- {
- Image image = NewImage( map );
- DALI_TEST_CHECK( BitmapImage::DownCast( image ) );
- }
+ // type BufferImage
+ map[ "type" ] = "BufferImage";
+ {
+ Image image = NewImage( map );
+ DALI_TEST_CHECK( BufferImage::DownCast( image ) );
+ DALI_TEST_CHECK((BufferImage::DownCast( image )).GetPixelFormat()== Pixel::RGBA8888);
+ }
+
+ // pixel-format
+ map[ "pixel-format" ] = "";
+ {
+ const StringEnum< int > values[] =
+ {
+ { "A8", Pixel::A8 },
+ { "L8", Pixel::L8 },
+ { "LA88", Pixel::LA88 },
+ { "RGB565", Pixel::RGB565 },
+ { "BGR565", Pixel::BGR565 },
+ { "RGBA4444", Pixel::RGBA4444 },
+ { "BGRA4444", Pixel::BGRA4444 },
+ { "RGBA5551", Pixel::RGBA5551 },
+ { "BGRA5551", Pixel::BGRA5551 },
+ { "RGB888", Pixel::RGB888 },
+ { "RGB8888", Pixel::RGB8888 },
+ { "BGR8888", Pixel::BGR8888 },
+ { "RGBA8888", Pixel::RGBA8888 },
+ { "BGRA8888", Pixel::BGRA8888 },
+ /*{ "COMPRESSED_R11_EAC", Pixel::COMPRESSED_R11_EAC },
+ { "COMPRESSED_SIGNED_R11_EAC", Pixel::COMPRESSED_SIGNED_R11_EAC },
+ { "COMPRESSED_RG11_EAC", Pixel::COMPRESSED_RG11_EAC },
+ { "COMPRESSED_SIGNED_RG11_EAC", Pixel::COMPRESSED_SIGNED_RG11_EAC },
+ { "COMPRESSED_RGB8_ETC2", Pixel::COMPRESSED_RGB8_ETC2 },
+ { "COMPRESSED_SRGB8_ETC2", Pixel::COMPRESSED_SRGB8_ETC2 },
+ { "COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2", Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 },
+ { "COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2", Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 },
+ { "COMPRESSED_RGBA8_ETC2_EAC", Pixel::COMPRESSED_RGBA8_ETC2_EAC },
+ { "COMPRESSED_SRGB8_ALPHA8_ETC2_EAC", Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC },
+ { "COMPRESSED_RGB8_ETC1", Pixel::COMPRESSED_RGB8_ETC1 },
+ { "COMPRESSED_RGB_PVRTC_4BPPV1", Pixel::COMPRESSED_RGB_PVRTC_4BPPV1 },*/
+ // BufferImage doesnot support compressed format
+ };
+
+ TestEnumStrings< Pixel::Format, BufferImage >( map, values, ( sizeof( values ) / sizeof ( values[0] ) ), &BufferImage::GetPixelFormat, &NewBufferImage );
+ }
+
// type Image
- map[ "type" ] = "Image";
+ map[ "type" ] = "ResourceImage";
{
Image image = NewImage( map );
- DALI_TEST_CHECK( Image::DownCast( image ) );
+ DALI_TEST_CHECK( ResourceImage::DownCast( image ) );
DALI_TEST_CHECK( !FrameBufferImage::DownCast( image ) );
- DALI_TEST_CHECK( !BitmapImage::DownCast( image ) );
+ DALI_TEST_CHECK( !BufferImage::DownCast( image ) );
}
END_TEST;
}
DALI_TEST_CHECK( !handle.MouseWheelEventSignal().GetConnectionCount() );
DALI_TEST_CHECK( !handle.OffStageSignal().GetConnectionCount() );
DALI_TEST_CHECK( !handle.OnStageSignal().GetConnectionCount() );
- DALI_TEST_CHECK( !handle.SetSizeSignal().GetConnectionCount() );
DALI_TEST_CHECK( !handle.TouchedSignal().GetConnectionCount() );
}
END_TEST;
child2Map[ "type" ] = "TextActor";
child2Map[ "position" ] = Vector3::ZAXIS;
- Property::Map grandChildMap;
- grandChildMap[ "type" ] = "LightActor";
- grandChildMap[ "position" ] = Vector3::ONE;
-
- // Add arrays to appropriate maps
- Property::Array grandChildArray;
- grandChildArray.push_back( grandChildMap );
Property::Array childArray;
- child1Map[ "actors" ] = grandChildArray;
childArray.push_back( child1Map );
childArray.push_back( child2Map );
map[ "actors" ] = childArray;
DALI_TEST_CHECK( child1 );
DALI_TEST_CHECK( ImageActor::DownCast( child1 ) );
DALI_TEST_EQUALS( child1.GetCurrentPosition(), Vector3::YAXIS, TEST_LOCATION );
- DALI_TEST_EQUALS( child1.GetChildCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( child1.GetChildCount(), 0u, TEST_LOCATION );
Actor child2 = handle.GetChildAt(1);
DALI_TEST_CHECK( child2 );
DALI_TEST_EQUALS( child2.GetCurrentPosition(), Vector3::ZAXIS, TEST_LOCATION );
DALI_TEST_EQUALS( child2.GetChildCount(), 0u, TEST_LOCATION );
- Actor grandChild = child1.GetChildAt( 0 );
- DALI_TEST_CHECK( grandChild );
- DALI_TEST_CHECK( LightActor::DownCast( grandChild ) );
- DALI_TEST_EQUALS( grandChild.GetCurrentPosition(), Vector3::ONE, TEST_LOCATION );
- DALI_TEST_EQUALS( grandChild.GetChildCount(), 0u, TEST_LOCATION );
-
Stage::GetCurrent().Remove( handle );
END_TEST;
}
actor.SetLeaveRequired( true );
actor.SetInheritRotation( false );
actor.SetInheritScale( false );
+ actor.SetSizeMode( USE_OWN_SIZE );
+ actor.SetSizeModeFactor( Vector3::ONE );
Stage::GetCurrent().Add( actor );
application.SendNotification();
DALI_TEST_EQUALS( value.GetValue( "inherit-rotation" ).Get< bool >(), false, TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "inherit-scale" ) );
DALI_TEST_EQUALS( value.GetValue( "inherit-scale" ).Get< bool >(), false, TEST_LOCATION );
+ DALI_TEST_CHECK( value.HasKey( "size-mode-factor" ) );
+ DALI_TEST_EQUALS( value.GetValue( "size-mode-factor" ).Get< Vector3 >(), Vector3::ONE, TEST_LOCATION );
Stage::GetCurrent().Remove( actor );
}
Actor actor = Actor::New();
Actor child = ImageActor::New();
Actor grandChild = TextActor::New();
- Actor grandChild2 = LightActor::New();
+
actor.Add( child );
child.Add( grandChild );
- child.Add( grandChild2 );
Stage::GetCurrent().Add( actor );
application.SendNotification();
DALI_TEST_CHECK( childValue.HasKey( "actors" ) );
Property::Array grandChildren( childValue.GetValue( "actors").Get< Property::Array >() );
- DALI_TEST_CHECK( grandChildren.size() == 2u );
+ DALI_TEST_CHECK( grandChildren.size() == 1u );
Property::Map grandChildMap( grandChildren[0].Get< Property::Map >() );
DALI_TEST_CHECK( !grandChildMap.Empty() );
DALI_TEST_CHECK( grandChildValue.HasKey( "type" ) );
DALI_TEST_EQUALS( grandChildValue.GetValue( "type" ).Get< std::string >(), "TextActor", TEST_LOCATION );
- Property::Map grandChild2Map( grandChildren[1].Get< Property::Map >() );
- DALI_TEST_CHECK( !grandChild2Map.Empty() );
- Property::Value grandChild2Value( grandChild2Map );
- DALI_TEST_CHECK( grandChild2Value.HasKey( "type" ) );
- DALI_TEST_EQUALS( grandChild2Value.GetValue( "type" ).Get< std::string >(), "LightActor", TEST_LOCATION );
Stage::GetCurrent().Remove( actor );
}
// Default
{
- Image image = Image::New( "MY_PATH" );
+ Image image = ResourceImage::New( "MY_PATH" );
Property::Map map;
CreatePropertyMap( image, map );
Property::Value value( map );
DALI_TEST_CHECK( value.HasKey( "type" ) );
- DALI_TEST_EQUALS( value.GetValue( "type" ).Get< std::string >(), "Image", TEST_LOCATION );
+ DALI_TEST_EQUALS( value.GetValue( "type" ).Get< std::string >(), "ResourceImage", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "filename" ) );
DALI_TEST_EQUALS( value.GetValue( "filename" ).Get< std::string >(), "MY_PATH", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "load-policy") );
DALI_TEST_EQUALS( value.GetValue( "load-policy" ).Get< std::string >(), "IMMEDIATE", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "release-policy") );
DALI_TEST_EQUALS( value.GetValue( "release-policy" ).Get< std::string >(), "NEVER", TEST_LOCATION );
- DALI_TEST_CHECK( value.HasKey( "pixel-format") );
- DALI_TEST_EQUALS( value.GetValue( "pixel-format" ).Get< std::string >(), "RGBA8888", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "scaling-mode") );
DALI_TEST_EQUALS( value.GetValue( "scaling-mode" ).Get< std::string >(), "SHRINK_TO_FIT", TEST_LOCATION );
DALI_TEST_CHECK( !value.HasKey( "width" ) );
// Change values
{
ImageAttributes attributes;
- attributes.SetPixelFormat( Pixel::A8 );
attributes.SetScalingMode( ImageAttributes::FitWidth );
attributes.SetSize( 300, 400 );
- Image image = Image::New( "MY_PATH", attributes, Image::OnDemand, Image::Unused );
+ Image image = ResourceImage::New( "MY_PATH", attributes, ResourceImage::ON_DEMAND, Image::UNUSED );
Property::Map map;
CreatePropertyMap( image, map );
Property::Value value( map );
DALI_TEST_CHECK( value.HasKey( "type" ) );
- DALI_TEST_EQUALS( value.GetValue( "type" ).Get< std::string >(), "Image", TEST_LOCATION );
+ DALI_TEST_EQUALS( value.GetValue( "type" ).Get< std::string >(), "ResourceImage", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "filename" ) );
DALI_TEST_EQUALS( value.GetValue( "filename" ).Get< std::string >(), "MY_PATH", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "load-policy") );
DALI_TEST_EQUALS( value.GetValue( "load-policy" ).Get< std::string >(), "ON_DEMAND", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "release-policy") );
DALI_TEST_EQUALS( value.GetValue( "release-policy" ).Get< std::string >(), "UNUSED", TEST_LOCATION );
- DALI_TEST_CHECK( value.HasKey( "pixel-format") );
- DALI_TEST_EQUALS( value.GetValue( "pixel-format" ).Get< std::string >(), "A8", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "scaling-mode") );
DALI_TEST_EQUALS( value.GetValue( "scaling-mode" ).Get< std::string >(), "FIT_WIDTH", TEST_LOCATION );
DALI_TEST_CHECK( value.HasKey( "width" ) );
DALI_TEST_EQUALS( value.GetValue( "height" ).Get< int >(), 400, TEST_LOCATION );
}
- // BitmapImage
+ // BufferImage
{
- Image image = BitmapImage::New( 200, 300, Pixel::RGBA8888 );
+ Image image = BufferImage::New( 200, 300, Pixel::A8 );
Property::Map map;
CreatePropertyMap( image, map );
Property::Value value( map );
DALI_TEST_CHECK( value.HasKey( "type" ) );
- DALI_TEST_EQUALS( value.GetValue( "type" ).Get< std::string >(), "BitmapImage", TEST_LOCATION );
+ DALI_TEST_EQUALS( value.GetValue( "type" ).Get< std::string >(), "BufferImage", TEST_LOCATION );
+ DALI_TEST_CHECK( value.HasKey( "pixel-format") );
+ DALI_TEST_EQUALS( value.GetValue( "pixel-format" ).Get< std::string >(), "A8", TEST_LOCATION );
}
// FrameBufferImage
END_TEST;
}
+
+int UtcDaliScriptingCompareEnums(void)
+{
+ // EQUAL
+ DALI_TEST_CHECK( CompareEnums( "", "" ) );
+ DALI_TEST_CHECK( CompareEnums( "HELLO", "HELLO" ) );
+ DALI_TEST_CHECK( CompareEnums( "HELLO", "hello" ) );
+ DALI_TEST_CHECK( CompareEnums( "hello", "HELLO" ) );
+ DALI_TEST_CHECK( CompareEnums( "hello-world", "HELLO_WORLD" ) );
+ DALI_TEST_CHECK( CompareEnums( "hello_WORLD", "HELLO-world" ) );
+ DALI_TEST_CHECK( CompareEnums( "hello_WORLD-", "HELLO-world_" ) );
+ DALI_TEST_CHECK( CompareEnums( "_hello_WORLD-", "-HELLO-world_" ) );
+ DALI_TEST_CHECK( CompareEnums( "-hello_WORLD-", "_HELLO-world_" ) );
+ DALI_TEST_CHECK( CompareEnums( "hello123", "HELLO123" ) );
+
+ // NOT EQUAL
+ DALI_TEST_CHECK( ! CompareEnums( "hello", "HELLOWORLD" ) );
+
+ END_TEST;
+}