projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce pv::data::SignalBase
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index ac3d654c63f06a4d70cd82db368bf16383c41453..4c6c73e37483e60f3b72ace3fd68b6a26befd8e0 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;
}
@@
-114,8
+115,6
@@
public:
void stop_capture();
void stop_capture();
- std::set< std::shared_ptr<data::SignalData> > get_data() const;
-
double get_samplerate() const;
const std::unordered_set< std::shared_ptr<view::Signal> >
double get_samplerate() const;
const std::unordered_set< std::shared_ptr<view::Signal> >
@@
-135,12
+134,11
@@
private:
void update_signals();
void update_signals();
- std::shared_ptr<
view::Signal
> signal_from_channel(
+ std::shared_ptr<
data::SignalBase
> signal_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();
@@
-169,6
+167,9
@@
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::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;