Commit 96f85663 authored by Edwin Carlinet's avatar Edwin Carlinet
Browse files

Update readme and CMakeLists.

parent 5bbd6621
Pipeline #554 passed with stage
in 2 minutes and 17 seconds
## News
### Feb 16, 2018. MToS-based interactive segmentation
The code for the interactive segmentation using the MToS has been cleaned up and
available in the [`mtos` subdirectory](./mtos).
### Feb 01, 2018. MToS computation code published
The code for the Multivariate Tree of Shape computation has been cleaned up and
available in the [`mtos` subdirectory](./mtos).
......
......@@ -18,6 +18,13 @@ E. Carlinet, S. Crozet, T. Géraud
## Installation, Compilation, Running
Required dependancies:
* FreeImage
* Google Benchmark
* Google Test (optional, to build test)
* Megawave (optional, to run megawave)
To reproduce benchmarks:
1. Install MegaWave and compile it in release mode. It can be downloaded here:
......
......@@ -9,7 +9,6 @@ set(CMAKE_MODULE_PATH
set(Pylene_ROOT ${CMAKE_CURRENT_LIST_DIR}/External/Pylene CACHE PATH "Path to Pylene ROOT directory")
find_package(Pylene REQUIRED)
find_package(Git)
# Set standard
set(CMAKE_CXX_STANDARD 14)
......
......@@ -3,44 +3,40 @@ project(mtos-demos)
include(../common.cmake)
find_package(FreeImage REQUIRED)
find_package(TBB)
find_package(Qt5Gui)
find_package(Qt5Widgets)
find_package(TBB REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Widgets REQUIRED)
set(CMAKE_AUTOMOC ON)
if (TBB_FOUND)
add_library(mtos
libmtos/include/mtos.hpp
libmtos/src/satmaxtree.hpp
libmtos/src/compute_g2.hpp
libmtos/src/mtos.cpp
libmtos/src/satmaxtree.cpp
libmtos/src/compute_g2.cpp)
target_include_directories(mtos PUBLIC libmtos/include)
target_link_libraries(mtos PUBLIC Pylene::Pylene ${TBB_LIBRARIES})
target_link_libraries(mtos PRIVATE libtos)
add_library(mtos
libmtos/include/mtos.hpp
libmtos/src/satmaxtree.hpp
libmtos/src/compute_g2.hpp
libmtos/src/mtos.cpp
libmtos/src/satmaxtree.cpp
libmtos/src/compute_g2.cpp)
add_executable(compute-mtos src/compute-mtos-cli.cpp)
target_link_libraries(compute-mtos mtos libtos ${FreeImage_LIBRARIES})
target_include_directories(mtos PUBLIC libmtos/include)
target_link_libraries(mtos PUBLIC Pylene::Pylene ${TBB_LIBRARIES})
target_link_libraries(mtos PRIVATE libtos)
qt5_add_resources(ICON src/interactive-segmentation/ISIcons.qrc)
add_executable(compute-mtos src/compute-mtos-cli.cpp)
target_link_libraries(compute-mtos mtos libtos ${FreeImage_LIBRARIES})
add_executable(ISDemo
src/interactive-segmentation/ISDemo.cpp
src/interactive-segmentation/ISMainWindow.hpp
src/interactive-segmentation/ISMainWindow.cpp
src/interactive-segmentation/ISBrush.hpp
src/interactive-segmentation/ISBrush.cpp
src/interactive-segmentation/tos-isegmentation.hpp
src/interactive-segmentation/tos-isegmentation.cpp
${ICON}
)
set_property(SOURCE ${ICON} PROPERTY SKIP_AUTOMOC ON)
target_link_libraries(ISDemo libtos mtos ImageViewer Qt5::Gui Qt5::Widgets Pylene::Pylene)
# Interactive Segmentation
set(CMAKE_AUTOMOC ON)
qt5_add_resources(ICON src/interactive-segmentation/ISIcons.qrc)
add_executable(ISDemo
src/interactive-segmentation/ISDemo.cpp
src/interactive-segmentation/ISMainWindow.hpp
src/interactive-segmentation/ISMainWindow.cpp
src/interactive-segmentation/ISBrush.hpp
src/interactive-segmentation/ISBrush.cpp
src/interactive-segmentation/tos-isegmentation.hpp
src/interactive-segmentation/tos-isegmentation.cpp
${ICON}
)
set_property(SOURCE ${ICON} PROPERTY SKIP_AUTOMOC ON)
target_link_libraries(ISDemo libtos mtos ImageViewer Qt5::Gui Qt5::Widgets Pylene::Pylene)
endif()
......@@ -6,6 +6,8 @@ Implementation of the Multivariate Tree of Shapes.
* FreeImage
* Boost
* Intel TBB
* Qt5 (for the interactive segmentation)
See also pylene [Readme](https://gitlab.lrde.epita.fr/olena/pylene) file.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment