* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
-
#include <QFileInfo>
#include <cassert>
+#include <memory>
#include <mutex>
#include <stdexcept>
#include <sys/stat.h>
-#include "session.hpp"
#include "devicemanager.hpp"
+#include "session.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.hpp"
+#include "data/decode/decoder.hpp"
#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 "devices/inputfile.hpp"
#include <libsigrokdecode/libsigrokdecode.h>
#endif
-using boost::shared_lock;
-using boost::shared_mutex;
-using boost::unique_lock;
-
+using std::bad_alloc;
using std::dynamic_pointer_cast;
+using std::find_if;
using std::function;
using std::lock_guard;
using std::list;
+using std::make_pair;
+using std::make_shared;
using std::map;
+using std::max;
+using std::move;
using std::mutex;
using std::pair;
using std::recursive_mutex;
-using std::set;
+using std::runtime_error;
using std::shared_ptr;
-using std::make_shared;
using std::string;
+using std::unique_ptr;
using std::unordered_set;
using std::vector;
using sigrok::Analog;
using sigrok::Channel;
-using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::DatafeedCallbackFunction;
using sigrok::Error;
-using sigrok::Header;
using sigrok::InputFormat;
using sigrok::Logic;
using sigrok::Meta;
-using sigrok::OutputFormat;
using sigrok::Packet;
-using sigrok::PacketPayload;
using sigrok::Session;
-using sigrok::SessionDevice;
using Glib::VariantBase;
-using Glib::Variant;
namespace pv {
Session::Session(DeviceManager &device_manager, QString name) :
name_changed();
}
-const std::list< std::shared_ptr<views::ViewBase> > Session::views() const
+const list< shared_ptr<views::ViewBase> > Session::views() const
{
return views_;
}
-std::shared_ptr<views::ViewBase> Session::main_view() const
+shared_ptr<views::ViewBase> Session::main_view() const
{
return main_view_;
}
-void Session::set_main_bar(s
td::shared_ptr<pv::toolbars::MainBar> main_bar)
+void Session::set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar)
{
main_bar_ = main_bar;
}
if (base->is_decode_signal()) {
shared_ptr<pv::data::DecoderStack> decoder_stack =
base->decoder_stack();
- std::shared_ptr<data::decode::Decoder> top_decoder =
+ shared_ptr<data::decode::Decoder> top_decoder =
decoder_stack->stack().front();
settings.beginGroup("decoder_stack" + QString::number(stacks++));
const string value = settings.value(k).toString().toStdString();
if (!value.empty())
- dev_info.insert(std::make_pair(key, value));
+ dev_info.insert(make_pair(key, value));
}
if (dev_info.count("model") > 0)
name_changed();
// Remove all stored data
- for (std::shared_ptr<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase> view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
signals_changed();
- device_ = std::move(device);
+ device_ = move(device);
try {
device_->open();
return;
// Try and find the demo device and select that by default
- const auto iter = std::find_if(devices.begin(), devices.end(),
+ const auto iter = find_if(devices.begin(), devices.end(),
[] (const shared_ptr<devices::HardwareDevice> &d) {
- return d->hardware_device()->driver()->name() ==
- "demo"; });
+ return d->hardware_device()->driver()->name() == "demo"; });
set_device((iter == devices.end()) ? devices.front() : *iter);
}
-void Session::load_init_file(const std::string &file_name,
- const std::string &format)
+void Session::load_init_file(const string &file_name, const string &format)
{
shared_ptr<InputFormat> input_format;
}
void Session::load_file(QString file_name,
- std::shared_ptr<sigrok::InputFormat> format,
- const std::map<std::string, Glib::VariantBase> &options)
+ shared_ptr<sigrok::InputFormat> format,
+ const map<string, Glib::VariantBase> &options)
{
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
const shared_ptr<sigrok::Device> sr_dev = device_->device();
if (sr_dev) {
const auto channels = sr_dev->channels();
- if (!std::any_of(channels.begin(), channels.end(),
+ if (!any_of(channels.begin(), channels.end(),
[](shared_ptr<Channel> channel) {
return channel->enabled(); })) {
error_handler(tr("No channels enabled."));
sampling_thread_.join();
}
-void Session::register_view(std::shared_ptr<views::ViewBase> view)
+void Session::register_view(shared_ptr<views::ViewBase> view)
{
if (views_.empty()) {
main_view_ = view;
update_signals();
}
-void Session::deregister_view(std::shared_ptr<views::ViewBase> view)
+void Session::deregister_view(shared_ptr<views::ViewBase> view)
{
- views_.remove_if([&](std::shared_ptr<views::ViewBase> v) {
- return v == view; });
+ views_.remove_if([&](shared_ptr<views::ViewBase> v) { return v == view; });
if (views_.empty()) {
main_view_.reset();
}
}
-bool Session::has_view(std::shared_ptr<views::ViewBase> view)
+bool Session::has_view(shared_ptr<views::ViewBase> view)
{
- for (std::shared_ptr<views::ViewBase> v : views_)
+ for (shared_ptr<views::ViewBase> v : views_)
if (v == view)
return true;
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());
+ samplerate = max(samplerate, s->samplerate());
}
// If there is no sample rate given we use samples as unit
if (samplerate == 0.0)
return samplerate;
}
-const std::unordered_set< std::shared_ptr<data::SignalBase> >
- Session::signalbases() const
+const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
{
return signalbases_;
}
#ifdef ENABLE_DECODE
bool Session::add_decoder(srd_decoder *const dec)
{
+ if (!dec)
+ return false;
+
map<const srd_channel*, shared_ptr<data::SignalBase> > channels;
shared_ptr<data::DecoderStack> decoder_stack;
decoder_stack = make_shared<data::DecoderStack>(*this, dec);
// Make a list of all the channels
- std::vector<const srd_channel*> all_channels;
+ vector<const srd_channel*> all_channels;
for (const GSList *i = dec->channels; i; i = i->next)
all_channels.push_back((const srd_channel*)i->data);
for (const GSList *i = dec->opt_channels; i; i = i->next)
// Auto select the initial channels
for (const srd_channel *pdch : all_channels)
for (shared_ptr<data::SignalBase> b : signalbases_) {
- if (b->type() == ChannelType::LOGIC) {
+ if (b->logic_data()) {
if (QString::fromUtf8(pdch->name).toLower().
contains(b->name().toLower()))
channels[pdch] = b;
// Create the decode signal
shared_ptr<data::SignalBase> signalbase =
- make_shared<data::SignalBase>(nullptr);
+ make_shared<data::SignalBase>(nullptr, data::SignalBase::DecodeChannel);
signalbase->set_decoder_stack(decoder_stack);
signalbases_.insert(signalbase);
- for (std::shared_ptr<views::ViewBase> view : views_)
+ for (shared_ptr<views::ViewBase> view : views_)
view->add_decode_signal(signalbase);
- } catch (std::runtime_error e) {
+ } catch (runtime_error e) {
return false;
}
{
signalbases_.erase(signalbase);
- for (std::shared_ptr<views::ViewBase> view : views_)
+ for (shared_ptr<views::ViewBase> view : views_)
view->remove_decode_signal(signalbase);
signals_changed();
if (!device_) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase> view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
if (!sr_dev) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr<views::ViewBase> view : views_) {
+ for (shared_ptr<views::ViewBase> view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
// Detect what data types we will receive
auto channels = sr_dev->channels();
- unsigned int logic_channel_count = std::count_if(
+ unsigned int logic_channel_count = count_if(
channels.begin(), channels.end(),
[] (shared_ptr<Channel> channel) {
- return channel->type() == ChannelType::LOGIC; });
+ return channel->type() == sigrok::ChannelType::LOGIC; });
// Create data containers for the logic data segments
{
}
// Make the signals list
- for (std::shared_ptr<views::ViewBase> viewbase : views_) {
+ for (shared_ptr<views::ViewBase> viewbase : views_) {
views::TraceView::View *trace_view =
qobject_cast<views::TraceView::View*>(viewbase.get());
shared_ptr<views::TraceView::Signal> signal;
// Find the channel in the old signals
- const auto iter = std::find_if(
+ const auto iter = find_if(
prev_sigs.cbegin(), prev_sigs.cend(),
[&](const shared_ptr<views::TraceView::Signal> &s) {
return s->base()->channel() == channel;
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
- signalbase = make_shared<data::SignalBase>(channel);
+ signalbase = make_shared<data::SignalBase>(channel,
+ data::SignalBase::LogicChannel);
signalbases_.insert(signalbase);
all_signal_data_.insert(logic_data_);
signalbase->set_data(logic_data_);
+
+ connect(this, SIGNAL(capture_state_changed(int)),
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
}
signal = shared_ptr<views::TraceView::Signal>(
case SR_CHANNEL_ANALOG:
{
if (!signalbase) {
- signalbase = make_shared<data::SignalBase>(channel);
+ signalbase = make_shared<data::SignalBase>(channel,
+ data::SignalBase::AnalogChannel);
signalbases_.insert(signalbase);
shared_ptr<data::Analog> data(new data::Analog());
all_signal_data_.insert(data);
signalbase->set_data(data);
+
+ connect(this, SIGNAL(capture_state_changed(int)),
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
}
signal = shared_ptr<views::TraceView::Signal>(
}
default:
- assert(0);
+ assert(false);
break;
}
}
set_capture_state(device_->session()->trigger() ?
AwaitingTrigger : Running);
- device_->run();
+ try {
+ device_->run();
+ } catch (Error e) {
+ error_handler(e.what());
+ set_capture_state(Stopped);
+ return;
+ }
+
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
if (cur_logic_segment_) {
qDebug("SR_DF_END was not received.");
- assert(0);
+ assert(false);
}
// Optimize memory usage
// Create a new data segment
cur_logic_segment_ = make_shared<data::LogicSegment>(
- *logic_data_, logic, cur_samplerate_);
+ *logic_data_, logic->unit_size(), cur_samplerate_);
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
// frame_began is DecoderStack, but in future we need to signal
// this after both analog and logic sweeps have begun.
frame_began();
- } else {
- // Append to the existing data segment
- cur_logic_segment_->append_payload(logic);
}
+ cur_logic_segment_->append_payload(logic);
+
data_received();
}
const vector<shared_ptr<Channel>> channels = analog->channels();
const unsigned int channel_count = channels.size();
const size_t sample_count = analog->num_samples() / channel_count;
- const float *data = static_cast<const float *>(analog->data_pointer());
bool sweep_beginning = false;
+ unique_ptr<float> data(new float[analog->num_samples()]);
+ analog->get_data_as_float(data.get());
+
if (signalbases_.empty())
update_signals();
+ float *channel_data = data.get();
for (auto channel : channels) {
shared_ptr<data::AnalogSegment> segment;
assert(segment);
// Append the samples in the segment
- segment->append_interleaved_samples(data++, sample_count,
+ segment->append_interleaved_samples(channel_data++, sample_count,
channel_count);
}
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
- static bool frame_began=false;
+ static bool frame_began = false;
(void)device;
case SR_DF_LOGIC:
try {
feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
- } catch (std::bad_alloc) {
+ } catch (bad_alloc) {
out_of_memory_ = true;
device_->stop();
}
case SR_DF_ANALOG:
try {
feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
- } catch (std::bad_alloc) {
+ } catch (bad_alloc) {
out_of_memory_ = true;
device_->stop();
}
projects / pulseview.git / blobdiff