1 files changed, 47 insertions, 1 deletions
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py
index 0fdacb796..1a9f8358d 100644
--- a/gr-uhd/swig/__init__.py
+++ b/gr-uhd/swig/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,6 +22,17 @@
 # The presence of this file turns this directory into a Python package
 
 ########################################################################
+# Create aliases for uhd swig attributes to avoid the "_t"
+# Install the __str__ and __repr__ handlers if applicable
+########################################################################
+import uhd_swig
+for attr in dir(uhd_swig):
+    myobj = getattr(uhd_swig, attr)
+    if hasattr(myobj, 'to_string'):    myobj.__repr__ = lambda s: s.to_string().strip()
+    if hasattr(myobj, 'to_pp_string'): myobj.__str__  = lambda s: s.to_pp_string().strip()
+    if attr.endswith('_t'): setattr(uhd_swig, attr[:-2], myobj)
+
+########################################################################
 # Add SWIG generated code to this namespace
 ########################################################################
 from uhd_swig import *
@@ -29,6 +40,8 @@ from uhd_swig import *
 ########################################################################
 # Add other content from pure-Python modules here
 ########################################################################
+class freq_range_t(meta_range_t): pass #a typedef for the user
+class gain_range_t(meta_range_t): pass #a typedef for the user
 
 class tune_request_t(tune_request_t, float):
     """
@@ -38,3 +51,36 @@ class tune_request_t(tune_request_t, float):
     """
     def __new__(self, *args): return float.__new__(self)
     def __float__(self): return self.target_freq
+
+class device_addr_t(device_addr_t, str):
+    """
+    Make the python tune request object inherit from string
+    so that it can be passed in GRC as a string parameter.
+    The type checking in GRC will accept the device address.
+    Define the set/get item special methods for dict access.
+    """
+    def __new__(self, *args): return str.__new__(self)
+    def __getitem__(self, key): return self.get(key)
+    def __setitem__(self, key, val): self.set(key, val)
+
+########################################################################
+# Cast constructor args (FIXME swig handle overloads?)
+########################################################################
+for attr in (
+    'single_usrp_source', 'single_usrp_sink',
+    'multi_usrp_source', 'multi_usrp_sink'
+):
+    def constructor_factory(old_constructor):
+        def constructor_interceptor(*args, **kwargs):
+            args = list(args)
+            kwargs = dict(kwargs)
+            for index, key, cast in (
+                (0, 'device_addr', device_addr),
+                (1, 'io_type', io_type),
+            ):
+                if len(args) > index: args[index] = cast(args[index])
+                if kwargs.has_key(key): kwargs[key] = cast(kwargs[key])
+            return old_constructor(*args, **kwargs)
+        return constructor_interceptor
+    import uhd_swig
+    globals()[attr] = constructor_factory(getattr(uhd_swig, attr))