diff options
author | rachytski <siarhei.rachytski@gmail.com> | 2013-01-25 21:00:40 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:49:22 +0300 |
commit | 9ef29ad3d046e982be99c71d026748932e80632d (patch) | |
tree | bf7d502e3aef22dbf45a7b6ea006e999cdd41295 /map/ruler.hpp | |
parent | 2bf7adf129911da7d2f6a41aca07ecefd006743b (diff) |
Ruler code cleanup and changes according to code review.
Diffstat (limited to 'map/ruler.hpp')
-rw-r--r-- | map/ruler.hpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/map/ruler.hpp b/map/ruler.hpp index 13fca1b769..fea0ce265c 100644 --- a/map/ruler.hpp +++ b/map/ruler.hpp @@ -28,9 +28,6 @@ private: double m_maxMetersWidth; //@} - double m_visualScale; - - graphics::FontDesc m_fontDesc; ScreenBase m_screen; /// Current diff in units between two endpoints of the ruler. @@ -54,16 +51,11 @@ private: int m_currSystem; void CalcMetresDiff(double v); - bool m_isInitialized; - bool m_hasPendingUpdate; - public: - void update(); //< update internal params after some other params changed. typedef base_t::Params Params; Ruler(Params const & p); - void setup(); void setScreen(ScreenBase const & screen); ScreenBase const & screen() const; @@ -71,13 +63,12 @@ public: void setMinPxWidth(unsigned minPxWidth); void setMinMetersWidth(double v); void setMaxMetersWidth(double v); - void setVisualScale(double visualScale); void setFontDesc(graphics::FontDesc const & fontDesc); vector<m2::AnyRectD> const & boundRects() const; void draw(graphics::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const; - double priority() const; - graphics::OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const; + void layout(); + void update(); }; |