mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop: automatically reload completion-models

Browse source 
Instead of programatically reload the completion models, listen
to the relevant signals in the models. To that goal, derive all
the models from a base class.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-11-14 17:42:59 +01:00 • committed by Dirk Hohndel
parent 52d5125926
commit 38a784f5af
5 changed files with 83 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

58
qt-models/completionmodels.cpp
View file

@ -3,7 +3,6 @@
#include "core/dive.h"
#include "core/tag.h"
#include <QSet>
#include <QString>
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
#define SKIP_EMPTY Qt::SkipEmptyParts
@ -11,6 +10,24 @@
#define SKIP_EMPTY QString::SkipEmptyParts
#endif
CompletionModelBase::CompletionModelBase()
{
connect(&diveListNotifier, &DiveListNotifier::dataReset, this, &CompletionModelBase::updateModel);
connect(&diveListNotifier, &DiveListNotifier::divesImported, this, &CompletionModelBase::updateModel);
connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &CompletionModelBase::divesChanged);
}
void CompletionModelBase::updateModel()
{
setStringList(getStrings());
}
void CompletionModelBase::divesChanged(const QVector<dive *> &, DiveField field)
{
if (relevantDiveField(field))
updateModel();
}
static QStringList getCSVList(char *dive::*item)
{
QSet<QString> set;
@ -26,17 +43,27 @@ static QStringList getCSVList(char *dive::*item)
return setList;
}
void BuddyCompletionModel::updateModel()
QStringList BuddyCompletionModel::getStrings()
{
setStringList(getCSVList(&dive::buddy));
return getCSVList(&dive::buddy);
}
void DiveMasterCompletionModel::updateModel()
bool BuddyCompletionModel::relevantDiveField(const DiveField &f)
{
setStringList(getCSVList(&dive::divemaster));
return f.buddy;
}
void SuitCompletionModel::updateModel()
QStringList DiveMasterCompletionModel::getStrings()
{
return getCSVList(&dive::divemaster);
}
bool DiveMasterCompletionModel::relevantDiveField(const DiveField &f)
{
return f.divemaster;
}
QStringList SuitCompletionModel::getStrings()
{
QStringList list;
struct dive *dive;
@ -47,18 +74,29 @@ void SuitCompletionModel::updateModel()
list.append(suit);
}
std::sort(list.begin(), list.end());
setStringList(list);
return list;
}
void TagCompletionModel::updateModel()
bool SuitCompletionModel::relevantDiveField(const DiveField &f)
{
return f.suit;
}
QStringList TagCompletionModel::getStrings()
{
if (g_tag_list == NULL)
return;
return {};
QStringList list;
struct tag_entry *current_tag_entry = g_tag_list;
while (current_tag_entry != NULL) {
list.append(QString(current_tag_entry->tag->name));
current_tag_entry = current_tag_entry->next;
}
setStringList(list);
std::sort(list.begin(), list.end());
return list;
}
bool TagCompletionModel::relevantDiveField(const DiveField &f)
{
return f.tags;
}