X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=6fc8abd38e0fcdce4bcd6a45f2a4a36233f0b424;hb=33666ec04c2a8bdeecd39eebfcf853a3628d6501;hp=aef26ef145c3882e73273ec9d52eb4aca3bf2646;hpb=1198b8872516662c257e5dcdec346094ed4f32dd;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index aef26ef..6fc8abd 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -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();
 
@@ -87,10 +89,12 @@ private:
 
 	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;
+
+	bool _sample_count_supported;
 
 	QIcon _icon_red;
 	QIcon _icon_green;