projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved default device functionality into SigSession
[pulseview.git]
/
pv
/
mainwindow.h
diff --git
a/pv/mainwindow.h
b/pv/mainwindow.h
index b53138ee5f84c83bef3a06a1281a7bec0317ada1..1f9dd528af7a22d152adace7342cb827882197da 100644
(file)
--- a/
pv/mainwindow.h
+++ b/
pv/mainwindow.h
@@
-21,76
+21,100
@@
#ifndef PULSEVIEW_PV_MAINWINDOW_H
#define PULSEVIEW_PV_MAINWINDOW_H
#ifndef PULSEVIEW_PV_MAINWINDOW_H
#define PULSEVIEW_PV_MAINWINDOW_H
+#include <list>
+
+#include <boost/weak_ptr.hpp>
+
#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 {
+class ContextBar;
class SamplingBar;
class SamplingBar;
+}
namespace view {
class View;
}
namespace view {
class View;
}
+namespace widgets {
+class DecoderMenu;
+}
+
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
- explicit MainWindow(QWidget *parent = 0);
+ explicit MainWindow(DeviceManager &device_manager,
+ const char *open_file_name = NULL,
+ QWidget *parent = 0);
private:
void setup_ui();
private:
void setup_ui();
-private:
-
- SigSession _session;
- pv::view::View *_view;
+ void session_error(const QString text, const QString info_text);
- QMenuBar *_menu_bar;
- QMenu *_menu_file;
- QAction *_action_open;
-
QAction *_action_quit
;
+ /**
+ * Updates the device list in the sampling bar
+ */
+
void update_device_list()
;
- QMenu *_menu_view;
- QAction *_action_view_zoom_in;
- QAction *_action_view_zoom_out;
- QAction *_action_view_show_cursors;
-
- QMenu *_menu_help;
- QAction *_action_about;
-
- QWidget *_central_widget;
- QVBoxLayout *_vertical_layout;
+private slots:
+ void load_file(QString file_name);
- QToolBar *_toolbar;
- SamplingBar *_sampling_bar;
-private slots:
+ void show_session_error(
+ const QString text, const QString info_text);
void on_actionOpen_triggered();
void on_actionOpen_triggered();
+ void on_actionSaveAs_triggered();
void on_actionQuit_triggered();
void on_actionQuit_triggered();
+ void on_actionConnect_triggered();
+
void on_actionViewZoomIn_triggered();
void on_actionViewZoomOut_triggered();
void on_actionViewZoomIn_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 add_decoder(srd_decoder *decoder);
+
void run_stop();
void capture_state_changed(int state);
void run_stop();
void capture_state_changed(int state);
+
+private:
+ DeviceManager &_device_manager;
+
+ SigSession _session;
+
+ pv::view::View *_view;
+
+ QWidget *_central_widget;
+ QVBoxLayout *_vertical_layout;
+
+ toolbars::SamplingBar *_sampling_bar;
};
} // namespace pv
};
} // namespace pv