X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fint.cpp;h=e750e9fa9d8ec15757801c2809de31bbba196ef6;hp=31f518a8cbd481467d0e5195861058989574ae28;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=4c60462b00cc329e61daedd1c2e66724077bd412 diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp index 31f518a..e750e9f 100644 --- a/pv/prop/int.cpp +++ b/pv/prop/int.cpp @@ -51,7 +51,8 @@ Int::~Int() QWidget* Int::get_widget(QWidget *parent, bool auto_commit) { - int64_t int_val = 0, range_min = 0, range_max = 0; + int64_t int_val = 0, range_min = 0; + uint64_t range_max = 0; if (spin_box_) return spin_box_; @@ -71,43 +72,28 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit) const GVariantType *const type = g_variant_get_type(value); assert(type); - if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) - { + 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)) - { + } 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)) - { + } 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)) - { + } 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)) - { + } 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)) - { + } 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)) - { + } 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 - { + } else { // Unexpected value type. assert(0); } @@ -118,7 +104,7 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit) // custom widget. range_min = max(range_min, (int64_t)INT_MIN); - range_max = min(range_max, (int64_t)INT_MAX); + range_max = min(range_max, (uint64_t)INT_MAX); if (range_) spin_box_->setRange((int)range_->first, (int)range_->second);