projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move signals to views and make Session handle multiple views
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 94fc092a940c278783629c77c41099fb7ed0fd7d..547089c59e5a39a17acf36771a75e37c094daa1f 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;
@@
-82,6
+83,8
@@
public:
std::string open_file_format = std::string(),
QWidget *parent = 0);
std::string open_file_format = std::string(),
QWidget *parent = 0);
+ ~MainWindow();
+
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
@@
-92,6
+95,7
@@
public:
QAction* action_view_zoom_fit() const;
QAction* action_view_zoom_one_to_one() const;
QAction* action_view_sticky_scrolling() const;
QAction* action_view_zoom_fit() const;
QAction* action_view_zoom_one_to_one() const;
QAction* action_view_sticky_scrolling() const;
+ QAction* action_view_coloured_bg() const;
QAction* action_view_show_cursors() const;
QAction* action_about() const;
QAction* action_view_show_cursors() const;
QAction* action_about() const;
@@
-99,12
+103,18
@@
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);
public Q_SLOTS:
void run_stop();
void select_device(std::shared_ptr<devices::Device> device);
public Q_SLOTS:
- void export_file(std::shared_ptr<sigrok::OutputFormat> format);
+ void export_file(std::shared_ptr<sigrok::OutputFormat> format,
+ bool selection_only = false);
void import_file(std::shared_ptr<sigrok::InputFormat> format);
private:
void import_file(std::shared_ptr<sigrok::InputFormat> format);
private:
@@
-159,6
+169,8
@@
private Q_SLOTS:
void on_actionViewStickyScrolling_triggered();
void on_actionViewStickyScrolling_triggered();
+ void on_actionViewColouredBg_triggered();
+
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
@@
-177,10
+189,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_;
@@
-194,6
+204,7
@@
private:
QAction *const action_view_zoom_fit_;
QAction *const action_view_zoom_one_to_one_;
QAction *const action_view_sticky_scrolling_;
QAction *const action_view_zoom_fit_;
QAction *const action_view_zoom_one_to_one_;
QAction *const action_view_sticky_scrolling_;
+ QAction *const action_view_coloured_bg_;
QAction *const action_view_show_cursors_;
QAction *const action_about_;
QAction *const action_view_show_cursors_;
QAction *const action_about_;