From 564e3430a13876bd29d12477421bf1b437e7bf92 Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 5 Nov 2013 13:42:48 +0300 Subject: [PATCH] Remove useless code. --- map/compass_filter.cpp | 53 --------------------------------- map/compass_filter.hpp | 16 ---------- map/location_state.cpp | 66 ++++-------------------------------------- map/location_state.hpp | 8 ----- map/map.pro | 2 -- 5 files changed, 5 insertions(+), 140 deletions(-) delete mode 100644 map/compass_filter.cpp delete mode 100644 map/compass_filter.hpp diff --git a/map/compass_filter.cpp b/map/compass_filter.cpp deleted file mode 100644 index ba22fe8442..0000000000 --- a/map/compass_filter.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include "compass_filter.hpp" - -//#include "../geometry/angles.hpp" - -#include "../platform/location.hpp" - - -/* -namespace -{ - double const LOW_PASS_FACTOR = 0.5; - double const TRASHOLD = my::DegToRad(15.0); -} -*/ - -CompassFilter::CompassFilter() - : m_headingRad(0.0) -{ -} - -void CompassFilter::OnCompassUpdate(location::CompassInfo const & info) -{ - double const heading = ((info.m_trueHeading >= 0.0) ? info.m_trueHeading : info.m_magneticHeading); - -//#ifdef OMIM_OS_IPHONE - - // On iOS we shouldn't smooth the compass values. - - m_headingRad = heading; - -/* -#else - - // if new heading lies outside the twice treshold radius we immediately accept it - if (fabs(ang::GetShortestDistance(m_headingRad, heading)) >= TRASHOLD) - { - m_headingRad = heading; - } - else - { - // else we smooth the received value with the following formula - // O(n) = O(n-1) + k * (I - O(n - 1)); - m_headingRad = m_headingRad + LOW_PASS_FACTOR * (heading - m_headingRad); - } - -#endif -*/ -} - -double CompassFilter::GetHeadingRad() const -{ - return m_headingRad; -} diff --git a/map/compass_filter.hpp b/map/compass_filter.hpp deleted file mode 100644 index 8a24c4271f..0000000000 --- a/map/compass_filter.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -namespace location { class CompassInfo; } - -class CompassFilter -{ - double m_headingRad; - -public: - CompassFilter(); - - // Getting new compass value - void OnCompassUpdate(location::CompassInfo const & info); - // get heading angle in radians. - double GetHeadingRad() const; -}; diff --git a/map/location_state.cpp b/map/location_state.cpp index 7bf8965f64..b147c87d9c 100644 --- a/map/location_state.cpp +++ b/map/location_state.cpp @@ -37,6 +37,7 @@ namespace location : base_t(p), m_errorRadius(0), m_position(0, 0), + m_drawHeading(0.0), m_hasPosition(false), m_hasCompass(false), m_isCentered(false), @@ -45,7 +46,6 @@ namespace location m_compassProcessMode(ECompassDoNothing), m_currentSlotID(0) { - m_drawHeading = m_compassFilter.GetHeadingRad(); m_locationAreaColor = p.m_locationAreaColor; m_compassAreaColor = p.m_compassAreaColor; m_compassBorderColor = p.m_compassBorderColor; @@ -148,7 +148,6 @@ namespace location m_framework->ShowRectExVisibleScale(rect, scales::GetUpperComfortScale()); SetIsCentered(true); - CheckCompassRotation(); CheckCompassFollowing(); m_locationProcessMode = ELocationCenterOnly; @@ -158,7 +157,6 @@ namespace location m_framework->SetViewportCenter(center); SetIsCentered(true); - CheckCompassRotation(); CheckCompassFollowing(); break; @@ -173,9 +171,9 @@ namespace location { m_hasCompass = true; - m_compassFilter.OnCompassUpdate(info); + m_drawHeading = + ((info.m_trueHeading >= 0.0) ? info.m_trueHeading : info.m_magneticHeading); - CheckCompassRotation(); CheckCompassFollowing(); invalidate(); @@ -428,60 +426,6 @@ namespace location return (pt.SquareLength(pivot()) <= my::sq(radius)); } - void State::CheckCompassRotation() - { -/* -#ifndef OMIM_OS_IPHONE - - if (m_headingInterpolation) - m_headingInterpolation->Lock(); - - double headingDelta = 0; - bool isRunning = m_headingInterpolation - && m_headingInterpolation->IsRunning(); - - if (isRunning) - headingDelta = fabs(ang::GetShortestDistance(m_headingInterpolation->EndAngle(), m_compassFilter.GetHeadingRad())); - - if (floor(my::RadToDeg(headingDelta)) > 0) - m_headingInterpolation->SetEndAngle(m_compassFilter.GetHeadingRad()); - else - { - if (!isRunning) - { - headingDelta = fabs(ang::GetShortestDistance(m_drawHeading, m_compassFilter.GetHeadingRad())); - - if (my::rounds(my::RadToDeg(headingDelta)) > 0) - { - if (m_headingInterpolation - && !m_headingInterpolation->IsCancelled() - && !m_headingInterpolation->IsEnded()) - { - m_headingInterpolation->Cancel(); - m_headingInterpolation->Unlock(); - m_headingInterpolation.reset(); - } - - m_headingInterpolation.reset(new anim::AngleInterpolation(m_drawHeading, - m_compassFilter.GetHeadingRad(), - m_framework->GetAnimator().GetRotationSpeed(), - m_drawHeading)); - - m_framework->GetAnimController()->AddTask(m_headingInterpolation); - return; - } - } - } - - if (m_headingInterpolation) - m_headingInterpolation->Unlock(); - -#else -*/ - m_drawHeading = m_compassFilter.GetHeadingRad(); -//#endif - } - void State::CheckCompassFollowing() { if (m_hasCompass @@ -499,7 +443,7 @@ namespace location m_framework->GetAnimator().RotateScreen( m_framework->GetNavigator().Screen().GetAngle(), - -m_compassFilter.GetHeadingRad()); + -m_drawHeading); } void State::AnimateToPosition() @@ -558,7 +502,7 @@ namespace location { SetCompassProcessMode(ECompassFollow); SetLocationProcessMode(ELocationCenterOnly); - CheckCompassRotation(); + CheckCompassFollowing(); setState(EPressed); } diff --git a/map/location_state.hpp b/map/location_state.hpp index 1d2c583d2e..42dc470cbe 100644 --- a/map/location_state.hpp +++ b/map/location_state.hpp @@ -1,7 +1,5 @@ #pragma once -#include "compass_filter.hpp" - #include "../gui/element.hpp" #include "../platform/location.hpp" @@ -16,8 +14,6 @@ class Framework; -//namespace anim { class AngleInterpolation; } - namespace graphics { class DisplayList; } namespace location @@ -55,7 +51,6 @@ namespace location double m_errorRadius; //< error radius in mercator m2::PointD m_position; //< position in mercator - CompassFilter m_compassFilter; double m_drawHeading; bool m_hasPosition; @@ -101,8 +96,6 @@ namespace location mutable vector m_boundRects; m2::RectD m_boundRect; - //shared_ptr m_headingInterpolation; - typedef map TCompassStatusListeners; TCompassStatusListeners m_compassStatusListeners; int m_currentSlotID; @@ -118,7 +111,6 @@ namespace location m2::PointD const & globalPt1, ScreenBase const & s); - void CheckCompassRotation(); void CheckCompassFollowing(); void FollowCompass(); diff --git a/map/map.pro b/map/map.pro index 8cdb544f0f..4e8f59c571 100644 --- a/map/map.pro +++ b/map/map.pro @@ -47,7 +47,6 @@ HEADERS += \ country_status_display.hpp \ rotate_screen_task.hpp \ compass_arrow.hpp \ - compass_filter.hpp \ animator.hpp \ move_screen_task.hpp \ change_viewport_task.hpp \ @@ -98,7 +97,6 @@ SOURCES += \ country_status_display.cpp \ rotate_screen_task.cpp \ compass_arrow.cpp \ - compass_filter.cpp \ animator.cpp \ move_screen_task.cpp \ change_viewport_task.cpp \