From 61884594ceff59279abe5530c8c1af1870dc8fbb Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 6 Oct 2022 18:34:03 +0200 Subject: Revert "options/value: add `QObject::connect` wrapper" This reverts commit a67e8630caf20e7f48151024e9e68dd9271d75c7. --- filter-kalman/kalman.cpp | 4 +- gui/mapping-dialog.cpp | 8 ++-- gui/options-dialog.cpp | 9 +++- opentrack/main-window.cpp | 17 +++++-- options/base-value.hpp | 13 +++-- options/tie.cpp | 66 +++++++++++++++----------- options/tie.hpp | 32 ++++++++----- options/value-traits.hpp | 11 ----- options/value.hpp | 21 +------- spline/spline.cpp | 9 ++-- tracker-aruco/ftnoir_tracker_aruco.cpp | 2 +- tracker-easy/tracker-easy.cpp | 20 ++++---- tracker-neuralnet/ftnoir_tracker_neuralnet.cpp | 2 +- tracker-pt/ftnoir_tracker_pt_dialog.cpp | 16 +++---- tracker-trackhat/camera.cpp | 4 +- tracker-trackhat/dialog.cpp | 21 ++++---- video-ps3eye/module.cpp | 5 +- 17 files changed, 136 insertions(+), 124 deletions(-) diff --git a/filter-kalman/kalman.cpp b/filter-kalman/kalman.cpp index a7d7aad8..1960e0f6 100644 --- a/filter-kalman/kalman.cpp +++ b/filter-kalman/kalman.cpp @@ -265,8 +265,8 @@ dialog_kalman::dialog_kalman() tie_setting(s.noise_rot_slider_value, ui.noiseRotSlider); tie_setting(s.noise_pos_slider_value, ui.noisePosSlider); - s.noise_rot_slider_value.connect_to(this, &dialog_kalman::updateLabels); - s.noise_pos_slider_value.connect_to(this, &dialog_kalman::updateLabels); + connect(&s.noise_rot_slider_value, SIGNAL(valueChanged(const slider_value&)), this, SLOT(updateLabels(const slider_value&))); + connect(&s.noise_pos_slider_value, SIGNAL(valueChanged(const slider_value&)), this, SLOT(updateLabels(const slider_value&))); updateLabels(slider_value()); } diff --git a/gui/mapping-dialog.cpp b/gui/mapping-dialog.cpp index bdf33a77..cdbf532e 100644 --- a/gui/mapping-dialog.cpp +++ b/gui/mapping-dialog.cpp @@ -117,7 +117,9 @@ void mapping_dialog::load() if (altp) { - axis.opts.altp.connect_to(this, [&](bool f) { qfc.setEnabled(f); }); + connect(&axis.opts.altp, + value_::value_changed(), + this, [&](bool f) { qfc.setEnabled(f); }); qfc.setEnabled(axis.opts.altp); } @@ -162,8 +164,8 @@ void mapping_dialog::load() qfc.set_snap(.5, 1); - axis.opts.clamp_x_.connect_to(&qfc, update_xstep); - axis.opts.clamp_y_.connect_to(&qfc, update_ystep); + connect(&axis.opts.clamp_x_, value_::value_changed(), &qfc, update_xstep); + connect(&axis.opts.clamp_y_, value_::value_changed(), &qfc, update_ystep); // force signal to avoid duplicating the slot's logic qfc.set_config(&conf); diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp index ab36d73b..ac4117bc 100644 --- a/gui/options-dialog.cpp +++ b/gui/options-dialog.cpp @@ -167,8 +167,13 @@ options_dialog::options_dialog(std::unique_ptr& tracker_dialog_, { tmp val = val_; val.label->setText(kopts_to_string(val.opt)); - val.opt.keycode.connect_to(val.label, [=] { val.label->setText(kopts_to_string(val.opt)); }, Qt::DirectConnection); - connect(val.button, &QPushButton::clicked, this, [=] { bind_key(val.opt, val.label); }); + connect(&val.opt.keycode, + static_cast(&value_::valueChanged), + val.label, + [=](const QString&) { val.label->setText(kopts_to_string(val.opt)); }); + { + connect(val.button, &QPushButton::clicked, this, [=] { bind_key(val.opt, val.label); }); + } } auto add_module_tab = [this] (auto& place, auto&& dlg, const QString& label) { diff --git a/opentrack/main-window.cpp b/opentrack/main-window.cpp index c021eaec..deccbc5a 100644 --- a/opentrack/main-window.cpp +++ b/opentrack/main-window.cpp @@ -112,9 +112,17 @@ void main_window::init_dylibs() this, [this](const QString&) { pFilterDialog = nullptr; if (options_widget) options_widget->filter_module_changed(); }); #endif - m.tracker_dll.connect_to(this, &main_window::save_modules, Qt::DirectConnection); - m.protocol_dll.connect_to(this, &main_window::save_modules, Qt::DirectConnection); - m.filter_dll.connect_to(this, &main_window::save_modules, Qt::DirectConnection); + connect(&m.tracker_dll, value_::value_changed(), + this, &main_window::save_modules, + Qt::DirectConnection); + + connect(&m.protocol_dll, value_::value_changed(), + this, &main_window::save_modules, + Qt::DirectConnection); + + connect(&m.filter_dll, value_::value_changed(), + this, &main_window::save_modules, + Qt::DirectConnection); { struct list { @@ -231,7 +239,8 @@ void main_window::init_tray_menu() QObject::connect(&menu_action_exit, &QAction::triggered, this, &main_window::exit); tray_menu.addAction(&menu_action_exit); - s.tray_enabled.connect_to(this, &main_window::ensure_tray, Qt::DirectConnection); + connect(&s.tray_enabled, value_::value_changed(), + this, &main_window::ensure_tray); } void main_window::init_buttons() diff --git a/options/base-value.hpp b/options/base-value.hpp index 7b65d524..5317191b 100644 --- a/options/base-value.hpp +++ b/options/base-value.hpp @@ -9,7 +9,6 @@ #include "value-traits.hpp" #include -#include #include #include @@ -26,15 +25,21 @@ class OTR_OPTIONS_EXPORT value_ : public QObject { Q_OBJECT -protected: - template using signal_sig_ = void(value_::*)(detail::cv_qualified>) const; - template using slot_sig_ = void(value_::*)(detail::cv_qualified>); + template using cv_qualified = detail::cv_qualified; + template + using signal_sig = void(value_::*)(cv_qualified) const; public: QString name() const { return self_name; } value_(bundle const& b, const QString& name) noexcept; ~value_() override; + template + static constexpr auto value_changed() + { + return static_cast>(&value_::valueChanged); + } + static const bool TRACE_NOTIFY; signals: diff --git a/options/tie.cpp b/options/tie.cpp index db39251b..c2976217 100644 --- a/options/tie.cpp +++ b/options/tie.cpp @@ -8,6 +8,7 @@ #include "tie.hpp" #include "compat/run-in-thread.hpp" +#include "compat/macros.h" #include "value-traits.hpp" @@ -19,16 +20,16 @@ void tie_setting(value& v, QComboBox* cb) { cb->setCurrentIndex(v); v = cb->currentIndex(); - v.connect_to(cb, &QComboBox::setCurrentIndex); - v.connect_from(cb, static_cast(&QComboBox::currentIndexChanged)); + value_::connect(cb, SIGNAL(currentIndexChanged(int)), &v, SLOT(setValue(int)), v.DIRECT_CONNTYPE); + value_::connect(&v, SIGNAL(valueChanged(int)), cb, SLOT(setCurrentIndex(int)), v.SAFE_CONNTYPE); } void tie_setting(value& v, QComboBox* cb) { cb->setCurrentText(v); v = cb->currentText(); - v.connect_to(cb, &QComboBox::currentTextChanged); - v.connect_from(cb, &QComboBox::setCurrentText); + value_::connect(cb, SIGNAL(currentTextChanged(QString)), &v, SLOT(setValue(const QString&)), v.DIRECT_CONNTYPE); + value_::connect(&v, SIGNAL(valueChanged(const QString&)), cb, SLOT(setCurrentText(const QString&)), v.SAFE_CONNTYPE); } void tie_setting(value& v, QComboBox* cb) @@ -53,57 +54,60 @@ void tie_setting(value& v, QComboBox* cb) else v = {}; - v.connect_from(cb, static_cast(&QComboBox::currentIndexChanged), - [cb, &v](int idx) { v = cb->itemData(idx); }); - v.connect_to(cb, [fn = std::move(set_idx)](const QVariant& var) { fn(var); }); + value_::connect(cb, static_cast(&QComboBox::currentIndexChanged), + &v, [cb, &v](int idx) { v = cb->itemData(idx); }, + v.DIRECT_CONNTYPE); + value_::connect(&v, value_::value_changed(), + cb, [set_idx](const QVariant& var) { set_idx(var); }, + v.SAFE_CONNTYPE); } void tie_setting(value& v, QRadioButton* cb) { cb->setChecked(v); - v.connect_to(cb, &QRadioButton::setChecked); - v.connect_from(cb, &QRadioButton::toggled); + value_::connect(cb, SIGNAL(toggled(bool)), &v, SLOT(setValue(bool)), v.DIRECT_CONNTYPE); + value_::connect(&v, SIGNAL(valueChanged(bool)), cb, SLOT(setChecked(bool)), v.SAFE_CONNTYPE); } void tie_setting(value& v, QCheckBox* cb) { cb->setChecked(v); - v.connect_to(cb, &QCheckBox::setChecked); - v.connect_from(cb, &QCheckBox::toggled); + value_::connect(cb, SIGNAL(toggled(bool)), &v, SLOT(setValue(bool)), v.DIRECT_CONNTYPE); + value_::connect(&v, SIGNAL(valueChanged(bool)), cb, SLOT(setChecked(bool)), v.SAFE_CONNTYPE); } void tie_setting(value& v, QDoubleSpinBox* dsb) { dsb->setValue(v); - v.connect_to(dsb, &QDoubleSpinBox::setValue); - v.connect_from(dsb, static_cast(&QDoubleSpinBox::valueChanged)); + value_::connect(dsb, SIGNAL(valueChanged(double)), &v, SLOT(setValue(double)), v.DIRECT_CONNTYPE); + value_::connect(&v, SIGNAL(valueChanged(double)), dsb, SLOT(setValue(double)), v.SAFE_CONNTYPE); } void tie_setting(value& v, QSpinBox* sb) { sb->setValue(v); - v.connect_to(sb, &QSpinBox::setValue); - v.connect_from(sb, static_cast(&QSpinBox::valueChanged)); + value_::connect(sb, SIGNAL(valueChanged(int)), &v, SLOT(setValue(int)), v.DIRECT_CONNTYPE); + value_::connect(&v, SIGNAL(valueChanged(int)), sb, SLOT(setValue(int)), v.SAFE_CONNTYPE); } void tie_setting(value& v, QLineEdit* le) { le->setText(v); - v.connect_to(le, &QLineEdit::setText); - v.connect_from(le, &QLineEdit::textChanged); + value_::connect(le, SIGNAL(textChanged(QString)), &v, SLOT(setValue(QString)), v.DIRECT_CONNTYPE); + value_::connect(&v, value_::value_changed(), le, &QLineEdit::setText, v.SAFE_CONNTYPE); } void tie_setting(value& v, QLabel* lb) { lb->setText(v); - v.connect_to(lb, &QLabel::setText); + value_::connect(&v, value_::value_changed(), lb, &QLabel::setText, v.SAFE_CONNTYPE); } void tie_setting(value& v, QTabWidget* t) { t->setCurrentIndex(v); - v.connect_to(t, &QTabWidget::setCurrentIndex); - v.connect_from(t, &QTabWidget::currentChanged); + value_::connect(t, SIGNAL(currentChanged(int)), &v, SLOT(setValue(int)), v.DIRECT_CONNTYPE); + value_::connect(&v, SIGNAL(valueChanged(int)), t, SLOT(setCurrentIndex(int)), v.SAFE_CONNTYPE); } void tie_setting(value& v, QSlider* w) @@ -116,24 +120,32 @@ void tie_setting(value& v, QSlider* w) v = v().update_from_slider(w->value(), q_min, q_max); } - v.connect_from(w, &QSlider::valueChanged, [=, &v](int pos) { - run_in_thread_sync(w, [&]() { + value_::connect(w, &QSlider::valueChanged, &v, [=, &v](int pos) + { + run_in_thread_sync(w, [&]() + { const int q_min = w->minimum(); const int q_max = w->maximum(); v = v().update_from_slider(pos, q_min, q_max); w->setValue(v().to_slider_pos(q_min, q_max)); }); - }, v.DIRECT_CONNTYPE); - - v.connect_to(w, [=, &v](double) { - run_in_thread_sync(w, [=, &v]() { + }, + v.DIRECT_CONNTYPE); + + value_::connect(&v, + value_::value_changed(), + w, + [=, &v](double) { + run_in_thread_sync(w, [=, &v]() + { const int q_min = w->minimum(); const int q_max = w->maximum(); const int pos = v->to_slider_pos(q_min, q_max); v = v->update_from_slider(pos, q_min, q_max); w->setValue(pos); }); - }, v.DIRECT_CONNTYPE); + }, + v.DIRECT_CONNTYPE); } } // ns options diff --git a/options/tie.hpp b/options/tie.hpp index 81567139..46ade075 100644 --- a/options/tie.hpp +++ b/options/tie.hpp @@ -37,9 +37,13 @@ std::enable_if_t> tie_setting(value& v, QComboBox* cb) cb->setCurrentIndex(cb->findData(int(static_cast(v)))); v = static_cast(cb->currentData().toInt()); - v.connect_from(cb, static_cast(&QComboBox::currentIndexChanged), - [&v, cb](int idx) { v = static_cast(cb->itemData(idx).toInt()); }); - v.connect_to(cb, [cb](int x) { cb->setCurrentIndex(cb->findData(x)); }); + value_::connect(cb, static_cast(&QComboBox::currentIndexChanged), + &v, [&v, cb](int idx) { v = static_cast(cb->itemData(idx).toInt()); }, + v.DIRECT_CONNTYPE); + + value_::connect(&v, value_::value_changed(), + cb, [cb](int x) { cb->setCurrentIndex(cb->findData(x)); }, + v.SAFE_CONNTYPE); } template @@ -48,20 +52,23 @@ void tie_setting(value& v, QComboBox* cb, From&& fn_to_index, To&& fn_to_valu cb->setCurrentIndex(fn_to_index(v)); v = fn_to_value(cb->currentIndex(), cb->currentData()); - v.connect_from(cb, static_cast(&QComboBox::currentIndexChanged), - [&v, cb, fn = std::forward(fn_to_value)](int idx) { v = fn(idx, cb->currentData()); }); - v.connect_to(cb, [cb, fn = std::forward(fn_to_index)](detail::cv_qualified v) { cb->setCurrentIndex(fn(v)); }); + value_::connect(cb, static_cast(&QComboBox::currentIndexChanged), + &v, [&v, cb, fn_to_value](int idx) { v = fn_to_value(idx, cb->currentData()); }, + v.DIRECT_CONNTYPE); + value_::connect(&v, value_::value_changed(), + cb, [cb, fn_to_index](detail::cv_qualified& v) { cb->setCurrentIndex(fn_to_index(v)); }, + v.DIRECT_CONNTYPE); } template void tie_setting(value& v, QLabel* lb, F&& fun) { - auto closure = [lb, fn = std::forward(fun)](detail::cv_qualified v) { - lb->setText(fn(v)); - }; + auto closure = [lb, fun](detail::cv_qualified v) { lb->setText(fun(v)); }; closure(v()); - v.connect_to(lb, std::move(closure)); + value_::connect(&v, value_::value_changed(), + lb, closure, + v.SAFE_CONNTYPE); } template @@ -71,7 +78,10 @@ void tie_setting(value& v, QObject* obj, F&& fun) abort(); fun(v()); - v.connect_to(obj, std::forward(fun)); + + value_::connect(&v, value_::value_changed(), + obj, fun, + v.DIRECT_CONNTYPE); } OTR_OPTIONS_EXPORT void tie_setting(value& v, QComboBox* cb); diff --git a/options/value-traits.hpp b/options/value-traits.hpp index e676f942..145cd924 100644 --- a/options/value-traits.hpp +++ b/options/value-traits.hpp @@ -15,17 +15,6 @@ using cv_qualified = std::remove_cvref_t, std::add_lvalue_reference_t>>>; -template -struct maybe_enum_type { - using type = t; -}; -template -struct maybe_enum_type>> { - using type = int; -}; - -template using maybe_enum_type_t = typename maybe_enum_type::type; - template struct default_value_traits { diff --git a/options/value.hpp b/options/value.hpp index c752d497..dacd0ea9 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -26,10 +26,10 @@ namespace options::detail { { t x; public: + constexpr t const* operator->() const { return &x; } constexpr t* operator->() { return &x; } constexpr explicit dereference_wrapper(t&& x) : x(x) {} }; - template /*MSVC workaround*/ static constexpr bool is_enum_v = std::is_enum_v; } // ns options::detail namespace options { @@ -85,9 +85,6 @@ class value final : public value_ } public: - using signal_sig = typename value_::signal_sig_; - using slot_sig = typename value_::slot_sig_; - QVariant get_variant() const noexcept override { if (QVariant ret{b->get_variant(self_name)}; ret.isValid() && !ret.isNull()) @@ -197,22 +194,6 @@ public: { return static_cast(get()); } - - template - QMetaObject::Connection - connect_to(Q* qobject, F&& writer, Qt::ConnectionType conn = Qt::QueuedConnection) { - return QObject::connect(this, static_cast(&value::valueChanged), qobject, std::forward(writer), conn); - } - template - QMetaObject::Connection - connect_from(Q* qobject, F&& reader, Qt::ConnectionType conn = Qt::DirectConnection) { - return QObject::connect(qobject, std::forward(reader), this, static_cast(&value::setValue), conn); - } - template - QMetaObject::Connection - connect_from(Q* qobject, F&& reader, G&& fn, Qt::ConnectionType conn = Qt::DirectConnection) { - return QObject::connect(qobject, std::forward(reader), this, std::forward(fn), conn); - } }; #if !defined OTR_OPTIONS_INST_VALUE diff --git a/spline/spline.cpp b/spline/spline.cpp index aae7dd2e..ecbfc3a0 100644 --- a/spline/spline.cpp +++ b/spline/spline.cpp @@ -390,9 +390,12 @@ void spline::set_bundle(bundle b, const QString& axis_name, Axis axis) invalidate_settings_(); S = s; - conn_points = s->points.connect_to(&*ctx, [this] { invalidate_settings(); }, Qt::DirectConnection); - conn_maxx = s->opts.clamp_x_.connect_to(&*ctx, [this] { invalidate_settings(); }, Qt::DirectConnection); - conn_maxy = s->opts.clamp_y_.connect_to(&*ctx, [this] { invalidate_settings(); }, Qt::DirectConnection); + conn_points = QObject::connect(&s->points, value_::value_changed>(), + &*ctx, [this] { invalidate_settings(); }, Qt::DirectConnection); + conn_maxx = QObject::connect(&s->opts.clamp_x_, value_::value_changed(), + &*ctx, [this](double) { invalidate_settings(); }, Qt::DirectConnection); + conn_maxy = QObject::connect(&s->opts.clamp_y_, value_::value_changed(), + &*ctx, [this](double) { invalidate_settings(); }, Qt::DirectConnection); } emit S->recomputed(); diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp index 26c803be..1f39db32 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.cpp +++ b/tracker-aruco/ftnoir_tracker_aruco.cpp @@ -537,7 +537,7 @@ aruco_dialog::aruco_dialog() : connect(&calib_timer, SIGNAL(timeout()), this, SLOT(update_tracker_calibration())); connect(ui.camera_settings, SIGNAL(clicked()), this, SLOT(camera_settings())); - s.camera_name.connect_to(this, &aruco_dialog::update_camera_settings_state); + connect(&s.camera_name, value_::value_changed(), this, &aruco_dialog::update_camera_settings_state); update_camera_settings_state(s.camera_name); } diff --git a/tracker-easy/tracker-easy.cpp b/tracker-easy/tracker-easy.cpp index a4b7ca4c..7046a918 100644 --- a/tracker-easy/tracker-easy.cpp +++ b/tracker-easy/tracker-easy.cpp @@ -59,31 +59,31 @@ namespace EasyTracker connect(&*iSettings.b, &bundle_::saving, this, &Tracker::CheckCamera, Qt::DirectConnection); connect(&*iSettings.b, &bundle_::reloading, this, &Tracker::CheckCamera, Qt::DirectConnection); - iSettings.fov.connect_to(this, &Tracker::set_fov, Qt::DirectConnection); + connect(&iSettings.fov, value_::value_changed(), this, &Tracker::set_fov, Qt::DirectConnection); set_fov(iSettings.fov); // We could not get this working, nevermind //connect(&iSettings.cam_fps, value_::value_changed(), this, &Tracker::SetFps, Qt::DirectConnection); // Make sure deadzones are updated whenever the settings are changed - iSettings.DeadzoneRectHalfEdgeSize.connect_to(this, &Tracker::UpdateSettings, Qt::DirectConnection); + connect(&iSettings.DeadzoneRectHalfEdgeSize, value_::value_changed(), this, &Tracker::UpdateSettings, Qt::DirectConnection); // Update point extractor whenever some of the settings it needs are changed - iSettings.iMinBlobSize.connect_to(this, &Tracker::UpdateSettings, Qt::DirectConnection); - iSettings.iMaxBlobSize.connect_to(this, &Tracker::UpdateSettings, Qt::DirectConnection); + connect(&iSettings.iMinBlobSize, value_::value_changed(), this, &Tracker::UpdateSettings, Qt::DirectConnection); + connect(&iSettings.iMaxBlobSize, value_::value_changed(), this, &Tracker::UpdateSettings, Qt::DirectConnection); // Make sure solver is updated whenever the settings are changed - iSettings.PnpSolver.connect_to(this, &Tracker::UpdateSettings, Qt::DirectConnection); + connect(&iSettings.PnpSolver, value_::value_changed(), this, &Tracker::UpdateSettings, Qt::DirectConnection); // Debug - iSettings.debug.connect_to(this, &Tracker::UpdateSettings, Qt::DirectConnection); + connect(&iSettings.debug, value_::value_changed(), this, &Tracker::UpdateSettings, Qt::DirectConnection); // Make sure model is updated whenever it is changed - iSettings.iCustomModelThree.connect_to(this, &Tracker::UpdateModel, Qt::DirectConnection); - iSettings.iCustomModelFour .connect_to(this, &Tracker::UpdateModel, Qt::DirectConnection); - iSettings.iCustomModelFive .connect_to(this, &Tracker::UpdateModel, Qt::DirectConnection); + connect(&iSettings.iCustomModelThree, value_::value_changed(), this, &Tracker::UpdateModel, Qt::DirectConnection); + connect(&iSettings.iCustomModelFour, value_::value_changed(), this, &Tracker::UpdateModel, Qt::DirectConnection); + connect(&iSettings.iCustomModelFive, value_::value_changed(), this, &Tracker::UpdateModel, Qt::DirectConnection); // Update model logic - #define UM(v) iSettings.v.connect_to(this, &Tracker::UpdateModel, Qt::DirectConnection) + #define UM(v) connect(&iSettings.v, value_::value_changed(), this, &Tracker::UpdateModel, Qt::DirectConnection) UM(iVertexTopX); UM(iVertexTopY); UM(iVertexTopZ); UM(iVertexTopRightX); UM(iVertexTopRightY); UM(iVertexTopRightZ); UM(iVertexTopLeftX); UM(iVertexTopLeftY); UM(iVertexTopLeftZ); diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp index 49ca43ae..62209978 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp @@ -1200,7 +1200,7 @@ NeuralNetDialog::NeuralNetDialog() : connect(ui_.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); connect(ui_.camera_settings, SIGNAL(clicked()), this, SLOT(camera_settings())); - settings_.camera_name.connect_to(this, &NeuralNetDialog::update_camera_settings_state); + connect(&settings_.camera_name, value_::value_changed(), this, &NeuralNetDialog::update_camera_settings_state); update_camera_settings_state(settings_.camera_name); diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index 988239e2..160eb831 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -120,22 +120,18 @@ TrackerDialog_PT::TrackerDialog_PT(const QString& module_name) : tie_setting(s.enable_point_filter, ui.enable_point_filter); tie_setting(s.point_filter_coefficient, ui.point_filter_slider); tie_setting(s.point_filter_limit, ui.point_filter_limit_slider); - s.point_filter_coefficient.connect_to(ui.point_filter_label, [this](double x) { - ui.point_filter_label->setValue(x); - }); - - s.point_filter_limit.connect_to(ui.point_filter_limit_label, [this] { - ui.point_filter_limit_label->setValue(*s.point_filter_limit); - }); + connect(&s.point_filter_coefficient, value_::value_changed(), + ui.point_filter_label, [this] { ui.point_filter_label->setValue(*s.point_filter_coefficient); } ); + connect(&s.point_filter_limit, value_::value_changed(), ui.point_filter_limit_label, + [this] { ui.point_filter_limit_label->setValue(*s.point_filter_limit); }, Qt::QueuedConnection); ui.point_filter_label->setValue(*s.point_filter_coefficient); ui.point_filter_limit_label->setValue(*s.point_filter_limit); tie_setting(s.point_filter_deadzone, ui.point_filter_deadzone_slider); ui.point_filter_deadzone_label->setValue(*s.point_filter_deadzone); - s.point_filter_deadzone.connect_to(ui.point_filter_deadzone_label, [this](double x) { - ui.point_filter_deadzone_label->setValue(x); - }); + connect(&s.point_filter_deadzone, value_::value_changed(), ui.point_filter_deadzone_label, + [this] { ui.point_filter_deadzone_label->setValue(*s.point_filter_deadzone); }, Qt::QueuedConnection); } QString TrackerDialog_PT::threshold_display_text(int threshold_value) diff --git a/tracker-trackhat/camera.cpp b/tracker-trackhat/camera.cpp index 0c18dd03..74e35423 100644 --- a/tracker-trackhat/camera.cpp +++ b/tracker-trackhat/camera.cpp @@ -57,7 +57,9 @@ trackhat_camera::trackhat_camera() for (auto* slider : { &t.exposure, &t.gain, /*&t.threshold,*/ }) { - slider->connect_to(&sig, &trackhat_impl::setting_receiver::settings_changed, Qt::DirectConnection); + QObject::connect(slider, options::value_::value_changed(), + &sig, &trackhat_impl::setting_receiver::settings_changed, + Qt::DirectConnection); } } diff --git a/tracker-trackhat/dialog.cpp b/tracker-trackhat/dialog.cpp index e18c89cf..4ef64f50 100644 --- a/tracker-trackhat/dialog.cpp +++ b/tracker-trackhat/dialog.cpp @@ -37,7 +37,8 @@ trackhat_dialog::trackhat_dialog() tie_setting(t.exposure, ui.exposure_slider); ui.exposure_label->setValue((int)*t.exposure); - t.exposure.connect_to(ui.exposure_label, [this] { 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); // gain @@ -47,7 +48,8 @@ trackhat_dialog::trackhat_dialog() tie_setting(t.gain, ui.gain_slider); ui.gain_label->setValue((int)*t.gain); - t.gain.connect_to(ui.gain_label, [this] { 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); #if 0 // threshold @@ -64,24 +66,21 @@ trackhat_dialog::trackhat_dialog() // point filter ui.point_filter_limit_label->setValue(*t.point_filter_limit); - t.point_filter_limit.connect_to(ui.point_filter_limit_label, [this] { - 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); 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); - t.point_filter_coefficient.connect_to(ui.point_filter_label, [this] { - 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); tie_setting(t.point_filter_deadzone, ui.point_filter_deadzone); ui.point_filter_deadzone_label->setValue(*t.point_filter_deadzone); - t.point_filter_deadzone.connect_to(ui.point_filter_deadzone_label, [this] { - 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); // led diff --git a/video-ps3eye/module.cpp b/video-ps3eye/module.cpp index 04e7ecbe..02543082 100644 --- a/video-ps3eye/module.cpp +++ b/video-ps3eye/module.cpp @@ -266,9 +266,8 @@ dialog::dialog(QWidget* parent) : QWidget(parent) tie_setting(s.gain, ui.gain_slider); ui.exposure_label->setValue((int)*s.exposure); ui.gain_label->setValue((int)*s.gain); - s.exposure.connect_to(this, [this] { t.stop(); t.start(); }); - s.gain.connect_to(this, [this] { t.stop(); t.start(); }); - + connect(&s.exposure, value_::value_changed(), this, [this](const slider_value&) { t.stop(); t.start(); }); + connect(&s.gain, value_::value_changed(), this, [this](const slider_value&) { t.stop(); t.start(); }); connect(ui.exposure_slider, &QSlider::valueChanged, ui.exposure_label, &QSpinBox::setValue); connect(ui.gain_slider, &QSlider::valueChanged, ui.gain_label, &QSpinBox::setValue); connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &dialog::do_ok); -- cgit v1.2.3