X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fimage-scaling-and-filtering%2Fimage-scaling-and-filtering-example.cpp;h=042ce7aa1e743ca63b140c4a59d35bf52bf2ef3a;hb=f3d4602ba67f66b6cedd9721765895e673bdb9b8;hp=c94c0423f5dd91a7c331c52081a08ce18fb0935a;hpb=61a27c16e79a05ed6ba17ee95a1d4d4a826c6b3d;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index c94c042..042ce7a 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -27,18 +27,18 @@ using Toolkit::TextLabel; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); -const char* BORDER_IMAGE( DALI_IMAGE_DIR "border-4px.9.png" ); +const char* BORDER_IMAGE( DEMO_IMAGE_DIR "border-4px.9.png" ); const int BORDER_WIDTH = ( 11.0f + 4.0f ); // Shadow size = 11, border size = 4. -const char* RESIZE_HANDLE_IMAGE( DALI_IMAGE_DIR "resize-handle.png" ); +const char* RESIZE_HANDLE_IMAGE( DEMO_IMAGE_DIR "resize-handle.png" ); const int MARGIN_SIZE = 10; const char* const NEXT_BUTTON_ID = "NEXT_BUTTON"; const char* const PREVIOUS_BUTTON_ID = "PREVIOUS_BUTTON"; -const char * const DALI_ICON_PLAY = DALI_IMAGE_DIR "icon-play.png"; +const char * const DALI_ICON_PLAY = DEMO_IMAGE_DIR "icon-play.png"; const char* const FITTING_BUTTON_ID = "FITTING_BUTTON"; const char* const SAMPLING_BUTTON_ID = "SAMPLING_BUTTON"; @@ -52,29 +52,29 @@ const char* const STYLE_BUTTON_TEXT = "buttonlabel"; const char* IMAGE_PATHS[] = { // Variety of sizes, shapes and formats: - DALI_IMAGE_DIR "dali-logo.png", - DALI_IMAGE_DIR "layer1.png", - DALI_IMAGE_DIR "layer2.png", - DALI_IMAGE_DIR "animation-list.png", - DALI_IMAGE_DIR "music-libray-main-screen.png", - DALI_IMAGE_DIR "music-libray-record-cover.png", - DALI_IMAGE_DIR "contacts-background.png", - DALI_IMAGE_DIR "portrait_screen_primitive_shapes.gif", - DALI_IMAGE_DIR "landscape_screen_primitive_shapes.gif", - DALI_IMAGE_DIR "square_primitive_shapes.bmp", - DALI_IMAGE_DIR "gallery-large-14.jpg", - DALI_IMAGE_DIR "book-landscape-cover.jpg", - DALI_IMAGE_DIR "book-portrait-p1.jpg", - DALI_IMAGE_DIR "book-landscape-cover-back.jpg", + DEMO_IMAGE_DIR "dali-logo.png", + DEMO_IMAGE_DIR "layer1.png", + DEMO_IMAGE_DIR "layer2.png", + DEMO_IMAGE_DIR "animation-list.png", + DEMO_IMAGE_DIR "music-libray-main-screen.png", + DEMO_IMAGE_DIR "music-libray-record-cover.png", + DEMO_IMAGE_DIR "contacts-background.png", + DEMO_IMAGE_DIR "portrait_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "landscape_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "square_primitive_shapes.bmp", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "book-landscape-cover.jpg", + DEMO_IMAGE_DIR "book-portrait-p1.jpg", + DEMO_IMAGE_DIR "book-landscape-cover-back.jpg", // Worst case for aliasing in downscaling, 2k x 2k 1 bit per pixel dithered // black and white image: - DALI_IMAGE_DIR "gallery-large-14.wbmp", + DEMO_IMAGE_DIR "gallery-large-14.wbmp", - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-blocks.jpg", - DALI_IMAGE_DIR "background-magnifier.jpg", - DALI_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-blocks.jpg", + DEMO_IMAGE_DIR "background-magnifier.jpg", + DEMO_IMAGE_DIR "gallery-large-14.jpg", NULL }; const int NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u; @@ -177,12 +177,12 @@ public: // Background image: Dali::Property::Map backgroundImage; - backgroundImage.Insert( "rendererType", "imageRenderer" ); - backgroundImage.Insert( "imageUrl", BACKGROUND_IMAGE ); - backgroundImage.Insert( "imageDesiredWidth", stage.GetSize().width ); - backgroundImage.Insert( "imageDesiredHeight", stage.GetSize().height ); - backgroundImage.Insert( "imageFittingMode", "scaleToFill" ); - backgroundImage.Insert( "imageSamplingMode", "boxThenNearest" ); + backgroundImage.Insert( "rendererType", "image" ); + backgroundImage.Insert( "url", BACKGROUND_IMAGE ); + backgroundImage.Insert( "desiredWidth", stage.GetSize().width ); + backgroundImage.Insert( "desiredHeight", stage.GetSize().height ); + backgroundImage.Insert( "fittingMode", "SCALE_TO_FILL" ); + backgroundImage.Insert( "samplingMode", "BOX_THEN_NEAREST" ); Toolkit::ImageView background = Toolkit::ImageView::New(); background.SetProperty( Toolkit::ImageView::Property::IMAGE, backgroundImage ); @@ -295,7 +295,7 @@ public: imagePrevious.SetOpacity( 0.6f ); controlsLayer.Add( imagePrevious ); imagePrevious.SetName( PREVIOUS_BUTTON_ID ); - imagePrevious.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); + imagePrevious.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); // Next image button: Toolkit::ImageView imageNext = Toolkit::ImageView::New( playImage ); @@ -305,7 +305,7 @@ public: imageNext.SetOpacity( 0.6f ); controlsLayer.Add( imageNext ); imageNext.SetName( NEXT_BUTTON_ID ); - imageNext.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); + imageNext.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); // Buttons to popup selectors for fitting and sampling modes: @@ -535,14 +535,13 @@ public: } } - bool OnControlTouched( Actor actor, const TouchEvent& event ) + bool OnControlTouched( Actor actor, const TouchData& event ) { if(event.GetPointCount() > 0) { - const TouchPoint& point = event.GetPoint(0); - switch(point.state) + switch( event.GetState( 0 ) ) { - case TouchPoint::Up: + case PointState::UP: { const std::string & name = actor.GetName(); if( name == NEXT_BUTTON_ID ) @@ -759,9 +758,9 @@ void RunTest( Application& application ) } // Entry point for Linux & Tizen applications -int main( int argc, char **argv ) +int DALI_EXPORT_API main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); RunTest( application );