projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Make sure the trace is redrawn when changing vdiv count
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 0828edbbf912cb3d8e09e18db94102df872ca1e1..ac3d654c63f06a4d70cd82db368bf16383c41453 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-31,7
+31,7
@@
#include <vector>
#ifdef _WIN32
#include <vector>
#ifdef _WIN32
-// Windows: Avoid
namespace pollution by thread.hpp
(which includes windows.h).
+// Windows: Avoid
boost/thread namespace pollution
(which includes windows.h).
#define NOGDI
#define NORESOURCE
#endif
#define NOGDI
#define NORESOURCE
#endif
@@
-40,6
+40,8
@@
#include <QObject>
#include <QString>
#include <QObject>
#include <QString>
+#include "util.hpp"
+
struct srd_decoder;
struct srd_channel;
struct srd_decoder;
struct srd_channel;
@@
-114,6
+116,8
@@
public:
std::set< std::shared_ptr<data::SignalData> > get_data() const;
std::set< std::shared_ptr<data::SignalData> > get_data() const;
+ double get_samplerate() const;
+
const std::unordered_set< std::shared_ptr<view::Signal> >
signals() const;
const std::unordered_set< std::shared_ptr<view::Signal> >
signals() const;
@@
-142,6
+146,8
@@
private:
void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
+ void feed_in_trigger();
+
void feed_in_frame_begin();
void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
void feed_in_frame_begin();
void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
@@
-157,7
+163,7
@@
private:
std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
- mutable std::mutex sampling_mutex_;
+ mutable std::mutex sampling_mutex_;
//!< Protects access to capture_state_.
capture_state capture_state_;
mutable boost::shared_mutex signals_mutex_;
capture_state capture_state_;
mutable boost::shared_mutex signals_mutex_;
@@
-180,6
+186,8
@@
Q_SIGNALS:
void signals_changed();
void signals_changed();
+ void trigger_event(util::Timestamp location);
+
void frame_began();
void data_received();
void frame_began();
void data_received();