projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSignal: Added trigger markers
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 333eda2a0a75dfbc02f9c534444d389d42498efa..8a67c615ca0718ec16e37f8cab203bc087edab5b 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-32,6
+32,10
@@
struct srd_decoder;
class QVBoxLayout;
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,8
+108,6
@@
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 device_selected();
void capture_state_changed(int state);
void device_selected();
@@
-120,7
+126,7
@@
private:
DeviceManager &device_manager_;
DeviceManager &device_manager_;
- S
igS
ession session_;
+ Session session_;
pv::view::View *view_;
pv::view::View *view_;