projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep Run/Stop button state updated
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index b6e5a56842c5c79def1356532001823e3eb3cd69..b4f07db4394397579e8d429bf9d9ca3d763e88b5 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-22,8
+22,10
@@
#define PULSEVIEW_PV_SIGSESSION_H
#include <boost/shared_ptr.hpp>
#define PULSEVIEW_PV_SIGSESSION_H
#include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
#include <string>
#include <string>
+#include <utility>
#include <vector>
#include <QObject>
#include <vector>
#include <QObject>
@@
-36,12
+38,21
@@
namespace pv {
class LogicData;
class LogicDataSnapshot;
class LogicData;
class LogicDataSnapshot;
+
+namespace view {
class Signal;
class Signal;
+}
class SigSession : public QObject
{
Q_OBJECT
class SigSession : public QObject
{
Q_OBJECT
+public:
+ enum capture_state {
+ Stopped,
+ Running
+ };
+
public:
SigSession();
public:
SigSession();
@@
-49,15
+60,25
@@
public:
void load_file(const std::string &name);
void load_file(const std::string &name);
+ 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(struct sr_dev_inst* sdi, uint64_t record_length,
uint64_t sample_rate);
- std::vector< boost::shared_ptr<Signal> >&
+ void stop_capture();
+
+ std::vector< boost::shared_ptr<view::Signal> >
get_signals();
boost::shared_ptr<LogicData> get_data();
private:
get_signals();
boost::shared_ptr<LogicData> get_data();
private:
+ void set_capture_state(capture_state state);
+
+private:
+ void sample_thread_proc(struct sr_dev_inst *sdi,
+ uint64_t record_length, uint64_t sample_rate);
+
void data_feed_in(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet);
void data_feed_in(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet);
@@
-65,11
+86,23
@@
private:
struct sr_datafeed_packet *packet);
private:
struct sr_datafeed_packet *packet);
private:
- std::vector< boost::shared_ptr<Signal> > _signals;
+ mutable boost::mutex _state_mutex;
+ capture_state _capture_state;
+
+ mutable boost::mutex _signals_mutex;
+ std::vector< boost::shared_ptr<view::Signal> > _signals;
+
+ mutable boost::mutex _data_mutex;
boost::shared_ptr<LogicData> _logic_data;
boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
boost::shared_ptr<LogicData> _logic_data;
boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+ std::auto_ptr<boost::thread> _sampling_thread;
+
signals:
signals:
+ void capture_state_changed(int state);
+
+ void signals_changed();
+
void data_updated();
private:
void data_updated();
private: