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

[qt] Added threading slot/signal connection for search results

Browse source
This commit is contained in:
Alex Zolotarev 2011-06-04 01:45:39 +02:00 • committed by Alex Zolotarev
parent 14c4098937
commit 195af153b7
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
qt/search_panel.cpp
View file

@ -30,19 +30,42 @@ SearchPanel::SearchPanel(DrawWidget * drawWidget, QWidget * parent)
verticalLayout->addWidget(m_pEditor);
verticalLayout->addWidget(m_pTable);
setLayout(verticalLayout);
// for multithreading support
connect(this, SIGNAL(SearchResultSignal(search::Result *)),
this, SLOT(OnSearchResult(search::Result *)), Qt::QueuedConnection);
}
void SearchPanel::OnSearchResult(search::Result const & result)
template<class T> static void ClearVector(vector<T *> & v)
{
if (!result.GetString().empty()) // last element
for(size_t i = 0; i < v.size(); ++i)
delete v[i];
v.clear();
}
SearchPanel::~SearchPanel()
{
ClearVector(m_results);
}
void SearchPanel::SearchResultThreadFunc(search::Result const & result)
{
emit SearchResultSignal(new search::Result(result));
}
void SearchPanel::OnSearchResult(search::Result * result)
{
if (!result->GetString().empty()) // last element
{
int const rowCount = m_pTable->rowCount();
m_pTable->setRowCount(rowCount + 1);
QTableWidgetItem * item = new QTableWidgetItem(QString::fromUtf8(result.GetString().c_str()));
QTableWidgetItem * item = new QTableWidgetItem(QString::fromUtf8(result->GetString().c_str()));
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
m_pTable->setItem(rowCount, 0, item);
m_results.push_back(result);
}
else
delete result;
}
void SearchPanel::OnSearchTextChanged(QString const & str)
@ -50,24 +73,24 @@ void SearchPanel::OnSearchTextChanged(QString const & str)
// clear old results
m_pTable->clear();
m_pTable->setRowCount(0);
m_results.clear();
ClearVector(m_results);
QString const normalized = str.normalized(QString::NormalizationForm_KC);
if (!normalized.isEmpty())
m_pDrawWidget->Search(normalized.toUtf8().constData(),
bind(&SearchPanel::OnSearchResult, this, _1));
bind(&SearchPanel::SearchResultThreadFunc, this, _1));
}
void SearchPanel::OnSearchPanelItemClicked(int row, int)
{
ASSERT_EQUAL(m_results.size(), static_cast<size_t>(m_pTable->rowCount()), ());
if (m_results[row].GetResultType() == search::Result::RESULT_FEATURE)
if (m_results[row]->GetResultType() == search::Result::RESULT_FEATURE)
{ // center viewport on clicked item
m_pDrawWidget->ShowFeature(m_results[row].GetFeatureRect());
m_pDrawWidget->ShowFeature(m_results[row]->GetFeatureRect());
}
else
{ // insert suggestion into the search bar
string const suggestion = m_results[row].GetSuggestionString();
string const suggestion = m_results[row]->GetSuggestionString();
m_pEditor->setText(QString::fromUtf8(suggestion.c_str()));
}
}

11
qt/search_panel.hpp
View file

@ -21,22 +21,29 @@ class SearchPanel : public QWidget
QLineEdit * m_pEditor;
/// Stores current search results
vector<search::Result> m_results;
vector<search::Result *> m_results;
Q_OBJECT
signals:
void SearchResultSignal(search::Result * result);
private:
void OnSearchResult(search::Result const & result);
void SearchResultThreadFunc(search::Result const & result);
protected:
virtual void showEvent(QShowEvent *);
virtual void hideEvent(QHideEvent *);
public:
explicit SearchPanel(DrawWidget * drawWidget, QWidget * parent);
~SearchPanel();
protected slots:
void OnSearchPanelItemClicked(int row, int column);
void OnSearchTextChanged(QString const &);
/// Called via signal to support multithreading
void OnSearchResult(search::Result * result);
};
}