From 227b48c667c849ba597c1671918489e16f6ee6c4 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Thu, 19 Nov 2015 17:38:10 +0300 Subject: [PATCH] Review fixes. Conflicts: android/jni/com/mapswithme/maps/Framework.cpp drape_frontend/message.hpp drape_frontend/message_subclasses.hpp map/framework.cpp --- android/jni/com/mapswithme/maps/Framework.cpp | 12 ++++---- android/jni/com/mapswithme/maps/Framework.hpp | 2 +- .../src/com/mapswithme/maps/Framework.java | 2 +- .../maps/search/SearchFragment.java | 2 +- drape_frontend/drape_engine.cpp | 4 +-- drape_frontend/drape_engine.hpp | 2 +- drape_frontend/frontend_renderer.cpp | 4 +-- drape_frontend/message.hpp | 2 +- drape_frontend/message_subclasses.hpp | 6 ++-- drape_frontend/user_event_stream.cpp | 6 ++-- .../Search/Console/MWMConsole.mm | 8 +++--- map/framework.cpp | 28 ++++++++++--------- map/framework.hpp | 6 ++-- qt/search_panel.cpp | 2 +- 14 files changed, 44 insertions(+), 42 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index efabf43c6a..e59bfaa7bc 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -188,9 +188,9 @@ MapStyle Framework::GetMapStyle() const return m_work.GetMapStyle(); } -void Framework::Enable3dMode(bool enable) +void Framework::Allow3dMode(bool allow) { - m_work.Enable3dMode(enable); + m_work.Allow3dMode(allow); } Storage & Framework::Storage() @@ -1319,13 +1319,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_com_mapswithme_maps_Framework_nativeEnable3dMode(JNIEnv * env, jclass thiz, jboolean enable) + Java_com_mapswithme_maps_Framework_nativeAllow3dMode(JNIEnv * env, jclass thiz, jboolean allow) { - bool const enable3d = static_cast(enable); + bool const allow3d = static_cast(allow); - g_framework->PostDrapeTask([enable3d]() + g_framework->PostDrapeTask([allow3d]() { - g_framework->Enable3dMode(enable3d); + g_framework->Allow3dMode(allow3d); }); } } // extern "C" diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index e57284747a..19fb1ac0ab 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -156,7 +156,7 @@ namespace android location::EMyPositionMode GetMyPositionMode() const; void SetMyPositionMode(location::EMyPositionMode mode); - void Enable3dMode(bool enable); + void Allow3dMode(bool allow); void SetupWidget(gui::EWidget widget, float x, float y, dp::Anchor anchor); void ApplyWidgets(); diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index 98dd15849b..e967974a72 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -178,5 +178,5 @@ public class Framework public native static void nativeDeregisterMaps(); - public native static void nativeEnable3dMode(boolean enable); + public native static void nativeAllow3dMode(boolean enable); } diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index dbedabce87..37817015fb 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -345,7 +345,7 @@ public class SearchFragment extends BaseMwmFragment return false; hideSearch(); - Framework.nativeEnable3dMode(is3d); + Framework.nativeAllow3dMode(is3d); return true; } diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp index baff0f362d..b32fdace68 100644 --- a/drape_frontend/drape_engine.cpp +++ b/drape_frontend/drape_engine.cpp @@ -429,10 +429,10 @@ gui::TWidgetsSizeInfo const & DrapeEngine::GetWidgetSizes() return m_widgetSizes; } -void DrapeEngine::Enable3dMode(bool enable) +void DrapeEngine::Allow3dMode(bool enable) { m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, - make_unique_dp(enable), + make_unique_dp(enable), MessagePriority::Normal); } diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp index dcb9ff5ff4..2e636425c4 100644 --- a/drape_frontend/drape_engine.hpp +++ b/drape_frontend/drape_engine.hpp @@ -114,7 +114,7 @@ public: void SetWidgetLayout(gui::TWidgetsLayoutInfo && info); gui::TWidgetsSizeInfo const & GetWidgetSizes(); - void Enable3dMode(bool enable); + void Allow3dMode(bool enable); void EnablePerspective(double rotationAngle, double angleFOV); private: diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index d738abf6ea..c9c0da8337 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -490,9 +490,9 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) break; } - case Message::Enable3dMode: + case Message::Allow3dMode: { - ref_ptr const msg = message; + ref_ptr const msg = message; m_enable3dInNavigation = msg->Enable(); break; } diff --git a/drape_frontend/message.hpp b/drape_frontend/message.hpp index cd64f8902e..078b9ae86b 100644 --- a/drape_frontend/message.hpp +++ b/drape_frontend/message.hpp @@ -44,7 +44,7 @@ public: UpdateMapStyle, InvalidateTextures, Invalidate, - Enable3dMode, + Allow3dMode, EnablePerspective }; diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp index 7a8714b59e..d02d850408 100644 --- a/drape_frontend/message_subclasses.hpp +++ b/drape_frontend/message_subclasses.hpp @@ -653,14 +653,14 @@ public: Type GetType() const override { return Message::DeactivateRouteFollowing; } }; -class Enable3dModeMessage : public Message +class Allow3dModeMessage : public Message { public: - Enable3dModeMessage(bool enable) + Allow3dModeMessage(bool enable) : m_enable(enable) {} - Type GetType() const override { return Message::Enable3dMode; } + Type GetType() const override { return Message::Allow3dMode; } bool Enable() const { return m_enable; } private: diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index d498e8b65a..04c5ae21af 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -187,7 +187,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool & e.m_followAndRotate.m_isAnim); TouchCancel(m_touches); break; - case UserEvent::EVENT_ENABLE_3D_MODE: + case UserEvent::EVENT_ENABLE_PERSPECTIVE: if (e.m_enable3dMode.m_isAnim) { m_pendingEvent.reset(new UserEvent(e.m_enable3dMode)); @@ -200,7 +200,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool & viewportChanged = true; } break; - case UserEvent::EVENT_DISABLE_3D_MODE: + case UserEvent::EVENT_DISABLE_PERSPECTIVE: SetDisable3dModeAnimation(); break; default: @@ -223,7 +223,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool & if (m_animation->IsFinished()) { if (m_animation->GetType() == ModelViewAnimationType::FollowAndRotate && - m_pendingEvent != nullptr && m_pendingEvent->m_type == UserEvent::EVENT_ENABLE_3D_MODE) + m_pendingEvent != nullptr && m_pendingEvent->m_type == UserEvent::EVENT_ENABLE_PERSPECTIVE) { SetEnable3dModeAnimation(m_pendingEvent->m_enable3dMode.m_rotationAngle); m_navigator.Enable3dMode(0.0 /* current rotation angle */, diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/Console/MWMConsole.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/Console/MWMConsole.mm index 195cfaa56e..e84b5acb2a 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/Console/MWMConsole.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/Console/MWMConsole.mm @@ -35,14 +35,14 @@ + (BOOL)perform3dMode:(NSString *)cmd { // Hook for shell command on change 3d mode - BOOL const enable = [cmd isEqualToString:@"?3d"]; - BOOL const disable = [cmd isEqualToString:@"?2d"]; + BOOL const is3d = [cmd isEqualToString:@"?3d"]; + BOOL const is2d = [cmd isEqualToString:@"?2d"]; - if (!enable && !disable) + if (!is3d && !is2d) return NO; Framework & frm = GetFramework(); - frm.Enable3dMode(enable); + frm.Allow3dMode(is3d); return YES; } diff --git a/map/framework.cpp b/map/framework.cpp index b4fa50780e..40fb4b125f 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -90,11 +90,13 @@ namespace { static const int BM_TOUCH_PIXEL_INCREASE = 20; static const int kKeepPedestrianDistanceMeters = 10000; + char const kRouterTypeKey[] = "router"; char const kMapStyleKey[] = "MapStyleKeyV1"; + char const kAllow3dKey[] = "Allow3d"; - double constexpr kRotationAngle = math::pi4; - double constexpr kAngleFOV = math::pi / 3.0; + double const kRotationAngle = math::pi4; + double const kAngleFOV = math::pi / 3.0; } pair Framework::RegisterMap( @@ -1269,14 +1271,14 @@ void Framework::CreateDrapeEngine(ref_ptr contextFactory, ActivateUserMark(mark, true); } - bool const enable3d = Load3dMode(); - Enable3dMode(enable3d); + bool const allow3d = Load3dMode(); + Allow3dMode(allow3d); // In case of the engine reinitialization recover route. if (m_routingSession.IsActive()) { InsertRoute(m_routingSession.GetRoute()); - if (enable3d) + if (allow3d) m_drapeEngine->EnablePerspective(kRotationAngle, kAngleFOV); } } @@ -2061,20 +2063,20 @@ void Framework::SetRouteFinishPoint(m2::PointD const & pt, bool isValid) m_drapeEngine->SetRoutePoint(pt, false /* isStart */, isValid); } -void Framework::Enable3dMode(bool enable) +void Framework::Allow3dMode(bool allow) { - Save3dMode(enable); - CallDrapeFunction(bind(&df::DrapeEngine::Enable3dMode, _1, enable)); + Save3dMode(allow); + CallDrapeFunction(bind(&df::DrapeEngine::Allow3dMode, _1, allow)); } -void Framework::Save3dMode(bool enable) +void Framework::Save3dMode(bool allow) { - Settings::Set("Enable3d", enable); + Settings::Set(kAllow3dKey, allow); } bool Framework::Load3dMode() { - bool enable3d = false; - Settings::Get("Enable3d", enable3d); - return enable3d; + bool allow = false; + Settings::Get(kAllow3dKey, allow); + return allow; } diff --git a/map/framework.hpp b/map/framework.hpp index 62ddbb6e11..0dc435ff01 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -544,9 +544,9 @@ public: void SetRouteStartPoint(m2::PointD const & pt, bool isValid); void SetRouteFinishPoint(m2::PointD const & pt, bool isValid); - void Enable3dMode(bool enable); - void Save3dMode(bool enable); - void Load3dMode(); + void Allow3dMode(bool allow); + void Save3dMode(bool allow); + bool Load3dMode(); private: void SetRouterImpl(routing::RouterType type); diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index 10240b0093..c7ce808fda 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -200,7 +200,7 @@ bool SearchPanel::Try3dModeCmd(QString const & str) if (!is3dModeOn && !is3dModeOff) return false; - m_pDrawWidget->GetFramework().Enable3dMode(is3dModeOn); + m_pDrawWidget->GetFramework().Allow3dMode(is3dModeOn); return true; }