X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=065fd548f22b336151d03da49f0c03e43456bce1;hp=a222c70bab490b2db8837a97f2ddb1efc59473a1;hb=9b25892767cee1d871ac18beb025033e905b28ae;hpb=9ba4ca3540ace02b1b5439ec2f4584f82f2aca77

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index a222c70b..065fd548 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,34 +24,44 @@
 
 #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) :
-	Property(name),
+	vector<pair<GVariant*, QString> > values,
+	Getter getter, Setter setter) :
+	Property(name, getter, setter),
 	_values(values),
-	_getter(getter),
-	_setter(setter),
 	_selector(NULL)
 {
 }
 
+Enum::~Enum()
+{
+	for (unsigned int i = 0; i < _values.size(); i++)
+		g_variant_unref(_values[i].first);
+}
+
 QWidget* Enum::get_widget(QWidget *parent)
 {
 	if (_selector)
 		return _selector;
 
+	GVariant *const value = _getter ? _getter() : NULL;
+	assert(value);
+
 	_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<GVariant*, QString> &v = _values[i];
+		_selector->addItem(v.second, qVariantFromValue((void*)v.first));
+		if (g_variant_compare(v.first, value) == 0)
+			_selector->setCurrentIndex(i);
+	}
+
+	g_variant_unref(value);
 
 	return _selector;
 }
@@ -67,7 +77,7 @@ void Enum::commit()
 	if (index < 0)
 		return;
 
-	_setter(_selector->itemData(index).value<void*>());
+	_setter((GVariant*)_selector->itemData(index).value<void*>());
 }
 
 } // prop