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

review fix

Browse source
This commit is contained in:
ExMix 2014-05-30 17:48:25 +03:00 • committed by Alex Zolotarev
parent 16429903fc
commit 9b5edccf4a
2 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
map/user_mark_container.cpp
View file

@ -79,7 +79,7 @@ namespace
graphics::DisplayList * dl,
m2::PointD const & ptOrg)
{
ScreenBase modelView = event.GetModelView();
ScreenBase const & modelView = event.GetModelView();
graphics::Screen * screen = event.GetDrawer()->screen();
m2::PointD pxPoint = modelView.GtoP(ptOrg);
pxPoint += (pixelOfsset * visualScale);
@ -114,16 +114,6 @@ namespace
else
DrawUserMarkImpl(scale, visualScale, m2::PointD(0.0, 0.0), event, cache->FindUserMark(defaultKey), mark);
}
void DefaultDrawUserMark(double scale,
double visualScale,
PaintOverlayEvent const & event,
UserMarkDLCache * cache,
UserMarkDLCache::Key const & defaultKey,
UserMark const * mark)
{
DrawUserMarkImpl(scale, visualScale, m2::PointD(0.0, 0.0), event, cache->FindUserMark(defaultKey), mark);
}
}
UserMarkContainer::UserMarkContainer(double layerDepth, Framework & fm)
@ -277,8 +267,7 @@ UserMark * ApiUserMarkContainer::AllocateUserMark(const m2::PointD & ptOrg)
SelectionContainer::SelectionContainer(Framework & fm)
: m_hasActiveMark(false)
, m_depth(graphics::minDepth - 100)
: m_container(NULL)
, m_fm(fm)
{
}
@ -288,25 +277,22 @@ void SelectionContainer::ActivateMark(UserMark const * userMark)
KillActivationAnim();
if (userMark != NULL)
{
m_hasActiveMark = true;
m_ptOrg = userMark->GetOrg();
UserMarkContainer const * container = userMark->GetContainer();
m_pinImageName = container->GetActiveTypeName();
m_depth = container->GetDepth();
m_container = userMark->GetContainer();
StartActivationAnim();
}
else
{
m_hasActiveMark = false;
m_depth = graphics::minDepth - 100;
}
m_container = NULL;
}
void SelectionContainer::Draw(const PaintOverlayEvent & e, UserMarkDLCache * cache) const
{
if (m_hasActiveMark)
if (m_container != NULL)
{
UserMarkDLCache::Key defaultKey(m_pinImageName, graphics::EPosCenter, m_depth);
UserMarkDLCache::Key defaultKey(m_container->GetActiveTypeName(),
graphics::EPosCenter,
m_container->GetDepth());
DrawUserMarkByPoint(GetActiveMarkScale(),
m_fm.GetVisualScale(),
m2::PointD(0, 0),

4
map/user_mark_container.hpp
View file

@ -145,9 +145,7 @@ private:
shared_ptr<anim::Task> m_animTask;
private:
bool m_hasActiveMark;
double m_depth;
string m_pinImageName;
UserMarkContainer const * m_container;
m2::PointD m_ptOrg;
Framework & m_fm;
};