projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed spurious declaration
[pulseview.git]
/
pv
/
prop
/
enum.cpp
diff --git
a/pv/prop/enum.cpp
b/pv/prop/enum.cpp
index 894ba9f8e2754ded46f9e07b783484871d25eade..412a31b0827854d01d103d5f110325b7717faaad 100644
(file)
--- a/
pv/prop/enum.cpp
+++ b/
pv/prop/enum.cpp
@@
-20,7
+20,6
@@
#include <assert.h>
#include <assert.h>
-#include <glib-2.0/glib.h>
#include <QComboBox>
#include "enum.h"
#include <QComboBox>
#include "enum.h"
@@
-32,35
+31,41
@@
namespace pv {
namespace prop {
Enum::Enum(QString name,
namespace prop {
Enum::Enum(QString name,
- vector<pair<const void*, QString> > values,
- function<GVariant* ()> getter,
- function<void (GVariant*)> setter) :
- Property(name),
+ vector<pair<GVariant*, QString> > values,
+ Getter getter, Setter setter) :
+ Property(name, getter, setter),
_values(values),
_values(values),
- _getter(getter),
- _setter(setter),
_selector(NULL)
{
}
_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;
{
if (_selector)
return _selector;
- const void *value = NULL;
- if (_getter)
- value = _getter();
+ GVariant *const value = _getter ? _getter() : NULL;
_selector = new QComboBox(parent);
for (unsigned int i = 0; i < _values.size(); i++) {
_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)
+ 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);
}
_selector->setCurrentIndex(i);
}
+ g_variant_unref(value);
+
+ if (auto_commit)
+ connect(_selector, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_current_item_changed(int)));
+
return _selector;
}
return _selector;
}
@@
-75,7
+80,12
@@
void Enum::commit()
if (index < 0)
return;
if (index < 0)
return;
- _setter(_selector->itemData(index).value<GVariant*>());
+ _setter((GVariant*)_selector->itemData(index).value<void*>());
+}
+
+void Enum::on_current_item_changed(int)
+{
+ commit();
}
} // prop
}
} // prop