X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsamplingbar.cpp;h=6eea6d78040af5b8be211e5037294a1e819139bc;hb=488883133fefe0af41737cea9b2fc9eb114042b8;hp=8bdadbb149709697e738f26190656d4b3084380f;hpb=d2aad78135050b13f1cf211fa0025aef1a238edf;p=pulseview.git

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index 8bdadbb1..6eea6d78 100644
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -18,23 +18,31 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <assert.h>
+#include <extdef.h>
 
-#include <boost/foreach.hpp>
+#include <assert.h>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 #include <QAction>
+#include <QDebug>
 
 #include "samplingbar.h"
 
-#include <pv/dialogs/hwcap.h>
+#include <pv/dialogs/deviceoptions.h>
 
 namespace pv {
 
-const uint64_t SamplingBar::RecordLengths[11] = {
+const uint64_t SamplingBar::RecordLengths[20] = {
+	1000,
+	2500,
+	5000,
+	10000,
+	25000,
+	50000,
+	100000,
+	250000,
+	500000,
 	1000000,
 	2000000,
 	5000000,
@@ -48,6 +56,8 @@ const uint64_t SamplingBar::RecordLengths[11] = {
 	10000000000ULL,
 };
 
+const uint64_t SamplingBar::DefaultRecordLength = 1000000;
+
 SamplingBar::SamplingBar(QWidget *parent) :
 	QToolBar("Sampling Bar", parent),
 	_device_selector(this),
@@ -68,12 +78,16 @@ SamplingBar::SamplingBar(QWidget *parent) :
 	_sample_rate_value.setDecimals(0);
 	_sample_rate_value.setSuffix("Hz");
 
-	BOOST_FOREACH(uint64_t l, RecordLengths)
+	for (size_t i = 0; i < countof(RecordLengths); i++)
 	{
+		const uint64_t &l = RecordLengths[i];
 		char *const text = sr_si_string_u64(l, " samples");
 		_record_length_selector.addItem(QString(text),
 			qVariantFromValue(l));
 		g_free(text);
+
+		if (l == DefaultRecordLength)
+			_record_length_selector.setCurrentIndex(i);
 	}
 
 	set_sampling(false);
@@ -91,7 +105,12 @@ SamplingBar::SamplingBar(QWidget *parent) :
 	addWidget(&_run_stop_button);
 
 	update_device_selector();
+
 	update_sample_rate_selector();
+	connect(&_sample_rate_list, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(on_sample_rate_changed()));
+	connect(&_sample_rate_value, SIGNAL(valueChanged(double)),
+		this, SLOT(on_sample_rate_changed()));
 }
 
 struct sr_dev_inst* SamplingBar::get_selected_device() const
@@ -113,25 +132,6 @@ uint64_t SamplingBar::get_record_length() const
 	return _record_length_selector.itemData(index).value<uint64_t>();
 }
 
-uint64_t SamplingBar::get_sample_rate() const
-{
-	assert(_sample_rate_value_action);
-	assert(_sample_rate_list_action);
-
-	if (_sample_rate_value_action->isVisible())
-		return (uint64_t)_sample_rate_value.value();
-	else if (_sample_rate_list_action->isVisible())
-	{
-		const int index = _sample_rate_list.currentIndex();
-		if (index < 0)
-			return 0;
-		
-		return _sample_rate_list.itemData(index).value<uint64_t>();
-	}
-
-	return 0;
-}
-
 void SamplingBar::set_sampling(bool sampling)
 {
 	_run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
@@ -177,7 +177,7 @@ void SamplingBar::update_sample_rate_selector()
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
 
-	if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+	if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
 		(const void **)&samplerates, sdi) != SR_OK)
 		return;
 
@@ -202,6 +202,63 @@ void SamplingBar::update_sample_rate_selector()
 		_sample_rate_list.show();
 		_sample_rate_list_action->setVisible(true);
 	}
+
+	update_sample_rate_selector_value();
+}
+
+void SamplingBar::update_sample_rate_selector_value()
+{
+	sr_dev_inst *const sdi = get_selected_device();
+	assert(sdi);
+
+        uint64_t *samplerate = NULL;
+        if(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+                (const void**)&samplerate, sdi) != SR_OK) {
+                qDebug() <<
+                        "WARNING: Failed to get value of sample rate";
+                return;
+        }
+
+	assert(_sample_rate_value_action);
+	assert(_sample_rate_list_action);
+
+	if (_sample_rate_value_action->isVisible())
+		_sample_rate_value.setValue(*samplerate);
+	else if (_sample_rate_list_action->isVisible())
+	{
+		for(int i = 0; i < _sample_rate_list.count(); i++)
+			if(*samplerate == _sample_rate_list.itemData(
+				i).value<uint64_t>())
+				_sample_rate_list.setCurrentIndex(i);
+	}
+}
+
+void SamplingBar::commit_sample_rate()
+{
+	uint64_t sample_rate = 0;
+
+	sr_dev_inst *const sdi = get_selected_device();
+	assert(sdi);
+
+	assert(_sample_rate_value_action);
+	assert(_sample_rate_list_action);
+
+	if (_sample_rate_value_action->isVisible())
+		sample_rate = (uint64_t)_sample_rate_value.value();
+	else if (_sample_rate_list_action->isVisible())
+	{
+		const int index = _sample_rate_list.currentIndex();
+		if (index >= 0)
+			sample_rate = _sample_rate_list.itemData(
+				index).value<uint64_t>();
+	}
+
+	// Set the samplerate
+	if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
+		&sample_rate) != SR_OK) {
+		qDebug() << "Failed to configure samplerate.";
+		return;
+	}
 }
 
 void SamplingBar::on_device_selected()
@@ -209,13 +266,22 @@ void SamplingBar::on_device_selected()
 	update_sample_rate_selector();
 }
 
+void SamplingBar::on_sample_rate_changed()
+{
+	commit_sample_rate();
+}
+
 void SamplingBar::configure()
 {
+	commit_sample_rate();
+
 	sr_dev_inst *const sdi = get_selected_device();
 	assert(sdi);
 
-	pv::dialogs::HwCap dlg(this, sdi);
+	pv::dialogs::DeviceOptions dlg(this, sdi);
 	dlg.exec();
+
+	update_sample_rate_selector_value();
 }
 
 } // namespace pv