gui restable: contents were not reset when search was

This commit is contained in:
Jean-Francois Dockes 2019-07-19 08:58:49 +02:00
parent 9038a96425
commit 0b7e12200a

View File

@ -290,15 +290,11 @@ void RecollModel::readDocSource()
void RecollModel::setDocSource(std::shared_ptr<DocSequence> nsource) void RecollModel::setDocSource(std::shared_ptr<DocSequence> nsource)
{ {
LOGDEB("RecollModel::setDocSource\n"); LOGDEB("RecollModel::setDocSource\n");
if (!nsource) { m_source = nsource;
m_source = std::shared_ptr<DocSequence>(); if (m_source) {
m_source->getTerms(m_hdata);
} else { } else {
// We used to allocate a new DocSource here instead of sharing m_hdata.clear();
// the input, but I can't see why.
//m_source = std::shared_ptr<DocSequence>(new
//DocSource(theconfig,nsource));
m_source = nsource;
m_hdata.clear();
} }
} }
@ -705,6 +701,7 @@ void ResTable::resetSource()
{ {
LOGDEB("ResTable::resetSource\n"); LOGDEB("ResTable::resetSource\n");
setDocSource(std::shared_ptr<DocSequence>()); setDocSource(std::shared_ptr<DocSequence>());
readDocSource();
} }
void ResTable::saveAsCSV() void ResTable::saveAsCSV()
@ -773,7 +770,6 @@ void ResTable::readDocSource(bool resetPos)
if (resetPos) if (resetPos)
tableView->verticalScrollBar()->setSliderPosition(0); tableView->verticalScrollBar()->setSliderPosition(0);
m_model->m_source->getTerms(m_model->m_hdata);
m_model->readDocSource(); m_model->readDocSource();
m_detail->clear(); m_detail->clear();
m_detaildocnum = -1; m_detaildocnum = -1;