projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrapped sr_dev_inst in a class: pv::DevInst
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index 41630bcab92703d7a7ff44a1ae02c47192c912db..94d9344e1e07b4403d474e8b2748fc6c4149c478 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-24,6
+24,9
@@
#include <stdint.h>
#include <list>
#include <stdint.h>
#include <list>
+#include <map>
+
+#include <boost/shared_ptr.hpp>
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QComboBox>
#include <QDoubleSpinBox>
@@
-34,11
+37,11
@@
#include <pv/widgets/popuptoolbutton.h>
#include <pv/widgets/sweeptimingwidget.h>
#include <pv/widgets/popuptoolbutton.h>
#include <pv/widgets/sweeptimingwidget.h>
-struct st_dev_inst;
class QAction;
namespace pv {
class QAction;
namespace pv {
+class DevInst;
class SigSession;
namespace toolbars {
class SigSession;
namespace toolbars {
@@
-48,15
+51,18
@@
class SamplingBar : public QToolBar
Q_OBJECT
private:
Q_OBJECT
private:
- static const uint64_t DefaultRecordLength;
+ static const uint64_t MinSampleCount;
+ static const uint64_t MaxSampleCount;
+ static const uint64_t DefaultSampleCount;
public:
SamplingBar(SigSession &session, QWidget *parent);
public:
SamplingBar(SigSession &session, QWidget *parent);
- void set_device_list(const std::list<struct sr_dev_inst*> &devices);
+ void set_device_list(
+ const std::list< boost::shared_ptr<pv::DevInst> > &devices);
-
struct sr_dev_inst*
get_selected_device() const;
- void set_selected_device(
struct sr_dev_inst *const sdi
);
+
boost::shared_ptr<pv::DevInst>
get_selected_device() const;
+ void set_selected_device(
boost::shared_ptr<pv::DevInst> dev_inst
);
void set_capture_state(pv::SigSession::capture_state state);
void set_capture_state(pv::SigSession::capture_state state);
@@
-80,6
+86,8
@@
private:
SigSession &_session;
QComboBox _device_selector;
SigSession &_session;
QComboBox _device_selector;
+ std::map<const sr_dev_inst*, boost::weak_ptr<DevInst> >
+ _device_selector_map;
bool _updating_device_selector;
pv::widgets::PopupToolButton _configure_button;
bool _updating_device_selector;
pv::widgets::PopupToolButton _configure_button;
@@
-92,6
+100,8
@@
private:
bool _updating_sample_rate;
bool _updating_sample_count;
bool _updating_sample_rate;
bool _updating_sample_count;
+ bool _sample_count_supported;
+
QIcon _icon_red;
QIcon _icon_green;
QIcon _icon_grey;
QIcon _icon_red;
QIcon _icon_green;
QIcon _icon_grey;