Skip to content

Commit

Permalink
Merge pull request #455 from DGtal-team/polyscopeVol
Browse files Browse the repository at this point in the history
Vol file visualization (hex mesh, point cloud, isosurface) using polyscope
  • Loading branch information
kerautret committed Jan 27, 2024
2 parents ac3f015 + d9b6693 commit da4a15d
Show file tree
Hide file tree
Showing 7 changed files with 1,393 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/buildAndDocumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
CONFIG_GLOBAL:
CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true
CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue
CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true #-DWITH_FFTW3=true #-DWITH_CAIRO=true #-DWITH_ITK=true -DWITH_GMP=true
CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true -DDISABLE_POLYSCOPE=ON #-DWITH_FFTW3=true #-DWITH_CAIRO=true #-DWITH_ITK=true -DWITH_GMP=true


jobs:
Expand All @@ -33,7 +33,7 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libeigen3-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libgraphicsmagick++1-dev libfftw3-dev
sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libeigen3-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libgraphicsmagick++1-dev libfftw3-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
- name: Get white list tools
run : |
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
- name: Set up
run: |
sudo apt-get update
sudo apt-get install libboost-dev graphviz texlive doxygen libqglviewer-dev-qt5 libeigen3-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libgraphicsmagick++1-dev libfftw3-dev
sudo apt-get install libboost-dev graphviz texlive doxygen libqglviewer-dev-qt5 libeigen3-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libgraphicsmagick++1-dev libfftw3-dev xorg-dev libglu1-mesa-dev freeglut3-dev
- name: DGtalBuild (linux)
shell: bash
Expand Down
15 changes: 15 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
SET(DGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD "100" CACHE INTERNAL "Threshold for the random selection of tools to build.")
SET(DGTALTOOLS_RANDOMIZED_BUILD_WHITELIST "" CACHE INTERNAL "List of whitelisted tools to build.")
option(NO_ADD_STBIMAGE_IMPLEMENT "To avoid duplicated linking errors (like LNK2005 in MSVC)" OFF)
option(DISABLE_POLYSCOPE "Disable polyscope based tools" OFF)



Expand Down Expand Up @@ -106,6 +107,20 @@ if ( WITH_ITK )
ENDIF( WITH_ITK )



#-----------------------------------------------------------------------------
# polyscope
#-----------------------------------------------------------------------------
if (NOT(DISABLE_POLYSCOPE))
message(STATUS "Enabling polyscope tools")
include(CPM)
include(polyscope)
else()
message(STATUS "Disabling polyscope tools")
endif()



# -----------------------------------------------------------------------------
# Documentation
# -----------------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
- meshViewer: Add colored SDP option in meshViewer when input texts is an alpha mesh and a colored SDP respectively.
(Xun Gong
[#452](https://github.com/DGtal-team/DGtalTools/pull/452))
- volscope new vol visualization tool using polyscope (David Coeurjolly,
[#455](https://github.com/DGtal-team/DGtalTools/pull/455))

- *volumetric*
- volReSample: fix the impossibility to export to vol when ITK is activated
Expand Down
Loading

0 comments on commit da4a15d

Please sign in to comment.