X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=92cc53c9de6e033cd215e6b8b3e0954f73098a57;hp=9b77e638a9c20d2e070bf2937f510690a49f04dc;hb=863244a09761c6e22a224299b6155a285e21d6ec;hpb=07b1b771c6a3affaf013f93c1306723eae0621e4

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 9b77e63..92cc53c 100644
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -28,7 +28,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/internal/visuals/border/border-visual.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
 #include <dali-toolkit/internal/visuals/gradient/gradient-visual.h>
@@ -63,6 +64,7 @@ DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, GRADIENT )
 DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, IMAGE )
 DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, MESH )
 DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, PRIMITIVE )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::DevelVisual, TEXT )
 DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, WIREFRAME )
 DALI_ENUM_TO_STRING_TABLE_END( VISUAL_TYPE )
 
@@ -97,111 +99,108 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
     mFactoryCache = new VisualFactoryCache();
   }
 
-  // Return a new WireframeVisual if we have debug enabled
-  if( mDebugEnabled )
-  {
-    return Toolkit::Visual::Base( WireframeVisual::New( *( mFactoryCache.Get() ) ).Get() );
-  }
-
   Visual::BasePtr visualPtr;
 
-  Property::Value* typeValue = propertyMap.Find( Toolkit::VisualProperty::TYPE, VISUAL_TYPE );
-  Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type.
-  if( typeValue )
+  if( mDebugEnabled )
   {
-    Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );
+    //Create a WireframeVisual if we have debug enabled
+    visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );
   }
-
-  switch( visualType )
+  else
   {
-    case Toolkit::Visual::BORDER:
+    Property::Value* typeValue = propertyMap.Find( Toolkit::DevelVisual::Property::TYPE, VISUAL_TYPE );
+    Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type.
+    if( typeValue )
     {
-      visualPtr = BorderVisual::New( *( mFactoryCache.Get() ) );
-      break;
+      Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );
     }
 
-    case Toolkit::Visual::COLOR:
+    switch( visualType )
     {
-      visualPtr = ColorVisual::New( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::BORDER:
+      {
+        visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
 
-    case Toolkit::Visual::GRADIENT:
-    {
-      visualPtr = GradientVisual::New( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::COLOR:
+      {
+        visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
 
-    case Toolkit::Visual::IMAGE:
-    {
-      Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
-      std::string imageUrl;
-      if( imageURLValue && imageURLValue->Get( imageUrl ) )
+      case Toolkit::Visual::GRADIENT:
       {
-        // first resolve url type to know which visual to create
-        UrlType::Type type = ResolveUrlType( imageUrl );
-        if( UrlType::N_PATCH == type )
-        {
-          visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl );
-        }
-        else if( UrlType::SVG == type )
-        {
-          visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl );
-        }
-        else // Regular image
+        visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
+
+      case Toolkit::Visual::IMAGE:
+      {
+        Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+        std::string imageUrl;
+        if( imageURLValue && imageURLValue->Get( imageUrl ) )
         {
-          bool batchingEnabled( false );
-          Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
-          if( batchingEnabledValue  )
+          // first resolve url type to know which visual to create
+          UrlType::Type type = ResolveUrlType( imageUrl );
+          if( UrlType::N_PATCH == type )
           {
-            batchingEnabledValue->Get( batchingEnabled );
+            visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
           }
-
-          if( batchingEnabled )
+          else if( UrlType::SVG == type )
           {
-            visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl );
-            break;
+            visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
           }
-          else
+          else // Regular image
           {
-            visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl );
+            bool batchingEnabled( false );
+            Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
+            if( batchingEnabledValue  )
+            {
+              batchingEnabledValue->Get( batchingEnabled );
+            }
+
+            if( batchingEnabled )
+            {
+              visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+            }
+            else
+            {
+              visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+            }
           }
         }
-      }
 
-      break;
-    }
+        break;
+      }
 
-    case Toolkit::Visual::MESH:
-    {
-      visualPtr = MeshVisual::New( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::MESH:
+      {
+        visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
 
-    case Toolkit::Visual::PRIMITIVE:
-    {
-      visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::PRIMITIVE:
+      {
+        visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
 
-    case Toolkit::Visual::WIREFRAME:
-    {
-      visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );
-      break;
-    }
+      case Toolkit::Visual::WIREFRAME:
+      {
+        visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );
+        break;
+      }
 
-    case Toolkit::Visual::TEXT:
-    {
-      visualPtr = TextVisual::New( *( mFactoryCache.Get() ) );
-      break;
+      case Toolkit::DevelVisual::TEXT:
+      {
+        visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap );
+        break;
+      }
     }
   }
 
-  if( visualPtr )
-  {
-    visualPtr->SetProperties( propertyMap );
-  }
-  else
+  if( !visualPtr )
   {
     DALI_LOG_ERROR( "Renderer type unknown\n" );
   }
@@ -258,7 +257,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image
   }
   else if( UrlType::SVG == type )
   {
-    visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url, size );
+    visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url );
   }
   else // Regular image
   {