mirror of
https://github.com/Sani7/remote-ui.git
synced 2026-10-26 21:51:13 +01:00
sim test
remove slider lock and use sliderMoves event instead of value_changed, sliderPressed and sliderReleased
This commit is contained in:
+1
-17
@@ -58,19 +58,10 @@ void Test_Sim::setup_sliders(void)
|
|||||||
{
|
{
|
||||||
for (Iterable<slider_lookup_e> lookup; lookup < slider_lookup_e::end; lookup++)
|
for (Iterable<slider_lookup_e> lookup; lookup < slider_lookup_e::end; lookup++)
|
||||||
{
|
{
|
||||||
connect(slider_lookup[lookup], &QwtSlider::valueChanged, this, [=]{
|
connect(slider_lookup[lookup], &QwtSlider::sliderMoved, this, [=]{
|
||||||
// Update the text while moving the slider
|
|
||||||
//value_lookup_e lookup_v = thermo_to_value_lookup(lookup);
|
//value_lookup_e lookup_v = thermo_to_value_lookup(lookup);
|
||||||
//value_lookup[lookup_v]->setText(format_value(lookup_v, thermo_lookup[lookup]->value()));
|
//value_lookup[lookup_v]->setText(format_value(lookup_v, thermo_lookup[lookup]->value()));
|
||||||
});
|
|
||||||
connect(slider_lookup[lookup], &QwtSlider::sliderPressed, this, [=]{
|
|
||||||
// When changing the sliders lock that slider
|
|
||||||
slider_lock[lookup] = true;
|
|
||||||
});
|
|
||||||
connect(slider_lookup[lookup], &QwtSlider::sliderReleased, this, [=]{
|
|
||||||
// Only trigger the update event when the slider is released and unlock the slider
|
|
||||||
slider_update(lookup);
|
slider_update(lookup);
|
||||||
slider_lock[lookup] = false;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -157,13 +148,6 @@ QwtSlider* Test_Sim::id_to_slider(QString name)
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the slider is being changed
|
|
||||||
if (slider_lock[lookup])
|
|
||||||
{
|
|
||||||
QD << "Slider in lock retrurning null";
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return slider_lookup[lookup];
|
return slider_lookup[lookup];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ class Test_Sim : public SimulatorBase {
|
|||||||
private:
|
private:
|
||||||
Ui::Test_Sim* ui;
|
Ui::Test_Sim* ui;
|
||||||
std::unordered_map<button_lookup_e, QPushButton*> button_lookup;
|
std::unordered_map<button_lookup_e, QPushButton*> button_lookup;
|
||||||
std::unordered_map<slider_lookup_e, bool> slider_lock;
|
|
||||||
std::unordered_map<slider_lookup_e, QwtSlider*> slider_lookup;
|
std::unordered_map<slider_lookup_e, QwtSlider*> slider_lookup;
|
||||||
std::unordered_map<dial_lookup_e, QwtDial*> dial_lookup;
|
std::unordered_map<dial_lookup_e, QwtDial*> dial_lookup;
|
||||||
std::unordered_map<thermo_lookup_e, QwtThermo*> thermo_lookup;
|
std::unordered_map<thermo_lookup_e, QwtThermo*> thermo_lookup;
|
||||||
|
|||||||
Reference in New Issue
Block a user