Skip to content

Commit afb0bab

Browse files
authored
Merge pull request #187 from mseng10/modernize-documentation
2 parents 86e91ae + 37fa225 commit afb0bab

File tree

10 files changed

+46
-45
lines changed

10 files changed

+46
-45
lines changed

.github/workflows/build-test.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,8 @@ jobs:
328328
329329
- name: Remove Duplicate Declaration Warnings
330330
run: |
331-
sed -i "6559d" /opt/hostedtoolcache/Python/3.8.6/x64/lib/python3.8/site-packages/sphinx/domains/cpp.py
331+
SITE_PACKAGES_DIR=$(python3 "-c" "from distutils import sysconfig; print(sysconfig.get_python_lib())")
332+
sed -i "6559d" ${SITE_PACKAGES_DIR}/sphinx/domains/cpp.py
332333
333334
- name: Download ITK
334335
run: |
@@ -357,7 +358,7 @@ jobs:
357358
set(CTEST_SITE "GitHubActions")
358359
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
359360
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
360-
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
361+
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/ITKExamples-build" CTEST_BINARY_DIRECTORY)
361362
set(dashboard_source_name "${GITHUB_REPOSITORY}")
362363
if(ENV{GITHUB_REF} MATCHES "master")
363364
set(branch "-master")
@@ -394,3 +395,11 @@ jobs:
394395
- name: Build and test
395396
run: |
396397
ctest -j 2 -VV -S dashboard.cmake
398+
399+
- name: Publish Documentation html as GitHub Artifact
400+
uses: actions/upload-artifact@v2
401+
with:
402+
name: Documentation
403+
path: |
404+
${{ github.workspace }}/ITKExamples-build/ITKExamples-5.2.0-html.tar.gz
405+
${{ github.workspace }}/ITKExamples-build/ITKExamples-5.2.0-html.zip

Documentation/Build/index.rst

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,19 +226,6 @@ Paraview
226226
Paraview_
227227

228228

229-
QGoImageCompare
230-
QGoImageCompare_ is a simple Qt_/VTK_ application capable of comparing multiple
231-
images simultaneous by coupling the cameras views. It is also possible to
232-
interactively probe the location and value of pixels for both 2D and 3D
233-
datasets.
234-
235-
.. figure:: QGoImageCompare.png
236-
:alt: QGoImageCompare
237-
:align: center
238-
239-
QGoImageCompare_
240-
241-
242229
VV
243230
VV_ is an image viewer designed for fast and simple visualization of
244231
spatio-temporal images: 2D, 2D+t, 3D and 3D+t (or 4D) images.
@@ -258,7 +245,6 @@ VV
258245
.. _ITK-SNAP: http://www.itksnap.org/pmwiki/pmwiki.php
259246
.. _MITK: http://www.mitk.org/wiki/MITK
260247
.. _Paraview: https://www.paraview.org/
261-
.. _QGoImageCompare: https://github.com/gofigure2/QGoImageCompare
262248
.. _Qt: https://www.qt.io/developers/
263249
.. _VTK: https://vtk.org/
264250
.. _VV: https://www.creatis.insa-lyon.fr/rio/vv

src/Core/Common/InPlaceFilterOfImage/Documentation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Results
2222
:alt: QuickView output.
2323

2424
Output In QuickView
25+
2526
Code
2627
----
2728

src/Core/ImageFunction/ResampleSegmentedImage/Documentation.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ Resample (stretch or compress) a segmented image.
1313

1414
Results
1515
-------
16-
.. figure:: Yinyang.png
16+
17+
.. figure:: Gourds.png
1718
:scale: 50%
18-
:alt: Input yin-yang image.
19+
:alt: Input image.
1920

2021
Input Image
2122

src/Core/Transform/MutualInformationAffine/Documentation.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,18 @@ Global registration by maximizing the mutual information and using an affine tra
1414

1515
Results
1616
-------
17+
1718
.. figure:: fixed.png
18-
:scale: 70%
1919
:alt: fixed.png
2020

2121
fixed.png
2222

2323
.. figure:: moving.png
24-
:scale: 70%
2524
:alt: moving.png
2625

2726
moving.png
2827

2928
.. figure:: OutputBaseline.png
30-
:scale: 70%
3129
:alt: OutputBaseline.png
3230

3331
OutputBaseline.png
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
46a0c840567a4eee4a3150674d78fecf7d0395c61c7de697218c0b408919587e4a39f7c307b7bbe144613e0c72bf8eb45f3f59a6b140f1b443bffa0a611aae1e

src/Core/Transform/MutualInformationAffine/outputBaseline.png.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Numerics/Optimizers/ExhaustiveOptimizer/Documentation.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ An optimizer that fully samples a grid on the parametric space.
1212

1313
Results
1414
-------
15+
1516
.. note::
1617
**Help Wanted**
1718
Implementation of Results for sphinx examples containing this message.
@@ -28,10 +29,11 @@ C++
2829
:lines: 18-
2930

3031
Python
31-
...
32+
......
3233

3334
.. literalinclude:: Code.py
34-
:lines: 20-
35+
:language: python
36+
:lines: 20-
3537

3638
Jupyter Notebook
3739
-----------------

src/Registration/Metricsv4/RegisterTwoPointSets/Documentation.rst

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,33 @@ Index
1515
Synopsis
1616
--------
1717

18-
Register two point sets with the Jensen-Havrda-Charvat-Tsallis point set
18+
Register two point sets with the Jensen-Havrda-Charvat-Tsallis point set
1919
metric.
2020

2121
Results
2222
--------
23-
It: 0 metric value: -0.0641355
24-
It: 1 metric value: -0.0955508
25-
It: 2 metric value: -0.0956365
26-
It: 3 metric value: -0.0956648
27-
It: 4 metric value: -0.0956742
28-
It: 5 metric value: -0.0956774
29-
It: 6 metric value: -0.0956784
30-
It: 7 metric value: -0.0956788
31-
It: 8 metric value: -0.0956789
32-
It: 9 metric value: -0.0956789
33-
numberOfIterations: 10
34-
Moving-source final value: -0.0956789
35-
Moving-source final position: [0.9999999481711049, 3.6956646020565954e-9,
36-
-3.9958144654776e-8, 1.0000000021678688,
37-
1.9991709056354183, 1.999169080146488]
38-
Optimizer scales: [10000, 9998.46502472856,
39-
10000, 9998.46502472848,
40-
1.0000000000010232, 1.0000000000010232]
41-
Optimizer learning rate: 164.938
23+
24+
::
25+
26+
It: 0 metric value: -0.0641355
27+
It: 1 metric value: -0.0955508
28+
It: 2 metric value: -0.0956365
29+
It: 3 metric value: -0.0956648
30+
It: 4 metric value: -0.0956742
31+
It: 5 metric value: -0.0956774
32+
It: 6 metric value: -0.0956784
33+
It: 7 metric value: -0.0956788
34+
It: 8 metric value: -0.0956789
35+
It: 9 metric value: -0.0956789
36+
numberOfIterations: 10
37+
Moving-source final value: -0.0956789
38+
Moving-source final position: [0.9999999481711049, 3.6956646020565954e-9,
39+
-3.9958144654776e-8, 1.0000000021678688,
40+
1.9991709056354183, 1.999169080146488]
41+
Optimizer scales: [10000, 9998.46502472856,
42+
10000, 9998.46502472848,
43+
1.0000000000010232, 1.0000000000010232]
44+
Optimizer learning rate: 164.938
4245

4346
Code
4447
--------
@@ -64,4 +67,4 @@ Classes demonstrated
6467
--------------------
6568

6669
.. breathelink:: itk::JensenHavrdaCharvatTsallisPointSetToPointSetMetricv4
67-
.. breathelink:: itk::GradientDescentOptimizerv4
70+
.. breathelink:: itk::GradientDescentOptimizerv4Template

src/Registration/Metricsv4/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Metricsv4
55
:maxdepth: 1
66

77
PerformRegistrationOnVectorImages/Documentation.rst
8+
RegisterTwoPointSets/Documentation.rst

0 commit comments

Comments
 (0)