Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrachytski <siarhei.rachytski@gmail.com>2011-10-03 15:09:28 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:25:24 +0300
commit5d830d56494790a93533a9498c2d81cfd0632848 (patch)
treea69e336b5f4d163e5d89685a7cda0465f67090d7 /geometry/geometry_tests/screen_test.cpp
parentba7b5963e026d94becb96305d6329a7db430bf30 (diff)
renamed AARect into AnyRect. renamed corresponding files.
Diffstat (limited to 'geometry/geometry_tests/screen_test.cpp')
-rw-r--r--geometry/geometry_tests/screen_test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/geometry/geometry_tests/screen_test.cpp b/geometry/geometry_tests/screen_test.cpp
index d2bdd9610a..1cbc78c727 100644
--- a/geometry/geometry_tests/screen_test.cpp
+++ b/geometry/geometry_tests/screen_test.cpp
@@ -16,7 +16,7 @@ namespace
m2::PointD b1(0.0, 0.0);
m2::PointD b2(300.0, 300.0);
- screen.SetFromRect(m2::AARectD(m2::RectD(b1, b2)));
+ screen.SetFromRect(m2::AnyRectD(m2::RectD(b1, b2)));
b1 = screen.GtoP(b1);
b2 = screen.GtoP(b2);
@@ -37,7 +37,7 @@ UNIT_TEST(ScreenBase_P2G2P)
check_set_from_rect(screen, 500, 1000);
screen.OnSize(0, 0, 640, 480);
- screen.SetFromRect(m2::AARectD(m2::RectD(-100, -200, 500, 680)));
+ screen.SetFromRect(m2::AnyRectD(m2::RectD(-100, -200, 500, 680)));
/// checking that PtoG(GtoP(p)) == p
@@ -55,7 +55,7 @@ UNIT_TEST(ScreenBase_AxisOrientation)
ScreenBase screen;
screen.OnSize(0, 0, 300, 200);
- screen.SetFromRect(m2::AARectD(m2::RectD(0, 0, 300, 200)));
+ screen.SetFromRect(m2::AnyRectD(m2::RectD(0, 0, 300, 200)));
TEST(is_equal(m2::PointD(150, 100), screen.GtoP(m2::PointD(150, 100))), ());
TEST(is_equal(m2::PointD(0, 0), screen.GtoP(m2::PointD(0, 200))), ());
@@ -68,7 +68,7 @@ UNIT_TEST(ScreenBase_X0Y0)
{
ScreenBase screen;
screen.OnSize(10, 10, 300, 200);
- screen.SetFromRect(m2::AARectD(m2::RectD(0, 0, 300, 200)));
+ screen.SetFromRect(m2::AnyRectD(m2::RectD(0, 0, 300, 200)));
m2::PointD pxPt = screen.PtoG(m2::PointD(0, 0));
@@ -79,7 +79,7 @@ UNIT_TEST(ScreenBase_ChoosingMaxScale)
{
ScreenBase screen;
screen.OnSize(10, 10, 300, 200);
- screen.SetFromRect(m2::AARectD(m2::RectD(0, 0, 200, 400)));
+ screen.SetFromRect(m2::AnyRectD(m2::RectD(0, 0, 200, 400)));
TEST(is_equal(screen.GtoP(m2::PointD(100, 200)), m2::PointD(160, 110)), ());
TEST(is_equal(screen.GtoP(m2::PointD(0, 0)), m2::PointD(110, 210)), ());
@@ -124,11 +124,11 @@ UNIT_TEST(ScreenBase_Rotate)
{
ScreenBase s;
s.OnSize(0, 0, 100, 200);
- s.SetFromRect(m2::AARectD(m2::RectD(0, 0, 100, 200)));
+ s.SetFromRect(m2::AnyRectD(m2::RectD(0, 0, 100, 200)));
s.Rotate(math::pi / 4);
m2::RectD pxRect = s.PixelRect();
- m2::AARectD glbRect = s.GlobalRect();
+ m2::AnyRectD glbRect = s.GlobalRect();
TEST(pxRect == m2::RectD(0, 0, 100, 200), ());
}