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

moved path text filtering into TextRenderer

Browse source
This commit is contained in:
rachytski 2011-06-04 18:01:08 +03:00 • committed by Alex Zolotarev
parent 76880dbdf5
commit 5b0d77fcfa
2 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
map/drawer_yg.cpp
View file

@ -77,7 +77,6 @@ void DrawerYG::beginFrame()
void DrawerYG::endFrame()
{
m_pScreen->endFrame();
m_pathsOrg.clear();
}
void DrawerYG::clear(yg::Color const & c, bool clearRT, float depth, bool clearDepth)
@ -413,33 +412,12 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size
// draw way name
if (isPath && !isArea && isN && !filter_text_size(pRule))
{
uint8_t const fontSize = get_pathtext_font_size(pRule);
list<m2::RectD> & lst = m_pathsOrg[pInfo->m_name];
for (list<di::PathInfo>::const_iterator i = pInfo->m_pathes.begin(); i != pInfo->m_pathes.end(); ++i)
{
m2::RectD r = i->GetLimitRect();
r.Inflate(-r.SizeX() / 4.0, -r.SizeY() / 4.0);
r.Inflate(fontSize, fontSize);
if (filter_text_size(pRule))
continue;
bool needDraw = true;
for (list<m2::RectD>::const_iterator j = lst.begin(); j != lst.end(); ++j)
if (r.IsIntersect(*j))
{
needDraw = false;
break;
}
if (needDraw)
{
if (drawPathText(*i, pInfo->m_name, fontSize, depth))
{
isNumber = false; // text hides number
lst.push_back(r);
}
}
else
isNumber = false; // neighbor text hides this text and this number
drawPathText(*i, pInfo->m_name, get_pathtext_font_size(pRule), depth);
}
}

3
map/drawer_yg.hpp
View file

@ -72,9 +72,6 @@ class DrawerYG
static void ClearSkinPage(uint8_t pageID);
typedef map<string, list<m2::RectD> > org_map_t;
org_map_t m_pathsOrg;
protected:
void drawSymbol(m2::PointD const & pt, rule_ptr_t pRule, yg::EPosition pos, int depth);
void drawCircle(m2::PointD const & pt, rule_ptr_t pRule, yg::EPosition pos, int depth);