projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made Decoder dialog export a map of probes, and routed through to pv::data::Decoder
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 296f28d51a1b4150f074c85d197319f29acac8d2..4ce6131d4bd39f9a7daf09c43e3b2044aa290df9 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-25,6
+25,7
@@
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
+#include <map>
#include <string>
#include <utility>
#include <vector>
#include <string>
#include <utility>
#include <vector>
@@
-34,6
+35,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
+50,7
@@
class LogicSnapshot;
}
namespace view {
}
namespace view {
+class DecodeSignal;
class Signal;
}
class Signal;
}
@@
-89,6
+94,10
@@
public:
boost::shared_ptr<data::Logic> get_data();
boost::shared_ptr<data::Logic> get_data();
+ void add_decoder(srd_decoder *const dec,
+ std::map<const srd_probe*,
+ boost::shared_ptr<view::Signal> > probes);
+
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-96,6
+105,8
@@
private:
bool is_trigger_enabled() const;
bool is_trigger_enabled() const;
+ void read_sample_rate(const sr_dev_inst *const sdi);
+
private:
/**
* Attempts to autodetect the format. Failing that
private:
/**
* Attempts to autodetect the format. Failing that
@@
-112,7
+123,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,
@@
-142,6
+156,8
@@
private:
*/
struct sr_dev_inst *_sdi;
*/
struct sr_dev_inst *_sdi;
+ std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;