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 a4fc352d1969fd527951820bbf75e37f8b2b991c..d6cfdd302c97815daec25bcf19b62e12008c96e2 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-72,6
+72,10
@@
namespace devices {
class Device;
}
class Device;
}
+namespace toolbars {
+class MainBar;
+}
+
namespace view {
class View;
}
namespace view {
class View;
}
@@
-100,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.
*/
@@
-159,6
+169,9
@@
private:
std::shared_ptr<devices::Device> device_;
std::unordered_set< std::shared_ptr<pv::view::View> > views_;
std::shared_ptr<devices::Device> device_;
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_;