From 1f3740351a99b9c5cb4cb8a3537e27db9f2e6f60 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 16 Feb 2014 21:24:44 +0000 Subject: [PATCH] Renamed SigSession::data_updated signal to data_received, and added the frame_ended signal --- pv/sigsession.cpp | 6 +++--- pv/sigsession.h | 4 +++- pv/view/view.cpp | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 1a5ac8c..b93ecc8 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -531,7 +531,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) _cur_logic_snapshot->append_payload(logic); } - data_updated(); + data_received(); } void SigSession::feed_in_analog(const sr_datafeed_analog &analog) @@ -592,7 +592,7 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) set_capture_state(Running); } - data_updated(); + data_received(); } void SigSession::data_feed_in(const struct sr_dev_inst *sdi, @@ -633,7 +633,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, _cur_logic_snapshot.reset(); _cur_analog_snapshots.clear(); } - data_updated(); + frame_ended(); break; } } diff --git a/pv/sigsession.h b/pv/sigsession.h index 6a8da06..1dacc09 100644 --- a/pv/sigsession.h +++ b/pv/sigsession.h @@ -188,7 +188,9 @@ signals: void frame_began(); - void data_updated(); + void data_received(); + + void frame_ended(); private: // TODO: This should not be necessary. Multiple concurrent diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 2b0f04a..2195433 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -92,7 +92,9 @@ View::View(SigSession &session, QWidget *parent) : connect(&_session, SIGNAL(signals_changed()), this, SLOT(signals_changed())); - connect(&_session, SIGNAL(data_updated()), + connect(&_session, SIGNAL(data_received()), + this, SLOT(data_updated())); + connect(&_session, SIGNAL(frame_ended()), this, SLOT(data_updated())); connect(_cursors.first().get(), SIGNAL(time_changed()), -- 2.30.2