fix: Can't show the measure cursor on DSO mode

This commit is contained in:
dreamsourcelabTAI 2023-05-11 15:44:29 +08:00
parent 997ccba840
commit 67be92f17b
3 changed files with 17 additions and 6 deletions

View File

@ -414,7 +414,8 @@ namespace pv
_rt_refresh_time_id = 0;
_rt_ck_refresh_time_id = 0;
_noData_cnt = 0;
_data_lock = false;
data_unlock();
// Init data container
_capture_data->clear();
@ -712,6 +713,8 @@ namespace pv
exit_capture();
data_unlock();
_callback->trigger_message(DSV_MSG_END_COLLECT_WORK);
return true;
}
@ -981,7 +984,7 @@ namespace pv
{
ds_lock_guard lock(_data_mutex);
_data_lock = true;
data_lock();
_view_data->get_logic()->init();
clear_all_decode_task2();
@ -1197,7 +1200,7 @@ namespace pv
set_receive_data_len(o.num_samples);
if (!_is_instant)
_data_lock = true;
data_lock();
_data_updated = true;
}
@ -1627,7 +1630,7 @@ namespace pv
void SigSession::feed_timeout()
{
_data_lock = false;
data_unlock();
if (!_data_updated)
{

View File

@ -229,7 +229,7 @@ public:
uint16_t get_ch_num(int type);
inline bool get_data_lock(){
inline bool is_data_lock(){
return _data_lock;
}
@ -498,6 +498,14 @@ private:
void clear_signals();
void on_delay_prop_msg();
inline void data_lock(){
_data_lock = true;
}
inline void data_unlock(){
_data_lock = false;
}
private:
mutable std::mutex _sampling_mutex;

View File

@ -1394,7 +1394,7 @@ void Viewport::clear_dso_xm()
void Viewport::measure()
{
if (_view.session().get_data_lock())
if (_view.session().is_data_lock())
return;
_measure_type = NO_MEASURE;