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

drawing secondary text for POI's and road names.

Browse source
This commit is contained in:
rachytski 2011-11-22 19:39:08 +04:00 • committed by Alex Zolotarev
parent eeabc82c6f
commit 00c4bb1e0b
10 changed files with 166 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/draw_processor.cpp
View file

@ -304,6 +304,7 @@ namespace fwork
shared_ptr<di::DrawInfo> ptr(new di::DrawInfo(
f.GetPreferredDrawableName(languages::GetCurrentPriorities()),
f.GetPreferredDrawableName(0),
f.GetRoadNumber(),
(m_zoom > 5) ? f.GetPopulationDrawRank() : 0.0));
@ -364,7 +365,7 @@ namespace fwork
if (fontSize != 0)
{
double textLength = m_glyphCache->getTextLength(fontSize, ptr->m_name);
double textLength = m_glyphCache->getTextLength(fontSize, ptr->GetPathName());
typedef calc_length<base_global> functor_t;
functor_t::params p1;
p1.m_convertor = &m_convertor;

47
map/drawer_yg.cpp
View file

@ -25,6 +25,24 @@ DrawerYG::Params::Params()
{
}
di::DrawInfo::DrawInfo(string const & name,
string const & secondaryName,
string const & road,
double rank)
: m_name(name),
m_secondaryName(secondaryName),
m_road(road),
m_rank(rank)
{}
string const di::DrawInfo::GetPathName() const
{
if (m_secondaryName.empty())
return m_name;
else
return m_name + " " + m_secondaryName;
}
uint32_t di::DrawRule::GetID(size_t threadID) const
{
return (m_transparent ? m_rule->GetID2(threadID) : m_rule->GetID(threadID));
@ -249,29 +267,34 @@ void DrawerYG::drawText(m2::PointD const & pt, di::DrawInfo const * pInfo, rule_
yg::FontDesc fontDesc(get_text_font(pRule));
fontDesc.SetRank(pInfo->m_rank);
yg::FontDesc smallFontDesc(fontDesc);
smallFontDesc.m_size *= 0.75;
if (!filter_text_size(pRule))
m_pScreen->drawText(
m_pScreen->drawTextEx(
fontDesc,
smallFontDesc,
pt,
pos,
pInfo->m_name,
pInfo->m_secondaryName,
depth,
true,
true);
}
bool DrawerYG::drawPathText(di::PathInfo const & info, string const & name, rule_ptr_t pRule, int depth)
bool DrawerYG::drawPathText(di::PathInfo const & info, di::DrawInfo const * pInfo, rule_ptr_t pRule, int depth)
{
yg::FontDesc fontDesc(get_text_font(pRule));
yg::FontDesc primaryFont(get_text_font(pRule));
return m_pScreen->drawPathText( fontDesc,
&info.m_path[0],
info.m_path.size(),
name,
info.GetFullLength(),
info.GetOffset(),
yg::EPosCenter,
depth);
return m_pScreen->drawPathText(primaryFont,
&info.m_path[0],
info.m_path.size(),
pInfo->GetPathName(),
info.GetFullLength(),
info.GetOffset(),
yg::EPosCenter,
depth);
}
void DrawerYG::drawPathNumber(di::PathInfo const & path, di::DrawInfo const * pInfo)
@ -419,7 +442,7 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size
if (filter_text_size(pRule))
continue;
drawPathText(*i, pInfo->m_name, pRule, depth);
drawPathText(*i, pInfo, pRule, depth);
}
}

14
map/drawer_yg.hpp
View file

@ -32,15 +32,21 @@ namespace di
class DrawInfo
{
public:
DrawInfo(string const & name, string const & road, double rank)
: m_name(name), m_road(road), m_rank(rank) {}
DrawInfo(string const & name,
string const & secondaryName,
string const & road,
double rank);
list<di::PathInfo> m_pathes;
list<di::AreaInfo> m_areas;
m2::PointD m_point;
string m_name, m_road;
string m_name;
string m_secondaryName;
string m_road;
double m_rank;
string const GetPathName() const;
};
struct DrawRule
@ -80,7 +86,7 @@ protected:
void drawArea(vector<m2::PointD> const & pts, rule_ptr_t pRule, int depth);
void drawText(m2::PointD const & pt, di::DrawInfo const * pInfo, rule_ptr_t pRule, yg::EPosition pos, int depth);
bool drawPathText(di::PathInfo const & info, string const & name, rule_ptr_t pRule, int depth);
bool drawPathText(di::PathInfo const & info, di::DrawInfo const * pInfo, rule_ptr_t pRule, int depth);
void drawPathNumber(di::PathInfo const & path, di::DrawInfo const * pInfo);
typedef shared_ptr<yg::gl::BaseTexture> texture_t;

6
yg/glyph_layout.cpp
View file

@ -66,6 +66,7 @@ namespace yg
yg::EPosition pos)
: m_firstVisible(0),
m_lastVisible(visText.size()),
m_fontDesc(fontDesc),
m_pivot(pt)
{
m2::RectD boundRect;
@ -404,4 +405,9 @@ namespace yg
m_pivot = pivot;
}
yg::FontDesc const & GlyphLayout::fontDesc() const
{
return m_fontDesc;
}
}

1
yg/glyph_layout.hpp
View file

@ -91,6 +91,7 @@ namespace yg
vector<m2::AnyRectD> const & boundRects() const;
m2::PointD const & pivot() const;
yg::FontDesc const & fontDesc() const;
void setPivot(m2::PointD const & pv);
};

47
yg/overlay_renderer.cpp
View file

@ -77,12 +77,12 @@ namespace yg
}
void OverlayRenderer::drawText(FontDesc const & fontDesc,
m2::PointD const & pt,
yg::EPosition pos,
string const & utf8Text,
double depth,
bool log2vis,
bool doSplit)
m2::PointD const & pt,
yg::EPosition pos,
string const & utf8Text,
double depth,
bool log2vis,
bool doSplit)
{
if (!m_drawTexts)
return;
@ -107,6 +107,41 @@ namespace yg
m_infoLayer->processOverlayElement(oe);
}
void OverlayRenderer::drawTextEx(FontDesc const & primaryFont,
FontDesc const & secondaryFont,
m2::PointD const & pt,
yg::EPosition pos,
string const & text,
string const & secondaryText,
double depth,
bool log2vis,
bool doSplit)
{
if (!m_drawTexts)
return;
StraightTextElement::Params params;
params.m_depth = depth;
params.m_fontDesc = primaryFont;
params.m_auxFontDesc = secondaryFont;
params.m_log2vis = log2vis;
params.m_pivot = pt;
params.m_position = pos;
params.m_glyphCache = glyphCache();
params.m_logText = strings::MakeUniString(text);
params.m_auxLogText = strings::MakeUniString(secondaryText);
params.m_doSplit = doSplit;
shared_ptr<OverlayElement> oe(new StraightTextElement(params));
math::Matrix<double, 3, 3> id = math::Identity<double, 3>();
if (!m_infoLayer.get())
oe->draw(this, id);
else
m_infoLayer->processOverlayElement(oe);
}
bool OverlayRenderer::drawPathText(
FontDesc const & fontDesc, m2::PointD const * path, size_t s, string const & utf8Text,
double fullLength, double pathOffset, yg::EPosition pos, double depth)

10
yg/overlay_renderer.hpp
View file

@ -47,6 +47,16 @@ namespace yg
bool log2vis,
bool doSplit = false);
void drawTextEx(FontDesc const & primaryFont,
FontDesc const & secondaryFont,
m2::PointD const & pt,
yg::EPosition pos,
string const & text,
string const & secondaryText,
double depth,
bool log2vis,
bool doSplit = false);
/// drawing text on the path
bool drawPathText(FontDesc const & fontDesc,
m2::PointD const * path,

39
yg/straight_text_element.cpp
View file

@ -107,11 +107,19 @@ namespace yg
allElemHeight += r.SizeY();
}
if (!auxVisText().empty())
{
m_glyphLayouts.push_back(GlyphLayout(p.m_glyphCache, p.m_auxFontDesc, m2::PointD(0, 0), auxVisText(), yg::EPosCenter));
m2::RectD r = m_glyphLayouts.back().boundRects().back().GetGlobalRect();
allElemWidth = max(r.SizeX(), allElemWidth);
allElemHeight += r.SizeY();
}
double curShift = allElemHeight / 2;
/// performing aligning of glyphLayouts as for the center position
for (unsigned i = 0; i < res.size(); ++i)
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
{
double elemSize = m_glyphLayouts[i].boundRects().back().GetGlobalRect().SizeY();
m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(0, -curShift + elemSize / 2));
@ -119,22 +127,22 @@ namespace yg
}
if (position() & yg::EPosLeft)
for (unsigned i = 0; i < res.size(); ++i)
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(-allElemWidth / 2, 0));
if (position() & yg::EPosRight)
for (unsigned i = 0; i < res.size(); ++i)
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(allElemWidth / 2, 0));
if (position() & yg::EPosAbove)
for (unsigned i = 0; i < res.size(); ++i)
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(0, -allElemHeight / 2));
if (position() & yg::EPosUnder)
for (unsigned i = 0; i < res.size(); ++i)
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(0, allElemHeight / 2));
for (unsigned i = 0; i < res.size(); ++i)
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
{
m_offsets.push_back(m_glyphLayouts[i].pivot());
m_glyphLayouts[i].setPivot(m_offsets[i] + pivot());
@ -149,7 +157,8 @@ namespace yg
m_doSplit(false)
{}
StraightTextElement::StraightTextElement(StraightTextElement const & src, math::Matrix<double, 3, 3> const & m)
StraightTextElement::StraightTextElement(StraightTextElement const & src,
math::Matrix<double, 3, 3> const & m)
: TextElement(src),
m_glyphLayouts(src.m_glyphLayouts)
{
@ -198,18 +207,18 @@ namespace yg
if (!isNeedRedraw())
return;
yg::FontDesc desc = m_fontDesc;
if (m_fontDesc.m_isMasked)
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
{
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
drawTextImpl(m_glyphLayouts[i], screen, m, true, m_fontDesc, yg::maxDepth - 1);
desc.m_isMasked = false;
if (m_glyphLayouts[i].fontDesc().m_isMasked)
drawTextImpl(m_glyphLayouts[i], screen, m, true, m_glyphLayouts[i].fontDesc(), yg::maxDepth - 1);
}
for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
drawTextImpl(m_glyphLayouts[i], screen, m, true, desc, yg::maxDepth);
{
yg::FontDesc fontDesc = m_glyphLayouts[i].fontDesc();
fontDesc.m_isMasked = false;
drawTextImpl(m_glyphLayouts[i], screen, m, true, fontDesc, yg::maxDepth);
}
}
void StraightTextElement::offset(m2::PointD const & offs)

24
yg/text_element.cpp
View file

@ -14,14 +14,23 @@ namespace yg
TextElement::TextElement(Params const & p)
: OverlayElement(p),
m_fontDesc(p.m_fontDesc),
m_auxFontDesc(p.m_auxFontDesc),
m_logText(p.m_logText),
m_auxLogText(p.m_auxLogText),
m_log2vis(p.m_log2vis),
m_glyphCache(p.m_glyphCache)
{
if (m_log2vis)
{
m_visText = m_glyphCache->log2vis(m_logText);
if (!m_auxLogText.empty())
m_auxVisText = m_glyphCache->log2vis(m_auxLogText);
}
else
{
m_visText = m_logText;
m_auxVisText = m_auxLogText;
}
}
strings::UniString const & TextElement::logText() const
@ -29,16 +38,31 @@ namespace yg
return m_logText;
}
strings::UniString const & TextElement::auxLogText() const
{
return m_auxLogText;
}
strings::UniString const & TextElement::visText() const
{
return m_visText;
}
strings::UniString const & TextElement::auxVisText() const
{
return m_auxVisText;
}
FontDesc const & TextElement::fontDesc() const
{
return m_fontDesc;
}
FontDesc const & TextElement::auxFontDesc() const
{
return m_auxFontDesc;
}
bool TextElement::isBidi() const
{
return m_logText != m_visText;

13
yg/text_element.hpp
View file

@ -29,8 +29,14 @@ namespace yg
/// text-element specific
FontDesc m_fontDesc;
FontDesc m_auxFontDesc;
strings::UniString m_logText; //< logical string
strings::UniString m_auxLogText;
strings::UniString m_visText; //< visual string, BIDI processed
strings::UniString m_auxVisText;
bool m_log2vis;
GlyphCache * m_glyphCache;
@ -63,6 +69,10 @@ namespace yg
{
FontDesc m_fontDesc;
strings::UniString m_logText;
FontDesc m_auxFontDesc;
strings::UniString m_auxLogText;
bool m_log2vis;
GlyphCache * m_glyphCache;
};
@ -76,7 +86,10 @@ namespace yg
FontDesc const & desc,
double depth) const;
strings::UniString const & logText() const;
strings::UniString const & auxLogText() const;
strings::UniString const & visText() const;
strings::UniString const & auxVisText() const;
FontDesc const & fontDesc() const;
FontDesc const & auxFontDesc() const;
};
}