projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nsis: Install libusb0.dll with the application.
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index f4e3d4af34d70b21cebe96992fc8f755797fb8a1..8b97f8c0364eedd1fcf60a9bd2782e800d46314f 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-25,8
+25,8
@@
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
+#include <map>
#include <string>
#include <string>
-#include <utility>
#include <vector>
#include <QObject>
#include <vector>
#include <QObject>
@@
-34,6
+34,9
@@
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
+struct srd_decoder;
+struct srd_probe;
+
namespace pv {
class DeviceManager;
namespace pv {
class DeviceManager;
@@
-46,6
+49,8
@@
class LogicSnapshot;
}
namespace view {
}
namespace view {
+class DecodeTrace;
+class LogicSignal;
class Signal;
}
class Signal;
}
@@
-56,6
+61,7
@@
class SigSession : public QObject
public:
enum capture_state {
Stopped,
public:
enum capture_state {
Stopped,
+ AwaitingTrigger,
Running
};
Running
};
@@
-84,14
+90,27
@@
public:
void stop_capture();
std::vector< boost::shared_ptr<view::Signal> >
void stop_capture();
std::vector< boost::shared_ptr<view::Signal> >
- get_signals();
+ get_signals()
const
;
boost::shared_ptr<data::Logic> get_data();
boost::shared_ptr<data::Logic> get_data();
+#ifdef ENABLE_DECODE
+ bool add_decoder(srd_decoder *const dec);
+
+ std::vector< boost::shared_ptr<view::DecodeTrace> >
+ get_decode_signals() const;
+
+ void remove_decode_signal(view::DecodeTrace *signal);
+#endif
+
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
- void update_signals();
+ void update_signals(const sr_dev_inst *const sdi);
+
+ bool is_trigger_enabled() const;
+
+ void read_sample_rate(const sr_dev_inst *const sdi);
private:
/**
private:
/**
@@
-109,7
+128,10
@@
private:
boost::function<void (const QString)> error_handler,
sr_input_format *format = NULL);
boost::function<void (const QString)> error_handler,
sr_input_format *format = NULL);
- void load_thread_proc(const std::string name,
+ void load_session_thread_proc(
+ boost::function<void (const QString)> error_handler);
+
+ void load_input_thread_proc(const std::string name, sr_input *in,
boost::function<void (const QString)> error_handler);
void sample_thread_proc(struct sr_dev_inst *sdi,
boost::function<void (const QString)> error_handler);
void sample_thread_proc(struct sr_dev_inst *sdi,
@@
-139,6
+161,8
@@
private:
*/
struct sr_dev_inst *_sdi;
*/
struct sr_dev_inst *_sdi;
+ std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
@@
-151,7
+175,7
@@
private:
boost::shared_ptr<data::Analog> _analog_data;
boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
boost::shared_ptr<data::Analog> _analog_data;
boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
-
std::auto_ptr<boost::thread>
_sampling_thread;
+
boost::thread
_sampling_thread;
signals:
void capture_state_changed(int state);
signals:
void capture_state_changed(int state);