Merge pull request #5920 from ygorshenin/non-found-results-icons

[assessment-tool] Added icons for non-found search results.
mapsme · Apr 26, 2017 · 62c3c97 · 62c3c97
2 parents 160ab9a + 391ea21
commit 62c3c97
Show file tree

Hide file tree

Showing 41 changed files with 4,008 additions and 3,985 deletions.
diff --git a/data/resources-6plus_clear/symbols-ad.png b/data/resources-6plus_clear/symbols-ad.png
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
diff --git a/data/resources-6plus_dark/symbols-ad.png b/data/resources-6plus_dark/symbols-ad.png
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
diff --git a/data/resources-hdpi_clear/symbols-ad.png b/data/resources-hdpi_clear/symbols-ad.png
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
diff --git a/data/resources-hdpi_dark/symbols-ad.png b/data/resources-hdpi_dark/symbols-ad.png
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
diff --git a/data/resources-mdpi_clear/symbols-ad.png b/data/resources-mdpi_clear/symbols-ad.png
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
diff --git a/data/resources-mdpi_dark/symbols-ad.png b/data/resources-mdpi_dark/symbols-ad.png
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
diff --git a/data/resources-xhdpi_clear/symbols-ad.png b/data/resources-xhdpi_clear/symbols-ad.png
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
diff --git a/data/resources-xhdpi_dark/symbols-ad.png b/data/resources-xhdpi_dark/symbols-ad.png
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
diff --git a/data/resources-xxhdpi_clear/symbols-ad.png b/data/resources-xxhdpi_clear/symbols-ad.png
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
diff --git a/data/resources-xxhdpi_dark/symbols-ad.png b/data/resources-xxhdpi_dark/symbols-ad.png
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
diff --git a/data/styles/clear/style-clear/6plus/non-found-search-result.png b/data/styles/clear/style-clear/6plus/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/hdpi/non-found-search-result.png b/data/styles/clear/style-clear/hdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/mdpi/non-found-search-result.png b/data/styles/clear/style-clear/mdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/xhdpi/non-found-search-result.png b/data/styles/clear/style-clear/xhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-clear/xxhdpi/non-found-search-result.png b/data/styles/clear/style-clear/xxhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/6plus/non-found-search-result.png b/data/styles/clear/style-night/6plus/non-found-search-result.png
diff --git a/data/styles/clear/style-night/hdpi/non-found-search-result.png b/data/styles/clear/style-night/hdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/mdpi/non-found-search-result.png b/data/styles/clear/style-night/mdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/xhdpi/non-found-search-result.png b/data/styles/clear/style-night/xhdpi/non-found-search-result.png
diff --git a/data/styles/clear/style-night/xxhdpi/non-found-search-result.png b/data/styles/clear/style-night/xxhdpi/non-found-search-result.png
diff --git a/search/search_quality/assessment_tool/sample_view.cpp b/search/search_quality/assessment_tool/sample_view.cpp
@@ -1,6 +1,8 @@
 #include "search/search_quality/assessment_tool/sample_view.hpp"
 
+#include "map/bookmark_manager.hpp"
 #include "map/framework.hpp"
+#include "map/user_mark.hpp"
 
 #include "search/result.hpp"
 #include "search/search_quality/assessment_tool/helpers.hpp"
@@ -113,8 +115,19 @@ void SampleView::ShowFoundResults(search::Results::ConstIter begin, search::Resu
 
 void SampleView::ShowNonFoundResults(std::vector<search::Sample::Result> const & results)
 {
+  auto & bookmarkManager = m_framework.GetBookmarkManager();
+  UserMarkControllerGuard guard(bookmarkManager, UserMarkType::SEARCH_MARK);
+  guard.m_controller.SetIsVisible(true);
+  guard.m_controller.SetIsDrawable(true);
+
   for (auto const & result : results)
+  {
     m_nonFoundResults->Add(result);
+
+    SearchMarkPoint * mark =
+        static_cast<SearchMarkPoint *>(guard.m_controller.CreateUserMark(result.m_pos));
+    mark->SetCustomSymbol("non-found-search-result");
+  }
 }
 
 void SampleView::ClearAllResults()