X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=cf425775aeb83bbb01bca1413b8c4eb718bb2c22;hb=8575601295c4853ae73fa404eb157bd063af0c20;hp=9f6ceb21fd20cb2b23f3f4b08b74f2a1f32d6a57;hpb=b3e8a5d8e8139278a40508694e0b179170fffa14;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 9f6ceb2..cf42577 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,7 +48,6 @@ class SamplingBar : public QToolBar
 	Q_OBJECT
 
 private:
-	static const uint64_t RecordLengths[20];
 	static const uint64_t DefaultRecordLength;
 
 public:
@@ -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();
 
@@ -86,15 +88,11 @@ private:
 	QAction *_configure_button_action;
 
 	pv::widgets::PopupToolButton _probes_button;
-	pv::popups::Probes _probes_popup;
 
-	QComboBox _record_length_selector;
-
-	QAction *_sample_rate_action;
-	QComboBox _sample_rate_list;
-	QAction *_sample_rate_list_action;
-	QDoubleSpinBox _sample_rate_value;
-	QAction *_sample_rate_value_action;
+	pv::widgets::SweepTimingWidget _sample_count;
+	pv::widgets::SweepTimingWidget _sample_rate;
+	bool _updating_sample_rate;
+	bool _updating_sample_count;
 
 	QIcon _icon_red;
 	QIcon _icon_green;