Skip to content

Commit d2beda6

Browse files
kerautretkerautret
committed
merge
2 parents e13f793 + abb50c0 commit d2beda6

15 files changed

+1846
-352
lines changed

‎.github/workflows/buildAndDocumentation.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
CONFIG_GLOBAL:
1313
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
1414
CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue
15-
CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true #-DWITH_FFTW3=true #-DWITH_CAIRO=true #-DWITH_ITK=true -DWITH_GMP=true
15+
CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true -DDISABLE_POLYSCOPE=ON #-DWITH_FFTW3=true #-DWITH_CAIRO=true #-DWITH_ITK=true -DWITH_GMP=true
1616

1717

1818
jobs:
@@ -33,7 +33,7 @@ jobs:
3333
if: matrix.os == 'ubuntu-latest'
3434
run: |
3535
sudo apt-get update
36-
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
36+
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
3737
3838
- name: Get white list tools
3939
run : |
@@ -142,7 +142,7 @@ jobs:
142142
- name: Set up
143143
run: |
144144
sudo apt-get update
145-
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
145+
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
146146
147147
- name: DGtalBuild (linux)
148148
shell: bash
@@ -173,12 +173,12 @@ jobs:
173173
cd build/html
174174
cp -r * ../../doctools-nightly/
175175
- name: Deploy to GitHub Pages
176-
uses: JamesIves/github-pages-deploy-action@v4.4.1
176+
uses: JamesIves/github-pages-deploy-action@v4
177177
# if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
178178
with:
179-
token: ${{ secrets.DEPLOYACTION }}
179+
token: ${{ secrets.DGTALTOOLSDOC }}
180+
branch: master
180181
repository-name: DGtal-team/doctools-nightly
181182
folder: build/html
182-
branch: master
183183
single-comit: true
184184
clean: true

‎CMakeLists.txt

+18-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
1111
SET(DGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD "100" CACHE INTERNAL "Threshold for the random selection of tools to build.")
1212
SET(DGTALTOOLS_RANDOMIZED_BUILD_WHITELIST "" CACHE INTERNAL "List of whitelisted tools to build.")
1313
option(NO_ADD_STBIMAGE_IMPLEMENT "To avoid duplicated linking errors (like LNK2005 in MSVC)" OFF)
14+
option(DISABLE_POLYSCOPE "Disable polyscope based tools" OFF)
1415

1516

1617

@@ -19,7 +20,7 @@ option(NO_ADD_STBIMAGE_IMPLEMENT "To avoid duplicated linking errors (like LNK20
1920
# -----------------------------------------------------------------------------
2021
message(STATUS "-------------------------------------------------------------------------------")
2122
message(STATUS "Checking if DGtal is installed:")
22-
FIND_PACKAGE(DGtal 1.3 REQUIRED)
23+
FIND_PACKAGE(DGtal 1.5 REQUIRED)
2324
INCLUDE_DIRECTORIES(${DGTAL_INCLUDE_DIRS})
2425
LINK_DIRECTORIES(${DGTAL_LIBRARY_DIRS})
2526
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -72,8 +73,8 @@ include_directories( "${PROJECT_SOURCE_DIR}/ext/" )
7273
# -----------------------------------------------------------------------------
7374
SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
7475
SET(DGtalTools_VERSION_MAJOR 1)
75-
SET(DGtalTools_VERSION_MINOR 4)
76-
#SET(DGtalTools_VERSION_PATCH beta)
76+
SET(DGtalTools_VERSION_MINOR 5)
77+
SET(DGtalTools_VERSION_PATCH beta)
7778
SET(DGTALTOOLS_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH}")
7879
SET(PROJECT_VERSION "${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH}")
7980
SET(VERSION ${DGtalTools_VERSION_MAJOR}.${DGtalTools_VERSION_MINOR}.${DGtalTools_VERSION_PATCH})
@@ -106,6 +107,20 @@ if ( WITH_ITK )
106107
ENDIF( WITH_ITK )
107108

108109

110+
111+
#-----------------------------------------------------------------------------
112+
# polyscope
113+
#-----------------------------------------------------------------------------
114+
if (NOT(DISABLE_POLYSCOPE))
115+
message(STATUS "Enabling polyscope tools")
116+
include(CPM)
117+
include(polyscope)
118+
else()
119+
message(STATUS "Disabling polyscope tools")
120+
endif()
121+
122+
123+
109124
# -----------------------------------------------------------------------------
110125
# Documentation
111126
# -----------------------------------------------------------------------------

‎ChangeLog.md

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
# DGtalTools 1.4 (beta)
1+
# DGtalTools 1.5 (beta)
2+
3+
4+
5+
# DGtalTools 1.4
6+
7+
- *build*
8+
- Remove STBimage preprocessor instruction used to fix MVSC that is
9+
no more usefull since DGtal PR [175](https://github.com/DGtal-team/DGtal/pull/1715)
10+
(Bertrand Kerautret [#459](https://github.com/DGtal-team/DGtalTools/pull/459))
11+
212

313
- *visualisation*
414
- meshViewer: new options to change the default background color, to
@@ -13,9 +23,22 @@
1323
- meshViewer: new option to set alpha channel of the mesh color.
1424
(Bertrand Kerautret
1525
[#451](https://github.com/DGtal-team/DGtalTools/pull/451))
26+
- 3dSDPViewer: new option to set alpha channel of the mesh color.
27+
(Xun Gong
28+
[#452](https://github.com/DGtal-team/DGtalTools/pull/452))
29+
- meshViewer: Add colored SDP option in meshViewer when input texts is an alpha mesh and a colored SDP respectively.
30+
(Xun Gong
31+
[#452](https://github.com/DGtal-team/DGtalTools/pull/452))
32+
- volscope new vol visualization tool using polyscope (David Coeurjolly,
33+
[#455](https://github.com/DGtal-team/DGtalTools/pull/455))
34+
- volscope documentation enhanced (David Coeurjolly,
35+
[#460](https://github.com/DGtal-team/DGtalTools/pull/460))
36+
1637
- *volumetric*
1738
- volReSample: fix the impossibility to export to vol when ITK is activated
1839
(Bertrand Kerautret [#445](https://github.com/DGtal-team/DGtalTools/pull/445))
40+
- volFillInterior: add new option to set the filling value.
41+
(Bertrand Kerautret [#456](https://github.com/DGtal-team/DGtalTools/pull/456))
1942

2043
- *converters*
2144
- mesh2vol: small fix to read generic mesh.

‎README.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
DGtalTools
22
==========
3-
43
DGtalTools is a separate github project containing tools constructed
54
using DGtal library. The main goal of this part is to gather simple
65
and useful tools exploiting the structures and algorithms defined in
@@ -26,6 +25,7 @@ own source code (in complement of DGtal tutorial https://dgtal-team.github.io/do
2625
More Information
2726
----------------
2827
* Related DGtalTools-contrib: https://github.com/DGtal-team/DGtalTools-contrib
28+
* Release 1.4 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11577409.svg)](https://doi.org/10.5281/zenodo.11577409)
2929
* Release 1.3 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7395984.svg)](https://doi.org/10.5281/zenodo.7395984)
3030
* Release 1.2 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4893597.svg)](https://doi.org/10.5281/zenodo.4893597)
3131
* Release 1.1 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4079375.svg)](https://doi.org/10.5281/zenodo.4079375)
@@ -197,6 +197,13 @@ Galleries
197197
<td align=center ><a href="https://dgtal-team.github.io/doctools-nightly/CompSurfelData.html" > 3dCompSurfelData</a></td>
198198
<td align="center" colspan="2"><a href="https://dgtal-team.github.io/doctools-nightly/Doc3dImplicitSurfaceExtractorByThickening.html" > 3dImplicitSurfaceExtractorByThickening</a> </td>
199199
</tr>
200+
<tr>
201+
<td align="center" colspan="2"><img width=250 src="doc/images/volscope-surface.png"</td>
202+
203+
</tr>
204+
<tr>
205+
<td align="center" colspan="2"> volscope </td>
206+
</tr>
200207
</table>
201208
</center>
202209

@@ -236,3 +243,4 @@ Galleries
236243
</tr>
237244
</table>
238245
</center>
246+
(test doc)

0 commit comments

Comments
 (0)