projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32: Use -mwindows only for non-Debug targets.
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 50708c2035a9f1069545292e03a50d3f6017e34d..71cad57817a0554ad832b8710e0dc39dbe8fcc91 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-25,14
+25,19
@@
#include <memory>
#include <QMainWindow>
#include <memory>
#include <QMainWindow>
+#include <QShortcut>
#include <QSignalMapper>
#include <QSignalMapper>
-#include <QToolButton>
#include <QTabWidget>
#include <QTabWidget>
-#include <Q
Shortcut
>
+#include <Q
ToolButton
>
#include "session.hpp"
#include "views/viewbase.hpp"
#include "session.hpp"
#include "views/viewbase.hpp"
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
struct srd_decoder;
class QVBoxLayout;
struct srd_decoder;
class QVBoxLayout;
@@
-65,31
+70,35
@@
private:
public:
explicit MainWindow(DeviceManager &device_manager,
public:
explicit MainWindow(DeviceManager &device_manager,
- std::string open_file_name = std::string(),
- std::string open_file_format = std::string(),
- QWidget *parent = 0);
+ QWidget *parent = nullptr);
~MainWindow();
~MainWindow();
- s
td::s
hared_ptr<views::ViewBase> get_active_view() const;
+ shared_ptr<views::ViewBase> get_active_view() const;
- s
td::s
hared_ptr<views::ViewBase> add_view(const QString &title,
+ shared_ptr<views::ViewBase> add_view(const QString &title,
views::ViewType type, Session &session);
views::ViewType type, Session &session);
- void remove_view(s
td::s
hared_ptr<views::ViewBase> view);
+ void remove_view(shared_ptr<views::ViewBase> view);
- s
td::s
hared_ptr<Session> add_session();
+ shared_ptr<Session> add_session();
- void remove_session(std::shared_ptr<Session> session);
+ void remove_session(shared_ptr<Session> session);
+
+ void add_session_with_file(string open_file_name, string open_file_format);
+
+ void add_default_session();
+
+ void save_sessions();
+ void restore_sessions();
private:
void setup_ui();
void save_ui_settings();
private:
void setup_ui();
void save_ui_settings();
-
void restore_ui_settings();
void restore_ui_settings();
- s
td::s
hared_ptr<Session> get_tab_session(int index) const;
+ shared_ptr<Session> get_tab_session(int index) const;
void closeEvent(QCloseEvent *event);
void closeEvent(QCloseEvent *event);
@@
-106,7
+115,7
@@
private Q_SLOTS:
Session *session);
void on_focus_changed();
Session *session);
void on_focus_changed();
- void on_focused_session_changed(s
td::s
hared_ptr<Session> session);
+ void on_focused_session_changed(shared_ptr<Session> session);
void on_new_session_clicked();
void on_run_stop_clicked();
void on_new_session_clicked();
void on_run_stop_clicked();
@@
-123,21
+132,24
@@
private Q_SLOTS:
void on_view_coloured_bg_shortcut();
void on_view_sticky_scrolling_shortcut();
void on_view_coloured_bg_shortcut();
void on_view_sticky_scrolling_shortcut();
+ void on_view_show_sampling_points_shortcut();
+ void on_view_show_analog_minor_grid_shortcut();
void on_settingViewColouredBg_changed(const QVariant new_value);
void on_settingViewColouredBg_changed(const QVariant new_value);
- void on_settingViewStickyScrolling_changed(const QVariant new_value);
+ void on_settingViewShowSamplingPoints_changed(const QVariant new_value);
+ void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);
void on_close_current_tab();
private:
DeviceManager &device_manager_;
void on_close_current_tab();
private:
DeviceManager &device_manager_;
-
std::list< std::
shared_ptr<Session> > sessions_;
- s
td::s
hared_ptr<Session> last_focused_session_;
+
list<
shared_ptr<Session> > sessions_;
+ shared_ptr<Session> last_focused_session_;
-
std::map< QDockWidget*, std::
shared_ptr<views::ViewBase> > view_docks_;
+
map< QDockWidget*,
shared_ptr<views::ViewBase> > view_docks_;
-
std::map< std::
shared_ptr<Session>, QMainWindow*> session_windows_;
+
map<
shared_ptr<Session>, QMainWindow*> session_windows_;
QWidget *static_tab_widget_;
QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
QWidget *static_tab_widget_;
QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
@@
-149,6
+161,8
@@
private:
QIcon icon_grey_;
QShortcut *view_sticky_scrolling_shortcut_;
QIcon icon_grey_;
QShortcut *view_sticky_scrolling_shortcut_;
+ QShortcut *view_show_sampling_points_shortcut_;
+ QShortcut *view_show_analog_minor_grid_shortcut_;
QShortcut *view_coloured_bg_shortcut_;
QShortcut *run_stop_shortcut_;
QShortcut *close_application_shortcut_;
QShortcut *view_coloured_bg_shortcut_;
QShortcut *run_stop_shortcut_;
QShortcut *close_application_shortcut_;