projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use alternating trace background colors when not using their own
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index f5c87f694f8e22a574307e7ae3568968423df9e8..ac3d654c63f06a4d70cd82db368bf16383c41453 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-31,15
+31,17
@@
#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
-#include <boost/thread.hpp>
+#include <boost/thread
/shared_mutex
.hpp>
#include <QObject>
#include <QString>
#include <QObject>
#include <QString>
+#include "util.hpp"
+
struct srd_decoder;
struct srd_channel;
struct srd_decoder;
struct srd_channel;
@@
-65,6
+67,10
@@
class LogicSegment;
class SignalData;
}
class SignalData;
}
+namespace devices {
+class Device;
+}
+
namespace view {
class DecodeTrace;
class LogicSignal;
namespace view {
class DecodeTrace;
class LogicSignal;
@@
-91,20
+97,14
@@
public:
const DeviceManager& device_manager() const;
const DeviceManager& device_manager() const;
-
const std::shared_ptr<sigrok::Session>&
session() const;
+
std::shared_ptr<sigrok::Session>
session() const;
- std::shared_ptr<
sigrok
::Device> device() const;
+ std::shared_ptr<
devices
::Device> device() const;
/**
* Sets device instance that will be used in the next capture session.
*/
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(std::shared_ptr<sigrok::Device> device);
-
- /**
- * Sets a sigrok session file as the capture device.
- * @param name the path to the file.
- */
- void set_session_file(const std::string &name);
+ void set_device(std::shared_ptr<devices::Device> device);
void set_default_device();
void set_default_device();
@@
-116,9
+116,9
@@
public:
std::set< std::shared_ptr<data::SignalData> > get_data() const;
std::set< std::shared_ptr<data::SignalData> > get_data() const;
-
boost::shared_mutex& signals_mutex
() const;
+
double get_samplerate
() const;
- const std::unordered_set< std::shared_ptr<view::Signal> >
&
+ const std::unordered_set< std::shared_ptr<view::Signal> >
signals() const;
#ifdef ENABLE_DECODE
signals() const;
#ifdef ENABLE_DECODE
@@
-133,21
+133,20
@@
public:
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
- void update_signals(
std::shared_ptr<sigrok::Device> device
);
+ void update_signals();
std::shared_ptr<view::Signal> signal_from_channel(
std::shared_ptr<sigrok::Channel> channel) const;
std::shared_ptr<view::Signal> signal_from_channel(
std::shared_ptr<sigrok::Channel> channel) const;
- void read_sample_rate(std::shared_ptr<sigrok::Device>);
-
private:
private:
- void sample_thread_proc(std::shared_ptr<
sigrok
::Device> device,
+ void sample_thread_proc(std::shared_ptr<
devices
::Device> device,
std::function<void (const QString)> error_handler);
std::function<void (const QString)> error_handler);
- void feed_in_header(std::shared_ptr<sigrok::Device> device);
+ void feed_in_header();
+
+ void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
- void feed_in_meta(std::shared_ptr<sigrok::Device> device,
- std::shared_ptr<sigrok::Meta> meta);
+ void feed_in_trigger();
void feed_in_frame_begin();
void feed_in_frame_begin();
@@
-160,22
+159,17
@@
private:
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;
- std::shared_ptr<sigrok::Session> session_;
-
- /**
- * The device instance that will be used in the next capture session.
- */
- std::shared_ptr<sigrok::Device> device_;
+ std::shared_ptr<devices::Device> device_;
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_;
std::unordered_set< std::shared_ptr<view::Signal> > signals_;
capture_state capture_state_;
mutable boost::shared_mutex signals_mutex_;
std::unordered_set< std::shared_ptr<view::Signal> > signals_;
- mutable std::mutex data_mutex_;
+ mutable std::
recursive_
mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
std::shared_ptr<data::LogicSegment> cur_logic_segment_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
std::shared_ptr<data::LogicSegment> cur_logic_segment_;
@@
-184,12
+178,16
@@
private:
std::thread sampling_thread_;
std::thread sampling_thread_;
+ bool out_of_memory_;
+
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();
void signals_changed();
Q_SIGNALS:
void capture_state_changed(int state);
void device_selected();
void signals_changed();
+ void trigger_event(util::Timestamp location);
+
void frame_began();
void data_received();
void frame_began();
void data_received();