projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move signals to views and make Session handle multiple views
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 59060a591fdfd0d743ad83780dbcd066cdefbc01..83a73f4af7678252dc28b0afee6f25cf2b02b553 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;
@@
-62,6
+64,7
@@
class Analog;
class AnalogSegment;
class Logic;
class LogicSegment;
class AnalogSegment;
class Logic;
class LogicSegment;
+class SignalBase;
class SignalData;
}
class SignalData;
}
@@
-71,8
+74,7
@@
class Device;
namespace view {
class DecodeTrace;
namespace view {
class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
}
class Session : public QObject
}
class Session : public QObject
@@
-112,12
+114,14
@@
public:
void stop_capture();
void stop_capture();
- std::set< std::shared_ptr<data::SignalData> > get_data() const;
+ double get_samplerate() const;
+
+ void register_view(std::shared_ptr<pv::view::View> view);
-
boost::shared_mutex& signals_mutex() const
;
+
void deregister_view(std::shared_ptr<pv::view::View> view)
;
- const std::unordered_set< std::shared_ptr<
view::Signal> >&
- signals() const;
+ const std::unordered_set< std::shared_ptr<
data::SignalBase> >
+ signal
base
s() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
@@
-133,17
+137,18
@@
private:
void update_signals();
void update_signals();
- std::shared_ptr<
view::Signal> signal
_from_channel(
+ std::shared_ptr<
data::SignalBase> signalbase
_from_channel(
std::shared_ptr<sigrok::Channel> channel) const;
private:
std::shared_ptr<sigrok::Channel> channel) const;
private:
- void sample_thread_proc(std::shared_ptr<devices::Device> device,
- std::function<void (const QString)> error_handler);
+ void sample_thread_proc(std::function<void (const QString)> error_handler);
void feed_in_header();
void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
void feed_in_header();
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,13
+162,16
@@
private:
DeviceManager &device_manager_;
std::shared_ptr<devices::Device> device_;
DeviceManager &device_manager_;
std::shared_ptr<devices::Device> device_;
+ std::unordered_set< std::shared_ptr<pv::view::View> > views_;
+
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_;
capture_state capture_state_;
- mutable boost::shared_mutex signals_mutex_;
- std::unordered_set< std::shared_ptr<view::Signal> > signals_;
+
+ std::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
+ std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
@@
-174,12
+182,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();