projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move signal data to SignalBase and adjust view::AnalogSignal
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 22705c3670fffdf851f8bdf65e1e115aa82f5b75..96da72d39be2c908ab41b470a151e63ec1b73a61 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;
}
@@
-133,12
+134,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();
@@
-166,6
+166,8
@@
private:
mutable boost::shared_mutex signals_mutex_;
std::unordered_set< std::shared_ptr<view::Signal> > signals_;
mutable boost::shared_mutex signals_mutex_;
std::unordered_set< std::shared_ptr<view::Signal> > signals_;
+
+ std::set< std::shared_ptr<data::SignalBase> > signalbases_;
std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
mutable std::recursive_mutex data_mutex_;
std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
mutable std::recursive_mutex data_mutex_;