Revert "[3.0] Added ResourceReadySignal to image-scaling-irregular demo"

This reverts commit 995ac8f2c415e33ba2e37fdc487e2e65780c1a07.

Change-Id: Ieeeda881a24ca6d912e3e707d264917f01539eca

diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
index 6ca46f0..302686c 100644 (file)
--- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
+++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2014 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.
@@ -46,7 +46,6 @@
 #include <map>
 #include <dali-toolkit/dali-toolkit.h>
 #include <iostream>
-#include <dali-toolkit/devel-api/controls/control-devel.h>
 
 // INTERNAL INCLUDES
 #include "grid-flags.h"
@@ -166,34 +165,43 @@ const char* IMAGE_PATHS[] = {
   NULL
 };
 const unsigned NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u;
-const unsigned int INITIAL_IMAGES_TO_LOAD = 10;
 
 
 /**
- * Creates an ImageView
+ * Creates an Image
  *
  * @param[in] filename The path of the image.
  * @param[in] width The width of the image in pixels.
  * @param[in] height The height of the image in pixels.
  * @param[in] fittingMode The mode to use when scaling the image to fit the desired dimensions.
  */
-ImageView CreateImageView(const std::string& filename, int width, int height, Dali::FittingMode::Type fittingMode )
+Image CreateImage(const std::string& filename, unsigned int width, unsigned int height, Dali::FittingMode::Type fittingMode )
 {
+#ifdef DEBUG_PRINT_DIAGNOSTICS
+    fprintf( stderr, "CreateImage(%s, %u, %u, fittingMode=%u)\n", filename.c_str(), width, height, unsigned( fittingMode ) );
+#endif
+  Image image = ResourceImage::New( filename, ImageDimensions( width, height ), fittingMode, Dali::SamplingMode::BOX_THEN_LINEAR );
 
-  ImageView imageView = ImageView::New();
-
-  Property::Map map;
-  map[Toolkit::ImageVisual::Property::URL] = filename;
-  map[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = width;
-  map[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = height;
-  map[Toolkit::ImageVisual::Property::FITTING_MODE] = fittingMode;
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
+  return image;
+}
 
-  imageView.SetName( filename );
-  imageView.SetParentOrigin(ParentOrigin::CENTER);
-  imageView.SetAnchorPoint(AnchorPoint::CENTER);
+/**
+ * Creates an ImageView
+ *
+ * @param[in] filename The path of the image.
+ * @param[in] width The width of the image in pixels.
+ * @param[in] height The height of the image in pixels.
+ * @param[in] fittingMode The mode to use when scaling the image to fit the desired dimensions.
+ */
+ImageView CreateImageView(const std::string& filename, unsigned int width, unsigned int height, Dali::FittingMode::Type fittingMode )
+{
+  Image img = CreateImage( filename, width, height, fittingMode );
+  ImageView actor = ImageView::New( img );
+  actor.SetName( filename );
+  actor.SetParentOrigin(ParentOrigin::CENTER);
+  actor.SetAnchorPoint(AnchorPoint::CENTER);
 
-  return imageView;
+  return actor;
 }
 
 /** Cycle the scaling mode options. */
@@ -260,8 +268,7 @@ public:
 
   ImageScalingIrregularGridController( Application& application )
   : mApplication( application ),
-    mScrolling( false ),
-    mImagesLoaded( 0 )
+    mScrolling( false )
   {
     std::cout << "ImageScalingIrregularGridController::ImageScalingIrregularGridController" << std::endl;
 
@@ -275,21 +282,6 @@ public:
   }
 
   /**
-   * Called everytime an ImageView has loaded it's image
-   */
-  void ResourceReadySignal( Toolkit::Control control )
-  {
-    mImagesLoaded++;
-    // To allow fast startup, we only place a small number of ImageViews on stage first
-    if ( mImagesLoaded == INITIAL_IMAGES_TO_LOAD )
-    {
-      // Adding the ImageViews to the stage will trigger loading of the Images
-      mGridActor.Add( mOffStageImageViews );
-    }
-  }
-
-
-  /**
    * One-time setup in response to Application InitSignal.
    */
   void Create( Application& application )
@@ -322,11 +314,6 @@ public:
 
     SetTitle( APPLICATION_TITLE );
 
-    mOffStageImageViews = Actor::New();
-    mOffStageImageViews.SetAnchorPoint( AnchorPoint::CENTER );
-    mOffStageImageViews.SetParentOrigin(ParentOrigin::CENTER);
-    mOffStageImageViews.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-
     // Build the main content of the widow:
     PopulateContentLayer( DEFAULT_SCALING_MODE );
   }
@@ -463,9 +450,8 @@ public:
     outFieldHeight = actualGridHeight * cellHeight;
     const Vector2 gridOrigin = Vector2( -fieldWidth * 0.5f, -outFieldHeight * 0.5 );
 
-     unsigned int count = 0;
     // Build the image actors in their right locations in their parent's frame:
-    for( std::vector<PositionedImage>::const_iterator i = placedImages.begin(), end = placedImages.end(); i != end; ++i, ++count )
+    for( std::vector<PositionedImage>::const_iterator i = placedImages.begin(), end = placedImages.end(); i != end; ++i )
     {
       const PositionedImage& imageSource = *i;
       const Vector2 imageSize = imageSource.imageGridDims * cellSize - Vector2( GRID_CELL_PADDING * 2, GRID_CELL_PADDING * 2 );
@@ -476,18 +462,11 @@ public:
       image.SetPosition( Vector3( imagePosition.x, imagePosition.y, 0 ) );
       image.SetSize( imageSize );
       image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage );
-      Toolkit::DevelControl::ResourceReadySignal( image).Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal);
       mFittingModes[image.GetId()] = fittingMode;
       mResourceUrls[image.GetId()] = imageSource.configuration.path;
       mSizes[image.GetId()] = imageSize;
-      if ( count < INITIAL_IMAGES_TO_LOAD )
-      {
-        gridActor.Add( image );
-      }
-      else
-      {
-        mOffStageImageViews.Add( image );
-      }
+
+      gridActor.Add( image );
     }
 
     return gridActor;
@@ -514,18 +493,13 @@ public:
         Dali::FittingMode::Type newMode = NextMode( mFittingModes[id] );
         const Vector2 imageSize = mSizes[actor.GetId()];
 
+        const std::string& url = mResourceUrls[id];
+        Image newImage = CreateImage( url, imageSize.width + 0.5f, imageSize.height + 0.5f, newMode );
         ImageView imageView = ImageView::DownCast( actor );
-        if( imageView)
+        if(imageView)
         {
-          Property::Map map;
-          map[Visual::Property::TYPE] = Visual::IMAGE;
-          map[ImageVisual::Property::URL] = mResourceUrls[id];
-          map[ImageVisual::Property::DESIRED_WIDTH] = imageSize.width + 0.5f;
-          map[ImageVisual::Property::DESIRED_HEIGHT] =  imageSize.height + 0.5f;
-          map[ImageVisual::Property::FITTING_MODE] = newMode;
-          imageView.SetProperty( ImageView::Property::IMAGE, map );
+          imageView.SetImage( newImage );
         }
-
         mFittingModes[id] = newMode;
       }
     }
@@ -567,16 +541,8 @@ public:
 
         const Vector2 imageSize = mSizes[ id ];
         Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] );
-
-        Property::Map map;
-        map[Visual::Property::TYPE] = Visual::IMAGE;
-        map[ImageVisual::Property::URL] = mResourceUrls[id];
-        map[ImageVisual::Property::DESIRED_WIDTH] = imageSize.width;
-        map[ImageVisual::Property::DESIRED_HEIGHT] =  imageSize.height;
-        map[ImageVisual::Property::FITTING_MODE] = newMode;
-        gridImageView.SetProperty( ImageView::Property::IMAGE, map );
-
-
+        Image newImage = CreateImage( mResourceUrls[ id ], imageSize.width, imageSize.height, newMode );
+        gridImageView.SetImage( newImage );
 
         mFittingModes[ id ] = newMode;
 
@@ -630,7 +596,6 @@ private:
   Toolkit::ToolBar mToolBar;          ///< The View's Toolbar.
   TextLabel mTitleActor;               ///< The Toolbar's Title.
   Actor mGridActor;                   ///< The container for the grid of images
-  Actor mOffStageImageViews;
   ScrollView mScrollView;             ///< ScrollView UI Component
   ScrollBar mScrollBarVertical;
   ScrollBar mScrollBarHorizontal;
@@ -638,7 +603,6 @@ private:
   std::map<unsigned, Dali::FittingMode::Type> mFittingModes; ///< Stores the current scaling mode of each image, keyed by image actor id.
   std::map<unsigned, std::string> mResourceUrls; ///< Stores the url of each image, keyed by image actor id.
   std::map<unsigned, Vector2> mSizes; ///< Stores the current size of each image, keyed by image actor id.
-  unsigned int mImagesLoaded;         ///< How many images have been loaded
 };
 
 void RunTest( Application& application )