]> sigrok.org Git - pulseview.git/commitdiff
Renamed SigSession::data_updated signal to data_received, and added the frame_ended...
authorJoel Holdsworth <redacted>
Sun, 16 Feb 2014 21:24:44 +0000 (21:24 +0000)
committerJoel Holdsworth <redacted>
Sun, 2 Mar 2014 17:39:58 +0000 (17:39 +0000)
pv/sigsession.cpp
pv/sigsession.h
pv/view/view.cpp

index 1a5ac8cad96405655af7cfd0ca0211d6695b3e2d..b93ecc85952ecc4053169782bd666bdd06cd968f 100644 (file)
@@ -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;
        }
        }
index 6a8da068cde4fbd1d795cf2ebd6a39f4e214d04e..1dacc0996cfea447785848f30411d04c5028a28f 100644 (file)
@@ -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
index 2b0f04a5952983ec3c4909fed12e112c4a34fc3e..219543338f98af77d22c4db8583cb7aeb0389383 100644 (file)
@@ -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()),