kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Debug output fixed.

Browse source
This commit is contained in:
Daria Volvenkova 2016-03-17 16:27:26 +03:00 • committed by Sergey Yershov
parent 8ce96397b0
commit 2928862bac
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape/overlay_tree.cpp
View file

@ -238,12 +238,12 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle,
Erase(*it);
#ifdef DEBUG_OVERLAYS_OUTPUT
LOG(LINFO, ("Displace (2):", handle->GetOverlayDebugInfo(), "->", it->GetOverlayDebugInfo()));
LOG(LINFO, ("Displace (2):", handle->GetOverlayDebugInfo(), "->", (*it)->GetOverlayDebugInfo()));
#endif
#ifdef COLLECT_DISPLACEMENT_INFO
m_displacementInfo.emplace_back(DisplacementData(handle->GetExtendedPixelRect(modelView).Center(),
it->GetExtendedPixelRect(modelView).Center(),
(*it)->GetExtendedPixelRect(modelView).Center(),
dp::Color(0, 0, 255, 255)));
#endif
@ -260,7 +260,7 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle,
DeleteHandle(rivalHandle);
#ifdef DEBUG_OVERLAYS_OUTPUT
LOG(LINFO, ("Displace (3):", handle->GetOverlayDebugInfo(), "->", handleToDelete->GetOverlayDebugInfo()));
LOG(LINFO, ("Displace (3):", handle->GetOverlayDebugInfo(), "->", rivalHandle->GetOverlayDebugInfo()));
#endif
#ifdef COLLECT_DISPLACEMENT_INFO

3
drape/render_bucket.cpp
View file

@ -124,8 +124,7 @@ void RenderBucket::RenderDebug(ScreenBase const & screen) const
if (!screen.PixelRect().IsIntersect(handle->GetPixelRect(screen, false)))
continue;
OverlayHandle::Rects rects;
handle->GetExtendedPixelShape(screen, rects);
OverlayHandle::Rects const & rects = handle->GetExtendedPixelShape(screen);
for (auto const & rect : rects)
{
if (screen.isPerspective() && !screen.PixelRectIn3d().IsIntersect(m2::RectD(rect)))