Commit f0e096a5 authored by Nicolas Vuaille's avatar Nicolas Vuaille Committed by Mathieu Westphal

Update Catalyst images to have them in 200ppi

  * fix ParaView issues 19031 (paraview#19031)
  * re enable Catalyst image testing
  * use imagemagick to rescale and change image dpi ($ convert -resize 400% -units pixelsperinch -density 200 )
  * some image have been converted to jpg to reduce the file size
parent 218ac445
set (IMAGE_EXTS "png" "jpg")
set (IMAGE_EXTS "png" "jpg" "jpeg")
set (IMAGE_FILES)
foreach (DIR ${IMAGE_DIRS})
......
......@@ -30,7 +30,6 @@ add_test(
set_tests_properties(TestParaViewCatalystGuide PROPERTIES
FAIL_REGULAR_EXPRESSION "Error;Warning")
if (false)
add_test(
NAME TestParaViewCatalystImages
COMMAND ${CMAKE_COMMAND}
......@@ -38,7 +37,6 @@ add_test(
-P ${CMAKE_SOURCE_DIR}/CMake/TestImagePPI.cmake)
set_tests_properties(TestParaViewCatalystImages PROPERTIES
FAIL_REGULAR_EXPRESSION "failed the PPI test")
endif()
if (__BUILDBOT_UPLOAD_FILES)
copy_to_upload(${name}.pdf "ParaViewCatalystGuide-CE-${MOST_RECENT_TAG}.pdf")
......
......@@ -165,7 +165,7 @@ of grids that are supported in VTK.
\begin{figure}[htb]
\begin{center}
\includegraphics[width=5in]{Images/vtkdatasets.png}
\includegraphics[width=5in]{Images/vtkdatasets.jpg}
\caption{VTK dataset types.}
\label{fig:vtkdatasets}
\end{center}
......@@ -832,7 +832,7 @@ dataObject) method. This method assigns dataObject into the blockNumber location
\begin{figure}[htb]
\begin{center}
\includegraphics[width=5in]{Images/multiblockexample.png}
\includegraphics[width=5in]{Images/multiblockexample.jpg}
\caption{Multi-block dataset where the outlines are for blocks with vtkUniformGrids and the interior surface is a vtkUnstructuredGrid.}
\label{fig:multiblockdataset}
\end{center}
......
ParaViewCatalyst/Images/SaveData.png

31.6 KB | W: | H:

ParaViewCatalyst/Images/SaveData.png

358 KB | W: | H:

ParaViewCatalyst/Images/SaveData.png
ParaViewCatalyst/Images/SaveData.png
ParaViewCatalyst/Images/SaveData.png
ParaViewCatalyst/Images/SaveData.png
  • 2-up
  • Swipe
  • Onion skin
ParaViewCatalyst/Images/armysbir2.jpg

5.23 KB | W: | H:

ParaViewCatalyst/Images/armysbir2.jpg

21.6 KB | W: | H:

ParaViewCatalyst/Images/armysbir2.jpg
ParaViewCatalyst/Images/armysbir2.jpg
ParaViewCatalyst/Images/armysbir2.jpg
ParaViewCatalyst/Images/armysbir2.jpg
  • 2-up
  • Swipe
  • Onion skin
ParaViewCatalyst/Images/celldata.png

3.23 KB | W: | H:

ParaViewCatalyst/Images/celldata.png

26.5 KB | W: | H:

ParaViewCatalyst/Images/celldata.png
ParaViewCatalyst/Images/celldata.png
ParaViewCatalyst/Images/celldata.png
ParaViewCatalyst/Images/celldata.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
ParaViewCatalyst/Images/fsi.png

25.6 KB | W: | H:

ParaViewCatalyst/Images/fsi.png

255 KB | W: | H:

ParaViewCatalyst/Images/fsi.png
ParaViewCatalyst/Images/fsi.png
ParaViewCatalyst/Images/fsi.png
ParaViewCatalyst/Images/fsi.png
  • 2-up
  • Swipe
  • Onion skin
ParaViewCatalyst/Images/lanl.jpg

7.89 KB | W: | H:

ParaViewCatalyst/Images/lanl.jpg

42.5 KB | W: | H:

ParaViewCatalyst/Images/lanl.jpg
ParaViewCatalyst/Images/lanl.jpg
ParaViewCatalyst/Images/lanl.jpg
ParaViewCatalyst/Images/lanl.jpg
  • 2-up
  • Swipe
  • Onion skin
ParaViewCatalyst/Images/pointdata.png

10.9 KB | W: | H:

ParaViewCatalyst/Images/pointdata.png

220 KB | W: | H:

ParaViewCatalyst/Images/pointdata.png
ParaViewCatalyst/Images/pointdata.png
ParaViewCatalyst/Images/pointdata.png
ParaViewCatalyst/Images/pointdata.png
  • 2-up
  • Swipe
  • Onion skin
ParaViewCatalyst/Images/pqLinkIn16.png

544 Bytes | W: | H:

ParaViewCatalyst/Images/pqLinkIn16.png

5.5 KB | W: | H:

ParaViewCatalyst/Images/pqLinkIn16.png
ParaViewCatalyst/Images/pqLinkIn16.png
ParaViewCatalyst/Images/pqLinkIn16.png
ParaViewCatalyst/Images/pqLinkIn16.png
  • 2-up
  • Swipe
  • Onion skin
ParaViewCatalyst/Images/pqLinkIn16d.png

412 Bytes | W: | H:

ParaViewCatalyst/Images/pqLinkIn16d.png

2.52 KB | W: | H:

ParaViewCatalyst/Images/pqLinkIn16d.png
ParaViewCatalyst/Images/pqLinkIn16d.png
ParaViewCatalyst/Images/pqLinkIn16d.png
ParaViewCatalyst/Images/pqLinkIn16d.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -169,7 +169,7 @@ extract derived information such as polygonal data or iso-surfaces to visualize
data.
\begin{figure}[htb]
\begin{center}
\includegraphics[width=5in]{Images/fullcatalystworkflow.png}
\includegraphics[width=5in]{Images/fullcatalystworkflow.jpg}
\caption{\textit{In situ} workflow with various Catalyst outputs.}
\label{fig:examplecatalystworkflow}
\end{center}
......@@ -184,10 +184,10 @@ Figure~\ref{fig:catalystexampleoutput}.
\begin{figure}[htb]
\begin{center}
\subfloat[PHASTA]{\includegraphics[width=3in]{Images/phasta.png}}\,
\subfloat[CREATE-AV\textsuperscript{TM}Helios]{\includegraphics[width=3in]{Images/helios.png}\label{fig:helios}} \\
\subfloat[Code Saturne]{\includegraphics[width=3in]{Images/codesaturne.png}}\,
\subfloat[CTH]{\includegraphics[width=3in]{Images/cth.png}\label{fig:cth}}
\subfloat[PHASTA]{\includegraphics[width=3in]{Images/phasta.jpg}}\,
\subfloat[CREATE-AV\textsuperscript{TM}Helios]{\includegraphics[width=3in]{Images/helios.jpg}\label{fig:helios}} \\
\subfloat[Code Saturne]{\includegraphics[width=3in]{Images/codesaturne.jpg}}\,
\subfloat[CTH]{\includegraphics[width=3in]{Images/cth.jpg}\label{fig:cth}}
\caption{Various results from simulation codes linked with ParaView Catalyst. Note that post-processing with different packages was performed with \protect\subref{fig:helios} and \protect\subref{fig:cth}.}
\label{fig:catalystexampleoutput}
\end{center}
......
......@@ -88,7 +88,7 @@ Figure~\ref{fig:catalystpanel}, available from \menu{Catalyst > Define Export}.
This panel contains three sections:
\begin{figure}[htb]
\begin{center}
\includegraphics[width=5in]{Images/DocumentedCatalystPanel.png}
\includegraphics[width=5in]{Images/DocumentedCatalystPanel.jpg}
\caption{The Catalyst panel can be toggled in \menu{View > Catatalyst Export Inspector}.}
\label{fig:catalystpanel}
\end{center}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment