From d941ecb925c1397681f9ec6b354176fdd45fa8e1 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 17 Mar 2013 18:39:06 -0700
Subject: gras: move block set/get into common area
---
include/gras/block.i | 15 +++++++++++++++
python/gras/GRAS_Block.i | 6 ------
tests/CMakeLists.txt | 12 ++++++------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/include/gras/block.i b/include/gras/block.i
index 1ad3106..5bfdc91 100644
--- a/include/gras/block.i
+++ b/include/gras/block.i
@@ -15,4 +15,19 @@
%include <gras/buffer_queue.hpp>
%include <gras/block.hpp>
+////////////////////////////////////////////////////////////////////////
+// Create pythonic gateway to get and set
+////////////////////////////////////////////////////////////////////////
+%extend gras::Block
+{
+ %insert("python")
+ %{
+ def set(self, key, value):
+ self._set_property(key, PMC_M(value))
+
+ def get(self, key):
+ return self._get_property(key)()
+ %}
+}
+
#endif /*INCLUDED_GRAS_BLOCK_I*/
diff --git a/python/gras/GRAS_Block.i b/python/gras/GRAS_Block.i
index 2f98b1b..b4d8293 100644
--- a/python/gras/GRAS_Block.i
+++ b/python/gras/GRAS_Block.i
@@ -290,10 +290,4 @@ class Block(BlockPython):
def register_property(self, key, getter, setter):
self.__prop_registry[key] = (getter, setter)
-
- def set(self, key, value):
- self._set_property(key, PMC_M(value))
-
- def get(self, key):
- return self._get_property(key)()
%}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bfc193e..9393afe 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -39,9 +39,9 @@ endforeach(test_source)
include(GrPython)
set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B})
-GR_ADD_TEST(block_py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/block_test.py)
-GR_ADD_TEST(hier_block_py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/hier_block_test.py)
-GR_ADD_TEST(thread_pool_py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/thread_pool_test.py)
-GR_ADD_TEST(sbuffer_py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/sbuffer_test.py)
-GR_ADD_TEST(stats_py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/stats_test.py)
-GR_ADD_TEST(block_props_py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/block_props_test.py)
+GR_ADD_TEST(block_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/block_test.py)
+GR_ADD_TEST(hier_block_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/hier_block_test.py)
+GR_ADD_TEST(thread_pool_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/thread_pool_test.py)
+GR_ADD_TEST(sbuffer_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/sbuffer_test.py)
+GR_ADD_TEST(stats_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/stats_test.py)
+GR_ADD_TEST(block_props_test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/block_props_test.py)
--
cgit