X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=54fe5fedca8284b15dc2f051a44a7f5e3e1dba22;hb=793f8096c486d0fba871227d9772a510f7496c08;hp=f762bd1a8ab83e56a1d8f2e9d3e733e54d9dc573;hpb=8a017a8bbc52e19c4d83362dbf58eb7ae447fd8b;p=pulseview.git diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp index f762bd1..54fe5fe 100644 --- a/pv/prop/enum.cpp +++ b/pv/prop/enum.cpp @@ -47,12 +47,18 @@ QWidget* Enum::get_widget(QWidget *parent) if (_selector) return _selector; + const void *value = NULL; + if (_getter) + value = _getter(); + _selector = new QComboBox(parent); - for (vector< pair >::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 &v = _values[i]; + _selector->addItem(v.second, + qVariantFromValue((void*)v.first)); + if (v.first == value) + _selector->setCurrentIndex(i); + } return _selector; }