pv::prop::Enum: Do not create a widget if the initial value could not be retrieved

[pulseview.git] / pv / prop / enum.cpp

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index ce33c5a8e724b779214d61416e23cda74b91db39..9044c6bae9d3c6335589c26e7be65835186a7b81 100644 (file)
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,42 +24,50 @@
 
 #include "enum.h"
 
-using namespace boost;
-using namespace std;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace prop {
 
 Enum::Enum(QString name,
-       vector<pair<const void*, QString> > values,
-       function<const void* ()> getter,
-       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)
 {
 }
 
-QWidget* Enum::get_widget(QWidget *parent)
+Enum::~Enum()
+{
+       for (unsigned int i = 0; i < _values.size(); i++)
+               g_variant_unref(_values[i].first);
+}
+
+QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 {
        if (_selector)
                return _selector;
 
-       const void *value = NULL;
-       if(_getter)
-               value = _getter();
+       GVariant *const value = _getter ? _getter() : NULL;
+       if (!value)
+               return NULL;
 
        _selector = new QComboBox(parent);
-       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)
+       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 (value && g_variant_equal(v.first, value))
                        _selector->setCurrentIndex(i);
        }
 
+       g_variant_unref(value);
+
+       if (auto_commit)
+               connect(_selector, SIGNAL(currentIndexChanged(int)),
+                       this, SLOT(on_current_item_changed(int)));
+
        return _selector;
 }
 
@@ -74,7 +82,12 @@ void Enum::commit()
        if (index < 0)
                return;
 
-       _setter(_selector->itemData(index).value<void*>());
+       _setter((GVariant*)_selector->itemData(index).value<void*>());
+}
+
+void Enum::on_current_item_changed(int)
+{
+       commit();
 }
 
 } // prop