projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move view-independent data from view::DecodeTrace to SignalBase
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 22705c3670fffdf851f8bdf65e1e115aa82f5b75..a4fc352d1969fd527951820bbf75e37f8b2b991c 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-64,6
+64,7
@@
class Analog;
class AnalogSegment;
class Logic;
class LogicSegment;
class AnalogSegment;
class Logic;
class LogicSegment;
+class SignalBase;
class SignalData;
}
class SignalData;
}
@@
-72,9
+73,7
@@
class Device;
}
namespace view {
}
namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
}
class Session : public QObject
}
class Session : public QObject
@@
-116,16
+115,17
@@
public:
double get_samplerate() const;
double get_samplerate() const;
- const std::unordered_set< std::shared_ptr<view::Signal> >
- signals() const;
+ void register_view(std::shared_ptr<pv::view::View> view);
+
+ void deregister_view(std::shared_ptr<pv::view::View> view);
+
+ const std::unordered_set< std::shared_ptr<data::SignalBase> >
+ signalbases() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
- std::vector< std::shared_ptr<view::DecodeTrace> >
- get_decode_signals() const;
-
- void remove_decode_signal(view::DecodeTrace *signal);
+ void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
#endif
private:
#endif
private:
@@
-133,12
+133,11
@@
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_header();
@@
-159,14
+158,14
@@
private:
DeviceManager &device_manager_;
std::shared_ptr<devices::Device> device_;
DeviceManager &device_manager_;
std::shared_ptr<devices::Device> device_;
- std::
vector< std::shared_ptr<view::DecodeTrace> > decode_trace
s_;
+ std::
unordered_set< std::shared_ptr<pv::view::View> > view
s_;
mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
capture_state capture_state_;
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> > signal
s_;
- std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
+
+ std::unordered_set< std::shared_ptr<
data::SignalBase> > signalbase
s_;
+ 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_;