X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=04aba21ab0f1ee7ab02f6468f9be9b504351043d;hp=914083c3c0a50ea1968caffa21cd8ee23e9ad248;hb=1d04852f3d78a49360da3e8a5289793fbeae2e0f;hpb=d99dc9f29066fba8948f1fca8b18a54b33064837

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 914083c3..04aba21a 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -35,12 +35,16 @@
 #include <pv/popups/deviceoptions.h>
 #include <pv/popups/probes.h>
 
+using std::max;
+using std::min;
 using std::string;
 
 namespace pv {
 namespace toolbars {
 
-const uint64_t SamplingBar::DefaultRecordLength = 1000000;
+const uint64_t SamplingBar::MinSampleCount = 100ULL;
+const uint64_t SamplingBar::MaxSampleCount = 1000000000000ULL;
+const uint64_t SamplingBar::DefaultSampleCount = 1000000;
 
 SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	QToolBar("Sampling Bar", parent),
@@ -54,6 +58,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_sample_rate("Hz", this),
 	_updating_sample_rate(false),
 	_updating_sample_count(false),
+	_sample_count_supported(false),
 	_icon_red(":/icons/status-red.svg"),
 	_icon_green(":/icons/status-green.svg"),
 	_icon_grey(":/icons/status-grey.svg"),
@@ -159,9 +164,28 @@ void SamplingBar::update_sample_rate_selector()
 	{
 		elements = (const uint64_t *)g_variant_get_fixed_array(
 				gvar_list, &num_elements, sizeof(uint64_t));
-		_sample_rate.show_min_max_step(elements[0], elements[1],
-			elements[2]);
+
+		const uint64_t min = elements[0];
+		const uint64_t max = elements[1];
+		const uint64_t step = elements[2];
+
 		g_variant_unref(gvar_list);
+
+		assert(min > 0);
+		assert(max > 0);
+		assert(max > min);
+		assert(step > 0);
+
+		if (step == 1)
+			_sample_rate.show_125_list(min, max);
+		else
+		{
+			// When the step is not 1, we cam't make a 1-2-5-10
+			// list of sample rates, because we may not be able to
+			// make round numbers. Therefore in this case, show a
+			// spin box.
+			_sample_rate.show_min_max_step(min, max, step);
+		}
 	}
 	else if ((gvar_list = g_variant_lookup_value(gvar_dict,
 			"samplerates", G_VARIANT_TYPE("at"))))
@@ -203,26 +227,48 @@ void SamplingBar::update_sample_count_selector()
 {
 	sr_dev_inst *const sdi = get_selected_device();
 	GVariant *gvar;
-	uint64_t samplecount;
 
 	assert(sdi);
 
-	if (sr_config_get(sdi->driver, sdi, NULL,
-		SR_CONF_LIMIT_SAMPLES, &gvar) != SR_OK)
-	{
-		_sample_count.show_none();
-	}
-	else
+	_updating_sample_count = true;
+
+	if (_sample_count_supported)
 	{
-		_sample_count.show_min_max_step(0, UINT64_MAX, 1);
+		uint64_t sample_count = DefaultSampleCount;
+		uint64_t min_sample_count = 0;
+		uint64_t max_sample_count = MaxSampleCount;
+
+		if (sr_config_list(sdi->driver, sdi, NULL,
+			SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) {
+			g_variant_get(gvar, "(tt)",
+				&min_sample_count, &max_sample_count);
+			g_variant_unref(gvar);
+		}
+
+		min_sample_count = min(max(min_sample_count, MinSampleCount),
+			max_sample_count);
+
+		_sample_count.show_125_list(
+			min_sample_count, max_sample_count);
 
-		samplecount = g_variant_get_uint64(gvar);
-		g_variant_unref(gvar);
+		if (sr_config_get(sdi->driver, sdi, NULL,
+			SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK)
+		{
+			sample_count = g_variant_get_uint64(gvar);
+			if (sample_count == 0)
+				sample_count = DefaultSampleCount;
+			sample_count = min(max(sample_count, MinSampleCount),
+				max_sample_count);
 
-		_updating_sample_count = true;
-		_sample_count.set_value(samplecount);
-		_updating_sample_count = false;
+			g_variant_unref(gvar);
+		}
+
+		_sample_count.set_value(sample_count);
 	}
+	else
+		_sample_count.show_none();
+
+	_updating_sample_count = false;
 }
 
 void SamplingBar::commit_sample_count()
@@ -263,17 +309,13 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
+	GVariant *gvar;
+
 	using namespace pv::popups;
 
 	if (_updating_device_selector)
 		return;
 
-	update_sample_count_selector();
-	update_sample_rate_selector();
-
-	if (_sample_count.value() == 0)
-		_sample_count.set_value(DefaultRecordLength);
-
 	sr_dev_inst *const sdi = get_selected_device();
 	_session.set_device(sdi);
 
@@ -286,6 +328,33 @@ void SamplingBar::on_device_selected()
 	// Update the probes popup
 	Probes *const probes = new Probes(_session, this);
 	_probes_button.set_popup(probes);
+
+	// Update supported options.
+	_sample_count_supported = false;
+
+	if (sr_config_list(sdi->driver, sdi, NULL,
+		SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK)
+	{
+		gsize num_opts;
+		const int *const options = (const int32_t *)g_variant_get_fixed_array(
+	        gvar, &num_opts, sizeof(int32_t));
+		for (unsigned int i = 0; i < num_opts; i++)
+		{
+			switch (options[i]) {
+			case SR_CONF_LIMIT_SAMPLES:
+				_sample_count_supported = true;
+				break;
+			case SR_CONF_LIMIT_FRAMES:
+				sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES,
+					g_variant_new_uint64(1));
+				break;
+			}
+		}
+	}
+
+	// Update sweep timing widgets.
+	update_sample_count_selector();
+	update_sample_rate_selector();
 }
 
 void SamplingBar::on_sample_count_changed()
@@ -302,6 +371,7 @@ void SamplingBar::on_sample_rate_changed()
 
 void SamplingBar::on_run_stop()
 {
+	commit_sample_count();
 	commit_sample_rate();	
 	run_stop();
 }