projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MarginWidget: Moved in keyPressEvent
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 9a000c2a261f54e3123cdaf7c81d9bc0459e4c12..35cad3ab2890993f13c30afc95fa956ef7775548 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-26,12
+26,16
@@
#include <QMainWindow>
#include <QMainWindow>
-#include "s
igs
ession.hpp"
+#include "session.hpp"
struct srd_decoder;
class QVBoxLayout;
struct srd_decoder;
class QVBoxLayout;
+namespace sigrok {
+class Device;
+}
+
namespace pv {
class DeviceManager;
namespace pv {
class DeviceManager;
@@
-58,6
+62,10
@@
public:
const char *open_file_name = NULL,
QWidget *parent = 0);
const char *open_file_name = NULL,
QWidget *parent = 0);
+ void run_stop();
+
+ void select_device(std::shared_ptr<sigrok::Device> device);
+
private:
void setup_ui();
private:
void setup_ui();
@@
-100,9
+108,8
@@
private Q_SLOTS:
void add_decoder(srd_decoder *decoder);
void add_decoder(srd_decoder *decoder);
- void run_stop();
-
void capture_state_changed(int state);
void capture_state_changed(int state);
+ void device_selected();
private:
/**
private:
/**
@@
-119,7
+126,7
@@
private:
DeviceManager &device_manager_;
DeviceManager &device_manager_;
- S
igS
ession session_;
+ Session session_;
pv::view::View *view_;
pv::view::View *view_;