Add label to object which has no text label

- Issue:
The utterance about number is not recognized in text label mode.

- Solution:
This patch adds label information for the objects which have no label
information. For these objects, mmi manager uses index information as
label information. Through this patch, number utterance in text label
mode is properly recognized. However, some utterance like '7번' can not
be recogntized yet.

Change-Id: I9fc025638a479d210f644dc5f47b12ed5f435ac3
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/src/mmimgr/iu/CommandFinder.cpp b/src/mmimgr/iu/CommandFinder.cpp
index f63ef34f10b5643ea6132e6da5a73253b56510e7..4f1646553bf707e1abbd722647097f6391a3db27 100644 (file)
--- a/src/mmimgr/iu/CommandFinder.cpp
+++ b/src/mmimgr/iu/CommandFinder.cpp
@@ -27,31 +27,25 @@
 
 using namespace std;
 
-CommandFinder::CommandFinder(std::string &text, std::list<std::shared_ptr<ClickableItem>>& commands) :
+CommandFinder::CommandFinder(std::string &text, int index, bool isIndex, std::list<std::shared_ptr<ClickableItem>> &commands) :
                __WORD_MATCHING_RATE(0.3), __CHAR_MATCHING_RATE(0.25), __MIN_WORD_SIZE(3), __commands(commands)
 {
-       _I("[CommandFinder] Initiate command searcher. text(%s)", text.c_str());
+       _I("[CommandFinder] Initiate command searcher. text(%s) index(%d), isIndex(%d)", text.c_str(), index, isIndex);
 
        __loweredText = StringUtil::makeLowerCase(text);
        __splitText = StringUtil::splitText(__loweredText, ' ');
 
-       __index = -1;
-       __isLabel = true;
-}
-
-CommandFinder::CommandFinder(int index, std::list<std::shared_ptr<ClickableItem>>& commands) :
-               __WORD_MATCHING_RATE(0.3), __CHAR_MATCHING_RATE(0.25), __MIN_WORD_SIZE(3), __commands(commands)
-{
-       _I("[CommandFinder] Initiate command searcher. index(%d)", index);
-
        __index = index;
-       __isLabel = false;
+       __isIndex = isIndex;
 }
 
 ClickableItem* CommandFinder::findCommand()
 {
        ClickableItem* result = nullptr;
-       if (__isLabel) {
+       if (__isIndex) {
+               _I("[CommandFinder] Find command by index. index(%d)", __index);
+               result = findCommandByIndex();
+       } else {
                _I("[CommandFinder] Find command by label text. text(%s)", __loweredText.c_str());
                result = findCommandByText();
                if (result != nullptr) {
@@ -67,9 +61,13 @@ ClickableItem* CommandFinder::findCommand()
                if (result != nullptr) {
                        return result;
                }
-       } else {
-               _I("[CommandFinder] Find command by index. index(%d)", __index);
+
+               _I("[CommandFinder] Fail to get command from text. Find command by index. index(%d)", __index);
                result = findCommandByIndex();
+               if (result == nullptr || result->label != to_string(result->index)) {
+                       _D("[CommandFinder] The result is null or not number label");
+                       return nullptr;
+               }
        }
 
        return result;

diff --git a/src/mmimgr/iu/CommandFinder.h b/src/mmimgr/iu/CommandFinder.h
index dfa0c2c97b8362a79da035e55339819fe63af796..d274df2f351d2f22a8eda8cb8f90812255d4c249 100644 (file)
--- a/src/mmimgr/iu/CommandFinder.h
+++ b/src/mmimgr/iu/CommandFinder.h
@@ -28,8 +28,7 @@
 
 class CommandFinder {
        public:
-               CommandFinder(std::string &text, std::list<std::shared_ptr<ClickableItem>> &__commands);
-               CommandFinder(int index, std::list<std::shared_ptr<ClickableItem>> &__commands);
+               CommandFinder(std::string &text, int index, bool isIndex, std::list<std::shared_ptr<ClickableItem>> &commands);
 
                ClickableItem* findCommand();
 
@@ -50,7 +49,7 @@ class CommandFinder {
                std::string __loweredText;
                int __index;
 
-               bool __isLabel;
+               bool __isIndex;
 };
 
 #endif /* __TIZEN_UIX_MMI_IU_COMMAND_FINDER_H__ */
\ No newline at end of file

diff --git a/src/mmimgr/iu/CommandManager.cpp b/src/mmimgr/iu/CommandManager.cpp
index f82802258b3543e1c931af95fb3a7ff3b4e9652b..3f75cf5570f144d0fa97f8e778d739cdfad0cb03 100644 (file)
--- a/src/mmimgr/iu/CommandManager.cpp
+++ b/src/mmimgr/iu/CommandManager.cpp
@@ -57,13 +57,7 @@ ClickableItem* CommandManager::findCommand(std::string &text, bool isIndex)
                return nullptr;
        }
 
-       unique_ptr<CommandFinder> finder;
-       if (isIndex) {
-               finder = make_unique<CommandFinder>(index, __commands);
-       } else {
-               finder = make_unique<CommandFinder>(text, __commands);
-       }
-
+       auto finder = make_unique<CommandFinder>(text, index, isIndex, __commands);
        auto command = finder->findCommand();
        if (command != nullptr) {
                _I("[CommandManager] Find command. text(%s). command(%s)", text.c_str(), command->label.c_str());

diff --git a/src/mmimgr/iu/VoiceTouchEngine.cpp b/src/mmimgr/iu/VoiceTouchEngine.cpp
index d15031285c94478920165d457ca0866566859b6b..f2d1cf91550a633cfca60788820e41ea99dcf41c 100644 (file)
--- a/src/mmimgr/iu/VoiceTouchEngine.cpp
+++ b/src/mmimgr/iu/VoiceTouchEngine.cpp
@@ -454,12 +454,14 @@ void VoiceTouchEngine::makeClickableItemInfo(int timestamp, JsonProvider &provid
        }
 
        provider.setOutputEvent(MMI_KEY_UI_CLICKABLE_OBJECT);
-       provider.setUiClickableObject(resultType, tooltipType, __itemList.size(), timestamp);
+       provider.setUiClickableObject(resultType, tooltipType, itemList->size(), timestamp);
        provider.setGridDepth(__currentGridInfo.currentStep + 1);
 
        for (auto &item : *itemList) {
-               auto label = (item.label.empty() ? to_string(item.index) : item.label);
-               provider.addInfoClickableObject(item.index, item.coordX, item.coordY, item.width, item.height, label.c_str());
+               if (item.label.empty()) {
+                       item.label = to_string(item.index);
+               }
+               provider.addInfoClickableObject(item.index, item.coordX, item.coordY, item.width, item.height, item.label.c_str());
        }
 }
 

diff --git a/tests/iu/CommandFinder_unittests.cpp b/tests/iu/CommandFinder_unittests.cpp
index 9ff9e5a77f7f0787a4bc8116bf06f0c20293f16d..3c295b3703528d44727f7f974c3ad3a8d12b8b06 100644 (file)
--- a/tests/iu/CommandFinder_unittests.cpp
+++ b/tests/iu/CommandFinder_unittests.cpp
@@ -70,20 +70,17 @@ class CommandFinderTest : public testing::Test {
 TEST_F(CommandFinderTest, utc_CommandFinder_Constructor)
 {
     string target = "test1";
-    auto finder1 = new(nothrow) CommandFinder(target, commands);
-    auto finder2 = new(nothrow) CommandFinder(1, commands);
+    auto finder = new(nothrow) CommandFinder(target, 1, false, commands);
 
-    EXPECT_NE(finder1, nullptr);
-    EXPECT_NE(finder2, nullptr);
+    EXPECT_NE(finder, nullptr);
 
-    delete finder1;
-    delete finder2;
+    delete finder;
 }
 
 TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_p)
 {
     string target = "test1";
-    auto finder_p = new(nothrow) CommandFinder(target, commands);
+    auto finder_p = new(nothrow) CommandFinder(target, -1, false, commands);
     ASSERT_NE(finder_p, nullptr);
 
     auto command = finder_p->findCommand();
@@ -96,7 +93,7 @@ TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_p)
 TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_p2)
 {
     string target = "text1";
-    auto finder_p = new(nothrow) CommandFinder(target, commands);
+    auto finder_p = new(nothrow) CommandFinder(target, -1, false, commands);
     ASSERT_NE(finder_p, nullptr);
 
     auto command = finder_p->findCommand();
@@ -108,7 +105,8 @@ TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_p2)
 
 TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_p3)
 {
-    auto finder_p = new(nothrow) CommandFinder(1, commands);
+    string target = "";
+    auto finder_p = new(nothrow) CommandFinder(target, 1, true, commands);
     ASSERT_NE(finder_p, nullptr);
 
     auto command = finder_p->findCommand();
@@ -121,7 +119,7 @@ TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_p3)
 TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_n)
 {
     string target = "no matched text";
-    auto finder_n = new(nothrow) CommandFinder(target, commands);
+    auto finder_n = new(nothrow) CommandFinder(target, -1, false, commands);
     ASSERT_NE(finder_n, nullptr);
 
     auto command = finder_n->findCommand();
@@ -132,7 +130,8 @@ TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_n)
 
 TEST_F(CommandFinderTest, utc_CommandFinder_findCommand_n2)
 {
-    auto finder_n = new(nothrow) CommandFinder(-1, commands);
+    string target = "";
+    auto finder_n = new(nothrow) CommandFinder(target, -1, true, commands);
     ASSERT_NE(finder_n, nullptr);
 
     auto command = finder_n->findCommand();