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
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index e86dd183bbee32192a6511b58bf29441c585be9c..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;
@@
-84,6
+85,7
@@
public:
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_open() const;
QAction* action_save_as() const;
+ QAction* action_save_selection_as() const;
QAction* action_connect() const;
QAction* action_quit() const;
QAction* action_view_zoom_in() const;
QAction* action_connect() const;
QAction* action_quit() const;
QAction* action_view_zoom_in() const;
@@
-91,6
+93,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;
@@
-98,12
+101,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:
@@
-130,6
+139,8
@@
private:
const std::map<std::string, Glib::VariantBase> &options =
std::map<std::string, Glib::VariantBase>());
const std::map<std::string, Glib::VariantBase> &options =
std::map<std::string, Glib::VariantBase>());
+ void save_selection_to_file();
+
private:
void closeEvent(QCloseEvent *event);
private:
void closeEvent(QCloseEvent *event);
@@
-141,6
+152,7
@@
private Q_SLOTS:
void on_actionOpen_triggered();
void on_actionSaveAs_triggered();
void on_actionOpen_triggered();
void on_actionSaveAs_triggered();
+ void on_actionSaveSelectionAs_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
@@
-155,6
+167,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();
@@
-173,15
+187,14
@@
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_;
QAction *const action_open_;
QAction *const action_save_as_;
toolbars::MainBar *main_bar_;
QAction *const action_open_;
QAction *const action_save_as_;
+ QAction *const action_save_selection_as_;
QAction *const action_connect_;
QAction *const action_quit_;
QAction *const action_view_zoom_in_;
QAction *const action_connect_;
QAction *const action_quit_;
QAction *const action_view_zoom_in_;
@@
-189,6
+202,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_;