diff options
| author | vng <viktor.govako@gmail.com> | 2012-11-21 22:12:41 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:47:05 +0300 |
| commit | dc21bffc6732ceeff9540882da7766cd8f367705 (patch) | |
| tree | 58cd45030f3179421cb7f4c085b0eea48de816f8 /qt | |
| parent | c408080c2712a08108368b8e981c81d006ab4fab (diff) | |
Add search settings.
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/draw_widget.cpp | 8 | ||||
| -rw-r--r-- | qt/search_panel.cpp | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index e3bc358084..690f9bc7de 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -493,11 +493,9 @@ namespace qt bool DrawWidget::Search(search::SearchParams params) { - if (m_framework->GetCurrentPosition(params.m_lat, params.m_lon)) - { - //params.SetNearMeMode(true); - params.m_validPos = true; - } + double lat, lon; + if (m_framework->GetCurrentPosition(lat, lon)) + params.SetPosition(lat, lon); return m_framework->Search(params); } diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index e4b37b9c88..f0419d97be 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -57,6 +57,8 @@ SearchPanel::SearchPanel(DrawWidget * drawWidget, QWidget * parent) setFocusPolicy(Qt::StrongFocus); setFocusProxy(m_pEditor); + + m_params.m_callback = bind(&SearchPanel::SearchResultThreadFunc, this, _1); } void SearchPanel::SearchResultThreadFunc(ResultsT const & result) @@ -180,8 +182,6 @@ void SearchPanel::OnSearchTextChanged(QString const & str) //if (!normalized.isEmpty()) { m_params.m_query = normalized.toUtf8().constData(); - m_params.m_callback = bind(&SearchPanel::SearchResultThreadFunc, this, _1); - if (m_pDrawWidget->Search(m_params)) { // show busy indicator |