summaryrefslogtreecommitdiffhomepage
path: root/gui/mapping-dialog.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-01-16 06:11:48 +0100
committerStanislaw Halik <sthalik@misaki.pl>2019-01-16 07:49:13 +0100
commit07b45ca4578ccaed91f7f3c70e82dc7ffbdf47ab (patch)
tree0904b728158414937919f62714358725f52e7400 /gui/mapping-dialog.cpp
parent1e04979c3452d4eac633677876a88f9411a1153d (diff)
spline: fix deadlock, logic error
Tracking rarely deadlocked when saving mappings. Investigating it further also shown how a wrong bundle was used for Accela's splines.
Diffstat (limited to 'gui/mapping-dialog.cpp')
-rw-r--r--gui/mapping-dialog.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/gui/mapping-dialog.cpp b/gui/mapping-dialog.cpp
index e57cead2..0bfb5068 100644
--- a/gui/mapping-dialog.cpp
+++ b/gui/mapping-dialog.cpp
@@ -105,7 +105,7 @@ void mapping_dialog::load()
for (QComboBox* x : { ui.max_x_translation, ui.max_y_translation, ui.max_z_translation })
for (a y : { a::t30, a::t20, a::t15, a::t10, a::t100 })
- x->addItem(QStringLiteral("%1 cm").arg(int(y)), y);
+ x->addItem(tr("%1 cm").arg(int(y)), y);
// XXX TODO add tie_setting overload for spline_widget!!! -sh 20171020
@@ -121,10 +121,8 @@ void mapping_dialog::load()
{
connect(&axis.opts.altp,
value_::value_changed<bool>(),
- this,
- [&](bool f) {qfc.setEnabled(f); qfc.force_redraw();});
+ this, [&](bool f) { qfc.setEnabled(f); });
qfc.setEnabled(axis.opts.altp);
- qfc.force_redraw();
}
using c = axis_opts::max_clamp;
@@ -163,7 +161,7 @@ void mapping_dialog::load()
connect(&axis.opts.clamp_y_, value_::value_changed<int>(), &qfc, update_ystep);
// force signal to avoid duplicating the slot's logic
- qfc.setConfig(&conf);
+ qfc.set_config(&conf);
update_xstep(axis.opts.clamp_x_);
update_ystep(axis.opts.clamp_y_);