diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-13 15:05:05 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-10-13 15:09:26 +0200 |
| commit | 9a0822c445e56580fb3034224191ec825ea0274a (patch) | |
| tree | 9fce6a93bb72a0db6b60015b58272abe0fba68ba /filter-accela | |
| parent | 887dd41c5d67c30bd1e9631920d8fc1c3dd1a3f0 (diff) | |
options/tie: change "tie" overloads
Adjust usages.
There are ODR issues with MSVC and it doesn't support
C++17 "static inline constexpr" _variables_. Otherwise,
"signal_fun" could be a variable and not a function.
The usages in accela/ewma2 dialog are more verbose now
but the original API was silly.
Diffstat (limited to 'filter-accela')
| -rw-r--r-- | filter-accela/ftnoir_filter_accela_dialog.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp index 519e6e0d..c504188a 100644 --- a/filter-accela/ftnoir_filter_accela_dialog.cpp +++ b/filter-accela/ftnoir_filter_accela_dialog.cpp @@ -27,18 +27,18 @@ dialog_accela::dialog_accela() tie_setting(s.pos_deadzone, ui.trans_dz_slider); tie_setting(s.rot_nonlinearity, ui.rot_nl_slider); - tie_setting(s.rot_sensitivity, ui.rot_gain, tr("%1°"), 0, 'g', 4); - tie_setting(s.pos_sensitivity, ui.trans_gain, tr("%1mm")); - tie_setting(s.ewma, ui.ewma_label, tr("%1ms")); - tie_setting(s.rot_deadzone, ui.rot_dz, tr("%1°"), 0, 'g', 4); - tie_setting(s.pos_deadzone, ui.trans_dz, tr("%1mm")); - tie_setting(s.rot_nonlinearity, ui.rot_nl, - tr("<html><head/><body>" - "<p>x<span style='vertical-align:super;'>" - "%1" - "</span></p>" - "</body></html>") - ); + tie_setting(s.rot_sensitivity, ui.rot_gain, [](const slider_value& s) { return tr("%1°").arg(s, 0, 'g', 4); }); + tie_setting(s.pos_sensitivity, ui.trans_gain, [](const slider_value& s) { return tr("%1mm").arg(s, 0, 'g', 4); }); + tie_setting(s.ewma, ui.ewma_label, [](const slider_value& s) { return tr("%1ms").arg(s); }); + tie_setting(s.rot_deadzone, ui.rot_dz, [](const slider_value& s) { return tr("%1°").arg(s, 0, 'g', 4); }); + tie_setting(s.pos_deadzone, ui.trans_dz, [](const slider_value& s) { return tr("%1mm").arg(s); }); + tie_setting(s.rot_nonlinearity, ui.rot_nl, [](const slider_value& s) { + return tr("<html><head/><body>" + "<p>x<span style='vertical-align:super;'>" + "%1" + "</span></p>" + "</body></html>").arg(s); + }); //#define SPLINE_ROT_DEBUG //#define SPLINE_TRANS_DEBUG |