X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fint.cpp;h=3f29951b3d997b7b5b8a299fd34c3a0bf0d6db40;hb=6f381ee71d55f5fda14cb04a36640485a0621563;hp=ce77b9592d3f66778ab6247b88b20cca32b9ca74;hpb=c063290ac7189bdd15221450f598504f43286b43;p=pulseview.git
diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index ce77b95..3f29951 100644
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -17,11 +17,14 @@
* along with this program; if not, see .
*/
-#include
#include
+#include
+#include
#include
+#include
+
#include "int.hpp"
using boost::optional;
@@ -33,11 +36,12 @@ namespace pv {
namespace prop {
Int::Int(QString name,
+ QString desc,
QString suffix,
optional< pair > range,
Getter getter,
Setter setter) :
- Property(name, getter, setter),
+ Property(name, desc, getter, setter),
suffix_(suffix),
range_(range),
spin_box_(nullptr)
@@ -46,7 +50,7 @@ Int::Int(QString name,
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
{
- int64_t int_val = 0, range_min = 0;
+ int64_t range_min = 0;
uint64_t range_max = 0;
if (spin_box_)
@@ -55,7 +59,12 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
if (!getter_)
return nullptr;
- value_ = getter_();
+ try {
+ value_ = getter_();
+ } catch (const sigrok::Error &e) {
+ qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+ return nullptr;
+ }
GVariant *value = value_.gobj();
if (!value)
@@ -68,32 +77,25 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) {
- 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)) {
- 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)) {
- 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)) {
- 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)) {
- 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)) {
- 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)) {
- int_val = g_variant_get_uint64(value);
range_min = 0, range_max = UINT64_MAX;
} else {
// Unexpected value type.
assert(false);
}
- // @todo Sigrok supports 64-bit quantities, but Qt does not have a
+ // @todo sigrok supports 64-bit quantities, but Qt does not have a
// standard widget to allow the values to be modified over the full
// 64-bit range on 32-bit machines. To solve the issue we need a
// custom widget.
@@ -106,7 +108,7 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
else
spin_box_->setRange((int)range_min, (int)range_max);
- spin_box_->setValue((int)int_val);
+ update_widget();
if (auto_commit)
connect(spin_box_, SIGNAL(valueChanged(int)),
@@ -115,6 +117,48 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
return spin_box_;
}
+void Int::update_widget()
+{
+ if (!spin_box_)
+ return;
+
+ try {
+ value_ = getter_();
+ } catch (const sigrok::Error &e) {
+ qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+ return;
+ }
+
+ GVariant *value = value_.gobj();
+ assert(value);
+
+ const GVariantType *const type = g_variant_get_type(value);
+ assert(type);
+
+ int64_t int_val = 0;
+
+ if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) {
+ int_val = g_variant_get_byte(value);
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16)) {
+ int_val = g_variant_get_int16(value);
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16)) {
+ int_val = g_variant_get_uint16(value);
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32)) {
+ int_val = g_variant_get_int32(value);
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32)) {
+ int_val = g_variant_get_uint32(value);
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64)) {
+ int_val = g_variant_get_int64(value);
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) {
+ int_val = g_variant_get_uint64(value);
+ } else {
+ // Unexpected value type.
+ assert(false);
+ }
+
+ spin_box_->setValue((int)int_val);
+}
+
void Int::commit()
{
assert(setter_);
@@ -157,5 +201,5 @@ void Int::on_value_changed(int)
commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv