Skip to content

Commit 66b6352

Browse files
authored
Merge pull request #284 from thewtex/MutualInformationAffine-output-baseline
MutualInformationAffine output baseline
2 parents cc062d9 + 7eae01a commit 66b6352

File tree

9 files changed

+13
-10
lines changed

9 files changed

+13
-10
lines changed

.github/workflows/build-test-publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ jobs:
278278
sudo apt-get install gnuplot dvipng
279279
sudo apt-get install texlive-full
280280
sudo apt-get install pandoc
281+
sudo apt-get install imagemagick
281282
282283
python -m pip install --upgrade pip
283284
python -m pip install ninja

CMake/FindSphinx.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ option( SPHINX_EPUB_OUTPUT "Build HTML pages with additional information for bui
6464
option( SPHINX_LATEX_OUTPUT "Build LaTeX sources that can be compiled to a PDF document using pdflatex." OFF )
6565
option( SPHINX_MAN_OUTPUT "Build manual pages in groff format for UNIX systems." OFF )
6666
option( SPHINX_TEXT_OUTPUT "Build plain text files." OFF )
67+
option( SPHINX_LINKCHECK "Create a target that will check HTTP links." OFF )
6768

6869

6970
mark_as_advanced(
@@ -77,6 +78,7 @@ mark_as_advanced(
7778
SPHINX_LATEX_OUTPUT
7879
SPHINX_MAN_OUTPUT
7980
SPHINX_TEXT_OUTPUT
81+
SPHINX_LINKCHECK
8082
)
8183

8284
function( Sphinx_add_target target_name builder conf source destination )
@@ -152,7 +154,7 @@ function( Sphinx_add_targets target_base_name conf source base_destination )
152154
add_dependencies( ${target_base_name}_text ${_dependencies} )
153155
endif()
154156

155-
if( ${BUILD_TESTING} )
157+
if( ${SPHINX_LINKCHECK} )
156158
sphinx_add_target( ${target_base_name}_linkcheck linkcheck ${conf} ${source} ${base_destination}/linkcheck )
157159

158160
add_dependencies( ${target_base_name}_linkcheck ${_dependencies} )

Formatting/conf.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ primary_domain = 'cpp'
4242
# Add any Sphinx extension module names here, as strings. They can be extensions
4343
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
4444
extensions = ['sphinx.ext.todo', 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig',
45-
'sphinx.ext.viewcode', 'breathe', 'doxylink', 'breathelink', 'nbsphinx']
45+
'sphinx.ext.viewcode', 'sphinx.ext.imgconverter', 'breathe', 'doxylink', 'breathelink', 'nbsphinx']
4646

4747
# Add any paths that contain templates here, relative to this directory.
4848
templates_path = ['templates']

README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ If building the documentation:
7272
- nbsphinx_
7373
- gnuplot_
7474
- dvipng_ ( for rendered equations )
75+
- imagemagick_
7576

7677
PDF generation requires a TeX distribution like `TeX Live`_ or MiKTeX_.
7778

@@ -96,3 +97,4 @@ Run the bash script ``SetupForDevelopment.sh``::
9697
.. _dvipng: https://sourceforge.net/projects/dvipng/
9798
.. _Pandoc: https://pandoc.org/
9899
.. _nbsphinx: https://nbsphinx.readthedocs.io/
100+
.. _imagemagick: https://www.imagemagick.org/

Superbuild/Superbuild.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ if(BUILD_DOCUMENTATION)
9494
"-DSPHINX_MAN_OUTPUT:BOOL=${SPHINX_MAN_OUTPUT}"
9595
"-DSPHINX_QTHELP_OUTPUT:BOOL=${SPHINX_QTHELP_OUTPUT}"
9696
"-DSPHINX_TEXT_OUTPUT:BOOL=${SPHINX_TEXT_OUTPUT}"
97+
"-DSPHINX_LINKCHECK:BOOL=${SPHINX_LINKCHECK}"
9798
)
9899
endif()
99100

src/Core/Transform/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ compare_to_baseline(EXAMPLE_NAME GlobalRegistrationTwoImagesAffine
3232
add_example(MutualInformationAffine)
3333
compare_to_baseline(EXAMPLE_NAME MutualInformationAffine
3434
BASELINE_PREFIX
35-
fixed
36-
moving
3735
OutputBaseline
3836
)
3937

src/Core/Transform/MutualInformationAffine/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ add_test(NAME MutualInformationAffineTest
2525
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/MutualInformationAffine
2626
fixed.png
2727
moving.png
28-
output.png)
29-
28+
Output.png)

src/Core/Transform/MutualInformationAffine/Documentation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ Results
2525
.. figure:: fixed.png
2626
:alt: fixed.png
2727

28-
fixed.png
28+
Fixed
2929

3030
.. figure:: moving.png
3131
:alt: moving.png
3232

33-
moving.png
33+
Moving
3434

3535
.. figure:: OutputBaseline.png
3636
:alt: OutputBaseline.png
3737

38-
OutputBaseline.png
38+
Output
3939

4040
Output::
4141

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
46a0c840567a4eee4a3150674d78fecf7d0395c61c7de697218c0b408919587e4a39f7c307b7bbe144613e0c72bf8eb45f3f59a6b140f1b443bffa0a611aae1e
1+
84bfbdda46574ed22a06b44f12d3bfa36ca86f384d39a7ca724eb7da0824f27e5d66e995200596ce62a6354994e24629b69776454a33c4199604eedbcacff7d2

0 commit comments

Comments
 (0)