X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fsegmentation.cpp;h=5e590b5bc7b5f5fe93509a8ea051ea639b58d46c;hp=efac834b37d81eab64b5007dc7029dab74821903;hb=e208465b3f8e6cffb9dfca62142f73c6ba166957;hpb=10d2080e1d25b75347daa2f8c2dcee494fbcb175

diff --git a/dali-toolkit/internal/text/segmentation.cpp b/dali-toolkit/internal/text/segmentation.cpp
index efac834..5e590b5 100644
--- a/dali-toolkit/internal/text/segmentation.cpp
+++ b/dali-toolkit/internal/text/segmentation.cpp
@@ -15,11 +15,30 @@
  *
  */
 
-// CLASS HEADER
+// FILE HEADER
 #include <dali-toolkit/internal/text/segmentation.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/text-abstraction/segmentation.h>
+#include <dali/devel-api/text-abstraction/segmentation.h>
+#ifdef DEBUG_ENABLED
+#include <string>
+#include <dali/integration-api/debug.h>
+#endif
+
+// INTERNAL INCLUDES
+#ifdef DEBUG_ENABLED
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#endif
+
+namespace
+{
+
+#if defined(DEBUG_ENABLED)
+  Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_SEGMENTATION");
+#endif
+
+} // namespace
+
 
 namespace Dali
 {
@@ -46,38 +65,88 @@ void SetLineBreakInfo( const Vector<Character>& text,
   TextAbstraction::Segmentation::Get().GetLineBreakPositions( text.Begin(),
                                                               numberOfCharacters,
                                                               lineBreakInfo.Begin() );
-}
-
-void ReplaceLineBreakInfo( LogicalModel& model,
-                           CharacterIndex characterIndex,
-                           Length numberOfCharactersToRemove,
-                           Length numberOfCharactersToInsert )
-{
+#ifdef DEBUG_ENABLED
+  if( gLogFilter->IsEnabledFor(Debug::Verbose) )
+  {
+    std::string utf8;
+    Utf32ToUtf8( text.Begin(), numberOfCharacters, utf8 );
+
+    std::string info;
+    info.reserve( numberOfCharacters );
+    for( unsigned int i=0; i<lineBreakInfo.Count(); ++i )
+    {
+      info.push_back( static_cast<char>('0' + lineBreakInfo[i]) );
+    }
+
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "SetLineBreakInfo Characters: %s\n", utf8.c_str() );
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "SetLineBreakInfo Break info: %s\n", info.c_str() );
+  }
+#endif
 }
 
 void SetWordBreakInfo( const Vector<Character>& text,
+                       CharacterIndex startIndex,
+                       Length numberOfCharacters,
                        Vector<WordBreakInfo>& wordBreakInfo )
 {
-  const Length numberOfCharacters = text.Count();
+  const Length totalNumberOfCharacters = text.Count();
 
-  if( 0u == numberOfCharacters )
+  if( 0u == totalNumberOfCharacters )
   {
     // Nothing to do if there are no characters.
     return;
   }
 
+  // Resize the vector.
+  wordBreakInfo.Resize( totalNumberOfCharacters );
+
+  // Whether the current buffer is being updated or is set from scratch.
+  const bool updateCurrentBuffer = numberOfCharacters < totalNumberOfCharacters;
+
+  WordBreakInfo* wordBreakInfoBuffer = NULL;
+  Vector<WordBreakInfo> newWordBreakInfo;
+
+  if( updateCurrentBuffer )
+  {
+    newWordBreakInfo.Resize( numberOfCharacters );
+    wordBreakInfoBuffer = newWordBreakInfo.Begin();
+  }
+  else
+  {
+    wordBreakInfoBuffer = wordBreakInfo.Begin();
+  }
+
   // Retrieve the word break info.
-  wordBreakInfo.Resize( numberOfCharacters );
-  TextAbstraction::Segmentation::Get().GetWordBreakPositions( text.Begin(),
+  TextAbstraction::Segmentation::Get().GetWordBreakPositions( text.Begin() + startIndex,
                                                               numberOfCharacters,
-                                                              wordBreakInfo.Begin() );
-}
+                                                              wordBreakInfoBuffer );
 
-void ReplaceWordBreakInfo( LogicalModel& model,
-                           CharacterIndex characterIndex,
-                           Length numberOfCharactersToRemove,
-                           Length numberOfCharactersToInsert )
-{
+  // If the word break info is updated, it needs to be inserted in the model.
+  if( updateCurrentBuffer )
+  {
+    wordBreakInfo.Insert( wordBreakInfo.Begin() + startIndex,
+                          newWordBreakInfo.Begin(),
+                          newWordBreakInfo.End() );
+    wordBreakInfo.Resize( totalNumberOfCharacters );
+  }
+
+#ifdef DEBUG_ENABLED
+  if( gLogFilter->IsEnabledFor(Debug::Verbose) )
+  {
+    std::string utf8;
+    Utf32ToUtf8( text.Begin(), totalNumberOfCharacters, utf8 );
+
+    std::string info;
+    info.reserve( totalNumberOfCharacters );
+    for( unsigned int i=0; i<wordBreakInfo.Count(); ++i )
+    {
+      info.push_back( static_cast<char>('0' + wordBreakInfo[i]) );
+    }
+
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "SetWordBreakInfo Characters: %s\n", utf8.c_str() );
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "SetWordBreakInfo Break info: %s\n", info.c_str() );
+  }
+#endif
 }
 
 } // namespace Text