Skip to content

Commit 58daa2a

Browse files
committed
FIX-MERGE: bringing the assembly/beam structure to the segmentation main branch
2 parents 1adc9de + 803fee2 commit 58daa2a

File tree

69 files changed

+1837
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1837
-334
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ temp/
8585
## Python
8686
#######################################
8787
# Byte-compiled / optimized / DLL files
88-
__pycache__/
88+
**/__pycache__/
8989
*.py[cod]
9090
*$py.class
9191

CMakeLists.txt

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,6 @@ target_include_directories(${APP_NAME_EXE}
119119
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
120120
)
121121

122-
#--------------------------------------------------------------------------
123-
# Tests
124-
#--------------------------------------------------------------------------
125-
126-
# include(CTest)
127-
# enable_testing()
128-
129-
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests/global_registrations)
130-
131122
#--------------------------------------------------------------------------
132123
# pybind11
133124
#--------------------------------------------------------------------------
@@ -171,4 +162,42 @@ if (BUILD_PYTHON_MODULE)
171162
)
172163
endforeach()
173164

174-
endif()
165+
endif()
166+
167+
#--------------------------------------------------------------------------
168+
# Tests
169+
#--------------------------------------------------------------------------
170+
171+
# include(CTest)
172+
# enable_testing()
173+
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deps/googletest)
174+
# set(TESTS_OUT_DIR ${CMAKE_BINARY_DIR}/tests/)
175+
176+
177+
# # Unit testing ------------------------------------------------------------
178+
# set(UNIT_TESTS unit_tests)
179+
# add_executable(${UNIT_TESTS} tests/unit_tests/DFPointCloudTest.cc)
180+
# set_target_properties(${UNIT_TESTS} PROPERTIES
181+
# RUNTIME_OUTPUT_DIRECTORY ${TESTS_OUT_DIR}
182+
# )
183+
184+
# target_link_libraries(${UNIT_TESTS} gtest gtest_main)
185+
# target_link_libraries(${UNIT_TESTS} ${SHARED_LIB_NAME})
186+
187+
# add_test(NAME ${UNIT_TESTS} COMMAND ${UNIT_TESTS})
188+
189+
# Integration testing -----------------------------------------------------
190+
# Component testing -------------------------------------------------------
191+
# etc ---------------------------------------------------------------------
192+
193+
# # TODO: a better way to copy the dlls to the tests directory for the tests
194+
# # get all the files -dlls in the bin directory and copy them one by one to tests dir
195+
# file(GLOB files ${CMAKE_BINARY_DIR}/bin/Release/*.dll)
196+
# foreach(file ${files})
197+
# message(STATUS "Copying ${file} to ${TESTS_OUT_DIR}")
198+
# add_custom_command(TARGET ${UNIT_TESTS} POST_BUILD
199+
# COMMAND ${CMAKE_COMMAND} -E copy
200+
# ${file}
201+
# ${TESTS_OUT_DIR}/Release
202+
# )
203+
# endforeach()

README.md

Lines changed: 6 additions & 19 deletions

assets/icon_pool/cloud1.png

-12 KB
Binary file not shown.

assets/icon_pool/cloud1.xcf

-2.93 KB
Binary file not shown.

assets/icon_pool/cloud2.png

-10.5 KB
Binary file not shown.

assets/icon_pool/cloud2.xcf

-4.77 KB
Binary file not shown.
-12.5 KB
Binary file not shown.
-4.85 KB
Binary file not shown.
-11.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)