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 widget: make Ui class subobject of widget

Browse source 
Commit 8e81d3f100 changed a bunch
of Ui classes to be subobject of the widget. For consistency do
the same with the filter widget.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-01-17 23:01:57 +01:00 • committed by Dirk Hohndel
parent ed09e6a909
commit 424f1e98af
2 changed files with 51 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
desktop-widgets/filterwidget2.cpp
View file

@ -3,113 +3,109 @@
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
FilterWidget2::FilterWidget2(QWidget* parent) FilterWidget2::FilterWidget2(QWidget* parent) : QWidget(parent)
: QWidget(parent)
, ui(new Ui::FilterWidget2())
{ {
ui->setupUi(this); ui.setupUi(this);
FilterData data; FilterData data;
ui->minRating->setCurrentStars(data.minRating); ui.minRating->setCurrentStars(data.minRating);
ui->maxRating->setCurrentStars(data.maxRating); ui.maxRating->setCurrentStars(data.maxRating);
ui->minVisibility->setCurrentStars(data.minVisibility); ui.minVisibility->setCurrentStars(data.minVisibility);
ui->maxVisibility->setCurrentStars(data.maxVisibility); ui.maxVisibility->setCurrentStars(data.maxVisibility);
ui->minAirTemp->setValue(data.minAirTemp); ui.minAirTemp->setValue(data.minAirTemp);
ui->maxAirTemp->setValue(data.maxAirTemp); ui.maxAirTemp->setValue(data.maxAirTemp);
ui->minWaterTemp->setValue(data.minWaterTemp); ui.minWaterTemp->setValue(data.minWaterTemp);
ui->maxWaterTemp->setValue(data.maxWaterTemp); ui.maxWaterTemp->setValue(data.maxWaterTemp);
ui->planned->setChecked(data.logged); ui.planned->setChecked(data.logged);
ui->planned->setChecked(data.planned); ui.planned->setChecked(data.planned);
// TODO: unhide this when we discover how to search for equipment. // TODO: unhide this when we discover how to search for equipment.
ui->equipment->hide(); ui.equipment->hide();
ui->labelEquipment->hide(); ui.labelEquipment->hide();
ui->invertFilter->hide(); ui.invertFilter->hide();
ui->to->setDate(data.to.date()); ui.to->setDate(data.to.date());
connect(ui->maxRating, &StarWidget::valueChanged, connect(ui.maxRating, &StarWidget::valueChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->minRating, &StarWidget::valueChanged, connect(ui.minRating, &StarWidget::valueChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->maxVisibility, &StarWidget::valueChanged, connect(ui.maxVisibility, &StarWidget::valueChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->minVisibility, &StarWidget::valueChanged, connect(ui.minVisibility, &StarWidget::valueChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->maxAirTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), connect(ui.maxAirTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->minAirTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), connect(ui.minAirTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->maxWaterTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), connect(ui.maxWaterTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->minWaterTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), connect(ui.minWaterTemp, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->from, &QDateTimeEdit::dateTimeChanged, connect(ui.from, &QDateTimeEdit::dateTimeChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->to, &QDateTimeEdit::dateTimeChanged, connect(ui.to, &QDateTimeEdit::dateTimeChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->tags, &QLineEdit::textChanged, connect(ui.tags, &QLineEdit::textChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->people, &QLineEdit::textChanged, connect(ui.people, &QLineEdit::textChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->location, &QLineEdit::textChanged, connect(ui.location, &QLineEdit::textChanged,
this, &FilterWidget2::updateFilter); this, &FilterWidget2::updateFilter);
connect(ui->logged, SIGNAL(stateChanged(int)), this, SLOT(updateLogged(int))); connect(ui.logged, SIGNAL(stateChanged(int)), this, SLOT(updateLogged(int)));
connect(ui->planned, SIGNAL(stateChanged(int)), this, SLOT(updatePlanned(int)));
connect(ui.planned, SIGNAL(stateChanged(int)), this, SLOT(updatePlanned(int)));
} }
void FilterWidget2::updateFilter() void FilterWidget2::updateFilter()
{ {
filterData.validFilter = true; filterData.validFilter = true;
filterData.minVisibility = ui->minVisibility->currentStars(); filterData.minVisibility = ui.minVisibility->currentStars();
filterData.maxVisibility = ui->maxVisibility->currentStars(); filterData.maxVisibility = ui.maxVisibility->currentStars();
filterData.minRating = ui->minRating->currentStars(); filterData.minRating = ui.minRating->currentStars();
filterData.maxRating = ui->maxRating->currentStars(); filterData.maxRating = ui.maxRating->currentStars();
filterData.minWaterTemp = ui->minWaterTemp->value(); filterData.minWaterTemp = ui.minWaterTemp->value();
filterData.maxWaterTemp = ui->maxWaterTemp->value(); filterData.maxWaterTemp = ui.maxWaterTemp->value();
filterData.minAirTemp = ui->minAirTemp->value(); filterData.minAirTemp = ui.minAirTemp->value();
filterData.maxWaterTemp = ui->maxWaterTemp->value(); filterData.maxWaterTemp = ui.maxWaterTemp->value();
filterData.from = ui->from->dateTime(); filterData.from = ui.from->dateTime();
filterData.to = ui->to->dateTime(); filterData.to = ui.to->dateTime();
filterData.tags = ui->tags->text().split(",", QString::SkipEmptyParts); filterData.tags = ui.tags->text().split(",", QString::SkipEmptyParts);
filterData.people = ui->people->text().split(",", QString::SkipEmptyParts); filterData.people = ui.people->text().split(",", QString::SkipEmptyParts);
filterData.location = ui->location->text().split(",", QString::SkipEmptyParts); filterData.location = ui.location->text().split(",", QString::SkipEmptyParts);
filterData.equipment = ui->equipment->text().split(",", QString::SkipEmptyParts); filterData.equipment = ui.equipment->text().split(",", QString::SkipEmptyParts);
filterData.invertFilter = ui->invertFilter->isChecked(); filterData.invertFilter = ui.invertFilter->isChecked();
filterData.logged = ui->logged->isChecked(); filterData.logged = ui.logged->isChecked();
filterData.planned = ui->planned->isChecked(); filterData.planned = ui.planned->isChecked();
filterDataChanged(filterData); filterDataChanged(filterData);
} }
void FilterWidget2::updateLogged(int value) { void FilterWidget2::updateLogged(int value) {
if (value == Qt::Unchecked) if (value == Qt::Unchecked)
ui->planned->setChecked(true); ui.planned->setChecked(true);
updateFilter(); updateFilter();
} }
void FilterWidget2::updatePlanned(int value) { void FilterWidget2::updatePlanned(int value) {
if (value == Qt::Unchecked) if (value == Qt::Unchecked)
ui->logged->setChecked(true); ui.logged->setChecked(true);
updateFilter(); updateFilter();
} }
void FilterWidget2::showEvent(QShowEvent *event) void FilterWidget2::showEvent(QShowEvent *event)
{ {
QWidget::showEvent(event); QWidget::showEvent(event);

2
desktop-widgets/filterwidget2.h
View file

@ -29,7 +29,7 @@ public slots:
void updateLogged(int value); void updateLogged(int value);
private: private:
std::unique_ptr<Ui::FilterWidget2> ui; Ui::FilterWidget2 ui;
void filterDataChanged(const FilterData &data); void filterDataChanged(const FilterData &data);
FilterData filterData; FilterData filterData;
}; };