#include "data/decoderstack.hpp"
#include "data/logic.hpp"
#include "data/logicsegment.hpp"
+#include "data/signalbase.hpp"
#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
#include "view/analogsignal.hpp"
#include "view/decodetrace.hpp"
#include "view/logicsignal.hpp"
+#include "view/signal.hpp"
+#include "view/view.hpp"
#include <cassert>
#include <mutex>
device_.reset();
// Remove all stored data
- signals_.clear();
- {
- shared_lock<shared_mutex> lock(signals_mutex_);
- for (const shared_ptr<data::SignalData> d : all_signal_data_)
- d->clear();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
}
+ for (const shared_ptr<data::SignalData> d : all_signal_data_)
+ d->clear();
all_signal_data_.clear();
+ signalbases_.clear();
cur_logic_segment_.reset();
for (auto entry : cur_analog_segments_) {
}
logic_data_.reset();
- decode_traces_.clear();
signals_changed();
device_ = std::move(device);
- device_->open();
+
+ try {
+ device_->open();
+ } catch (const QString &e) {
+ device_.reset();
+ device_selected();
+ throw;
+ }
+
device_->session()->add_datafeed_callback([=]
(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
data_feed_in(device, packet);
}
// Clear signal data
- {
- shared_lock<shared_mutex> lock(signals_mutex_);
- for (const shared_ptr<data::SignalData> d : all_signal_data_)
- d->clear();
- }
+ for (const shared_ptr<data::SignalData> d : all_signal_data_)
+ d->clear();
// Begin the session
sampling_thread_ = std::thread(
sampling_thread_.join();
}
+void Session::register_view(std::shared_ptr<pv::view::View> view)
+{
+ views_.insert(view);
+}
+
+void Session::deregister_view(std::shared_ptr<pv::view::View> view)
+{
+ views_.erase(view);
+}
+
double Session::get_samplerate() const
{
double samplerate = 0.0;
- {
- shared_lock<shared_mutex> lock(signals_mutex_);
- for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
- assert(d);
- const vector< shared_ptr<pv::data::Segment> > segments =
- d->segments();
- for (const shared_ptr<pv::data::Segment> &s : segments)
- samplerate = std::max(samplerate, s->samplerate());
- }
+ for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+ assert(d);
+ const vector< shared_ptr<pv::data::Segment> > segments =
+ d->segments();
+ for (const shared_ptr<pv::data::Segment> &s : segments)
+ samplerate = std::max(samplerate, s->samplerate());
}
// If there is no sample rate given we use samples as unit
if (samplerate == 0.0)
return samplerate;
}
-const unordered_set< shared_ptr<view::Signal> > Session::signals() const
+const std::unordered_set< std::shared_ptr<data::SignalBase> >
+ Session::signalbases() const
{
- shared_lock<shared_mutex> lock(signals_mutex_);
- return signals_;
+ return signalbases_;
}
#ifdef ENABLE_DECODE
bool Session::add_decoder(srd_decoder *const dec)
{
- map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
+ map<const srd_channel*, shared_ptr<data::SignalBase> > channels;
shared_ptr<data::DecoderStack> decoder_stack;
try {
- lock_guard<boost::shared_mutex> lock(signals_mutex_);
-
// Create the decoder
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(*this, dec));
// Auto select the initial channels
for (const srd_channel *pdch : all_channels)
- for (shared_ptr<view::Signal> s : signals_) {
- shared_ptr<view::LogicSignal> l =
- dynamic_pointer_cast<view::LogicSignal>(s);
- if (l && QString::fromUtf8(pdch->name).
- toLower().contains(
- l->name().toLower()))
- channels[pdch] = l;
+ for (shared_ptr<data::SignalBase> b : signalbases_) {
+ if (b->type() == ChannelType::LOGIC) {
+ if (QString::fromUtf8(pdch->name).toLower().
+ contains(b->name().toLower()))
+ channels[pdch] = b;
+ }
}
assert(decoder_stack);
decoder_stack->stack().front()->set_channels(channels);
// Create the decode signal
- shared_ptr<view::DecodeTrace> d(
- new view::DecodeTrace(*this, decoder_stack,
- decode_traces_.size()));
- decode_traces_.push_back(d);
+ shared_ptr<data::SignalBase> signalbase =
+ shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
+
+ signalbase->set_decoder_stack(decoder_stack);
+
+ for (std::shared_ptr<pv::view::View> view : views_)
+ view->add_decode_trace(signalbase);
} catch (std::runtime_error e) {
return false;
}
return true;
}
-vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
+void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
{
- shared_lock<shared_mutex> lock(signals_mutex_);
- return decode_traces_;
-}
-
-void Session::remove_decode_signal(view::DecodeTrace *signal)
-{
- for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
- if ((*i).get() == signal) {
- decode_traces_.erase(i);
- signals_changed();
- return;
- }
+ for (std::shared_ptr<pv::view::View> view : views_)
+ view->remove_decode_trace(signalbase);
}
#endif
void Session::update_signals()
{
if (!device_) {
- signals_.clear();
+ signalbases_.clear();
logic_data_.reset();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
+ }
return;
}
const shared_ptr<sigrok::Device> sr_dev = device_->device();
if (!sr_dev) {
- signals_.clear();
+ signalbases_.clear();
logic_data_.reset();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
+ }
return;
}
}
}
- // Make the Signals list
- {
- unique_lock<shared_mutex> lock(signals_mutex_);
-
- unordered_set< shared_ptr<view::Signal> > prev_sigs(signals_);
- signals_.clear();
+ // Make the signals list
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ unordered_set< shared_ptr<view::Signal> > prev_sigs(view->signals());
+ view->clear_signals();
for (auto channel : sr_dev->channels()) {
+ shared_ptr<data::SignalBase> signalbase;
shared_ptr<view::Signal> signal;
// Find the channel in the old signals
const auto iter = std::find_if(
prev_sigs.cbegin(), prev_sigs.cend(),
[&](const shared_ptr<view::Signal> &s) {
- return s->channel() == channel;
+ return s->base()->channel() == channel;
});
if (iter != prev_sigs.end()) {
// Copy the signal from the old set to the new
signal = *iter;
- auto logic_signal = dynamic_pointer_cast<
- view::LogicSignal>(signal);
- if (logic_signal)
- logic_signal->set_logic_data(
- logic_data_);
} else {
- // Create a new signal
+ // Find the signalbase for this channel if possible
+ signalbase.reset();
+ for (const shared_ptr<data::SignalBase> b : signalbases_)
+ if (b->channel() == channel)
+ signalbase = b;
+
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
+ if (!signalbase) {
+ signalbase = shared_ptr<data::SignalBase>(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ all_signal_data_.insert(logic_data_);
+ signalbase->set_data(logic_data_);
+ }
+
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
- device_, channel,
- logic_data_));
- all_signal_data_.insert(logic_data_);
+ device_, signalbase));
+ view->add_signal(signal);
break;
case SR_CHANNEL_ANALOG:
{
- shared_ptr<data::Analog> data(
- new data::Analog());
+ if (!signalbase) {
+ signalbase = shared_ptr<data::SignalBase>(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ shared_ptr<data::Analog> data(new data::Analog());
+ all_signal_data_.insert(data);
+ signalbase->set_data(data);
+ }
+
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(
- *this, channel, data));
- all_signal_data_.insert(data);
+ *this, signalbase));
+ view->add_signal(signal);
break;
}
break;
}
}
-
- assert(signal);
- signals_.insert(signal);
}
}
signals_changed();
}
-shared_ptr<view::Signal> Session::signal_from_channel(
- shared_ptr<Channel> channel) const
+shared_ptr<data::SignalBase> Session::signalbase_from_channel(
+ shared_ptr<sigrok::Channel> channel) const
{
- lock_guard<boost::shared_mutex> lock(signals_mutex_);
- for (shared_ptr<view::Signal> sig : signals_) {
+ for (shared_ptr<data::SignalBase> sig : signalbases_) {
assert(sig);
if (sig->channel() == channel)
return sig;
}
- return shared_ptr<view::Signal>();
+ return shared_ptr<data::SignalBase>();
}
void Session::sample_thread_proc(function<void (const QString)> error_handler)
uint64_t sample_count = 0;
{
- shared_lock<shared_mutex> lock(signals_mutex_);
for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
assert(d);
uint64_t temp_count = 0;
const float *data = static_cast<const float *>(analog->data_pointer());
bool sweep_beginning = false;
- if (signals_.empty())
+ if (signalbases_.empty())
update_signals();
for (auto channel : channels) {
cur_analog_segments_[channel] = segment;
// Find the analog data associated with the channel
- shared_ptr<view::AnalogSignal> sig =
- dynamic_pointer_cast<view::AnalogSignal>(
- signal_from_channel(channel));
- assert(sig);
+ shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
+ assert(base);
- shared_ptr<data::Analog> data(sig->analog_data());
+ shared_ptr<data::Analog> data(base->analog_data());
assert(data);
// Push the segment into the analog data.
projects / pulseview.git / blobdiff