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

AdjustToBounds fixes.

Browse source
This commit is contained in:
rachytski 2011-04-02 21:18:17 +03:00 • committed by Alex Zolotarev
parent 97faec6d71
commit dfc991a118
8 changed files with 84 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/EAGLView.mm
View file

@ -163,8 +163,6 @@
- (void)layoutSubviews
{
NSLog(@"layoutSubviews");
CGFloat scaleFactor = 1.0;
if ([self respondsToSelector:@selector(contentScaleFactor)])
scaleFactor = self.contentScaleFactor;

9
iphone/Maps/Classes/MapViewController.mm
View file

@ -136,12 +136,12 @@ typedef FrameWork<model::FeaturesFetcher, Navigator> framework_t;
// restore previous screen position
bool res = m_framework->LoadState();
if (!res)
m_framework->SetMaxWorldRect();
m_framework->initializeGL([(EAGLView*)self.view renderContext], resourceManager);
if (!res)
m_framework->ShowAll();
else
m_framework->UpdateNow();
m_framework->UpdateNow();
}
return self;
@ -153,7 +153,6 @@ typedef FrameWork<model::FeaturesFetcher, Navigator> framework_t;
if ((orientation == UIInterfaceOrientationLandscapeLeft)
||(orientation == UIInterfaceOrientationLandscapeRight))
std::swap(width, height);
NSLog(@"onResize: %d, %d", width, height);
m_framework->OnSize(width, height);
}

10
map/framework.hpp
View file

@ -132,11 +132,6 @@ class FrameWork
AddRedrawCommandSure();
}
void SetMaxWorldRect()
{
m_navigator.SetFromRect(m_model.GetWorldRect());
}
threads::Mutex m_modelSyn;
void AddMap(string const & datFile)
@ -273,6 +268,11 @@ public:
//@{
public:
void SetMaxWorldRect()
{
m_navigator.SetFromRect(m_model.GetWorldRect());
}
void UpdateNow()
{
AddRedrawCommand();

88
map/navigator.cpp
View file

@ -17,7 +17,8 @@
#include "../base/start_mem_debug.hpp"
Navigator::Navigator()
: m_orientation(EOrientation0)
: m_orientation(EOrientation0),
m_worldRect(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX, MercatorBounds::maxY)
{
}
@ -25,7 +26,8 @@ Navigator::Navigator(ScreenBase const & screen)
: m_StartScreen(screen),
m_Screen(screen),
m_InAction(false),
m_orientation(EOrientation0)
m_orientation(EOrientation0),
m_worldRect(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX, MercatorBounds::maxY)
{
}
@ -38,8 +40,13 @@ void Navigator::SetMinScreenParams(unsigned pxMinWidth, double metresMinWidth)
void Navigator::SetFromRect(m2::RectD const & r)
{
m_Screen.SetFromRect(r);
m_Screen = AdjustToBounds(m_Screen, m_worldRect, true);
if (!m_InAction)
{
m_StartScreen.SetFromRect(r);
m_StartScreen = AdjustToBounds(m_StartScreen, m_worldRect, true);
}
}
void Navigator::CenterViewport(m2::PointD const & p)
@ -76,13 +83,16 @@ void Navigator::OnSize(int x0, int y0, int w, int h)
{
m_Screen.OnSize(x0, y0, w, h);
m_Screen = AdjustToBounds(m_Screen, m2::RectD(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX, MercatorBounds::maxY));
m_Screen = AdjustToBounds(m_Screen, m_worldRect, false);
if (!m_InAction)
{
m_StartScreen.OnSize(x0, y0, w, h);
m_StartScreen = AdjustToBounds(m_StartScreen, m_worldRect, false);
}
}
ScreenBase const Navigator::AdjustToBounds(ScreenBase const & screen, m2::RectD const & boundRect)
ScreenBase const Navigator::AdjustToBounds(ScreenBase const & screen, m2::RectD const & boundRect, bool doScaleOnly)
{
ScreenBase res = screen;
m2::RectD globalRect = res.GlobalRect();
@ -92,44 +102,76 @@ ScreenBase const Navigator::AdjustToBounds(ScreenBase const & screen, m2::RectD
if (globalRect.minX() < boundRect.minX())
{
globalRect.Offset(m2::PointD(boundRect.minX() - globalRect.minX(), 0));
if (globalRect.maxX() > boundRect.maxX())
if (doScaleOnly)
{
double k = (globalRect.Center().x - boundRect.maxX()) / (globalRect.Center().x - globalRect.maxX());
double k = (globalRect.Center().x - boundRect.minX()) / (globalRect.Center().x - globalRect.minX());
globalRect.Scale(k);
}
else
{
globalRect.Offset(m2::PointD(boundRect.minX() - globalRect.minX(), 0));
if (globalRect.maxX() > boundRect.maxX())
{
double k = (globalRect.Center().x - boundRect.maxX()) / (globalRect.Center().x - globalRect.maxX());
globalRect.Scale(k);
}
}
}
if (globalRect.maxX() > boundRect.maxX())
{
globalRect.Offset(m2::PointD(boundRect.maxX() - globalRect.maxX(), 0));
if (globalRect.minX() < boundRect.minX())
if (doScaleOnly)
{
double k = (globalRect.Center().x - boundRect.minX()) / (globalRect.Center().x - globalRect.minX());
double k = (globalRect.Center().x - boundRect.maxX()) / (globalRect.Center().x - globalRect.maxX());
globalRect.Scale(k);
}
else
{
globalRect.Offset(m2::PointD(boundRect.maxX() - globalRect.maxX(), 0));
if (globalRect.minX() < boundRect.minX())
{
double k = (globalRect.Center().x - boundRect.minX()) / (globalRect.Center().x - globalRect.minX());
globalRect.Scale(k);
}
}
}
if (globalRect.minY() < boundRect.minY())
{
globalRect.Offset(m2::PointD(boundRect.minY() - globalRect.minY(), 0));
if (globalRect.maxY() > boundRect.maxY())
if (doScaleOnly)
{
double k = (globalRect.Center().y - boundRect.maxY()) / (globalRect.Center().y - globalRect.maxY());
double k = (globalRect.Center().y - boundRect.minY()) / (globalRect.Center().y - globalRect.minY());
globalRect.Scale(k);
}
else
{
globalRect.Offset(m2::PointD(boundRect.minY() - globalRect.minY(), 0));
if (globalRect.maxY() > boundRect.maxY())
{
double k = (globalRect.Center().y - boundRect.maxY()) / (globalRect.Center().y - globalRect.maxY());
globalRect.Scale(k);
}
}
}
if (globalRect.maxY() > boundRect.maxY())
{
globalRect.Offset(m2::PointD(boundRect.maxY() - globalRect.maxY(), 0));
if (globalRect.minY() < boundRect.minY())
if (doScaleOnly)
{
double k = (globalRect.Center().y - boundRect.minY()) / (globalRect.Center().y - globalRect.minY());
double k = (globalRect.Center().y - boundRect.maxY()) / (globalRect.Center().y - globalRect.maxY());
globalRect.Scale(k);
}
else
{
globalRect.Offset(m2::PointD(boundRect.maxY() - globalRect.maxY(), 0));
if (globalRect.minY() < boundRect.minY())
{
double k = (globalRect.Center().y - boundRect.minY()) / (globalRect.Center().y - globalRect.minY());
globalRect.Scale(k);
}
}
}
res.SetFromRect(globalRect);
@ -242,7 +284,7 @@ bool Navigator::CheckMaxScale(ScreenBase const & screen)
{
m2::RectD r = screen.ClipRect();
// multiple by 2 to allow scale on zero level
double const maxSize = (MercatorBounds::maxX - MercatorBounds::minX);
double const maxSize = m_worldRect.SizeX();
return (r.SizeX() <= maxSize || r.SizeY() <= maxSize);
}
@ -258,11 +300,7 @@ bool Navigator::CheckMinScale(ScreenBase const & screen)
bool Navigator::CheckBorders(ScreenBase const & screen)
{
m2::RectD ScreenBounds = screen.GlobalRect();
m2::RectD WorldBounds(MercatorBounds::minX, MercatorBounds::minY,
MercatorBounds::maxX, MercatorBounds::maxY);
return ScreenBounds.IsRectInside(WorldBounds) || WorldBounds.IsRectInside(ScreenBounds);
return ScreenBounds.IsRectInside(m_worldRect) || m_worldRect.IsRectInside(ScreenBounds);
}
bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
@ -279,7 +317,7 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
return false;
// if (!skipMaxScaleAndBordersCheck && !CheckBorders(tmp))
// tmp = AdjustToBounds(tmp, m2::RectD(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX, MercatorBounds::maxY));
// tmp = AdjustToBounds(tmp, m_worldRect);
if (!CheckMinScale(tmp))
return false;

4
map/navigator.hpp
View file

@ -62,7 +62,7 @@ public:
private:
m2::RectD m_worldRect;
unsigned m_pxMinWidth;
double m_metresMinWidth;
bool CheckMinScale(ScreenBase const & screen);
@ -70,7 +70,7 @@ private:
bool CheckBorders(ScreenBase const & screen);
// adjusting screen to specified limits
ScreenBase const AdjustToBounds(ScreenBase const & screen, m2::RectD const & boundRect);
ScreenBase const AdjustToBounds(ScreenBase const & screen, m2::RectD const & boundRect, bool doScaleOnly);
// Internal screen corresponding to the state when navigation began with StartDrag or StartScale.
ScreenBase m_StartScreen;
// Internal screen to do GtoP() and PtoG() calculations. It is always up to date with navigation.

7
qt/draw_widget.cpp
View file

@ -34,6 +34,11 @@ namespace qt
connect(m_pScale, SIGNAL(actionTriggered(int)), this, SLOT(ScaleChanged(int)));
}
void DrawWidget::UpdateNow()
{
m_framework.UpdateNow();
}
bool DrawWidget::LoadState()
{
pair<uint32_t, uint32_t> widthAndHeight;
@ -44,7 +49,7 @@ namespace qt
bool res = m_framework.LoadState();
m_framework.UpdateNow();
// m_framework.UpdateNow();
if (!res)
return false;

2
qt/draw_widget.hpp
View file

@ -64,6 +64,8 @@ namespace qt
/// @return false if can't load previously saved values
bool LoadState();
void UpdateNow();
protected:
static const uint32_t ini_file_version = 0;

2
qt/mainwindow.cpp
View file

@ -154,6 +154,8 @@ void MainWindow::LoadState()
showMaximized();
m_pDrawWidget->ShowAll();
}
else
m_pDrawWidget->UpdateNow();
}
void MainWindow::CreateClassifPanel()