X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=6fc8abd38e0fcdce4bcd6a45f2a4a36233f0b424;hb=5b8b1e47bd0d8c0d2519f83855a84f1820f1955e;hp=806a79a6c57547626d6175a9ec6c8ab0ba5fcecb;hpb=95237c18d988245fd5f484b70a481891982f5f37;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 806a79a..6fc8abd 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -31,8 +31,8 @@
 #include <QToolButton>
 
 #include <pv/sigsession.h>
-#include <pv/popups/probes.h>
 #include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
 
 struct st_dev_inst;
 class QAction;
@@ -48,8 +48,9 @@ class SamplingBar : public QToolBar
 	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:
 	SamplingBar(SigSession &session, QWidget *parent);
@@ -59,8 +60,6 @@ public:
 	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:
@@ -69,10 +68,13 @@ signals:
 private:
 	void update_sample_rate_selector();
 	void update_sample_rate_selector_value();
+	void update_sample_count_selector();
 	void commit_sample_rate();
+	void commit_sample_count();
 
 private slots:
 	void on_device_selected();
+	void on_sample_count_changed();
 	void on_sample_rate_changed();
 	void on_run_stop();
 
@@ -83,14 +85,16 @@ private:
 	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;