X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.h;h=7c0ec9af2d75a2d29577e7d5126f1b2c78c717ee;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=5821a01091a7eb59d6c7d1762a5ffef184b9c28d;hpb=488f068c7ecdc101820a3c48be61fb45a7e683dc;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 5821a01..7c0ec9a 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -23,7 +23,8 @@
 
 #include <stdint.h>
 
-#include <list>
+#include <map>
+#include <memory>
 
 #include <QComboBox>
 #include <QDoubleSpinBox>
@@ -32,8 +33,14 @@
 
 #include <pv/sigsession.h>
 #include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
+
+namespace sigrok {
+	class Device;
+}
+
+Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
 
-struct st_dev_inst;
 class QAction;
 
 namespace pv {
@@ -47,34 +54,44 @@ 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::map< std::shared_ptr<sigrok::Device>, std::string >
+			&device_names,
+		std::shared_ptr<sigrok::Device> selected);
 
-	uint64_t get_record_length() const;
+	std::shared_ptr<sigrok::Device> get_selected_device() const;
 
 	void set_capture_state(pv::SigSession::capture_state state);
 
-signals:
+Q_SIGNALS:
 	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:
+private Q_SLOTS:
 	void on_device_selected();
+	void on_sample_count_changed();
 	void on_sample_rate_changed();
 	void on_run_stop();
 
+	void on_config_changed();
+
+protected:
+	bool eventFilter(QObject *watched, QEvent *event);
+
 private:
 	SigSession &_session;
 
@@ -84,15 +101,14 @@ private:
 	pv::widgets::PopupToolButton _configure_button;
 	QAction *_configure_button_action;
 
-	pv::widgets::PopupToolButton _probes_button;
+	pv::widgets::PopupToolButton _channels_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;