SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

fix: Can not auto refresh on DSO mode, and got an error scale on ANALOG mode

Browse Source
This commit is contained in:
dreamsourcelabTAI
2022-12-23 18:39:57 +08:00
parent 44e120ee2b
commit a659114548
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DSView/pv/sigsession.cpp
View File

@@ -470,6 +470,9 @@ namespace pv
else else
_is_instant = instant; _is_instant = instant;
set_cur_snap_samplerate(_device_agent.get_sample_rate());
set_cur_samplelimits(_device_agent.get_sample_limit());
_callback->trigger_message(DSV_MSG_START_COLLECT_WORK_PREV); _callback->trigger_message(DSV_MSG_START_COLLECT_WORK_PREV);
if (exec_capture()) if (exec_capture())
@@ -662,6 +665,9 @@ namespace pv
if (_data_updated) if (_data_updated)
{ {
if (_device_agent.get_work_mode() != LOGIC)
data_updated();
_data_updated = false; _data_updated = false;
_noData_cnt = 0; _noData_cnt = 0;
data_auto_unlock(); data_auto_unlock();

3
DSView/pv/view/view.cpp
View File

@@ -216,10 +216,11 @@ void View::capture_init()
show_trig_cursor(true); show_trig_cursor(true);
else if (!_session->is_repeating()) else if (!_session->is_repeating())
show_trig_cursor(false); show_trig_cursor(false);
_maxscale = _session->cur_sampletime() / (get_view_width() * MaxViewRate); _maxscale = _session->cur_sampletime() / (get_view_width() * MaxViewRate);
if (mode == ANALOG) if (mode == ANALOG)
set_scale_offset(_maxscale, 0); set_scale_offset(_maxscale, 0);
status_clear(); status_clear();
_trig_time_setted = false; _trig_time_setted = false;
_trig_hoff = 0; _trig_hoff = 0;

3
DSView/pv/view/viewport.cpp
View File

@@ -147,9 +147,6 @@ void Viewport::paintEvent(QPaintEvent *event)
void Viewport::doPaint(bool bForce) void Viewport::doPaint(bool bForce)
{ {
using pv::view::Signal; using pv::view::Signal;
// if (_view.session().is_stopped_status())
// dsv_info("paint");
QStyleOption o; QStyleOption o;
o.initFrom(this); o.initFrom(this);