Skip to content

Commit 2d56095

Browse files
committed
review
1 parent 9b8b099 commit 2d56095

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

.github/actions/generic-ci/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ runs:
198198
-DF3D_TESTING_ENABLE_EGL_TESTS=${{ runner.os == 'Linux' && 'ON' || 'OFF' }}
199199
-DF3D_TESTING_ENABLE_EXTERNAL_GLFW=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }}
200200
-DF3D_TESTING_ENABLE_EXTERNAL_QT=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }}
201-
-DF3D_TESTING_ENABLE_ILLUSTRATION_TESTS=${{ (runner.os == 'Linux' && inputs.vtk_version == 'commit') && 'ON' || 'OFF' }}
201+
-DF3D_TESTING_ENABLE_ILLUSTRATION_TESTS=${{ (runner.os == 'Linux' && inputs.vtk_version == 'commit' && inputs.build_type == 'standard') && 'ON' || 'OFF' }}
202202
-DF3D_TESTING_ENABLE_GLX_TESTS=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }}
203203
-DF3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS=${{ (runner.os == 'Linux' || runner.os == 'Windows') && 'ON' || 'OFF' }}
204204
-DF3D_TESTING_ENABLE_OSMESA_TESTS=${{ runner.os == 'Linux' && 'ON' || 'OFF' }}

application/testing/tests.documentation.cmake

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ f3d_doc_test(<NAME> [ARGS...])
6464
function(f3d_test_doc)
6565
cmake_parse_arguments(F3D_TEST_DOC "UI;BACKGROUND;ROTATE" "NAME;DATA;REF_IMAGE;THRESHOLD" "ARGS" ${ARGN})
6666

67-
if(NOT F3D_TEST_DOC_THRESHOLD)
68-
set(F3D_TEST_DOC_THRESHOLD 0.04)
67+
set(_f3d_test_doc_threshold "")
68+
if(F3D_TEST_DOC_THRESHOLD)
69+
set(_f3d_test_doc_threshold "THRESHOLD ${F3D_TEST_DOC_THRESHOLD}")
6970
endif()
7071

7172
set(_f3d_test_doc_args
@@ -98,7 +99,7 @@ function(f3d_test_doc)
9899
BASELINE_PATH ${F3D_SOURCE_DIR}/doc/user/images/${F3D_TEST_DOC_REF_IMAGE}
99100
OUTPUT_PATH ${CMAKE_BINARY_DIR}/Testing/Temporary/${F3D_TEST_DOC_REF_IMAGE}
100101
RESOLUTION 800,600
101-
THRESHOLD ${F3D_TEST_DOC_THRESHOLD}
102+
${_f3d_test_doc_threshold}
102103
${_f3d_test_doc_ui}
103104
ARGS ${_f3d_test_doc_args}
104105
LONG_TIMEOUT
@@ -115,15 +116,15 @@ f3d_test_doc(NAME TestDocUpY DATA DamagedHelmet.glb REF_IMAGE up_y.png ARGS --up
115116
f3d_test_doc(NAME TestDocUpZ DATA DamagedHelmet.glb REF_IMAGE up_z.png ARGS --up=z -gfx UI)
116117

117118
## --x-color
118-
f3d_test_doc(NAME TestDocXColorDefault DATA DamagedHelmet.glb REF_IMAGE color_default.png ROTATE ARGS -gfx UI)
119+
f3d_test_doc(NAME TestDocXColorDefault DATA DamagedHelmet.glb REF_IMAGE x_color_default.png ROTATE ARGS -gfx UI)
119120
f3d_test_doc(NAME TestDocXColorYellow DATA DamagedHelmet.glb REF_IMAGE x_color_yellow.png ROTATE ARGS -gfx --x-color=yellow UI)
120121

121122
## --y-color
122-
### Default: color_default.png
123+
### Default: x_color_default.png
123124
f3d_test_doc(NAME TestDocYColorYellow DATA DamagedHelmet.glb REF_IMAGE y_color_yellow.png ROTATE ARGS -gfx --y-color=yellow UI)
124125

125126
## --z-color
126-
### Default: color_default.png
127+
### Default: x_color_default.png
127128
f3d_test_doc(NAME TestDocZColorYellow DATA DamagedHelmet.glb REF_IMAGE z_color_yellow.png ROTATE ARGS -gfx --z-color=yellow UI)
128129

129130
## --grid-unit

doc/user/03-OPTIONS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Set the X axis color in both widget and grid.
149149

150150
| Default | Yellow |
151151
| ------------------------------- | -------------------------------- |
152-
| ![](./images/color_default.png) | ![](./images/x_color_yellow.png) |
152+
| ![](./images/x_color_default.png) | ![](./images/x_color_yellow.png) |
153153

154154
### `--y-color` (_color_, default: `f3d_green`)
155155

@@ -159,7 +159,7 @@ Set the Y axis color in both widget and grid.
159159

160160
| Default | Yellow |
161161
| ------------------------------- | -------------------------------- |
162-
| ![](./images/color_default.png) | ![](./images/y_color_yellow.png) |
162+
| ![](./images/x_color_default.png) | ![](./images/y_color_yellow.png) |
163163

164164
### `--z-color` (_color_, default: `f3d_blue`)
165165

@@ -169,7 +169,7 @@ Set the Z axis color in both widget and grid.
169169

170170
| Default | Yellow |
171171
| ------------------------------- | -------------------------------- |
172-
| ![](./images/color_default.png) | ![](./images/z_color_yellow.png) |
172+
| ![](./images/x_color_default.png) | ![](./images/z_color_yellow.png) |
173173

174174
### `-g`, `--grid` (_bool_, default: `false`)
175175

0 commit comments

Comments
 (0)