X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fint.cpp;h=ce6a040d633c00c1a2583ba6fe9fc85f443f136c;hp=31f518a8cbd481467d0e5195861058989574ae28;hb=f6b6c9bf50999dc99f9517318ffd3114cae4960f;hpb=4c60462b00cc329e61daedd1c2e66724077bd412

diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 31f518a8..ce6a040d 100644
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <assert.h>
+#include <cassert>
+#include <cstdint>
 
 #include <QSpinBox>
 
@@ -34,24 +33,22 @@ namespace pv {
 namespace prop {
 
 Int::Int(QString name,
+	QString desc,
 	QString suffix,
 	optional< pair<int64_t, int64_t> > range,
 	Getter getter,
 	Setter setter) :
-	Property(name, getter, setter),
+	Property(name, desc, getter, setter),
 	suffix_(suffix),
 	range_(range),
 	spin_box_(nullptr)
 {
 }
 
-Int::~Int()
-{
-}
-
 QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 {
-	int64_t int_val = 0, range_min = 0, range_max = 0;
+	int64_t range_min = 0;
+	uint64_t range_max = 0;
 
 	if (spin_box_)
 		return spin_box_;
@@ -71,61 +68,39 @@ 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))
-	{
-		int_val = g_variant_get_byte(value);
+	if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) {
 		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);
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16)) {
 		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);
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16)) {
 		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);
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32)) {
 		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);
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32)) {
 		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);
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64)) {
 		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);
+	} else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) {
 		range_min = 0, range_max = UINT64_MAX;
-	}
-	else
-	{
+	} else {
 		// Unexpected value type.
-		assert(0);
+		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.
 
 	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);
 	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)),
@@ -134,6 +109,42 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 	return spin_box_;
 }
 
+void Int::update_widget()
+{
+	if (!spin_box_)
+		return;
+
+	value_ = getter_();
+	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_);
@@ -159,10 +170,9 @@ void Int::commit()
 		new_value = g_variant_new_int64(spin_box_->value());
 	else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
 		new_value = g_variant_new_uint64(spin_box_->value());
-	else
-	{
+	else {
 		// Unexpected value type.
-		assert(0);
+		assert(false);
 	}
 
 	assert(new_value);
@@ -177,5 +187,5 @@ void Int::on_value_changed(int)
 	commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv