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

[Tizen] Review fixes.

Browse source
This commit is contained in:
Sergey Pisarchik 2014-07-25 20:38:47 +03:00 • committed by Alex Zolotarev
parent 01149efe04
commit a19eb91ca4
4 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tizen/MapsWithMe/inc/BookMarkSplitPanel.hpp
View file

@ -113,5 +113,5 @@ private:
Tizen::Ui::Controls::ListView * m_pList;
MapsWithMeForm * m_pMainForm;
Tizen::Uix::Sensor::SensorManager m_sensorManager;
double m_NorthAzimut;
double m_northAzimuth;
};

2
tizen/MapsWithMe/inc/BookMarkUtils.hpp
View file

@ -27,7 +27,7 @@ Tizen::Base::String GetMarkName(UserMark const * pUserMark);
Tizen::Base::String GetMarkType(UserMark const * pUserMark);
Tizen::Base::String GetMarkCountry(UserMark const * pUserMark);
Tizen::Base::String GetDistance(UserMark const * pUserMark);
double GetAzimut(UserMark const * pUserMark, double north);
double GetAzimuth(UserMark const * pUserMark, double north);
const wchar_t * GetColorBM(EColor color);
const wchar_t * GetColorPPBM(EColor color);

33
tizen/MapsWithMe/src/BookMarkSplitPanel.cpp
View file

@ -100,7 +100,7 @@ bool BookMarkSplitPanel::Construct(const Tizen::Graphics::FloatRectangle& rect)
m_sensorManager.Construct();
if (m_sensorManager.IsAvailable(SENSOR_TYPE_MAGNETIC))
m_sensorManager.AddSensorListener(*this, SENSOR_TYPE_MAGNETIC, 50, true);
m_NorthAzimut = 0;
m_northAzimuth = 0;
return true;
}
@ -367,31 +367,28 @@ void BookMarkSplitPanel::UpdateCompass()
Tizen::Graphics::Canvas * pCanvas = m_pList->GetCanvasN();
if (pCanvas)
{
pCanvas->FillRectangle(consts::green, Rectangle(2,headerItemHeight + 2, 100,100));
pCanvas->FillRectangle(consts::green, Rectangle(2, headerItemHeight + 2, 100, 100));
Bitmap const * pBTM_Back = GetBitmap(IDB_PLACE_PAGE_COMPASS_BACKGROUND);
int imgBackHeighDiv2 = pBTM_Back->GetHeight()/2;
int const imgBackHeighDiv2 = pBTM_Back->GetHeight() / 2;
Bitmap const * pBTM = GetBitmap(IDB_PLACE_PAGE_COMPASS);
int imgHeighDiv2 = pBTM->GetHeight()/2;
int centerX = btwWdth + imgHeighDiv2;
int centerY = headerItemHeight + btwWdth + imgHeighDiv2;
pCanvas->DrawBitmap(Point(centerX - imgBackHeighDiv2, centerY - imgBackHeighDiv2), *pBTM_Back);
double dAzimut = GetAzimut(GetCurMark(), m_NorthAzimut);
pCanvas->DrawBitmap(Point(centerX, centerY), *pBTM, Point(imgHeighDiv2, imgHeighDiv2), (dAzimut/(2*M_PI))*360);
int const imgHeighDiv2 = pBTM->GetHeight() / 2;
int const centerX = btwWdth + imgHeighDiv2;
int const centerY = headerItemHeight + btwWdth + imgHeighDiv2;
pCanvas->DrawBitmap(Point(centerX - imgBackHeighDiv2, centerY - imgBackHeighDiv2), * pBTM_Back);
double const dAzimut = GetAzimuth(GetCurMark(), m_northAzimuth);
pCanvas->DrawBitmap(Point(centerX, centerY), *pBTM, Point(imgHeighDiv2, imgHeighDiv2), (dAzimut / (2 * math::pi)) * 360);
delete pCanvas;
}
}
void BookMarkSplitPanel::OnDataReceived(SensorType sensorType, SensorData & sensorData, result r)
{
MagneticSensorData & data = static_cast< MagneticSensorData& >(sensorData);
m_NorthAzimut = atan2(data.y, data.x) - math::pi;
double const pi2 = 2.0*math::pi;
if (m_NorthAzimut < 0.0)
m_NorthAzimut += pi2;
else if (m_NorthAzimut > pi2)
m_NorthAzimut -= pi2;
m_northAzimuth = atan2(data.y, data.x) - math::pi;
double const pi2 = 2.0 * math::pi;
if (m_northAzimuth < 0.0)
m_northAzimuth += pi2;
else if (m_northAzimuth > pi2)
m_northAzimuth -= pi2;
UpdateCompass();
}

4
tizen/MapsWithMe/src/BookMarkUtils.cpp
View file

@ -83,7 +83,7 @@ Tizen::Base::String GetDistance(UserMark const * pUserMark)
return dist.c_str();
}
double GetAzimut(UserMark const * pUserMark, double north)
double GetAzimuth(UserMark const * pUserMark, double north)
{
if (!pUserMark)
return 0;
@ -91,7 +91,7 @@ double GetAzimut(UserMark const * pUserMark, double north)
GetFramework()->GetCurrentPosition(lat, lon);
string dist;
double azimut;
m2::PointD pt = pUserMark->GetOrg();
m2::PointD const pt = pUserMark->GetOrg();
GetFramework()->GetDistanceAndAzimut(pt, lat, lon, north, dist, azimut);
return azimut;
}