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

added posibility to draw text by path

Browse source
This commit is contained in:
Roman Sorokin 2014-08-04 13:54:43 +03:00 • committed by Alex Zolotarev
parent ed35fd74cd
commit 5d7030c15b
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drape_frontend/apply_feature_functors.cpp
View file

@ -301,33 +301,29 @@ void ApplyLineFeature::ProcessRule(Stylist::rule_wrapper_t const & rule)
drule::BaseRule const * pRule = rule.first;
float depth = rule.second;
//bool isWay = (pRule->GetType() & drule::way) != 0;
bool isWay = (pRule->GetType() & drule::way) != 0;
CaptionDefProto const * pCaptionRule = pRule->GetCaption(0);
LineDefProto const * pLineRule = pRule->GetLine();
if (pCaptionRule == NULL && pLineRule == NULL)
return;
ASSERT(pCaptionRule == NULL || pLineRule == NULL, ());
if (pCaptionRule != NULL && pCaptionRule->height() > 2 &&
!m_captions.GetPathName().empty() && isWay)
{
FontDecl fontDecl;
CaptionDefProtoToFontDecl(pCaptionRule, fontDecl);
// TODO Если расскоментить этот код то возникает ASSERT
// в обновлении позиций глифов. Править будет Рома.
PathTextViewParams params;
params.m_depth = depth;
params.m_featureID = m_id;
params.m_offsetStart = 0;
params.m_offsetEnd = 300;
params.m_text = m_captions.GetPathName();
params.m_textFont = fontDecl;
// ASSERT(pCaptionRule == NULL || pLineRule == NULL, ());
// if (pCaptionRule != NULL && pCaptionRule->height() > 2 &&
// !m_primaryText.empty() && isWay)
// {
// FontDecl fontDecl;
// CaptionDefProtoToFontDecl(pCaptionRule, fontDecl);
// PathTextViewParams params;
// params.m_depth = depth;
// params.m_featureID = m_id;
// params.m_offsetStart = 0;
// params.m_offsetEnd = 300;
// params.m_text = m_primaryText;
// params.m_textFont = fontDecl;
// m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(new PathTextShape(m_path, params)));
// }
m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(new PathTextShape(m_path, params)));
}
if (pLineRule != NULL)
{