projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a spin box widget for timestamp values
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 35ccf0655d10b4e37699f87d47d9f308cb007822..e86dd183bbee32192a6511b58bf29441c585be9c 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-78,7
+78,8
@@
private:
public:
explicit MainWindow(DeviceManager &device_manager,
public:
explicit MainWindow(DeviceManager &device_manager,
- const char *open_file_name = NULL,
+ std::string open_file_name = std::string(),
+ std::string open_file_format = std::string(),
QWidget *parent = 0);
QAction* action_open() const;
QWidget *parent = 0);
QAction* action_open() const;
@@
-89,6
+90,7
@@
public:
QAction* action_view_zoom_out() const;
QAction* action_view_zoom_fit() const;
QAction* action_view_zoom_one_to_one() const;
QAction* action_view_zoom_out() const;
QAction* action_view_zoom_fit() const;
QAction* action_view_zoom_one_to_one() const;
+ QAction* action_view_sticky_scrolling() const;
QAction* action_view_show_cursors() const;
QAction* action_about() const;
QAction* action_view_show_cursors() const;
QAction* action_about() const;
@@
-102,10
+104,16
@@
public:
public Q_SLOTS:
void export_file(std::shared_ptr<sigrok::OutputFormat> format);
public Q_SLOTS:
void export_file(std::shared_ptr<sigrok::OutputFormat> format);
+ void import_file(std::shared_ptr<sigrok::InputFormat> format);
private:
void setup_ui();
private:
void setup_ui();
+ void select_init_device();
+
+ void load_init_file(const std::string &file_name,
+ const std::string &format);
+
void save_ui_settings();
void restore_ui_settings();
void save_ui_settings();
void restore_ui_settings();
@@
-117,17
+125,17
@@
private:
*/
void update_device_list();
*/
void update_device_list();
+ void load_file(QString file_name,
+ std::shared_ptr<sigrok::InputFormat> format = nullptr,
+ const std::map<std::string, Glib::VariantBase> &options =
+ std::map<std::string, Glib::VariantBase>());
+
private:
void closeEvent(QCloseEvent *event);
void keyReleaseEvent(QKeyEvent *event);
private Q_SLOTS:
private:
void closeEvent(QCloseEvent *event);
void keyReleaseEvent(QKeyEvent *event);
private Q_SLOTS:
- void load_file(QString file_name,
- std::shared_ptr<sigrok::InputFormat> format = nullptr,
- const std::map<std::string, Glib::VariantBase> &options =
- std::map<std::string, Glib::VariantBase>());
-
void show_session_error(
const QString text, const QString info_text);
void show_session_error(
const QString text, const QString info_text);
@@
-145,6
+153,8
@@
private Q_SLOTS:
void on_actionViewZoomOneToOne_triggered();
void on_actionViewZoomOneToOne_triggered();
+ void on_actionViewStickyScrolling_triggered();
+
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
@@
-154,6
+164,10
@@
private Q_SLOTS:
void capture_state_changed(int state);
void device_selected();
void capture_state_changed(int state);
void device_selected();
+ void sticky_scrolling_changed(bool state);
+
+ void always_zoom_to_fit_changed(bool state);
+
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;
@@
-174,6
+188,7
@@
private:
QAction *const action_view_zoom_out_;
QAction *const action_view_zoom_fit_;
QAction *const action_view_zoom_one_to_one_;
QAction *const action_view_zoom_out_;
QAction *const action_view_zoom_fit_;
QAction *const action_view_zoom_one_to_one_;
+ QAction *const action_view_sticky_scrolling_;
QAction *const action_view_show_cursors_;
QAction *const action_about_;
QAction *const action_view_show_cursors_;
QAction *const action_about_;