Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STANAG 4607 packets + mission segment + dwell segment #1716

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

STANAG 4607 packets + mission segment + dwell segment #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4d933ae
Add STANAG 4607 packet/segment headers, mission segment
Dec 15, 2022
f969ba0
Add dwell segment, file reorg
Dec 22, 2022
ada4b8d
Add stanag 4607 to python
Jan 24, 2023
1e7402e
Be more specific with int types
Feb 14, 2023
6c2f1f1
Read [signed]binary angles via SA and BA definitions in standard
Feb 15, 2023
bd8e371
Merge branch 'master' into dev/stanag_4607_mission
hdefazio Feb 15, 2023
666bbc5
bug fix: height was not printing in python
Feb 16, 2023
4feda91
Merge branch 'dev/stanag_4607_mission' of github.com:hdefazio/kwiver …
Feb 16, 2023
6d1bf86
Remove extra imports
Feb 16, 2023
b1f4d0f
Fix bug in docker
Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ OPTION(KWIVER_ENABLE_SPROKIT "Enable building sprokit" OFF )
if(KWIVER_ENABLE_ARROWS)
OPTION(KWIVER_ENABLE_MVG "Enable Multi-View Geometry Arrow" ON )
OPTION(KWIVER_ENABLE_KLV "Enable Key-Length-Value Metadata Arrow" ON)
OPTION(KWIVER_ENABLE_STANAG "Enable NATO Standardization Agreement Arrow" ON)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a bunch of STANAGs, of which 4607 is just one (and 4676 is probably also interesting, along with 4609). Perhaps

Suggested change
OPTION(KWIVER_ENABLE_STANAG "Enable NATO Standardization Agreement Arrow" ON)
OPTION(KWIVER_ENABLE_4607 "Enable NATO Standardization Agreement 4607 (GMTI) Arrow" ON)

and corresponding changes below.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@judajake Do you have a preference between making each STANAG its own arrow or having one arrow for all of them?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bias is towards having one arrow. Longterm, hopefully, more will be supported.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you already have two (since that is what the KLV arrow is - STANAG 4609). So it would not be consistent to say that this is the NATO Standardization Agreement Arrow.

OPTION(KWIVER_ENABLE_ZLIB "Enable Zlib Arrow" ON)
endif()

Expand Down
5 changes: 5 additions & 0 deletions arrows/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ if( KWIVER_ENABLE_KLV )
add_subdirectory( klv )
endif()

# if stanag is enabled
if( KWIVER_ENABLE_STANAG )
add_subdirectory( stanag )
endif()

# if GDAL is enabled
if ( KWIVER_ENABLE_GDAL )
add_subdirectory( gdal )
Expand Down
49 changes: 49 additions & 0 deletions arrows/stanag/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Build / Install STANAG Arrow

set(CMAKE_FOLDER "Arrows/STANAG")

set( sources
stanag_4607_packet.cxx
stanag_util.cxx
segments/stanag_4607_segments.cxx
segments/stanag_4607_segment_lookup.cxx
segments/stanag_4607_mission_segment.cxx
segments/stanag_4607_dwell_segment.cxx
)

set( public_headers
stanag_4607_packet.h
stanag_util.h
segments/stanag_4607_segments.h
segments/stanag_4607_segment_lookup.h
segments/stanag_4607_mission_segment.h
segments/stanag_4607_dwell_segment.h
)

kwiver_install_headers(
${public_headers}
SUBDIR arrows/stanag
)

kwiver_install_headers(
${CMAKE_CURRENT_BINARY_DIR}/kwiver_algo_stanag_export.h
NOPATH
SUBDIR arrows/stanag
)

kwiver_add_library( kwiver_algo_stanag
${sources}
${public_headers}
)

target_link_libraries( kwiver_algo_stanag
PUBLIC vital_algo
PRIVATE vital
vital_logger
kwiver_algo_klv kwiversys
)


#if (KWIVER_ENABLE_TESTS)
# add_subdirectory( tests )
#endif()
Loading