projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bindings for new device options
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index 1f40d0452ff6ca8d7265cc30703eab46bcf388d4..6fc8abd38e0fcdce4bcd6a45f2a4a36233f0b424 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-31,11
+31,16
@@
#include <QToolButton>
#include <pv/sigsession.h>
#include <QToolButton>
#include <pv/sigsession.h>
+#include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
struct st_dev_inst;
class QAction;
namespace pv {
struct st_dev_inst;
class QAction;
namespace pv {
+
+class SigSession;
+
namespace toolbars {
class SamplingBar : public QToolBar
namespace toolbars {
class SamplingBar : public QToolBar
@@
-43,47
+48,53
@@
class SamplingBar : public QToolBar
Q_OBJECT
private:
Q_OBJECT
private:
- static const uint64_t RecordLengths[20];
- static const uint64_t DefaultRecordLength;
+ static const uint64_t MinSampleCount;
+ static const uint64_t MaxSampleCount;
+ static const uint64_t DefaultSampleCount;
public:
public:
- SamplingBar(QWidget *parent);
+ SamplingBar(
SigSession &session,
QWidget *parent);
void set_device_list(const std::list<struct sr_dev_inst*> &devices);
struct sr_dev_inst* get_selected_device() const;
void set_selected_device(struct sr_dev_inst *const sdi);
void set_device_list(const std::list<struct sr_dev_inst*> &devices);
struct sr_dev_inst* get_selected_device() const;
void set_selected_device(struct sr_dev_inst *const sdi);
- uint64_t get_record_length() const;
-
void set_capture_state(pv::SigSession::capture_state state);
signals:
void set_capture_state(pv::SigSession::capture_state state);
signals:
- void device_selected();
-
void run_stop();
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
void run_stop();
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
+ void update_sample_count_selector();
void commit_sample_rate();
void commit_sample_rate();
+ void commit_sample_count();
private slots:
void on_device_selected();
private slots:
void on_device_selected();
+ void on_sample_count_changed();
void on_sample_rate_changed();
void on_sample_rate_changed();
- void on_configure();
void on_run_stop();
private:
void on_run_stop();
private:
+ SigSession &_session;
+
QComboBox _device_selector;
QComboBox _device_selector;
- QToolButton _configure_button;
+ bool _updating_device_selector;
+
+ pv::widgets::PopupToolButton _configure_button;
+ QAction *_configure_button_action;
+
+ pv::widgets::PopupToolButton _probes_button;
- QComboBox _record_length_selector;
+ pv::widgets::SweepTimingWidget _sample_count;
+ pv::widgets::SweepTimingWidget _sample_rate;
+ bool _updating_sample_rate;
+ bool _updating_sample_count;
- QComboBox _sample_rate_list;
- QAction *_sample_rate_list_action;
- QDoubleSpinBox _sample_rate_value;
- QAction *_sample_rate_value_action;
+ bool _sample_count_supported;
QIcon _icon_red;
QIcon _icon_green;
QIcon _icon_red;
QIcon _icon_green;