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

review fixes

Browse source
This commit is contained in:
ExMix 2014-09-22 14:32:45 +03:00 • committed by Alex Zolotarev
parent 8e37b274bc
commit 25c8197f78
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
map/track.cpp
View file

@ -39,9 +39,9 @@ void Track::DeleteDisplayList() const
void Track::AddClosingSymbol(bool isBeginSymbol, string const & symbolName, graphics::EPosition pos, double depth)
{
if (isBeginSymbol)
m_beginSymbols.push_back(make_pair(symbolName, make_pair(pos, depth)));
m_beginSymbols.push_back(ClosingSymbol(symbolName, pos, depth));
else
m_endSymbols.push_back(make_pair(symbolName, make_pair(pos, depth)));
m_endSymbols.push_back(ClosingSymbol(symbolName, pos, depth));
}
void Track::Draw(graphics::Screen * pScreen, MatrixT const & matrix) const
@ -97,9 +97,9 @@ void Track::CreateDisplayList(graphics::Screen * dlScreen, MatrixT const & matri
if (!m_beginSymbols.empty() || !m_endSymbols.empty())
{
m2::PointD pivot = pts2.front();
auto symDrawer = [&dlScreen, &pivot](TClosingSymbol const & symbol)
auto symDrawer = [&dlScreen, &pivot](ClosingSymbol const & symbol)
{
dlScreen->drawSymbol(pivot, symbol.first, symbol.second.first, symbol.second.second);
dlScreen->drawSymbol(pivot, symbol.m_iconName, symbol.m_position, symbol.m_depth);
};
for_each(m_beginSymbols.begin(), m_beginSymbols.end(), symDrawer);

18
map/track.hpp
View file

@ -84,7 +84,8 @@ public:
m2::RectD const & GetLimitRect() const { return m_rect; }
//@}
void AddClosingSymbol(bool isBeginSymbol, string const & symbolName, graphics::EPosition pos, double depth);
void AddClosingSymbol(bool isBeginSymbol, string const & symbolName,
graphics::EPosition pos, double depth);
double GetLengthMeters() const;
double GetShortestSquareDistance(m2::PointD const & point) const;
@ -101,10 +102,17 @@ private:
float m_outlineWidth;
graphics::Color m_outlineColor;
typedef pair<graphics::EPosition, double> TSymbolVisParams;
typedef pair<string, TSymbolVisParams> TClosingSymbol;
vector<TClosingSymbol> m_beginSymbols;
vector<TClosingSymbol> m_endSymbols;
struct ClosingSymbol
{
ClosingSymbol(string const & iconName, graphics::EPosition pos, double depth)
: m_iconName(iconName), m_position(pos), m_depth(depth) {}
string m_iconName;
graphics::EPosition m_position;
double m_depth;
};
vector<ClosingSymbol> m_beginSymbols;
vector<ClosingSymbol> m_endSymbols;
PolylineD m_polyline;
m2::RectD m_rect;