X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=6109c163ef4b11ecd6d8fdcc873618e44dc17a66;hb=07f82b73077f28b68f86bb3f0fefd8384fa78aed;hp=c57779c2f394bc546a4960631d9656bf63b5729a;hpb=124d97dee9b5e24c1025250fabd2255af68c9aa5;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index c57779c..6109c16 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -53,6 +53,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_sample_count(" samples", this),
 	_sample_rate("Hz", this),
 	_updating_sample_rate(false),
+	_updating_sample_count(false),
 	_icon_red(":/icons/status-red.svg"),
 	_icon_green(":/icons/status-green.svg"),
 	_icon_grey(":/icons/status-grey.svg"),
@@ -68,7 +69,6 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 		this, SLOT(on_sample_rate_changed()));
 
 	_sample_count.show_min_max_step(0, UINT64_MAX, 1);
-	_sample_count.set_value(DefaultRecordLength);
 
 	set_capture_state(pv::SigSession::Stopped);
 
@@ -126,11 +126,6 @@ void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi)
 		}
 }
 
-uint64_t SamplingBar::get_record_length() const
-{
-	return _sample_count.value();
-}
-
 void SamplingBar::set_capture_state(pv::SigSession::capture_state state)
 {
 	const QIcon *icons[] = {&_icon_grey, &_icon_red, &_icon_green};
@@ -204,6 +199,32 @@ void SamplingBar::update_sample_rate_selector_value()
 	_updating_sample_rate = false;
 }
 
+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
+	{
+		_sample_count.show_min_max_step(0, UINT64_MAX, 1);
+
+		samplecount = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
+
+		_updating_sample_count = true;
+		_sample_count.set_value(samplecount);
+		_updating_sample_count = false;
+	}
+}
+
 void SamplingBar::commit_sample_count()
 {
 	uint64_t sample_count = 0;
@@ -247,8 +268,6 @@ void SamplingBar::on_device_selected()
 	if (_updating_device_selector)
 		return;
 
-	update_sample_rate_selector();
-
 	sr_dev_inst *const sdi = get_selected_device();
 	_session.set_device(sdi);
 
@@ -261,11 +280,21 @@ void SamplingBar::on_device_selected()
 	// Update the probes popup
 	Probes *const probes = new Probes(_session, this);
 	_probes_button.set_popup(probes);
+
+	// Update sweep timing widgets.
+	update_sample_count_selector();
+	update_sample_rate_selector();
+
+	if (_sample_count.value() == 0) {
+		_sample_count.set_value(DefaultRecordLength);
+		commit_sample_count();
+	}
 }
 
 void SamplingBar::on_sample_count_changed()
 {
-	commit_sample_count();
+	if(!_updating_sample_count)
+		commit_sample_count();
 }
 
 void SamplingBar::on_sample_rate_changed()