projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSegment: Remove constructor requiring sigrok::Logic
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index e3a51c6d88f5b32a62c2801eed7c743e3b33d4bf..0611e0021c512e4c3fb7b654a5432bae168bc38d 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-33,6
+33,11
@@
#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,22
+70,22
@@
private:
public:
explicit MainWindow(DeviceManager &device_manager,
public:
explicit MainWindow(DeviceManager &device_manager,
- st
d::string open_file_name = std::
string(),
- st
d::string open_file_format = std::
string(),
+ st
ring open_file_name =
string(),
+ st
ring open_file_format =
string(),
QWidget *parent = 0);
~MainWindow();
QWidget *parent = 0);
~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(s
td::s
hared_ptr<Session> session);
+ void remove_session(shared_ptr<Session> session);
private:
void setup_ui();
private:
void setup_ui();
@@
-89,7
+94,7
@@
private:
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
+111,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();
@@
-121,22
+126,24
@@
private Q_SLOTS:
void on_tab_changed(int index);
void on_tab_close_requested(int index);
void on_tab_changed(int index);
void on_tab_close_requested(int index);
- void on_view_sticky_scrolling_shortcut();
void on_view_coloured_bg_shortcut();
void on_view_coloured_bg_shortcut();
+ void on_view_sticky_scrolling_shortcut();
+ void on_view_show_sampling_points_shortcut();
void on_settingViewColouredBg_changed(const QVariant new_value);
void on_settingViewColouredBg_changed(const QVariant new_value);
+ void on_settingViewShowSamplingPoints_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_;
@@
-148,6
+155,7
@@
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_coloured_bg_shortcut_;
QShortcut *run_stop_shortcut_;
QShortcut *close_application_shortcut_;
QShortcut *view_coloured_bg_shortcut_;
QShortcut *run_stop_shortcut_;
QShortcut *close_application_shortcut_;