map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixes after colleagues comments

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2015-01-22 09:06:31 +03:00 • committed by Alex Zolotarev
parent df256d265d
commit d3e7f3c768
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/bookmark_manager.cpp
View file

@ -249,7 +249,7 @@ size_t BookmarkManager::CreateBmCategory(string const & name)
return (m_categories.size()-1);
}
void BookmarkManager::DrawItems(shared_ptr<PaintEvent> const & e, int drawScale, double visualScale) const
void BookmarkManager::DrawItems(shared_ptr<PaintEvent> const & e) const
{
#ifndef USE_DRAPE
ASSERT(m_cache != NULL, ());
@ -258,6 +258,8 @@ void BookmarkManager::DrawItems(shared_ptr<PaintEvent> const & e, int drawScale,
LazyMatrixCalc matrix(screen, m_lastScale);
double const drawScale = m_framework.GetDrawScale();
double const visualScale = m_framework.GetVisualScale();
auto trackUpdateFn = [&matrix, &limitRect, this, drawScale, visualScale](Track const * track)
{
if (limitRect.IsIntersect(track->GetLimitRect()))

2
map/bookmark_manager.hpp
View file

@ -55,7 +55,7 @@ public:
BookmarkCategory * GetBmCategory(size_t index) const;
size_t CreateBmCategory(string const & name);
void DrawItems(shared_ptr<PaintEvent> const & e, int drawScale, double visualScale) const;
void DrawItems(shared_ptr<PaintEvent> const & e) const;
/// @name Delete bookmarks category with all bookmarks.
/// @return true if category was deleted

2
map/framework.cpp
View file

@ -768,7 +768,7 @@ void Framework::DrawAdditionalInfo(shared_ptr<PaintEvent> const & e)
pScreen->endFrame();
m_bmManager.DrawItems(e, GetDrawScale(), m_guiController->GetVisualScale());
m_bmManager.DrawItems(e);
m_guiController->UpdateElements();
m_guiController->DrawFrame(pScreen);
}

7
map/track.cpp
View file

@ -129,12 +129,7 @@ void drawArrowTriangle(graphics::Screen * dlScreen, pair<m2::PointD, m2::PointD>
m2::PointD p1, p2, p3;
m2::ArrowPoints(arrowDirection.first, arrowDirection.second, arrowWidth, arrowLength, p1, p2, p3);
vector<m2::PointF> arrow;
arrow.reserve(3);
arrow.push_back(p1);
arrow.push_back(p2);
arrow.push_back(p3);
vector<m2::PointF> arrow = {p1, p2, p3};
dlScreen->drawConvexPolygon(&arrow[0], arrow.size(), arrowColor, arrowDepth);
}