Fix random clazy warnings

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

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index d059755843112be79d6e014672f05e0e31feb806..f39ae844fc97ce34b4519d4a67546a867e8cdb74 100644 (file)
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -14,14 +14,16 @@
  * 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 <assert.h>
+#include <cassert>
 
+#include <QDebug>
 #include <QDoubleSpinBox>
 
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
 #include "double.hpp"
 
 using boost::optional;
@@ -31,22 +33,19 @@ namespace pv {
 namespace prop {
 
 Double::Double(QString name,
+       QString desc,
        int decimals,
        QString suffix,
        optional< pair<double, double> > range,
        optional<double> step,
        Getter getter,
        Setter setter) :
-       Property(name, getter, setter),
+       Property(name, desc, getter, setter),
        decimals_(decimals),
        suffix_(suffix),
        range_(range),
        step_(step),
-       spin_box_(NULL)
-{
-}
-
-Double::~Double()
+       spin_box_(nullptr)
 {
 }
 
@@ -56,14 +55,16 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
                return spin_box_;
 
        if (!getter_)
-               return NULL;
+               return nullptr;
 
-       Glib::VariantBase variant = getter_();
-       if (!variant.gobj())
-               return NULL;
-
-       double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
-               variant).get();
+       try {
+               Glib::VariantBase variant = getter_();
+               if (!variant.gobj())
+                       return nullptr;
+       } catch (const sigrok::Error &e) {
+               qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+               return nullptr;
+       }
 
        spin_box_ = new QDoubleSpinBox(parent);
        spin_box_->setDecimals(decimals_);
@@ -73,7 +74,7 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
        if (step_)
                spin_box_->setSingleStep(*step_);
 
-       spin_box_->setValue(value);
+       update_widget();
 
        if (auto_commit)
                connect(spin_box_, SIGNAL(valueChanged(double)),
@@ -82,6 +83,27 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
        return spin_box_;
 }
 
+void Double::update_widget()
+{
+       if (!spin_box_)
+               return;
+
+       Glib::VariantBase variant;
+
+       try {
+               variant = getter_();
+       } catch (const sigrok::Error &e) {
+               qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+               return;
+       }
+
+       assert(variant.gobj());
+
+       double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
+               variant).get();
+       spin_box_->setValue(value);
+}
+
 void Double::commit()
 {
        assert(setter_);
@@ -97,5 +119,5 @@ void Double::on_value_changed(double)
        commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv