X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=e2e24b788145bb3ca227b8931e6b13af934a7761;hp=1f40d0452ff6ca8d7265cc30703eab46bcf388d4;hb=40065ab65c4f347ac5c3731fcea628ab26b49c1e;hpb=2b49eeb02d92b4744f8ebfcfd38ef27384cdd751

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 1f40d045..e2e24b78 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>
@@ -31,11 +34,19 @@
 #include <QToolButton>
 
 #include <pv/sigsession.h>
+#include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
 
-struct st_dev_inst;
 class QAction;
 
 namespace pv {
+
+class SigSession;
+
+namespace device {
+class DevInst;
+}
+
 namespace toolbars {
 
 class SamplingBar : public QToolBar
@@ -43,47 +54,63 @@ 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(QWidget *parent);
-
-	void set_device_list(const std::list<struct sr_dev_inst*> &devices);
+	SamplingBar(SigSession &session, QWidget *parent);
 
-	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::device::DevInst> >
+			&devices,
+		boost::shared_ptr<pv::device::DevInst> selected);
 
-	uint64_t get_record_length() const;
+	boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
 
 	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 update_sample_count_selector();
+	void update_device_config_widgets();
 	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_configure();
 	void on_run_stop();
 
+	void on_config_changed();
+
+protected:
+	bool eventFilter(QObject *watched, QEvent *event);
+
 private:
+	SigSession &_session;
+
 	QComboBox _device_selector;
-	QToolButton _configure_button;
+	std::map<const sr_dev_inst*, boost::weak_ptr<device::DevInst> >
+		_device_selector_map;
+	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;