Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

fix repeat click isuse on run/stop button

Browse Source
This commit is contained in:
DreamSourceLab 2023-06-16 18:55:28 +08:00
parent 2147b758cd
commit 204fa2f591
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DSView/pv/toolbars/samplingbar.cpp
View File

@ -139,9 +139,6 @@ namespace pv
connect(_action_repeat, SIGNAL(triggered()), this, SLOT(on_collect_mode())); connect(_action_repeat, SIGNAL(triggered()), this, SLOT(on_collect_mode()));
connect(_action_loop, SIGNAL(triggered()), this, SLOT(on_collect_mode())); connect(_action_loop, SIGNAL(triggered()), this, SLOT(on_collect_mode()));
connect(&_sample_rate, SIGNAL(currentIndexChanged(int)), this, SLOT(on_samplerate_sel(int))); connect(&_sample_rate, SIGNAL(currentIndexChanged(int)), this, SLOT(on_samplerate_sel(int)));
connect(this, SIGNAL(sig_run_stop_action()), this, SLOT(on_run_stop_action()));
connect(this, SIGNAL(sig_instant_stop_action()), this, SLOT(on_instant_stop_action()));
} }
void SamplingBar::changeEvent(QEvent *event) void SamplingBar::changeEvent(QEvent *event)
@ -805,14 +802,13 @@ namespace pv
void SamplingBar::on_run_stop() void SamplingBar::on_run_stop()
{ {
_run_stop_button.setEnabled(false); _run_stop_button.setEnabled(false);
sig_run_stop_action(); QTimer::singleShot(10, this, &SamplingBar::on_run_stop_action);
} }
void SamplingBar::on_run_stop_action() void SamplingBar::on_run_stop_action()
{ {
if (action_run_stop() == false){ action_run_stop();
_run_stop_button.setEnabled(true); _run_stop_button.setEnabled(true);
}
} }
// start or stop capture // start or stop capture
@ -876,14 +872,13 @@ namespace pv
return; return;
} }
_instant_button.setEnabled(false); _instant_button.setEnabled(false);
sig_instant_stop_action(); QTimer::singleShot(10, this, &SamplingBar::on_instant_stop_action);
} }
void SamplingBar::on_instant_stop_action() void SamplingBar::on_instant_stop_action()
{ {
if (action_instant_stop() == false){ action_instant_stop();
_instant_button.setEnabled(true); _instant_button.setEnabled(true);
}
} }
bool SamplingBar::action_instant_stop() bool SamplingBar::action_instant_stop()
@ -1197,10 +1192,11 @@ namespace pv
} }
if (_session->is_working()){ if (_session->is_working()){
_run_stop_button.setEnabled(_is_run_as_instant ? false : true); if (_is_run_as_instant)
_instant_button.setEnabled(_is_run_as_instant ? true : false); _run_stop_button.setEnabled(false);
} else
else{ _instant_button.setEnabled(false);
} else {
_run_stop_button.setEnabled(true); _run_stop_button.setEnabled(true);
_instant_button.setEnabled(true); _instant_button.setEnabled(true);
} }

2
DSView/pv/toolbars/samplingbar.h
View File

@ -103,8 +103,6 @@ namespace pv
signals: signals:
void sig_store_session_data(); void sig_store_session_data();
void sig_run_stop_action();
void sig_instant_stop_action();
private: private:
void changeEvent(QEvent *event); void changeEvent(QEvent *event);