projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #829 by not throwing when device can't be used
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 42c581d420122fd126fc9e7fb7d51b11f3b34648..31cbb73c19e1fb37fde8955dff2de9e35062f683 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-383,7
+383,7
@@
void Session::set_device(shared_ptr<devices::Device> device)
device_.reset();
device_.reset();
- // Revert name back to default name (e.g. "
Untitled-
1") as the data is gone
+ // Revert name back to default name (e.g. "
Session
1") as the data is gone
name_ = default_name_;
name_changed();
name_ = default_name_;
name_changed();
@@
-415,16
+415,17
@@
void Session::set_device(shared_ptr<devices::Device> device)
device_->open();
} catch (const QString &e) {
device_.reset();
device_->open();
} catch (const QString &e) {
device_.reset();
- device_changed();
- throw;
}
}
- device_->session()->add_datafeed_callback([=]
- (shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
- data_feed_in(device, packet);
- });
+ if (device_) {
+ device_->session()->add_datafeed_callback([=]
+ (shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
+ data_feed_in(device, packet);
+ });
+
+ update_signals();
+ }
- update_signals();
device_changed();
}
device_changed();
}
@@
-532,7
+533,7
@@
void Session::start_capture(function<void (const QString)> error_handler)
for (const shared_ptr<data::SignalData> d : all_signal_data_)
d->clear();
for (const shared_ptr<data::SignalData> d : all_signal_data_)
d->clear();
- // Revert name back to default name (e.g. "
Untitled-
1") as the data is gone
+ // Revert name back to default name (e.g. "
Session
1") as the data is gone
name_ = default_name_;
name_changed();
name_ = default_name_;
name_changed();
@@
-954,7
+955,7
@@
void Session::feed_in_logic(shared_ptr<Logic> logic)
// Create a new data segment
cur_logic_segment_ = shared_ptr<data::LogicSegment>(
// Create a new data segment
cur_logic_segment_ = shared_ptr<data::LogicSegment>(
- new data::LogicSegment(logic, cur_samplerate_));
+ new data::LogicSegment(
*logic_data_,
logic, cur_samplerate_));
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
@@
-997,11
+998,6
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
// in the sweep containing this segment.
sweep_beginning = true;
// in the sweep containing this segment.
sweep_beginning = true;
- // Create a segment, keep it in the maps of channels
- segment = shared_ptr<data::AnalogSegment>(
- new data::AnalogSegment(cur_samplerate_));
- cur_analog_segments_[channel] = segment;
-
// Find the analog data associated with the channel
shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
assert(base);
// Find the analog data associated with the channel
shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
assert(base);
@@
-1009,6
+1005,11
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
shared_ptr<data::Analog> data(base->analog_data());
assert(data);
shared_ptr<data::Analog> data(base->analog_data());
assert(data);
+ // Create a segment, keep it in the maps of channels
+ segment = shared_ptr<data::AnalogSegment>(
+ new data::AnalogSegment(*data, cur_samplerate_));
+ cur_analog_segments_[channel] = segment;
+
// Push the segment into the analog data.
data->push_segment(segment);
}
// Push the segment into the analog data.
data->push_segment(segment);
}
@@
-1031,6
+1032,8
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
+ static bool frame_began=false;
+
(void)device;
assert(device);
(void)device;
assert(device);
@@
-1052,6
+1055,7
@@
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
case SR_DF_FRAME_BEGIN:
feed_in_frame_begin();
case SR_DF_FRAME_BEGIN:
feed_in_frame_begin();
+ frame_began = true;
break;
case SR_DF_LOGIC:
break;
case SR_DF_LOGIC:
@@
-1072,6
+1076,7
@@
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
}
break;
}
break;
+ case SR_DF_FRAME_END:
case SR_DF_END:
{
{
case SR_DF_END:
{
{
@@
-1079,7
+1084,10
@@
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
- frame_ended();
+ if (frame_began) {
+ frame_began = false;
+ frame_ended();
+ }
break;
}
default:
break;
}
default: