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

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 1694840a..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)
+	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;
 }
@@ -60,14 +70,14 @@ void Enum::commit()
 {
 	assert(_setter);
 
-	if(!_selector)
+	if (!_selector)
 		return;
 
 	const int index = _selector->currentIndex();
 	if (index < 0)
 		return;
 
-	_setter(_selector->itemData(index).value<void*>());
+	_setter((GVariant*)_selector->itemData(index).value<void*>());
 }
 
 } // prop