X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=03b81edb3cc0da0b0256ea751199e976cc5aa631;hb=cd59e6eca13632f8fc749a63fb8ccbadbb77e21b;hp=5e07c2c6f8744ad32ea0e388497bb851e2b536f2;hpb=b6b4f03e404e06430eca810ad2bf7ccc84262b6e;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 5e07c2c6..03b81edb 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -768,7 +768,7 @@ vector<shared_ptr<Channel>> ChannelGroup::channels()
 	return result;
 }
 
-Trigger::Trigger(shared_ptr<Context> context, string name) : 
+Trigger::Trigger(shared_ptr<Context> context, string name) :
 	_structure(sr_trigger_new(name.c_str())),
 	_context(move(context))
 {
@@ -812,7 +812,7 @@ TriggerStage::TriggerStage(struct sr_trigger_stage *structure) :
 TriggerStage::~TriggerStage()
 {
 }
-	
+
 int TriggerStage::number() const
 {
 	return _structure->stage;
@@ -1212,6 +1212,11 @@ void *Analog::data_pointer()
 	return _structure->data;
 }
 
+void Analog::get_data_as_float(float *dest)
+{
+	check(sr_analog_to_float(_structure, dest));
+}
+
 unsigned int Analog::num_samples() const
 {
 	return _structure->num_samples;
@@ -1227,6 +1232,58 @@ vector<shared_ptr<Channel>> Analog::channels()
 	return result;
 }
 
+unsigned int Analog::unitsize() const
+{
+	return _structure->encoding->unitsize;
+}
+
+bool Analog::is_signed() const
+{
+	return _structure->encoding->is_signed;
+}
+
+bool Analog::is_float() const
+{
+	return _structure->encoding->is_float;
+}
+
+bool Analog::is_bigendian() const
+{
+	return _structure->encoding->is_bigendian;
+}
+
+int Analog::digits() const
+{
+	return _structure->encoding->digits;
+}
+
+bool Analog::is_digits_decimal() const
+{
+	return _structure->encoding->is_digits_decimal;
+}
+
+shared_ptr<Rational> Analog::scale()
+{
+	unique_ptr<Rational> scale;
+	scale.reset(new Rational(&(_structure->encoding->scale)));
+
+	if (scale)
+		return scale->share_owned_by(shared_from_this());
+	else
+		throw Error(SR_ERR_NA);
+}
+
+shared_ptr<Rational> Analog::offset()
+{
+	unique_ptr<Rational> offset;
+	offset.reset(new Rational(&(_structure->encoding->offset)));
+
+	if (offset)
+		return offset->share_owned_by(shared_from_this());
+	else
+		throw Error(SR_ERR_NA);
+}
+
 const Quantity *Analog::mq() const
 {
 	return Quantity::get(_structure->meaning->mq);
@@ -1242,6 +1299,36 @@ vector<const QuantityFlag *> Analog::mq_flags() const
 	return QuantityFlag::flags_from_mask(_structure->meaning->mqflags);
 }
 
+Rational::Rational(const struct sr_rational *structure) :
+	_structure(structure)
+{
+}
+
+Rational::~Rational()
+{
+}
+
+shared_ptr<Rational> Rational::share_owned_by(shared_ptr<Analog> _parent)
+{
+	return static_pointer_cast<Rational>(
+		ParentOwned::share_owned_by(_parent));
+}
+
+int64_t Rational::numerator() const
+{
+	return _structure->p;
+}
+
+uint64_t Rational::denominator() const
+{
+	return _structure->q;
+}
+
+float Rational::value() const
+{
+	return (float)(_structure->p) / (float)(_structure->q);
+}
+
 InputFormat::InputFormat(const struct sr_input_module *structure) :
 	_structure(structure)
 {