Merge branch 'master' into FillColo

DGtal-team · Jan 29, 2024 · 14ca48c · 14ca48c
2 parents fc9dc43 + 6f715bf
commit 14ca48c
Show file tree

Hide file tree

Showing 8 changed files with 1,400 additions and 4 deletions.
diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml
@@ -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:
@@ -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 : |
@@ -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

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
 
 
 
@@ -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
 # -----------------------------------------------------------------------------

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -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

diff --git a/README.md b/README.md
@@ -197,6 +197,13 @@ Galleries
    <td align=center  ><a href="https://dgtal-team.github.io/doctools-nightly/CompSurfelData.html" > 3dCompSurfelData</a></td>
    <td  align="center" colspan="2"><a href="https://dgtal-team.github.io/doctools-nightly/Doc3dImplicitSurfaceExtractorByThickening.html" > 3dImplicitSurfaceExtractorByThickening</a> </td>
    </tr>
+<tr>
+       <td align="center" colspan="2"><img width=250 src="https://private-user-images.githubusercontent.com/700165/292447134-04037898-33e8-48f5-855c-d7432fe061e8.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDYzOTA1NTUsIm5iZiI6MTcwNjM5MDI1NSwicGF0aCI6Ii83MDAxNjUvMjkyNDQ3MTM0LTA0MDM3ODk4LTMzZTgtNDhmNS04NTVjLWQ3NDMyZmUwNjFlOC5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwMTI3JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDEyN1QyMTE3MzVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT04ZmRhODA5YTg2ODQ4Mzg1YzBiZDNlYWRiYmY0NzYxNDYyMzRhNTlkMWM0NDY4MDM5MDBkYmQ3OGJmYzE1YzA3JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.LZ85J7dmRixTVIqho3NLnSQjllhEttiX7Z2yki3xNtk"</td>
+
+</tr>
+      <tr>
+      <td  align="center" colspan="2"> volscope </td>
+</tr>
    </table>
    </center>