Merge branch 'master' into graph2vol

DGtal-team · Feb 1, 2024 · 548656a · 548656a
2 parents a429d4d + 28d4d95
commit 548656a
Show file tree

Hide file tree

Showing 8 changed files with 493 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
        if: matrix.os == 'ubuntu-latest'
        run: | 
            sudo apt-get update
-           sudo apt-get install 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 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: Install macOS deps
        if: matrix.os == 'macOS-latest'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,11 @@ PROJECT(DGtalTools-contrib)
 cmake_minimum_required (VERSION 3.11) 
 cmake_policy(SET CMP0057 NEW)
 
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+include(polyscope)
+
 
 
 # -----------------------------------------------------------------------------
@@ -17,7 +21,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 
-
 FIND_PACKAGE(DGtal 1.3 REQUIRED)
 INCLUDE_DIRECTORIES(${DGTAL_INCLUDE_DIRS})
 LINK_DIRECTORIES(${DGTAL_LIBRARY_DIRS})
@@ -43,8 +46,10 @@ if(WITH_OPENCV)
 endif()
 
 
+
 # CLI11
 include_directories( "${PROJECT_SOURCE_DIR}/ext/" )
+include_directories(${PROJECT_SOURCE_DIR})
 
 
 

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -15,12 +15,16 @@
  - *Geometry3d*
   - basicMorphoFilter: fix a bug on the dilate/erode options. 
     (Bertrand Kerautret [#74](https://github.com/DGtal-team/DGtalTools-contrib/pull/74))  
+
   - graph2vol: new tool to transform graph based object into volumetric object. 
     (Bertrand Kerautret [#76](https://github.com/DGtal-team/DGtalTools-contrib/pull/76))
 
-
+ - *visualisation*
+  - polyMeshEdit: tool to edit a mesh (add local noise, remove selected faces).
+    (Bertrand Kerautret [#78](https://github.com/DGtal-team/DGtalTools-contrib/pull/78))
+
 
- # DGtalTools-contrib  1.3 
+# DGtalTools-contrib  1.3 
 
 - *global*
   - Continuous integration does not use Travis anymore but Github Actions.

diff --git a/README.md b/README.md
@@ -92,8 +92,23 @@ This section, can contain all tools related to visualisation:
    - displayTgtCoverAlphaTS: to display alpha-thick segment given on a simple contour.
    - meshViewerEdit: tool to visualize a mesh and to apply simple edits (face removal, color edits...).
    - graphViewer: tool to display graphs from a list of edges, a list of vertex and an optionnal list of radius for each edge.
+   - polyMeshEdit: tool to edit a mesh (add local noise, remove selected faces).
 
-
-|![](https://cloud.githubusercontent.com/assets/772865/12538777/cd8c2d28-c2e2-11e5-93ab-cb4a6cfadc8e.png)| ![](https://cloud.githubusercontent.com/assets/772865/12523276/22205f46-c156-11e5-827d-ec788baf7029.png) |<img width="260" alt="capture d ecran 2016-03-04 a 19 46 54" src="https://cloud.githubusercontent.com/assets/772865/13536787/02f16df6-e242-11e5-8541-88f8ca3f0a48.png">|
-| :-: | :-: | :-: |
-|displayTgtCoverAlphaTS|meshViewerEdit|graphViewer|
+<table>
+<tr>
+  <td><img width="260" src="https://cloud.githubusercontent.com/assets/772865/12538777/cd8c2d28-c2e2-11e5-93ab-cb4a6cfadc8e.png"></td>
+  <td> <img width="260" src="https://cloud.githubusercontent.com/assets/772865/12523276/22205f46-c156-11e5-827d-ec788baf7029.png"> </td>
+  <td><img width="260" src="https://cloud.githubusercontent.com/assets/772865/13536787/02f16df6-e242-11e5-8541-88f8ca3f0a48.png"></td>
+</tr> 
+ <tr>
+ <td>displayTgtCoverAlphaTS</td>
+ <td>meshViewerEdit</td>
+ <td>graphViewer</td>
+ </tr>
+  <tr>
+   <td><img width="260" src="https://github.com/DGtal-team/DGtalTools-contrib/assets/772865/5da7e052-d332-4c1e-95bd-bfd06d4cd1e7"></td>   
+  </tr>
+ <tr>
+ <td>polyMeshEdit</td>
+ </tr>
+</table>
diff --git a/cmake/polyscope.cmake b/cmake/polyscope.cmake
@@ -0,0 +1,14 @@
+if (TARGET polyscope)
+  return()
+endif()
+
+include(FetchContent)
+
+message(STATUS "Fetching polyscope")
+
+FetchContent_Declare(
+    polyscope
+    GIT_REPOSITORY https://github.com/nmwsharp/polyscope.git
+    GIT_SHALLOW    TRUE
+    )
+FetchContent_MakeAvailable(polyscope)
diff --git a/polyscope.cmake b/polyscope.cmake
@@ -0,0 +1,14 @@
+if (TARGET polyscope)
+  return()
+endif()
+
+include(FetchContent)
+
+message(STATUS "Fetching polyscope")
+
+FetchContent_Declare(
+    polyscope
+    GIT_REPOSITORY https://github.com/nmwsharp/polyscope.git
+    GIT_SHALLOW    TRUE
+    )
+FetchContent_MakeAvailable(polyscope)
diff --git a/visualisation/CMakeLists.txt b/visualisation/CMakeLists.txt
@@ -4,6 +4,12 @@ SET(DGTAL_TOOLS_CONTRIB
    displaySet2dPts
 )
 
+SET(DGTAL_TOOLS_CONTRIB_POLY
+   polyMeshEdit 
+)
+
+
+
 
 
 FOREACH(FILE ${DGTAL_TOOLS_CONTRIB})
@@ -16,6 +22,16 @@ FOREACH(FILE ${DGTAL_TOOLS_CONTRIB})
 ENDFOREACH(FILE)
 
 
+FOREACH(FILE ${DGTAL_TOOLS_CONTRIB_POLY})
+  add_executable(${FILE} ${FILE})
+  target_link_libraries (${FILE}  polyscope ${DGTAL_LIBRARIES} ${DGtalToolsContribLibDependencies})
+  install(TARGETS ${FILE} 
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)
+ENDFOREACH(FILE)
+
+
 
 
 if (  WITH_VISU3D_QGLVIEWER )