From a67e8630caf20e7f48151024e9e68dd9271d75c7 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 1 Jul 2022 18:07:03 +0200 Subject: options/value: add `QObject::connect` wrapper This is useful not just to save on complexity in call sites, but also because I plan on using the Verdigris library to remove needless `valueChanged()` and `setValue()` overloads from each `value` instance. Also fix a bug in `options/tie.hpp` where `QComboBox::setCurrentIndex` was erroneously called as `Qt::DirectConnection`. --- tracker-trackhat/dialog.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'tracker-trackhat/dialog.cpp') diff --git a/tracker-trackhat/dialog.cpp b/tracker-trackhat/dialog.cpp index 4ef64f50..e18c89cf 100644 --- a/tracker-trackhat/dialog.cpp +++ b/tracker-trackhat/dialog.cpp @@ -37,8 +37,7 @@ trackhat_dialog::trackhat_dialog() tie_setting(t.exposure, ui.exposure_slider); ui.exposure_label->setValue((int)*t.exposure); - connect(&t.exposure, value_::value_changed(), ui.exposure_label, - [this] { ui.exposure_label->setValue((int)*t.exposure); }, Qt::QueuedConnection); + t.exposure.connect_to(ui.exposure_label, [this] { ui.exposure_label->setValue((int)*t.exposure); }); // gain @@ -48,8 +47,7 @@ trackhat_dialog::trackhat_dialog() tie_setting(t.gain, ui.gain_slider); ui.gain_label->setValue((int)*t.gain); - connect(&t.gain, value_::value_changed(), ui.gain_label, - [this] { ui.gain_label->setValue((int)*t.gain); }, Qt::QueuedConnection); + t.gain.connect_to(ui.gain_label, [this] { ui.gain_label->setValue((int)*t.gain); }); #if 0 // threshold @@ -66,21 +64,24 @@ trackhat_dialog::trackhat_dialog() // point filter ui.point_filter_limit_label->setValue(*t.point_filter_limit); - connect(&t.point_filter_limit, value_::value_changed(), ui.point_filter_limit_label, - [this] { ui.point_filter_limit_label->setValue(*t.point_filter_limit); }, Qt::QueuedConnection); + t.point_filter_limit.connect_to(ui.point_filter_limit_label, [this] { + ui.point_filter_limit_label->setValue(*t.point_filter_limit); + }); tie_setting(t.enable_point_filter, ui.enable_point_filter); tie_setting(t.point_filter_coefficient, ui.point_filter_slider); ui.point_filter_label->setValue(*t.point_filter_coefficient); - connect(&t.point_filter_coefficient, value_::value_changed(), ui.point_filter_label, - [this] { ui.point_filter_label->setValue(*t.point_filter_coefficient); }, Qt::QueuedConnection); + t.point_filter_coefficient.connect_to(ui.point_filter_label, [this] { + ui.point_filter_label->setValue(*t.point_filter_coefficient); + }); tie_setting(t.point_filter_deadzone, ui.point_filter_deadzone); ui.point_filter_deadzone_label->setValue(*t.point_filter_deadzone); - connect(&t.point_filter_deadzone, value_::value_changed(), ui.point_filter_deadzone_label, - [this] { ui.point_filter_deadzone_label->setValue(*t.point_filter_deadzone); }, Qt::QueuedConnection); + t.point_filter_deadzone.connect_to(ui.point_filter_deadzone_label, [this] { + ui.point_filter_deadzone_label->setValue(*t.point_filter_deadzone); + }); // led -- cgit v1.2.3