X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=454d607931be9633354549a43d89ba137c744024;hb=82afd5e35c8113b719d78e5c654edf933375218a;hp=5821a01091a7eb59d6c7d1762a5ffef184b9c28d;hpb=488f068c7ecdc101820a3c48be61fb45a7e683dc;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 5821a010..454d6079 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -24,6 +24,9 @@
 #include <stdint.h>
 
 #include <list>
+#include <map>
+
+#include <boost/shared_ptr.hpp>
 
 #include <QComboBox>
 #include <QDoubleSpinBox>
@@ -32,12 +35,13 @@
 
 #include <pv/sigsession.h>
 #include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
 
-struct st_dev_inst;
 class QAction;
 
 namespace pv {
 
+class DevInst;
 class SigSession;
 
 namespace toolbars {
@@ -47,18 +51,18 @@ 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);
 
-	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< boost::shared_ptr<pv::DevInst> > &devices);
 
-	uint64_t get_record_length() const;
+	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);
 
@@ -68,17 +72,24 @@ 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();
 
+	void on_config_changed();
+
 private:
 	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;
@@ -86,13 +97,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;
 
-	QAction *_sample_rate_action;
-	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;