projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enabled C++11 build
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index db4e856e26dfff48a59a80bae7f41909aa124e30..e2e24b788145bb3ca227b8931e6b13af934a7761 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-63,11
+63,10
@@
public:
void set_device_list(
const std::list< boost::shared_ptr<pv::device::DevInst> >
void set_device_list(
const std::list< boost::shared_ptr<pv::device::DevInst> >
- &devices);
+ &devices,
+ boost::shared_ptr<pv::device::DevInst> selected);
boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
- void set_selected_device(
- boost::shared_ptr<pv::device::DevInst> dev_inst);
void set_capture_state(pv::SigSession::capture_state state);
void set_capture_state(pv::SigSession::capture_state state);
@@
-78,6
+77,7
@@
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
void update_sample_count_selector();
void update_sample_rate_selector();
void update_sample_rate_selector_value();
void update_sample_count_selector();
+ void update_device_config_widgets();
void commit_sample_rate();
void commit_sample_count();
void commit_sample_rate();
void commit_sample_count();
@@
-89,6
+89,9
@@
private slots:
void on_config_changed();
void on_config_changed();
+protected:
+ bool eventFilter(QObject *watched, QEvent *event);
+
private:
SigSession &_session;
private:
SigSession &_session;