/*
* This file is part of the PulseView project.
*
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#ifndef PULSEVIEW_PV_SIGSESSION_H
#define PULSEVIEW_PV_SIGSESSION_H
+#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
+#include <map>
+#include <set>
#include <string>
-#include <utility>
#include <vector>
#include <QObject>
+#include <QString>
#include <libsigrok/libsigrok.h>
+struct srd_decoder;
+struct srd_channel;
+
namespace pv {
+class DeviceManager;
+
namespace data {
class Analog;
class AnalogSnapshot;
class Logic;
class LogicSnapshot;
+class SignalData;
+}
+
+namespace device {
+class DevInst;
}
namespace view {
+class DecodeTrace;
+class LogicSignal;
class Signal;
}
public:
enum capture_state {
Stopped,
+ AwaitingTrigger,
Running
};
public:
- SigSession();
+ SigSession(DeviceManager &device_manager);
~SigSession();
- void load_file(const std::string &name);
+ boost::shared_ptr<device::DevInst> get_device() const;
+
+ /**
+ * Sets device instance that will be used in the next capture session.
+ */
+ void set_device(boost::shared_ptr<device::DevInst> dev_inst)
+ throw(QString);
+
+ void set_file(const std::string &name)
+ throw(QString);
+
+ void set_default_device();
+
+ void release_device(device::DevInst *dev_inst);
capture_state get_capture_state() const;
- void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
- uint64_t sample_rate);
+ void start_capture(boost::function<void (const QString)> error_handler);
void stop_capture();
+ std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
std::vector< boost::shared_ptr<view::Signal> >
- get_signals();
+ get_signals() const;
+
+#ifdef ENABLE_DECODE
+ bool add_decoder(srd_decoder *const dec);
+
+ std::vector< boost::shared_ptr<view::DecodeTrace> >
+ get_decode_signals() const;
- boost::shared_ptr<data::Logic> get_data();
+ void remove_decode_signal(view::DecodeTrace *signal);
+#endif
private:
void set_capture_state(capture_state state);
-private:
- void load_thread_proc(const std::string name);
+ void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
+
+ boost::shared_ptr<view::Signal> signal_from_probe(
+ const sr_channel *probe) const;
+
+ void read_sample_rate(const sr_dev_inst *const sdi);
- void sample_thread_proc(struct sr_dev_inst *sdi,
- uint64_t record_length, uint64_t sample_rate);
+private:
+ /**
+ * Attempts to autodetect the format. Failing that
+ * @param filename The filename of the input file.
+ * @return A pointer to the 'struct sr_input_format' that should be
+ * used, or NULL if no input format was selected or
+ * auto-detected.
+ */
+ static sr_input_format* determine_input_file_format(
+ const std::string &filename);
+
+ static sr_input* load_input_file_format(
+ const std::string &filename,
+ boost::function<void (const QString)> error_handler,
+ sr_input_format *format = NULL);
+
+ void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
+ boost::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
void feed_in_meta(const sr_dev_inst *sdi,
const sr_datafeed_meta &meta);
+ void feed_in_frame_begin();
+
void feed_in_logic(const sr_datafeed_logic &logic);
void feed_in_analog(const sr_datafeed_analog &analog);
const struct sr_datafeed_packet *packet);
static void data_feed_in_proc(const struct sr_dev_inst *sdi,
- const struct sr_datafeed_packet *packet);
+ const struct sr_datafeed_packet *packet, void *cb_data);
private:
+ DeviceManager &_device_manager;
+
+ /**
+ * The device instance that will be used in the next capture session.
+ */
+ boost::shared_ptr<device::DevInst> _dev_inst;
+
+ std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
mutable boost::mutex _data_mutex;
boost::shared_ptr<data::Logic> _logic_data;
boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
- boost::shared_ptr<data::Analog> _analog_data;
- boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+ std::map< const sr_channel*, boost::shared_ptr<data::AnalogSnapshot> >
+ _cur_analog_snapshots;
- std::auto_ptr<boost::thread> _sampling_thread;
+ boost::thread _sampling_thread;
signals:
void capture_state_changed(int state);
void signals_changed();
- void data_updated();
+ void frame_began();
+
+ void data_received();
+
+ void frame_ended();
private:
// TODO: This should not be necessary. Multiple concurrent