#include <assert.h>
+#include <glib-2.0/glib.h>
#include <QComboBox>
#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<GVariant* ()> getter,
+ function<void (GVariant*)> setter) :
Property(name),
_values(values),
_getter(getter),
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;
}
if (index < 0)
return;
- _setter(_selector->itemData(index).value<void*>());
+ _setter(_selector->itemData(index).value<GVariant*>());
}
} // prop