projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
StoreSession: Support output formats other than srzip
[pulseview.git]
/
pv
/
prop
/
int.cpp
diff --git
a/pv/prop/int.cpp
b/pv/prop/int.cpp
index 4277524886a0f12c9cc5ff610ed805a7faad3c92..0edba420b2e8538819d6f4b1d55c9c2a75ef26ba 100644
(file)
--- a/
pv/prop/int.cpp
+++ b/
pv/prop/int.cpp
@@
-23,7
+23,7
@@
#include <QSpinBox>
#include <QSpinBox>
-#include "int.h"
+#include "int.h
pp
"
using boost::optional;
using std::max;
using boost::optional;
using std::max;
@@
-39,73
+39,71
@@
Int::Int(QString name,
Getter getter,
Setter setter) :
Property(name, getter, setter),
Getter getter,
Setter setter) :
Property(name, getter, setter),
- _suffix(suffix),
- _range(range),
- _value(NULL),
- _spin_box(NULL)
+ suffix_(suffix),
+ range_(range),
+ spin_box_(NULL)
{
}
Int::~Int()
{
{
}
Int::~Int()
{
- if (_value)
- g_variant_unref(_value);
}
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
{
int64_t int_val = 0, range_min = 0, range_max = 0;
}
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
{
int64_t int_val = 0, range_min = 0, range_max = 0;
- if (
_spin_box
)
- return
_spin_box
;
+ if (
spin_box_
)
+ return
spin_box_
;
- if (_value)
- g_variant_unref(_value);
+ if (!getter_)
+ return NULL;
+
+ value_ = getter_();
- _value = _getter ? _getter() : NULL;
- assert(_value);
- if (!_value)
+ GVariant *value = value_.gobj();
+ if (!value)
return NULL;
return NULL;
-
_spin_box
= new QSpinBox(parent);
-
_spin_box->setSuffix(_suffix
);
+
spin_box_
= new QSpinBox(parent);
+
spin_box_->setSuffix(suffix_
);
- const GVariantType *const type = g_variant_get_type(
_
value);
+ const GVariantType *const type = g_variant_get_type(value);
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
{
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
{
- int_val = g_variant_get_byte(
_
value);
+ int_val = g_variant_get_byte(value);
range_min = 0, range_max = UINT8_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
{
range_min = 0, range_max = UINT8_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
{
- int_val = g_variant_get_int16(
_
value);
+ int_val = g_variant_get_int16(value);
range_min = INT16_MIN, range_max = INT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
{
range_min = INT16_MIN, range_max = INT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
{
- int_val = g_variant_get_uint16(
_
value);
+ int_val = g_variant_get_uint16(value);
range_min = 0, range_max = UINT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
{
range_min = 0, range_max = UINT16_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
{
- int_val = g_variant_get_int32(
_
value);
+ int_val = g_variant_get_int32(value);
range_min = INT32_MIN, range_max = INT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
{
range_min = INT32_MIN, range_max = INT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
{
- int_val = g_variant_get_uint32(
_
value);
+ int_val = g_variant_get_uint32(value);
range_min = 0, range_max = UINT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
{
range_min = 0, range_max = UINT32_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
{
- int_val = g_variant_get_int64(
_
value);
+ int_val = g_variant_get_int64(value);
range_min = INT64_MIN, range_max = INT64_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
{
range_min = INT64_MIN, range_max = INT64_MAX;
}
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
{
- int_val = g_variant_get_uint64(
_
value);
+ int_val = g_variant_get_uint64(value);
range_min = 0, range_max = UINT64_MAX;
}
else
range_min = 0, range_max = UINT64_MAX;
}
else
@@
-122,47
+120,45
@@
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
range_min = max(range_min, (int64_t)INT_MIN);
range_max = min(range_max, (int64_t)INT_MAX);
range_min = max(range_min, (int64_t)INT_MIN);
range_max = min(range_max, (int64_t)INT_MAX);
- if (
_range
)
-
_spin_box->setRange((int)_range->first, (int)_range
->second);
+ if (
range_
)
+
spin_box_->setRange((int)range_->first, (int)range_
->second);
else
else
-
_spin_box
->setRange((int)range_min, (int)range_max);
+
spin_box_
->setRange((int)range_min, (int)range_max);
-
_spin_box
->setValue((int)int_val);
+
spin_box_
->setValue((int)int_val);
if (auto_commit)
if (auto_commit)
- connect(
_spin_box
, SIGNAL(valueChanged(int)),
+ connect(
spin_box_
, SIGNAL(valueChanged(int)),
this, SLOT(on_value_changed(int)));
this, SLOT(on_value_changed(int)));
- return
_spin_box
;
+ return
spin_box_
;
}
void Int::commit()
{
}
void Int::commit()
{
- assert(
_setter
);
+ assert(
setter_
);
- if (!
_spin_box
)
+ if (!
spin_box_
)
return;
return;
- assert(_value);
-
GVariant *new_value = NULL;
GVariant *new_value = NULL;
- const GVariantType *const type = g_variant_get_type(
_value
);
+ const GVariantType *const type = g_variant_get_type(
value_.gobj()
);
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
- new_value = g_variant_new_byte(
_spin_box
->value());
+ new_value = g_variant_new_byte(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
- new_value = g_variant_new_int16(
_spin_box
->value());
+ new_value = g_variant_new_int16(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
- new_value = g_variant_new_uint16(
_spin_box
->value());
+ new_value = g_variant_new_uint16(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
- new_value = g_variant_new_int32(
_spin_box
->value());
+ new_value = g_variant_new_int32(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
- new_value = g_variant_new_int32(
_spin_box
->value());
+ new_value = g_variant_new_int32(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
- new_value = g_variant_new_int64(
_spin_box
->value());
+ new_value = g_variant_new_int64(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
- new_value = g_variant_new_uint64(
_spin_box
->value());
+ new_value = g_variant_new_uint64(
spin_box_
->value());
else
{
// Unexpected value type.
else
{
// Unexpected value type.
@@
-171,11
+167,9
@@
void Int::commit()
assert(new_value);
assert(new_value);
- g_variant_unref(_value);
- g_variant_ref(new_value);
- _value = new_value;
+ value_ = Glib::VariantBase(new_value);
-
_setter(new_value
);
+
setter_(value_
);
}
void Int::on_value_changed(int)
}
void Int::on_value_changed(int)