[Commit-gnuradio] [gnuradio] 02/08: Addition of PDU block setters: added setters for the pdu metadata manipulation blocks pdu_filter, pdu_remove, and pdu_set and associated GRC files.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit f3bc21930622df02f3fc17cbdb620924d80e1bb4
Author: Jacob Gilbert <address@hidden>
Date:   Sun Aug 14 15:16:13 2016 -0700

    Addition of PDU block setters: added setters for the pdu metadata 
manipulation blocks pdu_filter, pdu_remove, and pdu_set and associated GRC 
files.
---
 gr-blocks/grc/blocks_pdu_filter.xml            | 5 ++++-
 gr-blocks/grc/blocks_pdu_remove.xml            | 1 +
 gr-blocks/grc/blocks_pdu_set.xml               | 2 ++
 gr-blocks/include/gnuradio/blocks/pdu_filter.h | 3 +++
 gr-blocks/include/gnuradio/blocks/pdu_remove.h | 1 +
 gr-blocks/include/gnuradio/blocks/pdu_set.h    | 2 ++
 gr-blocks/lib/pdu_filter_impl.h                | 3 +++
 gr-blocks/lib/pdu_remove_impl.h                | 1 +
 gr-blocks/lib/pdu_set_impl.h                   | 2 ++
 9 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gr-blocks/grc/blocks_pdu_filter.xml 
b/gr-blocks/grc/blocks_pdu_filter.xml
index 1fb7209..0e84896 100644
--- a/gr-blocks/grc/blocks_pdu_filter.xml
+++ b/gr-blocks/grc/blocks_pdu_filter.xml
@@ -10,6 +10,9 @@
        <import>from gnuradio import blocks</import>
        <import>import pmt</import>
        <make>blocks.pdu_filter($k, $v, $invert)</make>
+       <callback>set_key($k)</callback>
+       <callback>set_val($v)</callback>
+       <callback>set_inversion($invert)</callback>
        <param>
                <name>Key</name>
                <key>k</key>
@@ -26,7 +29,7 @@
         <name>Invert Filter</name>
         <key>invert</key>
         <value>False</value>
-        <type>enum</type>
+        <type>bool</type>
         <option>
             <name>No</name>
             <key>False</key>
diff --git a/gr-blocks/grc/blocks_pdu_remove.xml 
b/gr-blocks/grc/blocks_pdu_remove.xml
index ad99445..c71da32 100644
--- a/gr-blocks/grc/blocks_pdu_remove.xml
+++ b/gr-blocks/grc/blocks_pdu_remove.xml
@@ -10,6 +10,7 @@
        <import>from gnuradio import blocks</import>
        <import>import pmt</import>
        <make>blocks.pdu_remove($k)</make>
+       <callback>set_key($k)</callback>
        <param>
                <name>Key</name>
                <key>k</key>
diff --git a/gr-blocks/grc/blocks_pdu_set.xml b/gr-blocks/grc/blocks_pdu_set.xml
index 1e7157f..b7a9030 100644
--- a/gr-blocks/grc/blocks_pdu_set.xml
+++ b/gr-blocks/grc/blocks_pdu_set.xml
@@ -10,6 +10,8 @@
        <import>from gnuradio import blocks</import>
        <import>import pmt</import>
        <make>blocks.pdu_set($k, $v)</make>
+       <callback>set_key($k)</callback>
+       <callback>set_val($v)</callback>
        <param>
                <name>Key</name>
                <key>k</key>
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_filter.h 
b/gr-blocks/include/gnuradio/blocks/pdu_filter.h
index 1483731..25dd185 100644
--- a/gr-blocks/include/gnuradio/blocks/pdu_filter.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu_filter.h
@@ -44,6 +44,9 @@ namespace gr {
        * \brief Construct a PDU filter
        */
       static sptr make(pmt::pmt_t k, pmt::pmt_t v, bool invert = false);
+      virtual void set_key(pmt::pmt_t key) = 0;
+      virtual void set_val(pmt::pmt_t val) = 0;
+      virtual void set_inversion(bool invert) = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_remove.h 
b/gr-blocks/include/gnuradio/blocks/pdu_remove.h
index 9b8a087..f2ab35f 100644
--- a/gr-blocks/include/gnuradio/blocks/pdu_remove.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu_remove.h
@@ -44,6 +44,7 @@ namespace gr {
        * \brief Construct a PDU meta remove block
        */
       static sptr make(pmt::pmt_t k);
+      virtual void set_key(pmt::pmt_t key) = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_set.h 
b/gr-blocks/include/gnuradio/blocks/pdu_set.h
index cfafc44..ba96492 100644
--- a/gr-blocks/include/gnuradio/blocks/pdu_set.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu_set.h
@@ -44,6 +44,8 @@ namespace gr {
        * \brief Construct a PDU meta set block
        */
       static sptr make(pmt::pmt_t k, pmt::pmt_t v);
+      virtual void set_key(pmt::pmt_t key) = 0;
+      virtual void set_val(pmt::pmt_t val) = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/lib/pdu_filter_impl.h b/gr-blocks/lib/pdu_filter_impl.h
index 66440ee..e54b504 100644
--- a/gr-blocks/lib/pdu_filter_impl.h
+++ b/gr-blocks/lib/pdu_filter_impl.h
@@ -38,6 +38,9 @@ namespace gr {
     public:
       pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert);
       void handle_msg(pmt::pmt_t msg);
+      void set_key(pmt::pmt_t key) { d_k = key; };
+      void set_val(pmt::pmt_t val) { d_v = val; };
+      void set_inversion(bool invert) { d_invert = invert; };
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/lib/pdu_remove_impl.h b/gr-blocks/lib/pdu_remove_impl.h
index 4492e4b..6f1a7f1 100644
--- a/gr-blocks/lib/pdu_remove_impl.h
+++ b/gr-blocks/lib/pdu_remove_impl.h
@@ -36,6 +36,7 @@ namespace gr {
     public:
       pdu_remove_impl(pmt::pmt_t k);
       void handle_msg(pmt::pmt_t msg);
+      void set_key(pmt::pmt_t key) { d_k = key; };
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/lib/pdu_set_impl.h b/gr-blocks/lib/pdu_set_impl.h
index b27315e..3529195 100644
--- a/gr-blocks/lib/pdu_set_impl.h
+++ b/gr-blocks/lib/pdu_set_impl.h
@@ -37,6 +37,8 @@ namespace gr {
     public:
       pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v);
       void handle_msg(pmt::pmt_t msg);
+      void set_key(pmt::pmt_t key) { d_k = key; };
+      void set_val(pmt::pmt_t val) { d_v = val; };
     };
 
   } /* namespace blocks */