projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the first view own the toolbar instead of the main window
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index e113cf4fdb77711d33a4aac0b45cff49521e88ce..d6cfdd302c97815daec25bcf19b62e12008c96e2 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;
}
@@
-71,10
+72,12
@@
namespace devices {
class Device;
}
class Device;
}
+namespace toolbars {
+class MainBar;
+}
+
namespace view {
namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
}
class Session : public QObject
}
class Session : public QObject
@@
-101,6
+104,12
@@
public:
std::shared_ptr<devices::Device> device() const;
std::shared_ptr<devices::Device> device() const;
+ std::shared_ptr<pv::view::View> main_view() const;
+
+ void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
+
+ std::shared_ptr<pv::toolbars::MainBar> main_bar() 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.
*/
@@
-116,16
+125,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,7
+143,7
@@
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:
@@
-158,14
+168,17
@@
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_traces_;
+ std::unordered_set< std::shared_ptr<pv::view::View> > views_;
+ std::shared_ptr<pv::view::View> main_view_;
+
+ std::shared_ptr<pv::toolbars::MainBar> main_bar_;
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_;