projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libsigrok C++ bindings (patch version 7).
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index 0f4c2ee5549b92cd2c3d9f40c168b1fa9b690207..7c0ec9af2d75a2d29577e7d5126f1b2c78c717ee 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-23,7
+23,6
@@
#include <stdint.h>
#include <stdint.h>
-#include <list>
#include <map>
#include <memory>
#include <map>
#include <memory>
@@
-36,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
@@
-61,11
+62,11
@@
public:
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
SamplingBar(SigSession &session, QWidget *parent);
void set_device_list(
- const std::
list< std::shared_ptr<pv::device::DevInst>
>
- &devices,
- std::shared_ptr<
pv::device::DevInst
> selected);
+ const std::
map< std::shared_ptr<sigrok::Device>, std::string
>
+ &device
_name
s,
+ std::shared_ptr<
sigrok::Device
> selected);
- std::shared_ptr<
pv::device::DevInst
> get_selected_device() const;
+ 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);
@@
-95,14
+96,12
@@
private:
SigSession &_session;
QComboBox _device_selector;
SigSession &_session;
QComboBox _device_selector;
- std::map<const sr_dev_inst*, std::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;