mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
36fa27050c
In FilterWidget2::updateFilter() a new FilterData object is generated and then copied onto the filterData member variable. Instead, modify filterData directly. This seems also more logical from a semantic point of view: Do we want to reset fields that were not set by the user? Contains trivial whitespace fix. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
129 lines
4.1 KiB
C++
129 lines
4.1 KiB
C++
#include "desktop-widgets/filterwidget2.h"
|
|
#include "desktop-widgets/simplewidgets.h"
|
|
|
|
#include <QDoubleSpinBox>
|
|
|
|
FilterWidget2::FilterWidget2(QWidget* parent)
|
|
: QWidget(parent)
|
|
, ui(new Ui::FilterWidget2())
|
|
{
|
|
ui->setupUi(this);
|
|
|
|
FilterData data;
|
|
ui->minRating->setCurrentStars(data.minRating);
|
|
ui->maxRating->setCurrentStars(data.maxRating);
|
|
ui->minVisibility->setCurrentStars(data.minVisibility);
|
|
ui->maxVisibility->setCurrentStars(data.maxVisibility);
|
|
ui->minAirTemp->setValue(data.minAirTemp);
|
|
ui->maxAirTemp->setValue(data.maxAirTemp);
|
|
ui->minWaterTemp->setValue(data.minWaterTemp);
|
|
ui->maxWaterTemp->setValue(data.maxWaterTemp);
|
|
ui->planned->setChecked(data.logged);
|
|
ui->planned->setChecked(data.planned);
|
|
|
|
// TODO: unhide this when we discover how to search for equipment.
|
|
ui->equipment->hide();
|
|
ui->labelEquipment->hide();
|
|
ui->invertFilter->hide();
|
|
|
|
ui->to->setDate(data.to.date());
|
|
|
|
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, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->minAirTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->maxWaterTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->minWaterTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->from, &QDateTimeEdit::dateTimeChanged,
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->to, &QDateTimeEdit::dateTimeChanged,
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->tags, &QLineEdit::textChanged,
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->people, &QLineEdit::textChanged,
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->location, &QLineEdit::textChanged,
|
|
this, &FilterWidget2::updateFilter);
|
|
|
|
connect(ui->logged, SIGNAL(stateChanged(int)), this, SLOT(updateLogged(int)));
|
|
|
|
connect(ui->planned, SIGNAL(stateChanged(int)), this, SLOT(updatePlanned(int)));
|
|
|
|
}
|
|
|
|
void FilterWidget2::updateFilter()
|
|
{
|
|
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.from = ui->from->dateTime();
|
|
filterData.to = ui->to->dateTime();
|
|
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.equipment = ui->equipment->text().split(",", QString::SkipEmptyParts);
|
|
filterData.invertFilter = ui->invertFilter->isChecked();
|
|
filterData.logged = ui->logged->isChecked();
|
|
filterData.planned = ui->planned->isChecked();
|
|
|
|
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();
|
|
}
|
|
|
|
|
|
void FilterWidget2::showEvent(QShowEvent *event)
|
|
{
|
|
QWidget::showEvent(event);
|
|
filterDataChanged(filterData);
|
|
}
|
|
|
|
void FilterWidget2::hideEvent(QHideEvent *event)
|
|
{
|
|
QWidget::hideEvent(event);
|
|
FilterData data;
|
|
filterDataChanged(data);
|
|
}
|
|
|
|
void FilterWidget2::filterDataChanged(const FilterData &data)
|
|
{
|
|
MultiFilterSortModel::instance()->filterDataChanged(data);
|
|
}
|