X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fint.cpp;h=ce6a040d633c00c1a2583ba6fe9fc85f443f136c;hb=9cca8508357758b6ee68f25c998bf4de8822df14;hp=6a2cb7d0300b06345cbfa2422e07068812c5d13c;hpb=b1fe148e0dce6e369c9d4770ca935a6a9ec94b59;p=pulseview.git
diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 6a2cb7d..ce6a040 100644
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -14,71 +14,172 @@
* 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 .
*/
-#include
+#include
+#include
#include
-#include "int.h"
+#include "int.hpp"
-using namespace std;
-using namespace boost;
+using boost::optional;
+using std::max;
+using std::min;
+using std::pair;
namespace pv {
namespace prop {
Int::Int(QString name,
+ QString desc,
QString suffix,
optional< pair > range,
Getter getter,
Setter setter) :
- Property(name, getter, setter),
- _suffix(suffix),
- _range(range),
- _spin_box(NULL)
-{
-}
-
-Int::~Int()
+ Property(name, desc, getter, setter),
+ suffix_(suffix),
+ range_(range),
+ spin_box_(nullptr)
{
}
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
{
- if (_spin_box)
- return _spin_box;
+ int64_t range_min = 0;
+ uint64_t range_max = 0;
+
+ if (spin_box_)
+ return spin_box_;
+
+ if (!getter_)
+ return nullptr;
+
+ value_ = getter_();
+
+ GVariant *value = value_.gobj();
+ if (!value)
+ return nullptr;
+
+ spin_box_ = new QSpinBox(parent);
+ spin_box_->setSuffix(suffix_);
+
+ const GVariantType *const type = g_variant_get_type(value);
+ assert(type);
+
+ 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)) {
+ range_min = INT16_MIN, range_max = INT16_MAX;
+ } 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)) {
+ range_min = INT32_MIN, range_max = INT32_MAX;
+ } 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)) {
+ range_min = INT64_MIN, range_max = INT64_MAX;
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) {
+ range_min = 0, range_max = UINT64_MAX;
+ } else {
+ // Unexpected value type.
+ assert(false);
+ }
+
+ // @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.
- _spin_box = new QSpinBox(parent);
- _spin_box->setSuffix(_suffix);
- if (_range)
- _spin_box->setRange((int)_range->first, (int)_range->second);
+ range_min = max(range_min, (int64_t)INT_MIN);
+ 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_MIN, INT_MAX);
+ spin_box_->setRange((int)range_min, (int)range_max);
- GVariant *const value = _getter ? _getter() : NULL;
- if (value) {
- _spin_box->setValue((int)g_variant_get_int64(value));
- g_variant_unref(value);
- }
+ 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::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);
+ assert(setter_);
- if (!_spin_box)
+ if (!spin_box_)
return;
- _setter(g_variant_new_int64(_spin_box->value()));
+ 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());
+ else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
+ 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());
+ else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
+ 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_uint32(spin_box_->value());
+ else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
+ 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 {
+ // Unexpected value type.
+ assert(false);
+ }
+
+ assert(new_value);
+
+ value_ = Glib::VariantBase(new_value);
+
+ setter_(value_);
}
void Int::on_value_changed(int)
@@ -86,5 +187,5 @@ void Int::on_value_changed(int)
commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv