Adjust pv:prop::Enum to GVariant-based sr_config_* functions

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

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 29f95d8ebcf9d19417a0fe4f8806b512b9f7b615..894ba9f8e2754ded46f9e07b783484871d25eade 100644 (file)
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -18,35 +18,65 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#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, vector< pair<int, QString> > values) :
+Enum::Enum(QString name,
+       vector<pair<const void*, QString> > values,
+       function<GVariant* ()> getter,
+       function<void (GVariant*)> setter) :
        Property(name),
        _values(values),
+       _getter(getter),
+       _setter(setter),
        _selector(NULL)
 {
 }
 
 QWidget* Enum::get_widget(QWidget *parent)
 {
-       if(_selector)
+       if (_selector)
                return _selector;
 
+       const void *value = NULL;
+       if (_getter)
+               value = _getter();
+
        _selector = new QComboBox(parent);
-       for(vector< pair<int, QString> >::const_iterator i = _values.begin();
-               i != _values.end(); i++)
-               _selector->addItem((*i).second,
-                       qVariantFromValue((*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;
 }
 
+void Enum::commit()
+{
+       assert(_setter);
+
+       if (!_selector)
+               return;
+
+       const int index = _selector->currentIndex();
+       if (index < 0)
+               return;
+
+       _setter(_selector->itemData(index).value<GVariant*>());
+}
+
 } // prop
 } // pv