projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: Bundle Qt libs with the APK
[pulseview.git]
/
pv
/
mainwindow.h
diff --git
a/pv/mainwindow.h
b/pv/mainwindow.h
index 8129020348109ec6c395672f27bfa98995f9f9c3..41c55ba5ca9c11f2d6282c497831c9ad83985d4f 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-22,22
+22,26
@@
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
#define PULSEVIEW_PV_MAINWINDOW_H
#include <list>
+#include <memory>
#include <QMainWindow>
#include "sigsession.h"
#include <QMainWindow>
#include "sigsession.h"
-class QAction;
-class QMenuBar;
-class QMenu;
+struct srd_decoder;
+
class QVBoxLayout;
class QVBoxLayout;
-class QStatusBar;
-class QToolBar;
-class QWidget;
namespace pv {
namespace pv {
+class DeviceManager;
+
+namespace device {
+class DevInst;
+}
+
namespace toolbars {
namespace toolbars {
+class ContextBar;
class SamplingBar;
}
class SamplingBar;
}
@@
-45,21
+49,30
@@
namespace view {
class View;
}
class View;
}
+namespace widgets {
+class DecoderMenu;
+}
+
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
- explicit MainWindow(const char *open_file_name = NULL,
+ explicit MainWindow(DeviceManager &device_manager,
+ const char *open_file_name = NULL,
QWidget *parent = 0);
private:
void setup_ui();
QWidget *parent = 0);
private:
void setup_ui();
- void scan_devices();
void session_error(const QString text, const QString info_text);
void session_error(const QString text, const QString info_text);
-private slots:
+ /**
+ * Updates the device list in the sampling bar
+ */
+ void update_device_list();
+
+private Q_SLOTS:
void load_file(QString file_name);
void load_file(QString file_name);
@@
-67,6
+80,7
@@
private slots:
const QString text, const QString info_text);
void on_actionOpen_triggered();
const QString text, const QString info_text);
void on_actionOpen_triggered();
+ void on_actionSaveAs_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
void on_actionQuit_triggered();
void on_actionConnect_triggered();
@@
-75,41
+89,42
@@
private slots:
void on_actionViewZoomOut_triggered();
void on_actionViewZoomOut_triggered();
+ void on_actionViewZoomFit_triggered();
+
+ void on_actionViewZoomOneToOne_triggered();
+
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
void on_actionViewShowCursors_triggered();
void on_actionAbout_triggered();
- void
device_selected(
);
+ void
add_decoder(srd_decoder *decoder
);
void run_stop();
void capture_state_changed(int state);
private:
void run_stop();
void capture_state_changed(int state);
private:
+ /**
+ * Name of the setting used to remember the directory
+ * containing the last file that was opened.
+ */
+ static const char *SettingOpenDirectory;
- SigSession _session;
- std::list<sr_dev_inst*> _devices;
+ /**
+ * Name of the setting used to remember the directory
+ * containing the last file that was saved.
+ */
+ static const char *SettingSaveDirectory;
-
pv::view::View *_view
;
+
DeviceManager &_device_manager
;
- QMenuBar *_menu_bar;
- QMenu *_menu_file;
- QAction *_action_open;
- QAction *_action_connect;
- QAction *_action_quit;
-
- QMenu *_menu_view;
- QAction *_action_view_zoom_in;
- QAction *_action_view_zoom_out;
- QAction *_action_view_show_cursors;
+ SigSession _session;
- QMenu *_menu_help;
- QAction *_action_about;
+ pv::view::View *_view;
QWidget *_central_widget;
QVBoxLayout *_vertical_layout;
QWidget *_central_widget;
QVBoxLayout *_vertical_layout;
- QToolBar *_toolbar;
toolbars::SamplingBar *_sampling_bar;
};
toolbars::SamplingBar *_sampling_bar;
};