From 22b779d4f1be04073146071c6675f1f2d11f73af Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Tue, 5 Dec 2017 11:56:40 +0300 Subject: [PATCH] Review fixes. --- drape_frontend/text_layout.cpp | 6 +++--- drape_frontend/text_layout.hpp | 2 +- drape_frontend/text_shape.cpp | 4 ++-- map/routing_mark.cpp | 2 +- map/routing_mark.hpp | 2 +- map/transit/transit_display.cpp | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drape_frontend/text_layout.cpp b/drape_frontend/text_layout.cpp index cdd51d72df..28d22fb08d 100644 --- a/drape_frontend/text_layout.cpp +++ b/drape_frontend/text_layout.cpp @@ -25,7 +25,7 @@ public: , m_buffer(buffer) {} - void SetPen(glsl::vec2 const & penOffset) {} + void SetPenPosition(glsl::vec2 const & penOffset) {} void operator() (dp::TextureManager::GlyphRegion const & glyph) { @@ -55,7 +55,7 @@ public: , m_textRatio(textRatio) {} - void SetPen(glsl::vec2 const & penPosition) + void SetPenPosition(glsl::vec2 const & penPosition) { m_penPosition = penPosition; m_isFirstGlyph = true; @@ -107,7 +107,7 @@ public: , m_buffer(buffer) {} - void SetPen(glsl::vec2 const & penOffset) {} + void SetPenPosition(glsl::vec2 const & penOffset) {} void operator() (dp::TextureManager::GlyphRegion const & glyph) { diff --git a/drape_frontend/text_layout.hpp b/drape_frontend/text_layout.hpp index 8fb8f4c801..3390444a69 100644 --- a/drape_frontend/text_layout.hpp +++ b/drape_frontend/text_layout.hpp @@ -79,7 +79,7 @@ private: for (pair const & node : m_offsets) { size_t const endOffset = node.first; - generator.SetPen(node.second); + generator.SetPenPosition(node.second); for (size_t index = beginOffset; index < endOffset && index < m_metrics.size(); ++index) generator(m_metrics[index]); beginOffset = endOffset; diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp index cb11c328d9..f64b9bd1c5 100644 --- a/drape_frontend/text_shape.cpp +++ b/drape_frontend/text_shape.cpp @@ -37,8 +37,8 @@ public: , m_isOptional(isOptional) {} - void SetDynamicSymbolSizes(StraightTextLayout const &layout, - std::vector const &symbolSizes, + void SetDynamicSymbolSizes(StraightTextLayout const & layout, + std::vector const & symbolSizes, dp::Anchor symbolAnchor) { m_layout = make_unique_dp(layout); diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp index e2ec4f0426..5bcd660d9a 100644 --- a/map/routing_mark.cpp +++ b/map/routing_mark.cpp @@ -474,4 +474,4 @@ void TransitMark::GetDefaultTransitTitle(dp::TitleDecl & titleDecl) titleDecl.m_secondaryTextFont.m_color = df::GetColorConstant(kTransitMarkText); titleDecl.m_secondaryTextFont.m_outlineColor = df::GetColorConstant(kTransitMarkTextOutline); titleDecl.m_secondaryTextFont.m_size = kTransitMarkTextSize; -} \ No newline at end of file +} diff --git a/map/routing_mark.hpp b/map/routing_mark.hpp index ee6d028560..f2795d4af5 100644 --- a/map/routing_mark.hpp +++ b/map/routing_mark.hpp @@ -153,4 +153,4 @@ private: SymbolNameZoomInfo m_symbolNames; ColoredSymbolZoomInfo m_coloredSymbols; SymbolSizes m_symbolSizes; -}; \ No newline at end of file +}; diff --git a/map/transit/transit_display.cpp b/map/transit/transit_display.cpp index 262fec980e..b9360aa372 100644 --- a/map/transit/transit_display.cpp +++ b/map/transit/transit_display.cpp @@ -459,8 +459,8 @@ void TransitRouteDisplay::CollectTransitDisplayInfo(vector const & void TransitRouteDisplay::CreateTransitMarks(std::vector const & transitMarks) { - static vector const kTransferMarkerSizes = GetTransitMarkerSizes(kTransferMarkerScale, m_maxSubrouteWidth); - static vector const kStopMarkerSizes = GetTransitMarkerSizes(kStopMarkerScale, m_maxSubrouteWidth); + std::vector const transferMarkerSizes = GetTransitMarkerSizes(kTransferMarkerScale, m_maxSubrouteWidth); + std::vector const stopMarkerSizes = GetTransitMarkerSizes(kStopMarkerScale, m_maxSubrouteWidth); auto & marksController = m_bmManager->GetUserMarksController(UserMark::Type::TRANSIT); uint32_t nextIndex = static_cast(marksController.GetUserMarkCount()); @@ -514,17 +514,17 @@ void TransitRouteDisplay::CreateTransitMarks(std::vector const transitMark->AddTitle(titleDecl); } df::UserPointMark::ColoredSymbolZoomInfo coloredSymbol; - for (size_t sizeIndex = 0; sizeIndex < kTransferMarkerSizes.size(); ++sizeIndex) + for (size_t sizeIndex = 0; sizeIndex < transferMarkerSizes.size(); ++sizeIndex) { auto const zoomLevel = sizeIndex + 1; - auto const & sz = kTransferMarkerSizes[sizeIndex]; + auto const & sz = transferMarkerSizes[sizeIndex]; df::ColoredSymbolViewParams params; params.m_radiusInPixels = max(sz.x, sz.y) * 0.5f; params.m_color = dp::Color::Transparent(); if (coloredSymbol.empty() || coloredSymbol.rbegin()->second.m_radiusInPixels != params.m_radiusInPixels) coloredSymbol.insert(make_pair(zoomLevel, params)); } - transitMark->SetSymbolSizes(kTransferMarkerSizes); + transitMark->SetSymbolSizes(transferMarkerSizes); transitMark->SetColoredSymbols(coloredSymbol); transitMark->SetPriority(UserMark::Priority::TransitTransfer); } @@ -570,17 +570,17 @@ void TransitRouteDisplay::CreateTransitMarks(std::vector const else { df::UserPointMark::ColoredSymbolZoomInfo coloredSymbol; - for (size_t sizeIndex = 0; sizeIndex < kStopMarkerSizes.size(); ++sizeIndex) + for (size_t sizeIndex = 0; sizeIndex < stopMarkerSizes.size(); ++sizeIndex) { auto const zoomLevel = sizeIndex + 1; - auto const & sz = kStopMarkerSizes[sizeIndex]; + auto const & sz = stopMarkerSizes[sizeIndex]; df::ColoredSymbolViewParams params; params.m_radiusInPixels = max(sz.x, sz.y) * 0.5f; params.m_color = dp::Color::Transparent(); if (coloredSymbol.empty() || coloredSymbol.rbegin()->second.m_radiusInPixels != params.m_radiusInPixels) coloredSymbol.insert(make_pair(zoomLevel, params)); } - transitMark->SetSymbolSizes(kStopMarkerSizes); + transitMark->SetSymbolSizes(stopMarkerSizes); transitMark->SetColoredSymbols(coloredSymbol); transitMark->SetPriority(UserMark::Priority::TransitStop); transitMark->SetMinTitleZoom(kMinStopTitleZoom);