projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.gitignore: Ignore vim .swo files
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index db4e856e26dfff48a59a80bae7f41909aa124e30..d8d81219659e9a0cc19ca496ef8e11a6fcb2b234 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-24,9
+24,7
@@
#include <stdint.h>
#include <list>
#include <stdint.h>
#include <list>
-#include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QComboBox>
#include <QDoubleSpinBox>
@@
-37,16
+35,18
@@
#include <pv/widgets/popuptoolbutton.h>
#include <pv/widgets/sweeptimingwidget.h>
#include <pv/widgets/popuptoolbutton.h>
#include <pv/widgets/sweeptimingwidget.h>
+namespace sigrok {
+ class Device;
+}
+
+Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
+
class QAction;
namespace pv {
class SigSession;
class QAction;
namespace pv {
class SigSession;
-namespace device {
-class DevInst;
-}
-
namespace toolbars {
class SamplingBar : public QToolBar
namespace toolbars {
class SamplingBar : public QToolBar
@@
-62,26
+62,25
@@
public:
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
- const std::list<
boost::shared_ptr<pv::device::DevInst> >
-
&devices
);
+ const std::list<
std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
+
std::shared_ptr<sigrok::Device> selected
);
- boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
- void set_selected_device(
- boost::shared_ptr<pv::device::DevInst> dev_inst);
+ std::shared_ptr<sigrok::Device> get_selected_device() const;
void set_capture_state(pv::SigSession::capture_state state);
void set_capture_state(pv::SigSession::capture_state state);
-
signals
:
+
Q_SIGNALS
:
void run_stop();
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
void update_sample_count_selector();
void run_stop();
private:
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();
-private
slots
:
+private
Q_SLOTS
:
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
@@
-89,18
+88,19
@@
private slots:
void on_config_changed();
void on_config_changed();
+protected:
+ bool eventFilter(QObject *watched, QEvent *event);
+
private:
SigSession &_session;
QComboBox _device_selector;
private:
SigSession &_session;
QComboBox _device_selector;
- std::map<const sr_dev_inst*, boost::weak_ptr<device::DevInst> >
- _device_selector_map;
bool _updating_device_selector;
pv::widgets::PopupToolButton _configure_button;
QAction *_configure_button_action;
bool _updating_device_selector;
pv::widgets::PopupToolButton _configure_button;
QAction *_configure_button_action;
- pv::widgets::PopupToolButton _
probe
s_button;
+ pv::widgets::PopupToolButton _
channel
s_button;
pv::widgets::SweepTimingWidget _sample_count;
pv::widgets::SweepTimingWidget _sample_rate;
pv::widgets::SweepTimingWidget _sample_count;
pv::widgets::SweepTimingWidget _sample_rate;