X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=ce33c5a8e724b779214d61416e23cda74b91db39;hp=1694840a1c7a69357e860bbe047e4af2b681f4fe;hb=d191508b2cfa24b5cf56c5184e7609353582f972;hpb=24bb0bd140f7f8b00ea3c0cbe0c5d26dc03a3b69

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 1694840a..ce33c5a8 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,15 +24,16 @@
 
 #include "enum.h"
 
+using namespace boost;
 using namespace std;
 
 namespace pv {
 namespace prop {
 
 Enum::Enum(QString name,
-	std::vector<std::pair<const void*, QString> > values,
-	boost::function<const void* ()> getter,
-	boost::function<void (const void*)> setter) :
+	vector<pair<const void*, QString> > values,
+	function<const void* ()> getter,
+	function<void (const void*)> setter) :
 	Property(name),
 	_values(values),
 	_getter(getter),
@@ -43,15 +44,21 @@ Enum::Enum(QString name,
 
 QWidget* Enum::get_widget(QWidget *parent)
 {
-	if(_selector)
+	if (_selector)
 		return _selector;
 
+	const void *value = NULL;
+	if(_getter)
+		value = _getter();
+
 	_selector = new QComboBox(parent);
-	for(vector< pair<const void*, QString> >::const_iterator i =
-			_values.begin();
-		i != _values.end(); i++)
-		_selector->addItem((*i).second,
-			qVariantFromValue((void*)(*i).first));
+	for(unsigned int i = 0; i < _values.size(); i++) {
+		const pair<const void*, QString> &v = _values[i];
+		_selector->addItem(v.second,
+			qVariantFromValue((void*)v.first));
+		if(v.first == value)
+			_selector->setCurrentIndex(i);
+	}
 
 	return _selector;
 }
@@ -60,7 +67,7 @@ void Enum::commit()
 {
 	assert(_setter);
 
-	if(!_selector)
+	if (!_selector)
 		return;
 
 	const int index = _selector->currentIndex();