diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2011-10-03 15:09:28 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:25:24 +0300 |
| commit | 5d830d56494790a93533a9498c2d81cfd0632848 (patch) | |
| tree | a69e336b5f4d163e5d89685a7cda0465f67090d7 /geometry/screenbase.cpp | |
| parent | ba7b5963e026d94becb96305d6329a7db430bf30 (diff) | |
renamed AARect into AnyRect. renamed corresponding files.
Diffstat (limited to 'geometry/screenbase.cpp')
| -rw-r--r-- | geometry/screenbase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp index bdbaa65c44..2f31218c99 100644 --- a/geometry/screenbase.cpp +++ b/geometry/screenbase.cpp @@ -20,7 +20,7 @@ ScreenBase::ScreenBase() : // UpdateDependentParameters(); } -ScreenBase::ScreenBase(m2::RectI const & pxRect, m2::AARectD const & glbRect) +ScreenBase::ScreenBase(m2::RectI const & pxRect, m2::AnyRectD const & glbRect) { OnSize(pxRect); SetFromRect(glbRect); @@ -53,11 +53,11 @@ void ScreenBase::UpdateDependentParameters() double HalfSizeX = PtoG(m2::PointD(m_PixelRect.maxX(), m_PixelRect.Center().y)).Length(PtoG(m2::PointD(m_PixelRect.Center()))); double HalfSizeY = PtoG(m2::PointD(m_PixelRect.Center().x, m_PixelRect.minY())).Length(PtoG(m2::PointD(m_PixelRect.Center()))); - m_GlobalRect = m2::AARectD(m_Org, m_Angle, m2::RectD(-HalfSizeX, -HalfSizeY, HalfSizeX, HalfSizeY)); + m_GlobalRect = m2::AnyRectD(m_Org, m_Angle, m2::RectD(-HalfSizeX, -HalfSizeY, HalfSizeX, HalfSizeY)); m_ClipRect = m_GlobalRect.GetGlobalRect(); } -void ScreenBase::SetFromRect(m2::AARectD const & GlobalRect) +void ScreenBase::SetFromRect(m2::AnyRectD const & GlobalRect) { double hScale = GlobalRect.GetLocalRect().SizeX() / m_PixelRect.SizeX(); double vScale = GlobalRect.GetLocalRect().SizeY() / m_PixelRect.SizeY(); @@ -125,7 +125,7 @@ m2::RectD const & ScreenBase::PixelRect() const return m_PixelRect; } -m2::AARectD const & ScreenBase::GlobalRect() const +m2::AnyRectD const & ScreenBase::GlobalRect() const { return m_GlobalRect; } |