Merge pull request #169 from Y-Nak/allow-cast

Allow implicit cast between (GenICam) int, float, and enum
cameleon-rs · Aug 29, 2023 · 9695010 · 9695010
2 parents 513cb25 + 9902369
commit 9695010
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 87 deletions.
diff --git a/device/src/u3v/async_read.rs b/device/src/u3v/async_read.rs
@@ -217,7 +217,7 @@ impl Drop for AsyncTransfer {
 /// timeout, or error, instead of potentially returning early.
 ///
 /// This design is based on
-/// https://libusb.sourceforge.io/api-1.0/libusb_mtasync.html#threadwait
+/// <https://libusb.sourceforge.io/api-1.0/libusb_mtasync.html#threadwait>
 fn poll_completed(
     ctx: &impl UsbContext,
     timeout: Duration,

diff --git a/genapi/src/boolean.rs b/genapi/src/boolean.rs
@@ -65,7 +65,7 @@ impl IBoolean for BooleanNode {
         store: &impl NodeStore,
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
-        let value = self.value.value(device, store, cx)?;
+        let value: i64 = self.value.value(device, store, cx)?;
         if value == self.on_value {
             Ok(true)
         } else if value == self.off_value {
@@ -102,7 +102,7 @@ impl IBoolean for BooleanNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_readable(device, store, cx)?
-            && self.value.is_readable(device, store, cx)?)
+            && IValue::<i64>::is_readable(&self.value, device, store, cx)?)
     }
 
     #[tracing::instrument(skip(self, device, store, cx),
@@ -115,7 +115,7 @@ impl IBoolean for BooleanNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_writable(device, store, cx)?
-            && self.value.is_writable(device, store, cx)?)
+            && IValue::<i64>::is_writable(&self.value, device, store, cx)?)
     }
 }
 

diff --git a/genapi/src/command.rs b/genapi/src/command.rs
@@ -4,7 +4,7 @@
 
 use super::{
     elem_type::ImmOrPNode,
-    interface::{ICommand, IInteger, INode},
+    interface::{ICommand, INode},
     ivalue::IValue,
     node_base::{NodeAttributeBase, NodeBase, NodeElementBase},
     store::{CacheStore, IntegerId, NodeStore, ValueStore},
@@ -59,7 +59,7 @@ impl ICommand for CommandNode {
     ) -> GenApiResult<()> {
         cx.invalidate_cache_by(self.node_base().id());
 
-        let value = self.command_value.value(device, store, cx)?;
+        let value: i64 = self.command_value.value(device, store, cx)?;
         self.value.set_value(value, device, store, cx)
     }
 
@@ -71,15 +71,14 @@ impl ICommand for CommandNode {
         store: &impl NodeStore,
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
-        let nid = match self.value {
+        let node = match self.value {
             ImmOrPNode::Imm(..) => return Ok(true),
             ImmOrPNode::PNode(nid) => nid,
         };
 
-        cx.invalidate_cache_of(nid);
-        let node = nid.expect_iinteger_kind(store)?;
-        if node.is_readable(device, store, cx)? {
-            let command_value = self.command_value.value(device, store, cx)?;
+        cx.invalidate_cache_of(node);
+        if IValue::<i64>::is_readable(&node, device, store, cx)? {
+            let command_value: i64 = self.command_value.value(device, store, cx)?;
             let reg_value = node.value(device, store, cx)?;
             Ok(command_value != reg_value)
         } else {
@@ -97,6 +96,6 @@ impl ICommand for CommandNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_writable(device, store, cx)?
-            && self.value.is_writable(device, store, cx)?)
+            && IValue::<i64>::is_writable(&self.value, device, store, cx)?)
     }
 }
diff --git a/genapi/src/elem_type.rs b/genapi/src/elem_type.rs
@@ -6,7 +6,6 @@
 use std::marker::PhantomData;
 
 use super::{
-    interface::IInteger,
     ivalue::IValue,
     store::{CacheStore, NodeId, NodeStore, ValueStore},
     Device, GenApiResult, ValueCtxt,
@@ -281,7 +280,7 @@ impl AddressKind {
     ) -> GenApiResult<i64> {
         match self {
             Self::Address(i) => i.value(device, store, cx),
-            Self::IntSwissKnife(nid) => nid.expect_iinteger_kind(store)?.value(device, store, cx),
+            Self::IntSwissKnife(nid) => nid.value(device, store, cx),
             Self::PIndex(p_index) => p_index.value(device, store, cx),
         }
     }
@@ -310,12 +309,10 @@ impl RegPIndex {
         store: &impl NodeStore,
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<i64> {
-        let base = self
-            .p_index
-            .expect_iinteger_kind(store)?
-            .value(device, store, cx)?;
+        let base = self.p_index.value(device, store, cx)?;
         if let Some(offset) = &self.offset {
-            Ok(base + offset.value(device, store, cx)?)
+            let offset: i64 = offset.value(device, store, cx)?;
+            Ok(base + offset)
         } else {
             Ok(base)
         }

diff --git a/genapi/src/enumeration.rs b/genapi/src/enumeration.rs
@@ -152,7 +152,7 @@ impl IEnumeration for EnumerationNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_readable(device, store, cx)?
-            && self.value.is_readable(device, store, cx)?)
+            && IValue::<i64>::is_readable(&self.value, device, store, cx)?)
     }
 
     #[tracing::instrument(skip(self, device, store, cx),
@@ -165,7 +165,7 @@ impl IEnumeration for EnumerationNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_writable(device, store, cx)?
-            && self.value.is_writable(device, store, cx)?)
+            && IValue::<i64>::is_writable(&self.value, device, store, cx)?)
     }
 }
 

diff --git a/genapi/src/float.rs b/genapi/src/float.rs
@@ -198,7 +198,7 @@ impl IFloat for FloatNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_readable(device, store, cx)?
-            && self.value_kind.is_readable(device, store, cx)?)
+            && IValue::<f64>::is_readable(&self.value_kind, device, store, cx)?)
     }
 
     #[tracing::instrument(skip(self, device, store, cx),
@@ -211,6 +211,6 @@ impl IFloat for FloatNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_writable(device, store, cx)?
-            && self.value_kind.is_writable(device, store, cx)?)
+            && IValue::<f64>::is_writable(&self.value_kind, device, store, cx)?)
     }
 }
diff --git a/genapi/src/integer.rs b/genapi/src/integer.rs
@@ -188,7 +188,7 @@ impl IInteger for IntegerNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_readable(device, store, cx)?
-            && self.value_kind.is_readable(device, store, cx)?)
+            && IValue::<i64>::is_readable(&self.value_kind, device, store, cx)?)
     }
 
     #[tracing::instrument(skip(self, device, store, cx),
@@ -201,7 +201,7 @@ impl IInteger for IntegerNode {
         cx: &mut ValueCtxt<T, U>,
     ) -> GenApiResult<bool> {
         Ok(self.elem_base.is_writable(device, store, cx)?
-            && self.value_kind.is_writable(device, store, cx)?)
+            && IValue::<i64>::is_writable(&self.value_kind, device, store, cx)?)
     }
 }