Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / prop / int.cpp

diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index ce6a040d633c00c1a2583ba6fe9fc85f443f136c..c1b2d22a6be97b4692d8254c2185e1cd076c72ea 100644 (file)
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -20,8 +20,11 @@
 #include <cassert>
 #include <cstdint>
 
+#include <QDebug>
 #include <QSpinBox>
 
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
 #include "int.hpp"
 
 using boost::optional;
@@ -32,14 +35,12 @@ using std::pair;
 namespace pv {
 namespace prop {
 
-Int::Int(QString name,
-       QString desc,
-       QString suffix,
-       optional< pair<int64_t, int64_t> > range,
-       Getter getter,
-       Setter setter) :
+Int::Int(QString name, QString desc, QString suffix,
+       optional< pair<int64_t, int64_t> > range, Getter getter, Setter setter,
+       QString special_value_text) :
        Property(name, desc, getter, setter),
        suffix_(suffix),
+       special_value_text_(special_value_text),
        range_(range),
        spin_box_(nullptr)
 {
@@ -56,7 +57,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)
@@ -64,6 +70,7 @@ QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 
        spin_box_ = new QSpinBox(parent);
        spin_box_->setSuffix(suffix_);
+       spin_box_->setSpecialValueText(special_value_text_);
 
        const GVariantType *const type = g_variant_get_type(value);
        assert(type);
@@ -114,7 +121,13 @@ void Int::update_widget()
        if (!spin_box_)
                return;
 
-       value_ = getter_();
+       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);