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

filter: add filter preset table

Browse source 
Add a table view that shows all presets and a button to delete
old presets. When clicking on an item, load the preset.
When the filter is reset, deselect any item.

Change the preset-loading code: instead of simply loading the
preset, select the preset in the table. Thus, it will be loaded
implicitly.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-05-28 22:19:58 +02:00 • committed by Dirk Hohndel
parent c6bd2a7ffb
commit 142f76374c
3 changed files with 241 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
desktop-widgets/filterwidget2.cpp
View file

@ -27,10 +27,16 @@ FilterWidget2::FilterWidget2(QWidget* parent) :
ui.loadSetButton->setPopupMode(QToolButton::InstantPopup);
ui.presetTable->setModel(FilterPresetModel::instance());
ui.presetTable->setSelectionBehavior(QAbstractItemView::SelectRows);
ui.presetTable->setSelectionMode(QAbstractItemView::SingleSelection);
connect(ui.clear, &QToolButton::clicked, this, &FilterWidget2::clearFilter);
connect(ui.close, &QToolButton::clicked, this, &FilterWidget2::closeFilter);
connect(ui.fullText, &QLineEdit::textChanged, this, &FilterWidget2::updateFilter);
connect(ui.fulltextStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FilterWidget2::updateFilter);
connect(ui.presetTable, &QTableView::clicked, this, &FilterWidget2::presetClicked);
connect(ui.presetTable->selectionModel(), &QItemSelectionModel::selectionChanged, this, &FilterWidget2::presetSelected);
connect(&constraintModel, &FilterConstraintModel::rowsInserted, this, &FilterWidget2::constraintAdded);
connect(&constraintModel, &FilterConstraintModel::rowsRemoved, this, &FilterWidget2::constraintRemoved);
@ -65,13 +71,22 @@ void FilterWidget2::updatePresetMenu()
}
ui.loadSetButton->setEnabled(true);
for (int i = 0; i < count; ++i) {
QModelIndex idx = model->index(i, 0);
QModelIndex idx = model->index(i, FilterPresetModel::NAME);
QString name = model->data(idx, Qt::DisplayRole).value<QString>();
loadFilterPresetMenu->addAction(name, [this,i]() { loadPreset(i); });
loadFilterPresetMenu->addAction(name, [this,i,model]() { selectPreset(i); });
}
ui.loadSetButton->setMenu(loadFilterPresetMenu.get());
}
void FilterWidget2::selectPreset(int i)
{
QAbstractItemModel *model = FilterPresetModel::instance();
QItemSelectionModel *selectionModel = ui.presetTable->selectionModel();
QModelIndex idx = model->index(i, 0);
selectionModel->reset();
selectionModel->select(idx, QItemSelectionModel::Select | QItemSelectionModel::Rows);
}
void FilterWidget2::loadPreset(int index)
{
FilterData filter = filter_preset_get(index);
@ -103,6 +118,25 @@ void FilterWidget2::constraintRemoved(const QModelIndex &parent, int first, int
updateFilter();
}
void FilterWidget2::presetClicked(const QModelIndex &index)
{
if (!index.isValid())
return;
if (index.column() == FilterPresetModel::REMOVE)
Command::removeFilterPreset(index.row());
}
void FilterWidget2::presetSelected(const QItemSelection &selected, const QItemSelection &)
{
if (selected.indexes().isEmpty())
return clearFilter();
const QModelIndex index = selected.indexes()[0];
if (!index.isValid())
return clearFilter();
loadPreset(index.row());
}
void FilterWidget2::constraintChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
{
// Note: this may appear strange, but we don't update the widget if we get
@ -126,6 +160,7 @@ void FilterWidget2::constraintsReset()
void FilterWidget2::clearFilter()
{
ignoreSignal = true; // Prevent signals to force filter recalculation (TODO: check if necessary)
ui.presetTable->selectionModel()->reset(); // Note: we use reset(), because that doesn't emit signals.
ui.fulltextStringMode->setCurrentIndex((int)StringFilterMode::STARTSWITH);
ui.fullText->clear();
ignoreSignal = false;

4
desktop-widgets/filterwidget2.h
View file

@ -35,6 +35,8 @@ private slots:
void constraintChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
void constraintsReset();
void updatePresetMenu();
void presetClicked(const QModelIndex &index);
void presetSelected(const QItemSelection &selected, const QItemSelection &);
void on_addSetButton_clicked();
private:
@ -47,6 +49,8 @@ private:
FilterData createFilterData() const;
void setFilterData(const FilterData &filterData);
void loadPreset(int index);
void selectPreset(int i);
void clearFilterData();
std::unique_ptr<QMenu> loadFilterPresetMenu;
};

17
desktop-widgets/filterwidget2.ui
View file

@ -19,9 +19,16 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QVBoxLayout" name="gridLayout_2">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QScrollArea" name="scrollArea">
<attribute name="title">
<string>Filter</string>
</attribute>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
@ -215,6 +222,12 @@
</layout>
</widget>
</widget>
<widget class="QTableView" name="presetTable">
<attribute name="title">
<string>Filter sets</string>
</attribute>
</widget>
</widget>
</item>
</layout>
</widget>