]> sigrok.org Git - pulseview.git/blobdiff - pv/prop/int.cpp
Fix random clazy warnings
[pulseview.git] / pv / prop / int.cpp
index 8124f9b0c9a2abc88772f99cac0961b9e72fb20a..3f29951b3d997b7b5b8a299fd34c3a0bf0d6db40 100644 (file)
  * 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 <QDebug>
 #include <QSpinBox>
 
-#include "int.h"
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
+#include "int.hpp"
 
 using boost::optional;
 using std::max;
@@ -34,147 +36,164 @@ 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),
-       _suffix(suffix),
-       _range(range),
-       _value(NULL),
-       _spin_box(NULL)
+       Property(name, desc, getter, setter),
+       suffix_(suffix),
+       range_(range),
+       spin_box_(nullptr)
 {
 }
 
-Int::~Int()
-{
-       if (_value)
-               g_variant_unref(_value);
-}
-
 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_;
 
-       if (_spin_box)
-               return _spin_box;
+       if (!getter_)
+               return nullptr;
 
-       if (_value)
-               g_variant_unref(_value);
+       try {
+               value_ = getter_();
+       } catch (const sigrok::Error &e) {
+               qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+               return nullptr;
+       }
 
-       _value = _getter ? _getter() : NULL;
-       if (!_value)
-               return NULL;
+       GVariant *value = value_.gobj();
+       if (!value)
+               return nullptr;
 
-       _spin_box = new QSpinBox(parent);
-       _spin_box->setSuffix(_suffix);
+       spin_box_ = new QSpinBox(parent);
+       spin_box_->setSuffix(suffix_);
 
-       const GVariantType *const type = g_variant_get_type(_value);
+       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);
+       if (range_)
+               spin_box_->setRange((int)range_->first, (int)range_->second);
        else
-               _spin_box->setRange((int)range_min, (int)range_max);
+               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)),
+               connect(spin_box_, SIGNAL(valueChanged(int)),
                        this, SLOT(on_value_changed(int)));
 
-       return _spin_box;
+       return spin_box_;
 }
 
-void Int::commit()
+void Int::update_widget()
 {
-       assert(_setter);
+       if (!spin_box_)
+               return;
 
-       if (!_spin_box)
+       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);
+       }
 
-       assert(_value);
+       spin_box_->setValue((int)int_val);
+}
 
-       GVariant *new_value = NULL;
-       const GVariantType *const type = g_variant_get_type(_value);
+void Int::commit()
+{
+       assert(setter_);
+
+       if (!spin_box_)
+               return;
+
+       GVariant *new_value = nullptr;
+       const GVariantType *const type = g_variant_get_type(value_.gobj());
        assert(type);
 
        if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
-               new_value = g_variant_new_byte(_spin_box->value());
+               new_value = g_variant_new_byte(spin_box_->value());
        else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
-               new_value = g_variant_new_int16(_spin_box->value());
+               new_value = g_variant_new_int16(spin_box_->value());
        else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
-               new_value = g_variant_new_uint16(_spin_box->value());
+               new_value = g_variant_new_uint16(spin_box_->value());
        else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
-               new_value = g_variant_new_int32(_spin_box->value());
+               new_value = g_variant_new_int32(spin_box_->value());
        else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
-               new_value = g_variant_new_int32(_spin_box->value());
+               new_value = g_variant_new_uint32(spin_box_->value());
        else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
-               new_value = g_variant_new_int64(_spin_box->value());
+               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
-       {
+               new_value = g_variant_new_uint64(spin_box_->value());
+       else {
                // Unexpected value type.
-               assert(0);
+               assert(false);
        }
 
        assert(new_value);
 
-       g_variant_unref(_value);
-       g_variant_ref(new_value);
-       _value = new_value;
+       value_ = Glib::VariantBase(new_value);
 
-       _setter(new_value);
+       setter_(value_);
 }
 
 void Int::on_value_changed(int)
@@ -182,5 +201,5 @@ void Int::on_value_changed(int)
        commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv