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 065fd548f22b336151d03da49f0c03e43456bce1..9044c6bae9d3c6335589c26e7be65835186a7b81 100644 (file)
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,8 +24,8 @@
 
 #include "enum.h"
 
-using namespace boost;
-using namespace std;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace prop {
@@ -45,24 +45,29 @@ Enum::~Enum()
                g_variant_unref(_values[i].first);
 }
 
-QWidget* Enum::get_widget(QWidget *parent)
+QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 {
        if (_selector)
                return _selector;
 
        GVariant *const value = _getter ? _getter() : NULL;
-       assert(value);
+       if (!value)
+               return NULL;
 
        _selector = new QComboBox(parent);
        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)
+               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;
 }
 
@@ -80,5 +85,10 @@ void Enum::commit()
        _setter((GVariant*)_selector->itemData(index).value<void*>());
 }
 
+void Enum::on_current_item_changed(int)
+{
+       commit();
+}
+
 } // prop
 } // pv