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

Enabling and disabling 3d mode on desktop via search panel.

Browse source 
Conflicts:
	map/framework.cpp
This commit is contained in:
Daria Volvenkova 2015-10-09 18:39:38 +03:00
parent e2d1b91262
commit 49021cfa61
4 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/framework.cpp
View file

@ -2046,3 +2046,12 @@ void Framework::SetRouteFinishPoint(m2::PointD const & pt, bool isValid)
if (m_drapeEngine != nullptr)
m_drapeEngine->SetRoutePoint(pt, false /* isStart */, isValid);
}
void Framework::Enable3dMode(bool enable)
{
ASSERT(m_drapeEngine != nullptr, ());
if (enable)
m_drapeEngine->Enable3dMode(M_PI / 3.0f, -M_PI_4, 0.5f);
else
m_drapeEngine->Disable3dMode();
}

2
map/framework.hpp
View file

@ -543,6 +543,8 @@ public:
void SetRouteStartPoint(m2::PointD const & pt, bool isValid);
void SetRouteFinishPoint(m2::PointD const & pt, bool isValid);
void Enable3dMode(bool enable);
private:
void SetRouterImpl(routing::RouterType type);
void RemoveRoute(bool deactivateFollowing);

15
qt/search_panel.cpp
View file

@ -191,6 +191,19 @@ bool SearchPanel::TryChangeRouterCmd(QString const & str)
return true;
}
// TODO: This code only for demonstration purposes and will be removed soon
bool SearchPanel::Try3dModeCmd(QString const & str)
{
bool const is3dModeOn = (str == "?3d");
bool const is3dModeOff = (str == "?2d");
if (!is3dModeOn && !is3dModeOff)
return false;
m_pDrawWidget->GetFramework().Enable3dMode(is3dModeOn);
return true;
}
void SearchPanel::OnSearchTextChanged(QString const & str)
{
@ -201,6 +214,8 @@ void SearchPanel::OnSearchTextChanged(QString const & str)
return;
if (TryChangeRouterCmd(normalized))
return;
if (Try3dModeCmd(normalized))
return;
// search even with empty query
if (!normalized.isEmpty())

1
qt/search_panel.hpp
View file

@ -66,6 +66,7 @@ private slots:
bool TryChangeMapStyleCmd(QString const & str);
bool TryChangeRouterCmd(QString const & str);
bool Try3dModeCmd(QString const & str);
};
}