projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrated signal handler from qpdfview
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index a611e7ac7c14159eed9d8e4c569e2a8b79bb9880..55b33087a3dbd5b2533df32001efe8836b934974 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-29,6
+29,8
@@
#include <assert.h>
#include <assert.h>
+#include <QDebug>
+
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-259,7
+261,7
@@
void SigSession::feed_in_header(const sr_dev_inst *sdi)
case SR_PROBE_ANALOG:
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(probe->name,
case SR_PROBE_ANALOG:
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(probe->name,
- _analog_data));
+ _analog_data
, probe->index
));
break;
}
break;
}
@@
-292,10
+294,15
@@
void SigSession::feed_in_meta(const sr_dev_inst *sdi,
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
{
lock_guard<mutex> lock(_data_mutex);
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
{
lock_guard<mutex> lock(_data_mutex);
- if (!_cur_logic_snapshot)
+
+ if (!_logic_data)
{
{
- assert(_logic_data);
+ qDebug() << "Unexpected logic packet";
+ return;
+ }
+ if (!_cur_logic_snapshot)
+ {
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
new data::LogicSnapshot(logic));
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
new data::LogicSnapshot(logic));
@@
-313,10
+320,15
@@
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
{
lock_guard<mutex> lock(_data_mutex);
void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
{
lock_guard<mutex> lock(_data_mutex);
- if (!_cur_analog_snapshot)
+
+ if(!_analog_data)
{
{
- assert(_analog_data);
+ qDebug() << "Unexpected analog packet";
+ return; // This analog packet was not expected.
+ }
+ if (!_cur_analog_snapshot)
+ {
// Create a new data snapshot
_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
new data::AnalogSnapshot(analog));
// Create a new data snapshot
_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
new data::AnalogSnapshot(analog));