Added get/set support to Property and Enum

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 29f95d8ebcf9d19417a0fe4f8806b512b9f7b615..1694840a1c7a69357e860bbe047e4af2b681f4fe 100644 (file)
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

+#include <assert.h>
+

 #include <QComboBox>
 
 #include "enum.h"
 #include <QComboBox>
 
 #include "enum.h"


@@ -27,9 +29,14 @@ using namespace std;
 namespace pv {
 namespace prop {
 
 namespace pv {
 namespace prop {
 

-Enum::Enum(QString name, vector< pair<int, QString> > values) :
+Enum::Enum(QString name,
+       std::vector<std::pair<const void*, QString> > values,
+       boost::function<const void* ()> getter,
+       boost::function<void (const void*)> setter) :

        Property(name),
        _values(values),
        Property(name),
        _values(values),

+       _getter(getter),
+       _setter(setter),

        _selector(NULL)
 {
 }
        _selector(NULL)
 {
 }


@@ -40,13 +47,28 @@ QWidget* Enum::get_widget(QWidget *parent)
                return _selector;
 
        _selector = new QComboBox(parent);
                return _selector;
 
        _selector = new QComboBox(parent);

-       for(vector< pair<int, QString> >::const_iterator i = _values.begin();
+       for(vector< pair<const void*, QString> >::const_iterator i =
+                       _values.begin();

                i != _values.end(); i++)
                _selector->addItem((*i).second,
                i != _values.end(); i++)
                _selector->addItem((*i).second,

-                       qVariantFromValue((*i).first));
+                       qVariantFromValue((void*)(*i).first));

 
        return _selector;
 }
 
 
        return _selector;
 }
 

+void Enum::commit()
+{
+       assert(_setter);
+
+       if(!_selector)
+               return;
+
+       const int index = _selector->currentIndex();
+       if (index < 0)
+               return;
+
+       _setter(_selector->itemData(index).value<void*>());
+}
+

 } // prop
 } // pv
 } // prop
 } // pv

diff --git a/pv/prop/enum.h b/pv/prop/enum.h
index 2350fef886917ad884639938c0f5b106a00a6c70..c2cc63956cde129eac87f05a66959259b6b96cab 100644 (file)
--- a/pv/prop/enum.h
+++ b/pv/prop/enum.h
@@ -34,12 +34,19 @@ namespace prop {
 class Enum : public Property
 {
 public:
 class Enum : public Property
 {
 public:

-       Enum(QString name, std::vector<std::pair<int, QString> > values);
+       Enum(QString name,
+               std::vector<std::pair<const void*, QString> > values,
+               boost::function<const void* ()> getter,
+               boost::function<void (const void*)> setter);

 
        QWidget* get_widget(QWidget *parent);
 
 
        QWidget* get_widget(QWidget *parent);
 

+       void commit();
+

 private:
 private:

-       const std::vector< std::pair<int, QString> > _values;
+       const std::vector< std::pair<const void*, QString> > _values;
+       boost::function<const void* ()> _getter;
+       boost::function<void (const void*)> _setter;

 
        QComboBox *_selector;
 };
 
        QComboBox *_selector;
 };

diff --git a/pv/prop/property.h b/pv/prop/property.h
index e6745a10d903cf9b4726f83c2bd1d252cf741b8a..002c91161faffd053d2a690e15f641a65282de9d 100644 (file)
--- a/pv/prop/property.h
+++ b/pv/prop/property.h
@@ -21,6 +21,8 @@
 #ifndef PULSEVIEW_PV_PROP_PROPERTY_H
 #define PULSEVIEW_PV_PROP_PROPERTY_H
 
 #ifndef PULSEVIEW_PV_PROP_PROPERTY_H
 #define PULSEVIEW_PV_PROP_PROPERTY_H
 

+#include <boost/function.hpp>
+

 #include <QString>
 #include <QWidget>
 
 #include <QString>
 #include <QWidget>
 


@@ -39,6 +41,8 @@ public:
 
        virtual QWidget* get_widget(QWidget *parent) = 0;
 
 
        virtual QWidget* get_widget(QWidget *parent) = 0;
 

+       virtual void commit() = 0;
+

 private:
        QString _name;
 };
 private:
        QString _name;
 };