projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #928 by catching errors if config_list() fails
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 19fd993872edc04ba8bae3ca8ad11568dce9a894..2ee31cfee5afb8ef6de44171322d1d20086e755a 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-20,6
+20,7
@@
#ifndef PULSEVIEW_PV_SESSION_HPP
#define PULSEVIEW_PV_SESSION_HPP
#ifndef PULSEVIEW_PV_SESSION_HPP
#define PULSEVIEW_PV_SESSION_HPP
+#include <functional>
#include <map>
#include <memory>
#include <mutex>
#include <map>
#include <memory>
#include <mutex>
@@
-165,6
+166,8
@@
public:
uint32_t get_segment_count() const;
uint32_t get_segment_count() const;
+ vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
+
void register_view(shared_ptr<views::ViewBase> view);
void deregister_view(shared_ptr<views::ViewBase> view);
void register_view(shared_ptr<views::ViewBase> view);
void deregister_view(shared_ptr<views::ViewBase> view);
@@
-224,7
+227,7
@@
Q_SIGNALS:
void name_changed();
void name_changed();
- void trigger_event(util::Timestamp location);
+ void trigger_event(
int segment_id,
util::Timestamp location);
void new_segment(int new_segment_id);
void segment_completed(int segment_id);
void new_segment(int new_segment_id);
void segment_completed(int segment_id);
@@
-253,6
+256,9
@@
private:
unordered_set< shared_ptr<data::SignalBase> > signalbases_;
unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
unordered_set< shared_ptr<data::SignalBase> > signalbases_;
unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
+ /// trigger_list_ contains pairs of <segment_id, timestamp> values.
+ vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
+
mutable recursive_mutex data_mutex_;
shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
mutable recursive_mutex data_mutex_;
shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;