mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
filter: connect new filtercode to filterwidget2
Replace the static filterwidget with a list of filterconstraints. The first attempt of using a table widget failed, because Qt's table delegates are dysfunctional. It's not that they are bad, they just don't work at all. Therefore, this code "simulates" a table in that on addition / deletion of constraints it keeps track of the rows of all constraints so that each constraint-widget can be associated with a row of the constraint model. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger
Dirk Hohndel
parent
c0af74ba88
commit
6c443ba841
5 changed files with 240 additions and 1061 deletions
|
|
@ -1,4 +1,5 @@
|
|||
#include "desktop-widgets/filterwidget2.h"
|
||||
#include "desktop-widgets/filterconstraintwidget.h"
|
||||
#include "desktop-widgets/simplewidgets.h"
|
||||
#include "desktop-widgets/mainwindow.h"
|
||||
#include "core/qthelper.h"
|
||||
|
|
@ -9,195 +10,89 @@
|
|||
|
||||
FilterWidget2::FilterWidget2(QWidget* parent) :
|
||||
QWidget(parent),
|
||||
ignoreSignal(false)
|
||||
ignoreSignal(false),
|
||||
validFilter(false)
|
||||
{
|
||||
ui.setupUi(this);
|
||||
|
||||
FilterData data;
|
||||
QMenu *newConstraintMenu = new QMenu(this);
|
||||
QStringList constraintTypes = filter_constraint_type_list_translated();
|
||||
for (int i = 0; i < constraintTypes.size(); ++i) {
|
||||
filter_constraint_type type = filter_constraint_type_from_index(i);
|
||||
newConstraintMenu->addAction(constraintTypes[i], [this, type]() { addConstraint(type); });
|
||||
}
|
||||
ui.addConstraintButton->setMenu(newConstraintMenu);
|
||||
ui.addConstraintButton->setPopupMode(QToolButton::InstantPopup);
|
||||
ui.constraintTable->setColumnStretch(4, 1); // The fifth column is were the actual constraint resides - stretch that.
|
||||
|
||||
// Use default values to set minimum and maximum air and water temperature.
|
||||
ui.minAirTemp->setRange(data.minAirTemp, data.maxAirTemp);
|
||||
ui.maxAirTemp->setRange(data.minAirTemp, data.maxAirTemp);
|
||||
ui.minWaterTemp->setRange(data.minWaterTemp, data.maxWaterTemp);
|
||||
ui.maxWaterTemp->setRange(data.minWaterTemp, data.maxWaterTemp);
|
||||
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);
|
||||
|
||||
// This needs to be the same order as enum dive_comp_type in dive.h!
|
||||
QStringList types;
|
||||
types.append(""); // Empty means don't filter on dive mode
|
||||
for (int i = 0; i < NUM_DIVEMODE; i++)
|
||||
types.append(gettextFromC::tr(divemode_text_ui[i]));
|
||||
ui.diveMode->insertItems(0, types);
|
||||
connect(&constraintModel, &FilterConstraintModel::rowsInserted, this, &FilterWidget2::constraintAdded);
|
||||
connect(&constraintModel, &FilterConstraintModel::rowsRemoved, this, &FilterWidget2::constraintRemoved);
|
||||
connect(&constraintModel, &FilterConstraintModel::dataChanged, this, &FilterWidget2::constraintChanged);
|
||||
connect(&constraintModel, &FilterConstraintModel::modelReset, this, &FilterWidget2::constraintsReset);
|
||||
|
||||
// TODO: unhide this when we discover how to search for equipment.
|
||||
ui.equipment->hide();
|
||||
ui.equipmentMode->hide();
|
||||
ui.equipmentStringMode->hide();
|
||||
ui.labelEquipment->hide();
|
||||
|
||||
ui.fromDate->setDisplayFormat(prefs.date_format);
|
||||
ui.fromTime->setDisplayFormat(prefs.time_format);
|
||||
|
||||
ui.toDate->setDisplayFormat(prefs.date_format);
|
||||
ui.toTime->setDisplayFormat(prefs.time_format);
|
||||
|
||||
// Initialize temperature fields to display correct unit.
|
||||
temperatureChanged();
|
||||
|
||||
connect(ui.clear, &QToolButton::clicked,
|
||||
this, &FilterWidget2::clearFilter);
|
||||
|
||||
connect(ui.close, &QToolButton::clicked,
|
||||
this, &FilterWidget2::closeFilter);
|
||||
|
||||
connect(ui.maxRating, &StarWidget::valueChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.minRating, &StarWidget::valueChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.maxVisibility, &StarWidget::valueChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.minVisibility, &StarWidget::valueChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.maxAirTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.minAirTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.maxWaterTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.minWaterTemp, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.fromDate, &QDateTimeEdit::dateChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.fromTime, &QDateTimeEdit::timeChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.toDate, &QDateTimeEdit::dateChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.toTime, &QDateTimeEdit::timeChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.fullText, &QLineEdit::textChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.fulltextStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.tags, &QLineEdit::textChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.tagsMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.tagsStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.people, &QLineEdit::textChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.peopleMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.peopleStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.location, &QLineEdit::textChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.locationMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.locationStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.suit, &QLineEdit::textChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.suitMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.suitStringMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.dnotes, &QLineEdit::textChanged,
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.dnotesMode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.dnotesStringMode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
connect(ui.logged, &QCheckBox::stateChanged,
|
||||
this, &FilterWidget2::updateLogged);
|
||||
|
||||
connect(ui.planned, &QCheckBox::stateChanged,
|
||||
this, &FilterWidget2::updatePlanned);
|
||||
|
||||
connect(ui.diveMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &FilterWidget2::updateFilter);
|
||||
|
||||
// Update temperature fields if user changes temperature-units in preferences.
|
||||
connect(qPrefUnits::instance(), &qPrefUnits::temperatureChanged,
|
||||
this, &FilterWidget2::temperatureChanged);
|
||||
|
||||
connect(qPrefUnits::instance(), &qPrefUnits::unit_systemChanged,
|
||||
this, &FilterWidget2::temperatureChanged);
|
||||
|
||||
// Reset all fields.
|
||||
clearFilter();
|
||||
}
|
||||
|
||||
FilterWidget2::~FilterWidget2()
|
||||
{
|
||||
}
|
||||
|
||||
void FilterWidget2::constraintAdded(const QModelIndex &parent, int first, int last)
|
||||
{
|
||||
if (parent.isValid() || last < first)
|
||||
return; // We only support one level
|
||||
constraintWidgets.reserve(constraintWidgets.size() + 1 + last - first);
|
||||
for (int i = last + 1; i < (int)constraintWidgets.size(); ++i)
|
||||
constraintWidgets[i]->moveToRow(i);
|
||||
for (int i = first; i <= last; ++i) {
|
||||
QModelIndex idx = constraintModel.index(i, 0);
|
||||
constraintWidgets.emplace(constraintWidgets.begin() + i, new FilterConstraintWidget(&constraintModel, idx, ui.constraintTable));
|
||||
}
|
||||
updateFilter();
|
||||
}
|
||||
|
||||
void FilterWidget2::constraintRemoved(const QModelIndex &parent, int first, int last)
|
||||
{
|
||||
if (parent.isValid() || last < first)
|
||||
return; // We only support one level
|
||||
constraintWidgets.erase(constraintWidgets.begin() + first, constraintWidgets.begin() + last + 1);
|
||||
for (int i = first; i < (int)constraintWidgets.size(); ++i)
|
||||
constraintWidgets[i]->moveToRow(i);
|
||||
updateFilter();
|
||||
}
|
||||
|
||||
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
|
||||
// a constraint-changed signal from the model. The reason being that the user
|
||||
// is currently editing the constraint and we don't want to bother them by
|
||||
// overwriting strings with canonicalized data.
|
||||
updateFilter();
|
||||
}
|
||||
|
||||
void FilterWidget2::constraintsReset()
|
||||
{
|
||||
constraintWidgets.clear();
|
||||
int count = constraintModel.rowCount(QModelIndex());
|
||||
for (int i = 0; i < count; ++i) {
|
||||
QModelIndex idx = constraintModel.index(i, 0);
|
||||
constraintWidgets.emplace_back(new FilterConstraintWidget(&constraintModel, idx, ui.constraintTable));
|
||||
}
|
||||
updateFilter();
|
||||
}
|
||||
|
||||
void FilterWidget2::clearFilter()
|
||||
{
|
||||
ignoreSignal = true; // Prevent signals to force filter recalculation
|
||||
filterData = FilterData();
|
||||
ui.minRating->setCurrentStars(filterData.minRating);
|
||||
ui.maxRating->setCurrentStars(filterData.maxRating);
|
||||
ui.minVisibility->setCurrentStars(filterData.minVisibility);
|
||||
ui.maxVisibility->setCurrentStars(filterData.maxVisibility);
|
||||
ui.minAirTemp->setValue(filterData.minAirTemp);
|
||||
ui.maxAirTemp->setValue(filterData.maxAirTemp);
|
||||
ui.minWaterTemp->setValue(filterData.minWaterTemp);
|
||||
ui.maxWaterTemp->setValue(filterData.maxWaterTemp);
|
||||
ui.planned->setChecked(filterData.logged);
|
||||
ui.planned->setChecked(filterData.planned);
|
||||
ui.people->clear();
|
||||
ui.location->clear();
|
||||
ui.suit->clear();
|
||||
ui.dnotes->clear();
|
||||
ui.equipment->clear();
|
||||
ui.tags->clear();
|
||||
ui.fromDate->setDate(filterData.fromDate.date());
|
||||
ui.fromTime->setTime(filterData.fromTime);
|
||||
ui.toDate->setDate(filterData.toDate.date());
|
||||
ui.toTime->setTime(filterData.toTime);
|
||||
ui.tagsMode->setCurrentIndex((int)filterData.tagsMode);
|
||||
ui.peopleMode->setCurrentIndex((int)filterData.peopleMode);
|
||||
ui.locationMode->setCurrentIndex((int)filterData.locationMode);
|
||||
ui.suitMode->setCurrentIndex((int)filterData.suitMode);
|
||||
ui.dnotesMode->setCurrentIndex((int)filterData.dnotesMode);
|
||||
ui.equipmentMode->setCurrentIndex((int)filterData.equipmentMode);
|
||||
ui.fulltextStringMode->setCurrentIndex((int)filterData.fulltextStringMode);
|
||||
ui.tagsStringMode->setCurrentIndex((int)filterData.tagsStringMode);
|
||||
ui.peopleStringMode->setCurrentIndex((int)filterData.peopleStringMode);
|
||||
ui.locationStringMode->setCurrentIndex((int)filterData.locationStringMode);
|
||||
ui.suitStringMode->setCurrentIndex((int)filterData.suitStringMode);
|
||||
ui.dnotesStringMode->setCurrentIndex((int)filterData.dnotesStringMode);
|
||||
ui.equipmentStringMode->setCurrentIndex((int)filterData.equipmentStringMode);
|
||||
ui.diveMode->setCurrentIndex(filterData.diveMode + 1); // -1 means don't filter, transform that into index 0
|
||||
|
||||
ignoreSignal = true; // Prevent signals to force filter recalculation (TODO: check if necessary)
|
||||
ui.fulltextStringMode->setCurrentIndex((int)StringFilterMode::STARTSWITH);
|
||||
ui.fullText->clear();
|
||||
ignoreSignal = false;
|
||||
|
||||
filterDataChanged(filterData);
|
||||
constraintModel.reload({}); // Causes a filter reload
|
||||
}
|
||||
|
||||
void FilterWidget2::closeFilter()
|
||||
|
|
@ -205,79 +100,24 @@ void FilterWidget2::closeFilter()
|
|||
MainWindow::instance()->setApplicationState(ApplicationState::Default);
|
||||
}
|
||||
|
||||
void FilterWidget2::temperatureChanged()
|
||||
{
|
||||
QString temp = get_temp_unit();
|
||||
ui.minAirTemp->setSuffix(temp);
|
||||
ui.maxAirTemp->setSuffix(temp);
|
||||
ui.minWaterTemp->setSuffix(temp);
|
||||
ui.maxWaterTemp->setSuffix(temp);
|
||||
}
|
||||
|
||||
void FilterWidget2::updateFilter()
|
||||
{
|
||||
if (ignoreSignal)
|
||||
return;
|
||||
|
||||
filterData.validFilter = true;
|
||||
filterData.minVisibility = ui.minVisibility->currentStars();
|
||||
filterData.maxVisibility = ui.maxVisibility->currentStars();
|
||||
filterData.minRating = ui.minRating->currentStars();
|
||||
filterData.maxRating = ui.maxRating->currentStars();
|
||||
filterData.minWaterTemp = ui.minWaterTemp->value();
|
||||
filterData.maxWaterTemp = ui.maxWaterTemp->value();
|
||||
filterData.minAirTemp = ui.minAirTemp->value();
|
||||
filterData.maxWaterTemp = ui.maxWaterTemp->value();
|
||||
filterData.fromDate = ui.fromDate->dateTime();
|
||||
filterData.fromTime = ui.fromTime->time();
|
||||
filterData.toDate = ui.toDate->dateTime();
|
||||
filterData.toTime = ui.toTime->time();
|
||||
filterData.fullText = ui.fullText->text();
|
||||
filterData.tags = ui.tags->text().split(",", QString::SkipEmptyParts);
|
||||
filterData.people = ui.people->text().split(",", QString::SkipEmptyParts);
|
||||
filterData.location = ui.location->text().split(",", QString::SkipEmptyParts);
|
||||
filterData.suit = ui.suit->text().split(",", QString::SkipEmptyParts);
|
||||
filterData.dnotes = ui.dnotes->text().split(",", QString::SkipEmptyParts);
|
||||
filterData.equipment = ui.equipment->text().split(",", QString::SkipEmptyParts);
|
||||
filterData.tagsMode = (FilterData::Mode)ui.tagsMode->currentIndex();
|
||||
filterData.peopleMode = (FilterData::Mode)ui.peopleMode->currentIndex();
|
||||
filterData.locationMode = (FilterData::Mode)ui.locationMode->currentIndex();
|
||||
filterData.suitMode = (FilterData::Mode)ui.suitMode->currentIndex();
|
||||
filterData.dnotesMode = (FilterData::Mode)ui.dnotesMode->currentIndex();
|
||||
filterData.equipmentMode = (FilterData::Mode)ui.equipmentMode->currentIndex();
|
||||
FilterData filterData;
|
||||
filterData.fulltextStringMode = (StringFilterMode)ui.fulltextStringMode->currentIndex();
|
||||
filterData.tagsStringMode = (StringFilterMode)ui.tagsStringMode->currentIndex();
|
||||
filterData.peopleStringMode = (StringFilterMode)ui.peopleStringMode->currentIndex();
|
||||
filterData.locationStringMode = (StringFilterMode)ui.locationStringMode->currentIndex();
|
||||
filterData.suitStringMode = (StringFilterMode)ui.suitStringMode->currentIndex();
|
||||
filterData.dnotesStringMode = (StringFilterMode)ui.dnotesStringMode->currentIndex();
|
||||
filterData.equipmentStringMode = (StringFilterMode)ui.equipmentStringMode->currentIndex();
|
||||
filterData.logged = ui.logged->isChecked();
|
||||
filterData.planned = ui.planned->isChecked();
|
||||
filterData.diveMode = ui.diveMode->currentIndex() - 1; // The first entry means don't filter, transform that to -1.
|
||||
|
||||
filterDataChanged(filterData);
|
||||
}
|
||||
|
||||
void FilterWidget2::updateLogged(int value)
|
||||
{
|
||||
if (value == Qt::Unchecked)
|
||||
ui.planned->setChecked(true);
|
||||
updateFilter();
|
||||
}
|
||||
|
||||
void FilterWidget2::updatePlanned(int value)
|
||||
{
|
||||
if (value == Qt::Unchecked)
|
||||
ui.logged->setChecked(true);
|
||||
updateFilter();
|
||||
filterData.fullText = ui.fullText->text();
|
||||
filterData.constraints = constraintModel.getConstraints();
|
||||
validFilter = filterData.validFilter();
|
||||
DiveFilter::instance()->setFilter(filterData);
|
||||
}
|
||||
|
||||
void FilterWidget2::showEvent(QShowEvent *event)
|
||||
{
|
||||
QWidget::showEvent(event);
|
||||
ui.fullText->setFocus();
|
||||
filterDataChanged(filterData);
|
||||
updateFilter();
|
||||
}
|
||||
|
||||
void FilterWidget2::hideEvent(QHideEvent *event)
|
||||
|
|
@ -285,20 +125,15 @@ void FilterWidget2::hideEvent(QHideEvent *event)
|
|||
QWidget::hideEvent(event);
|
||||
}
|
||||
|
||||
void FilterWidget2::filterDataChanged(const FilterData &data)
|
||||
void FilterWidget2::addConstraint(filter_constraint_type type)
|
||||
{
|
||||
DiveFilter::instance()->setFilter(data);
|
||||
constraintModel.addConstraint(type);
|
||||
}
|
||||
|
||||
QString FilterWidget2::shownText()
|
||||
{
|
||||
if (isActive())
|
||||
if (validFilter)
|
||||
return tr("%L1/%L2 shown").arg(shown_dives).arg(dive_table.nr);
|
||||
else
|
||||
return tr("%L1 dives").arg(dive_table.nr);
|
||||
}
|
||||
|
||||
bool FilterWidget2::isActive() const
|
||||
{
|
||||
return filterData.validFilter;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue