kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-03-10 10:39:20 +03:00
parent b23b74b63f
commit 5880717934
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qt/draw_widget.cpp
View file

@ -43,7 +43,7 @@ DrawWidget::DrawWidget(Framework & framework, QWidget * parent)
{
m_framework.SetMapSelectionListeners(
[this](place_page::Info const & info) { ShowPlacePage(info); },
[](bool /*switchFullScreenMode*/) {}); // Empty deactivation listener.
[](bool /* switchFullScreenMode */) {}); // Empty deactivation listener.
m_framework.SetRouteBuildingListener(
[](routing::IRouter::ResultCode, storage::TCountriesVec const &) {});
@ -126,14 +126,16 @@ void DrawWidget::ShowAll()
void DrawWidget::ChoosePositionModeEnable()
{
m_framework.BlockTapEvents(true);
m_framework.EnableChoosePositionMode(true, false, false, m2::PointD());
m_framework.BlockTapEvents(true /* block */);
m_framework.EnableChoosePositionMode(true /* enable */, false /* enableBounds */,
false /* applyPosition */, m2::PointD() /* position */);
}
void DrawWidget::ChoosePositionModeDisable()
{
m_framework.EnableChoosePositionMode(false, false, false, m2::PointD());
m_framework.BlockTapEvents(false);
m_framework.EnableChoosePositionMode(false /* enable */, false /* enableBounds */,
false /* applyPosition */, m2::PointD() /* position */);
m_framework.BlockTapEvents(false /* block */);
}
void DrawWidget::initializeGL()

4
qt/qt_common/map_widget.cpp
View file

@ -153,8 +153,8 @@ df::TouchEvent MapWidget::GetTouchEvent(QMouseEvent * e, df::TouchEvent::ETouchT
df::Touch MapWidget::GetSymmetrical(df::Touch const & touch) const
{
m2::PointD pixelCenter = m_framework.GetPixelCenter();
m2::PointD symmetricalLocation = pixelCenter + (pixelCenter - touch.m_location);
m2::PointD const pixelCenter = m_framework.GetPixelCenter();
m2::PointD const symmetricalLocation = pixelCenter + (pixelCenter - touch.m_location);
df::Touch result;
result.m_id = touch.m_id + 1;

2
qt/qt_common/map_widget.hpp
View file

@ -80,7 +80,7 @@ protected:
drape_ptr<QtOGLContextFactory> m_contextFactory;
std::unique_ptr<gui::Skin> m_skin;
unique_ptr<QTimer> m_updateTimer;
std::unique_ptr<QTimer> m_updateTimer;
};
} // namespace common
} // namespace qt

1
search/search_quality/assessment_tool/CMakeLists.txt
View file

@ -18,6 +18,7 @@ omim_link_libraries(
storage
tracking
traffic
routing_common
indexer
drape
partners_api