Skip to content

Commit

Permalink
Merge pull request #38 from jafyvilla/data_frame
Browse files Browse the repository at this point in the history
Add data.Frame event
  • Loading branch information
Jafet Villafranca committed Mar 31, 2016
2 parents d0d145b + 6829823 commit fc4b0bd
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 6 deletions.
14 changes: 8 additions & 6 deletions doc/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

# git master

* [35](https://github.com/HBPVIS/ZeroBuf/pull/35)
Added LookOut and Frame events
* [38](https://github.com/HBPVIS/ZeroBuf/pull/38):
Add data.Frame event
* [35](https://github.com/HBPVIS/ZeroBuf/pull/35):
Add LookOut and render.Frame events

# Release 0.2 (08-03-2016)

* [32](https://github.com/HBPVIS/ZeroBuf/pull/32)
Added JSON conversion to code generator
* [30](https://github.com/HBPVIS/ZeroBuf/pull/30)
Added ImageJPEG event
* [32](https://github.com/HBPVIS/ZeroBuf/pull/32):
Add JSON conversion to code generator
* [30](https://github.com/HBPVIS/ZeroBuf/pull/30):
Add ImageJPEG event

# Release 0.1 (28-01-2016)

Expand Down
1 change: 1 addition & 0 deletions zerobuf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ set(ZEROBUF_OMIT_LIBRARY_HEADER ON)
common_library(ZeroBuf)
target_compile_definitions(ZeroBuf PRIVATE ZEROBUF_SHARED_INL)

add_subdirectory(data)
add_subdirectory(render)
14 changes: 14 additions & 0 deletions zerobuf/data/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) HBP 2016 Jafet Villafranca <jafet.villafrancadiaz@epfl.ch>

set(ZEROBUFDATA_INCLUDE_NAME zerobuf/data)

include(zerobufGenerateCxx)
zerobuf_generate_cxx(ZEROBUFDATA
${OUTPUT_INCLUDE_DIR}/${ZEROBUFDATA_INCLUDE_NAME} frame.fbs)

set(ZEROBUFDATA_PUBLIC_HEADERS ${ZEROBUFDATA_HEADERS})
set(ZEROBUFDATA_LINK_LIBRARIES PUBLIC ZeroBuf)

set(ZEROBUFDATA_INCLUDE_NAME zerobuf/data)
set(ZEROBUFDATA_NAMESPACE zerobufdata)
common_library(ZeroBufData)
19 changes: 19 additions & 0 deletions zerobuf/data/frame.fbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright (c) 2016, Human Brain Project
// Jafet.VillafrancaDiaz@epfl.ch
//
namespace zerobuf.data;

// Event containing the data frame range information. It is based on the same
// units as the zerobuf.render.Frame, i.e. number of frames.
// It may be used as a base event that defines the available range of frames
// coming from a certain data source, being also possible to use the
// zerobuf.render.Frame event at the same time, which would define the frame
// subrange used by a rendering animation to loop within.

table Frame
{
// starting frame number in the data frame range
start:uint;
// end frame number in the data frame range
end:uint;
}

0 comments on commit fc4b0bd

Please sign in to comment.