pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed bookmark color updating. Fixed cmake compilation.

Browse source
This commit is contained in:
Daria Volvenkova 2017-07-25 14:48:16 +03:00 • committed by Roman Kuznetsov
parent 19b89c2d9b
commit 06b38b7853
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/bookmark.cpp
View file

@ -43,6 +43,7 @@ Bookmark::Bookmark(BookmarkData const & data, m2::PointD const & ptOrg, UserMark
void Bookmark::SetData(BookmarkData const & data)
{
SetDirty();
m_data = data;
}
@ -85,6 +86,7 @@ std::string const & Bookmark::GetName() const
void Bookmark::SetName(std::string const & name)
{
SetDirty();
m_data.SetName(name);
}
@ -95,6 +97,7 @@ std::string const & Bookmark::GetType() const
void Bookmark::SetType(std::string const & type)
{
SetDirty();
m_data.SetType(type);
}

18
search/search_quality/assessment_tool/sample_view.cpp
View file

@ -222,10 +222,10 @@ void SampleView::ShowNonFoundResults(std::vector<search::Sample::Result> const &
{
CHECK_EQUAL(results.size(), entries.size(), ());
auto & bookmarkManager = m_framework.GetBookmarkManager();
UserMarkControllerGuard guard(bookmarkManager, UserMarkType::SEARCH_MARK);
guard.m_controller.SetIsVisible(true);
guard.m_controller.SetIsDrawable(true);
auto & controller = m_framework.GetBookmarkManager().GetUserMarksController(UserMarkType::SEARCH_MARK);
controller.SetIsVisible(true);
controller.SetIsDrawable(true);
controller.NotifyChanges();
m_nonFoundResults->Clear();
@ -251,10 +251,9 @@ void SampleView::ShowNonFoundResultsMarks(std::vector<search::Sample::Result> co
{
CHECK_EQUAL(results.size(), entries.size(), ());
auto & bookmarkManager = m_framework.GetBookmarkManager();
UserMarkControllerGuard guard(bookmarkManager, UserMarkType::SEARCH_MARK);
guard.m_controller.SetIsVisible(true);
guard.m_controller.SetIsDrawable(true);
auto & controller = m_framework.GetBookmarkManager().GetUserMarksController(UserMarkType::SEARCH_MARK);
controller.SetIsVisible(true);
controller.SetIsDrawable(true);
for (size_t i = 0; i < results.size(); ++i)
{
@ -264,9 +263,10 @@ void SampleView::ShowNonFoundResultsMarks(std::vector<search::Sample::Result> co
continue;
SearchMarkPoint * mark =
static_cast<SearchMarkPoint *>(guard.m_controller.CreateUserMark(result.m_pos));
static_cast<SearchMarkPoint *>(controller.CreateUserMark(result.m_pos));
mark->SetCustomSymbol("non-found-search-result");
}
controller.NotifyChanges();
}
void SampleView::ClearSearchResultMarks() { m_framework.ClearSearchResultsMarks(); }