From d508f272bde88ef4836e742c3b6ad53000d8549c Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Tue, 27 Aug 2024 17:33:34 +0200 Subject: [PATCH] sim test remove slider lock and use sliderMoves event instead of value_changed, sliderPressed and sliderReleased --- Qt/sim-test.cpp | 18 +----------------- Qt/sim-test.h | 1 - 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Qt/sim-test.cpp b/Qt/sim-test.cpp index 613a7bd..ac4a7f7 100644 --- a/Qt/sim-test.cpp +++ b/Qt/sim-test.cpp @@ -58,19 +58,10 @@ void Test_Sim::setup_sliders(void) { for (Iterable lookup; lookup < slider_lookup_e::end; lookup++) { - connect(slider_lookup[lookup], &QwtSlider::valueChanged, this, [=]{ - // Update the text while moving the slider + connect(slider_lookup[lookup], &QwtSlider::sliderMoved, this, [=]{ //value_lookup_e lookup_v = thermo_to_value_lookup(lookup); //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_lock[lookup] = false; }); } } @@ -157,13 +148,6 @@ QwtSlider* Test_Sim::id_to_slider(QString name) 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]; } diff --git a/Qt/sim-test.h b/Qt/sim-test.h index 8baf079..77aac5c 100644 --- a/Qt/sim-test.h +++ b/Qt/sim-test.h @@ -60,7 +60,6 @@ class Test_Sim : public SimulatorBase { private: Ui::Test_Sim* ui; std::unordered_map button_lookup; - std::unordered_map slider_lock; std::unordered_map slider_lookup; std::unordered_map dial_lookup; std::unordered_map thermo_lookup;