projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove data_ also for LogicSignal and use SignalBase data instead
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 208cbe4367e163062b59fb8fc05e6e3695da219a..91a0bc5d69d971076f8191b01f9d53316864acfc 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-30,6
+30,7
@@
#include <QMainWindow>
#include "session.hpp"
#include <QMainWindow>
#include "session.hpp"
+#include "view/viewwidget.hpp"
struct srd_decoder;
struct srd_decoder;
@@
-100,6
+101,11
@@
public:
QMenu* menu_decoder_add() const;
#endif
QMenu* menu_decoder_add() const;
#endif
+ std::shared_ptr<pv::view::View> get_active_view() const;
+
+ std::shared_ptr<pv::view::View> add_view(const QString &title,
+ view::ViewType type, Session &session);
+
void run_stop();
void select_device(std::shared_ptr<devices::Device> device);
void run_stop();
void select_device(std::shared_ptr<devices::Device> device);
@@
-181,10
+187,8
@@
private:
Session session_;
Session session_;
- pv::view::View *view_;
-
- QWidget *central_widget_;
- QVBoxLayout *vertical_layout_;
+ std::map< std::shared_ptr<QDockWidget>,
+ std::shared_ptr<pv::view::View> > view_docks_;
toolbars::MainBar *main_bar_;
toolbars::MainBar *main_bar_;