[Commit-gnuradio] r7202 - gnuradio/branches/developers/jcorgan/t127/usrpdb/src

[eb]

Author: eb
Date: 2007-12-16 17:26:14 -0700 (Sun, 16 Dec 2007)
New Revision: 7202

Modified:
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.i
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.i
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.i
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.i
Log:
now builds and passes check, modulo throwing exception failure

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i       
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb.i       
2007-12-17 00:26:14 UTC (rev 7202)
@@ -21,9 +21,16 @@
  */
 
 %feature("autodoc", "1");
+
 %include <shared_ptr.i>
+%include <std_vector.i>
 
+namespace std {
+  %template() vector<float>;
+}
+
 %include "usrpdb_hwa_qa.i"
+%include "usrpdb_base.i"
 %include "usrpdb_basic_rx.i"
 %include "usrpdb_basic_tx.i"
 %include "usrpdb_lfrx.i"

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.h
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.h  
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.h  
2007-12-17 00:26:14 UTC (rev 7202)
@@ -25,7 +25,12 @@
 
 #include <usrpdb_hwa.h>
 #include <vector>
+#include <boost/shared_ptr.hpp>
 
+class usrpdb_base;
+typedef boost::shared_ptr<usrpdb_base> usrpdb_base_sptr;
+
+
 class usrpdb_base 
 {
 protected:

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.i
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.i  
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_base.i  
2007-12-17 00:26:14 UTC (rev 7202)
@@ -20,9 +20,37 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%include "usrpdb_base.h"
-%include <std_vector.i>
 
-namespace std {
-  %template() vector<float>;
-}
\ No newline at end of file
+
+%{
+#include "usrpdb_base.h"
+%}
+
+class usrpdb_base;
+typedef boost::shared_ptr<usrpdb_base> usrpdb_base_sptr;
+%template(usrpdb_base_sptr) boost::shared_ptr<usrpdb_base>;
+
+
+class usrpdb_base 
+{
+public:
+  usrpdb_base(usrpdb_hwa_sptr hwa);
+  virtual ~usrpdb_base();
+
+  // These methods MUST be overridden in derived classes
+  // (they raised NotImplemented exceptions in old db_base.py)
+  virtual std::vector<float> freq_range() = 0;
+  virtual float set_freq(float target_freq) = 0;
+  virtual std::vector<float> gain_range() = 0;
+  virtual void set_gain(float gain) = 0;
+  virtual bool is_quadrature() = 0;
+
+  // These methods MAY be overriden in derived classes, but have default ops
+  virtual bool i_and_q_swapped();            // false
+  virtual bool spectrum_inverted();          // false
+  virtual void set_enable(bool on);          // nop
+  virtual void set_auto_tr(bool on);         // nop
+  virtual void set_lo_offset(float offset);  // nop
+  virtual float lo_offset();                 // 0.0
+  virtual void select_antenna(int which);    // nop
+};

Modified: 
gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc     
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc     
2007-12-17 00:26:14 UTC (rev 7202)
@@ -27,10 +27,10 @@
 #include <usrpdb_basic_rx.h>
 #include <stdexcept>
 
-usrpdb_basic_rx_sptr
+usrpdb_base_sptr
 usrpdb_make_basic_rx(usrpdb_hwa_sptr hwa)
 {
-  return usrpdb_basic_rx_sptr(new usrpdb_basic_rx(hwa));
+  return usrpdb_base_sptr(new usrpdb_basic_rx(hwa));
 }
 
 usrpdb_basic_rx::usrpdb_basic_rx(usrpdb_hwa_sptr hwa)

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.h
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.h      
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.h      
2007-12-17 00:26:14 UTC (rev 7202)
@@ -25,17 +25,17 @@
 
 #include <usrpdb_base.h>
 
-class usrpdb_basic_rx;
-typedef boost::shared_ptr<usrpdb_basic_rx> usrpdb_basic_rx_sptr;
+//class usrpdb_basic_rx;
+//typedef boost::shared_ptr<usrpdb_basic_rx> usrpdb_basic_rx_sptr;
 
-usrpdb_basic_rx_sptr usrpdb_make_basic_rx(usrpdb_hwa_sptr hwa);
+usrpdb_base_sptr usrpdb_make_basic_rx(usrpdb_hwa_sptr hwa);
 
-class usrpdb_basic_rx : protected usrpdb_base
+class usrpdb_basic_rx : public usrpdb_base
 {
 protected:
   usrpdb_basic_rx(usrpdb_hwa_sptr hwa);
 
-  friend usrpdb_basic_rx_sptr usrpdb_make_basic_rx(usrpdb_hwa_sptr hwa);
+  friend usrpdb_base_sptr usrpdb_make_basic_rx(usrpdb_hwa_sptr hwa);
 
 public:
   virtual ~usrpdb_basic_rx();

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.i
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.i      
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.i      
2007-12-17 00:26:14 UTC (rev 7202)
@@ -27,14 +27,15 @@
 %include "usrpdb_base.i"
 
 class usrpdb_basic_rx;
-typedef boost::shared_ptr<usrpdb_basic_rx> usrpdb_basic_rx_sptr;
-%template(usrpdb_basic_rx_sptr) boost::shared_ptr<usrpdb_basic_rx>;
+//typedef boost::shared_ptr<usrpdb_basic_rx> usrpdb_basic_rx_sptr;
+//%template(usrpdb_basic_rx_sptr) boost::shared_ptr<usrpdb_basic_rx>;
+
 %rename(basic_rx) usrpdb_make_basic_rx;
 %ignore basic_rx;
 
-usrpdb_basic_rx_sptr usrpdb_make_basic_rx(usrpdb_hwa_sptr hwa);
+usrpdb_base_sptr usrpdb_make_basic_rx(usrpdb_hwa_sptr hwa);
 
-class usrpdb_basic_rx : protected usrpdb_base
+class usrpdb_basic_rx : public usrpdb_base
 {
 protected:
   usrpdb_basic_rx(usrpdb_hwa_sptr hwa);

Modified: 
gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc     
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc     
2007-12-17 00:26:14 UTC (rev 7202)
@@ -27,10 +27,10 @@
 #include <usrpdb_basic_tx.h>
 #include <stdexcept>
 
-usrpdb_basic_tx_sptr
+usrpdb_base_sptr
 usrpdb_make_basic_tx(usrpdb_hwa_sptr hwa)
 {
-  return usrpdb_basic_tx_sptr(new usrpdb_basic_tx(hwa));
+  return usrpdb_base_sptr(new usrpdb_basic_tx(hwa));
 }
 
 usrpdb_basic_tx::usrpdb_basic_tx(usrpdb_hwa_sptr hwa)

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.h
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.h      
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.h      
2007-12-17 00:26:14 UTC (rev 7202)
@@ -25,17 +25,17 @@
 
 #include <usrpdb_base.h>
 
-class usrpdb_basic_tx;
-typedef boost::shared_ptr<usrpdb_basic_tx> usrpdb_basic_tx_sptr;
+//class usrpdb_basic_tx;
+//typedef boost::shared_ptr<usrpdb_basic_tx> usrpdb_basic_tx_sptr;
 
-usrpdb_basic_tx_sptr usrpdb_make_basic_tx(usrpdb_hwa_sptr hwa);
+usrpdb_base_sptr usrpdb_make_basic_tx(usrpdb_hwa_sptr hwa);
 
-class usrpdb_basic_tx : protected usrpdb_base
+class usrpdb_basic_tx : public usrpdb_base
 {
 protected:
   usrpdb_basic_tx(usrpdb_hwa_sptr hwa);
 
-  friend usrpdb_basic_tx_sptr usrpdb_make_basic_tx(usrpdb_hwa_sptr hwa);
+  friend usrpdb_base_sptr usrpdb_make_basic_tx(usrpdb_hwa_sptr hwa);
 
 public:
   virtual ~usrpdb_basic_tx();

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.i
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.i      
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.i      
2007-12-17 00:26:14 UTC (rev 7202)
@@ -26,15 +26,16 @@
 
 %include "usrpdb_base.i"
 
-class usrpdb_basic_tx;
-typedef boost::shared_ptr<usrpdb_basic_tx> usrpdb_basic_tx_sptr;
-%template(usrpdb_basic_tx_sptr) boost::shared_ptr<usrpdb_basic_tx>;
+ //class usrpdb_basic_tx;
+ //typedef boost::shared_ptr<usrpdb_basic_tx> usrpdb_basic_tx_sptr;
+ //%template(usrpdb_basic_tx_sptr) boost::shared_ptr<usrpdb_basic_tx>;
+
 %rename(basic_tx) usrpdb_make_basic_tx;
 %ignore basic_tx;
 
-usrpdb_basic_tx_sptr usrpdb_make_basic_tx(usrpdb_hwa_sptr hwa);
+usrpdb_base_sptr usrpdb_make_basic_tx(usrpdb_hwa_sptr hwa);
 
-class usrpdb_basic_tx : protected usrpdb_base
+class usrpdb_basic_tx : public usrpdb_base
 {
 protected:
   usrpdb_basic_tx(usrpdb_hwa_sptr hwa);

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.cc 
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.cc 
2007-12-17 00:26:14 UTC (rev 7202)
@@ -27,10 +27,10 @@
 #include <usrpdb_lfrx.h>
 #include <stdexcept>
 
-usrpdb_lfrx_sptr
+usrpdb_base_sptr
 usrpdb_make_lfrx(usrpdb_hwa_sptr hwa)
 {
-  return usrpdb_lfrx_sptr(new usrpdb_lfrx(hwa));
+  return usrpdb_base_sptr(new usrpdb_lfrx(hwa));
 }
 
 usrpdb_lfrx::usrpdb_lfrx(usrpdb_hwa_sptr hwa)

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.h
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.h  
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.h  
2007-12-17 00:26:14 UTC (rev 7202)
@@ -25,17 +25,17 @@
 
 #include <usrpdb_basic_rx.h>
 
-class usrpdb_lfrx;
-typedef boost::shared_ptr<usrpdb_lfrx> usrpdb_lfrx_sptr;
+//class usrpdb_lfrx;
+//typedef boost::shared_ptr<usrpdb_lfrx> usrpdb_lfrx_sptr;
 
-usrpdb_lfrx_sptr usrpdb_make_lfrx(usrpdb_hwa_sptr hwa);
+usrpdb_base_sptr usrpdb_make_lfrx(usrpdb_hwa_sptr hwa);
 
-class usrpdb_lfrx : protected usrpdb_basic_rx
+class usrpdb_lfrx : public usrpdb_basic_rx
 {
 protected:
   usrpdb_lfrx(usrpdb_hwa_sptr hwa);
 
-  friend usrpdb_lfrx_sptr usrpdb_make_lfrx(usrpdb_hwa_sptr hwa);
+  friend usrpdb_base_sptr usrpdb_make_lfrx(usrpdb_hwa_sptr hwa);
 
 public:
   virtual ~usrpdb_lfrx();

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.i
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.i  
2007-12-16 23:32:51 UTC (rev 7201)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_lfrx.i  
2007-12-17 00:26:14 UTC (rev 7202)
@@ -26,15 +26,16 @@
 
 %include "usrpdb_basic_rx.i"
 
-class usrpdb_lfrx;
-typedef boost::shared_ptr<usrpdb_lfrx> usrpdb_lfrx_sptr;
-%template(usrpdb_lfrx_sptr) boost::shared_ptr<usrpdb_lfrx>;
+ //class usrpdb_lfrx;
+ //typedef boost::shared_ptr<usrpdb_lfrx> usrpdb_lfrx_sptr;
+ //%template(usrpdb_lfrx_sptr) boost::shared_ptr<usrpdb_lfrx>;
+
 %rename(lfrx) usrpdb_make_lfrx;
 %ignore lfrx;
 
-usrpdb_lfrx_sptr usrpdb_make_lfrx(usrpdb_hwa_sptr hwa);
+usrpdb_base_sptr usrpdb_make_lfrx(usrpdb_hwa_sptr hwa);
 
-class usrpdb_lfrx : protected usrpdb_basic_rx
+class usrpdb_lfrx : public usrpdb_basic_rx
 {
 protected:
   usrpdb_lfrx(usrpdb_hwa_sptr hwa);