projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::data::decode::Annotation: Add row() and set_row().
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 805f6ae07efda2f153a2514a24a64607b2e0f54d..3848a3d4d6267a35093471cd7495a32c75595821 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-1,7
+1,7
@@
/*
* This file is part of the PulseView project.
*
/*
* 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
*
* 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
@@
-25,8
+25,9
@@
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
+#include <map>
+#include <set>
#include <string>
#include <string>
-#include <utility>
#include <vector>
#include <QObject>
#include <vector>
#include <QObject>
@@
-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;
@@
-43,9
+47,12
@@
class Analog;
class AnalogSnapshot;
class Logic;
class LogicSnapshot;
class AnalogSnapshot;
class Logic;
class LogicSnapshot;
+class SignalData;
}
namespace view {
}
namespace view {
+class DecodeTrace;
+class LogicSignal;
class Signal;
}
class Signal;
}
@@
-79,15
+86,23
@@
public:
capture_state get_capture_state() const;
capture_state get_capture_state() const;
- void start_capture(uint64_t record_length,
- boost::function<void (const QString)> error_handler);
+ void start_capture(boost::function<void (const QString)> error_handler);
void stop_capture();
void stop_capture();
+ std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
std::vector< boost::shared_ptr<view::Signal> >
std::vector< boost::shared_ptr<view::Signal> >
- get_signals();
+ get_signals() const;
+
+#ifdef ENABLE_DECODE
+ bool add_decoder(srd_decoder *const dec);
- boost::shared_ptr<data::Logic> get_data();
+ 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);
@@
-96,6
+111,11
@@
private:
bool is_trigger_enabled() const;
bool is_trigger_enabled() const;
+ boost::shared_ptr<view::Signal> signal_from_probe(
+ const sr_probe *probe) 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
@@
-119,7
+139,6
@@
private:
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,
- uint64_t record_length,
boost::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
boost::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
@@
-145,6
+164,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;
@@
-154,10
+175,10
@@
private:
mutable boost::mutex _data_mutex;
boost::shared_ptr<data::Logic> _logic_data;
boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
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_probe*, 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);
signals:
void capture_state_changed(int state);