diff options
| author | Josh Blum | 2013-06-21 19:53:34 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-06-21 19:53:34 -0700 |
| commit | 78139a05aa2f1516688f29359538fbc09b8c3e2e (patch) | |
| tree | 5e18889f2fc3cbcb22d722ac70176d5809f0ea27 /python/gras | |
| parent | b6e5debf3d0b9fddd5f274bf16bd3d5e09219639 (diff) | |
| parent | 90579c89748704dc1d7e9d80120c42988481197c (diff) | |
| download | sandhi-78139a05aa2f1516688f29359538fbc09b8c3e2e.tar.gz sandhi-78139a05aa2f1516688f29359538fbc09b8c3e2e.tar.bz2 sandhi-78139a05aa2f1516688f29359538fbc09b8c3e2e.zip | |
Merge branch 'time_tag_work'
Diffstat (limited to 'python/gras')
| -rw-r--r-- | python/gras/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | python/gras/GRAS_TimeTag.i | 14 | ||||
| -rw-r--r-- | python/gras/__init__.py | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/python/gras/CMakeLists.txt b/python/gras/CMakeLists.txt index 8171e7f..a7fc8f3 100644 --- a/python/gras/CMakeLists.txt +++ b/python/gras/CMakeLists.txt @@ -19,6 +19,7 @@ set(GR_SWIG_LIBRARIES gras) file(GLOB GR_SWIG_SOURCE_DEPS "${GRAS_SOURCE_DIR}/include/gras/*.i") GR_SWIG_MAKE(GRAS_Tags GRAS_Tags.i) +GR_SWIG_MAKE(GRAS_TimeTag GRAS_TimeTag.i) GR_SWIG_MAKE(GRAS_Block GRAS_Block.i) GR_SWIG_MAKE(GRAS_HierBlock GRAS_HierBlock.i) GR_SWIG_MAKE(GRAS_ThreadPool GRAS_ThreadPool.i) @@ -26,6 +27,7 @@ GR_SWIG_MAKE(GRAS_SBuffer GRAS_SBuffer.i) GR_SWIG_INSTALL( TARGETS GRAS_Tags + GRAS_TimeTag GRAS_Block GRAS_HierBlock GRAS_ThreadPool diff --git a/python/gras/GRAS_TimeTag.i b/python/gras/GRAS_TimeTag.i new file mode 100644 index 0000000..3b77dfb --- /dev/null +++ b/python/gras/GRAS_TimeTag.i @@ -0,0 +1,14 @@ +// Copyright (C) by Josh Blum. See LICENSE.txt for licensing information. + + +%include <gras/time_tag.i> + +%include <PMC/Registry.i> + +DECL_PMC_SWIG_TYPE(gras::TimeTag, swig_time_tag) + +%pythoncode %{ +from GRAS_TimeTag import TimeTag +%} + +REG_PMC_SWIG_TYPE(swig_time_tag, TimeTag) diff --git a/python/gras/__init__.py b/python/gras/__init__.py index 33d2b00..cf2c7f5 100644 --- a/python/gras/__init__.py +++ b/python/gras/__init__.py @@ -3,6 +3,7 @@ from PMC import * from GRAS_SBuffer import SBufferConfig, SBuffer from GRAS_Tags import Tag, StreamTag, PacketMsg +from GRAS_TimeTag import TimeTag from GRAS_Block import Block from GRAS_HierBlock import HierBlock, TopBlock from GRAS_ThreadPool import ThreadPoolConfig, ThreadPool |