using Gst::Pipeline;
#endif
+using pv::data::SignalGroup;
using pv::util::Timestamp;
using pv::views::trace::Signal;
using pv::views::trace::AnalogSignal;
shared_ptr<sigrok::Context> Session::sr_context;
Session::Session(DeviceManager &device_manager, QString name) :
+ shutting_down_(false),
device_manager_(device_manager),
default_name_(name),
name_(name),
Session::~Session()
{
+ shutting_down_ = true;
+
// Stop and join to the thread
stop_capture();
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
+ }
}
DeviceManager& Session::device_manager()
#endif
view->reset_view_state();
}
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
+ }
+ signal_groups_.clear();
+
for (const shared_ptr<data::SignalData>& d : all_signal_data_)
d->clear();
+
all_signal_data_.clear();
signalbases_.clear();
cur_logic_segment_.reset();
return signalbases_;
}
-bool Session::all_segments_complete(uint32_t segment_id) const
+void Session::add_generated_signal(shared_ptr<data::SignalBase> signal)
{
- bool all_complete = true;
+ signalbases_.push_back(signal);
- for (const shared_ptr<data::SignalBase>& base : signalbases_)
- if (!base->segment_is_complete(segment_id))
- all_complete = false;
+ for (shared_ptr<views::ViewBase>& view : views_)
+ view->add_signalbase(signal);
- return all_complete;
+ update_signals();
+}
+
+void Session::remove_generated_signal(shared_ptr<data::SignalBase> signal)
+{
+ if (shutting_down_)
+ return;
+
+ signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+ [&](shared_ptr<data::SignalBase> s) { return s == signal; }),
+ signalbases_.end());
+
+ for (shared_ptr<views::ViewBase>& view : views_)
+ view->remove_signalbase(signal);
+
+ update_signals();
}
#ifdef ENABLE_DECODE
void Session::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
{
+ if (shutting_down_)
+ return;
+
signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
[&](shared_ptr<data::SignalBase> s) { return s == signal; }),
signalbases_.end());
}
#endif
+bool Session::all_segments_complete(uint32_t segment_id) const
+{
+ bool all_complete = true;
+
+ for (const shared_ptr<data::SignalBase>& base : signalbases_)
+ if (!base->segment_is_complete(segment_id))
+ all_complete = false;
+
+ return all_complete;
+}
+
MetadataObjManager* Session::metadata_obj_manager()
{
return &metadata_obj_manager_;
signalbase->set_data(logic_data_);
connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
break;
case SR_CHANNEL_ANALOG:
signalbase->set_data(data);
connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
break;
}
}
}
+ // Create and assign default signal groups if needed
+ if (signal_groups_.empty()) {
+ for (auto& entry : sr_dev->channel_groups()) {
+ const shared_ptr<sigrok::ChannelGroup>& group = entry.second;
+
+ if (group->channels().size() <= 1)
+ continue;
+
+ SignalGroup* sg = new SignalGroup(QString::fromStdString(entry.first));
+ for (const shared_ptr<sigrok::Channel>& channel : group->channels()) {
+ for (shared_ptr<data::SignalBase> s : signalbases_) {
+ if (s->channel() == channel) {
+ sg->append_signal(s);
+ break;
+ }
+ }
+ }
+ signal_groups_.emplace_back(sg);
+ }
+ }
+
+ // Update all views
for (shared_ptr<views::ViewBase>& viewbase : views_) {
vector< shared_ptr<SignalBase> > view_signalbases =
viewbase->signalbases();
lock_guard<recursive_mutex> lock(data_mutex_);
cur_logic_segment_.reset();
cur_analog_segments_.clear();
+ for (shared_ptr<data::SignalBase> sb : signalbases_)
+ sb->clear_sample_data();
}
highest_segment_id_ = -1;
frame_began_ = false;
signal_segment_completed();
}
-void Session::feed_in_logic(shared_ptr<Logic> logic)
+void Session::feed_in_logic(shared_ptr<sigrok::Logic> logic)
{
if (logic->data_length() == 0) {
qDebug() << "WARNING: Received logic packet with 0 samples.";
data_received();
}
-void Session::feed_in_analog(shared_ptr<Analog> analog)
+void Session::feed_in_analog(shared_ptr<sigrok::Analog> analog)
{
if (analog->num_samples() == 0) {
qDebug() << "WARNING: Received analog packet with 0 samples.";