From d2b77cca0a5002f5ba23829b467e1472179b639c Mon Sep 17 00:00:00 2001
From: Andras Lasso <lasso@queensu.ca>
Date: Wed, 11 Sep 2019 12:41:10 -0400
Subject: [PATCH] ENH: Add X-ray volume rendering preset

Added non-shaded X-ray-like volume rendering preset. User has to set view background color manually.
---
 .../VolumeRendering/Resources/Icons/CT-X-ray.png | Bin 0 -> 3608 bytes
 .../VolumeRendering/Resources/presets.xml        |  11 ++++++-----
 .../Resources/qSlicerVolumeRenderingModule.qrc   |   1 +
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 Modules/Loadable/VolumeRendering/Resources/Icons/CT-X-ray.png

diff --git a/Modules/Loadable/VolumeRendering/Resources/Icons/CT-X-ray.png b/Modules/Loadable/VolumeRendering/Resources/Icons/CT-X-ray.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f624474a5fbacaddfcbf6df528462e6dbfdb3c7
GIT binary patch
literal 3608
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
XuO;kC$Fd3dCjx1z>LRL@Z7}}_y1BZc

literal 0
HcmV?d00001

diff --git a/Modules/Loadable/VolumeRendering/Resources/presets.xml b/Modules/Loadable/VolumeRendering/Resources/presets.xml
index 0ddde2e9af8..f419a605aa0 100644
--- a/Modules/Loadable/VolumeRendering/Resources/presets.xml
+++ b/Modules/Loadable/VolumeRendering/Resources/presets.xml
@@ -21,9 +21,10 @@
   <VolumeProperty selected="false" hideFromEditors="false" name="CT-Pulmonary-Arteries" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="14 -2048 0 -568.625 0 -364.081 0.0714286 -244.813 0.401786 18.2775 0.607143 447.798 0.830357 3592.73 0.839286" id="vtkMRMLVolumePropertyNode19" specular="0" shade="1" ambient="0.2" colorTransfer="28 -2048 0 0 0 -568.625 0 0 0 -364.081 0.396078 0.301961 0.180392 -244.813 0.611765 0.352941 0.0705882 18.2775 0.843137 0.0156863 0.156863 447.798 0.752941 0.752941 0.752941 3592.73 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="-568.625 447.798"/>
   <VolumeProperty selected="false" hideFromEditors="false" name="CT-Soft-Tissue" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="10 -2048 0 -167.01 0 -160 1 240 1 3661 1" id="vtkMRMLVolumePropertyNode20" specular="0" shade="0" ambient="0.2" colorTransfer="20 -2048 0 0 0 -167.01 0 0 0 -160 0.0556356 0.0556356 0.0556356 240 1 1 1 3661 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="-167.01 240"/>
   <VolumeProperty selected="false" hideFromEditors="false" name="CT-Air" gradientOpacity="4 0 1 255 1" userTags="" specularPower="10" scalarOpacity="8 -3024 0.705882 -900.0 0.715686 -500.0 0 3071 0" id="vtkMRMLVolumePropertyNode21" specular="0.2" shade="1" ambient="0.1" colorTransfer="16 -3024 1 1 1 -900.0 0.2 1.0 1.0 -500.0 0.3 0.3 1.0 3071 0 0 0 " selectable="true" diffuse="0.9" interpolation="1" effectiveRange="-1200.0 -200.0"/>
-  <VolumeProperty selected="false" hideFromEditors="false" name="MR-Angio" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="12 -2048 0 151.354 0 158.279 0.4375 190.112 0.580357 200.873 0.732143 3661 0.741071" id="vtkMRMLVolumePropertyNode22" specular="0" shade="1" ambient="0.2" colorTransfer="24 -2048 0 0 0 151.354 0 0 0 158.279 0.74902 0.376471 0 190.112 1 0.866667 0.733333 200.873 0.937255 0.937255 0.937255 3661 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="151.354 200.873"/>
-  <VolumeProperty selected="false" hideFromEditors="false" name="MR-Default" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="12 0 0 20 0 40 0.15 120 0.3 220 0.375 1024 0.5" id="vtkMRMLVolumePropertyNode23" specular="0" shade="1" ambient="0.2" colorTransfer="24 0 0 0 0 20 0.168627 0 0 40 0.403922 0.145098 0.0784314 120 0.780392 0.607843 0.380392 220 0.847059 0.835294 0.788235 1024 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="0 220"/>
-  <VolumeProperty selected="false" hideFromEditors="false" name="MR-MIP" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="8 0 0 98.3725 0 416.637 1 2800 1" id="vtkMRMLVolumePropertyNode24" specular="0" shade="0" ambient="0.2" colorTransfer="16 0 1 1 1 98.3725 1 1 1 416.637 1 1 1 2800 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="0 416.637"/>
-  <VolumeProperty selected="false" hideFromEditors="false" name="MR-T2-Brain" gradientOpacity="4 0 1 160.25 1" userTags="" specularPower="40" scalarOpacity="10 0 0 36.05 0 218.302 0.171429 412.406 1 641 1" id="vtkMRMLVolumePropertyNode25" specular="0.5" shade="1" ambient="0.3" colorTransfer="16 0 0 0 0 98.7223 0.956863 0.839216 0.192157 412.406 0 0.592157 0.807843 641 1 1 1" selectable="true" diffuse="0.6" interpolation="1" effectiveRange="0 412.406"/>
-  <VolumeProperty selected="false" hideFromEditors="false" name="DTI-FA-Brain" gradientOpacity="4 0 1 0.9950 1" userTags="" specularPower="40" scalarOpacity="16 0 0 0 0 0.3501 0.0158 0.49379 0.7619 0.6419 1 0.9920 1 0.9950 0 0.9950 0" id="vtkMRMLVolumePropertyNode26" specular="0.5" shade="1" ambient="0.3" colorTransfer="28 0 1 0 0 0 1 0 0 0.24974 0.4941 1 0 0.49949 0 0.9882 1 0.7492 0.51764 0 1 0.9950 1 0 0 0.9950 1 0 0" selectable="true" diffuse="0.9" interpolation="1" effectiveRange="0 1"/>
+  <VolumeProperty selected="false" hideFromEditors="false" name="CT-X-ray" gradientOpacity="4 0 1 255 1" userTags="" specularPower="10" scalarOpacity="8 -3024 0 -200.0 0.0 1500.0 0.05 3071 0.05" id="vtkMRMLVolumePropertyNode22" specular="0.2" shade="0" ambient="0.1" colorTransfer="8 -3024 1 1 1 3071 1 1 1 " selectable="true" diffuse="0.9" interpolation="1" effectiveRange="-250.0.0 1550.0"/>
+  <VolumeProperty selected="false" hideFromEditors="false" name="MR-Angio" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="12 -2048 0 151.354 0 158.279 0.4375 190.112 0.580357 200.873 0.732143 3661 0.741071" id="vtkMRMLVolumePropertyNode23" specular="0" shade="1" ambient="0.2" colorTransfer="24 -2048 0 0 0 151.354 0 0 0 158.279 0.74902 0.376471 0 190.112 1 0.866667 0.733333 200.873 0.937255 0.937255 0.937255 3661 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="151.354 200.873"/>
+  <VolumeProperty selected="false" hideFromEditors="false" name="MR-Default" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="12 0 0 20 0 40 0.15 120 0.3 220 0.375 1024 0.5" id="vtkMRMLVolumePropertyNode24" specular="0" shade="1" ambient="0.2" colorTransfer="24 0 0 0 0 20 0.168627 0 0 40 0.403922 0.145098 0.0784314 120 0.780392 0.607843 0.380392 220 0.847059 0.835294 0.788235 1024 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="0 220"/>
+  <VolumeProperty selected="false" hideFromEditors="false" name="MR-MIP" gradientOpacity="4 0 1 255 1" userTags="" specularPower="1" scalarOpacity="8 0 0 98.3725 0 416.637 1 2800 1" id="vtkMRMLVolumePropertyNode25" specular="0" shade="0" ambient="0.2" colorTransfer="16 0 1 1 1 98.3725 1 1 1 416.637 1 1 1 2800 1 1 1" selectable="true" diffuse="1" interpolation="1" effectiveRange="0 416.637"/>
+  <VolumeProperty selected="false" hideFromEditors="false" name="MR-T2-Brain" gradientOpacity="4 0 1 160.25 1" userTags="" specularPower="40" scalarOpacity="10 0 0 36.05 0 218.302 0.171429 412.406 1 641 1" id="vtkMRMLVolumePropertyNode26" specular="0.5" shade="1" ambient="0.3" colorTransfer="16 0 0 0 0 98.7223 0.956863 0.839216 0.192157 412.406 0 0.592157 0.807843 641 1 1 1" selectable="true" diffuse="0.6" interpolation="1" effectiveRange="0 412.406"/>
+  <VolumeProperty selected="false" hideFromEditors="false" name="DTI-FA-Brain" gradientOpacity="4 0 1 0.9950 1" userTags="" specularPower="40" scalarOpacity="16 0 0 0 0 0.3501 0.0158 0.49379 0.7619 0.6419 1 0.9920 1 0.9950 0 0.9950 0" id="vtkMRMLVolumePropertyNode27" specular="0.5" shade="1" ambient="0.3" colorTransfer="28 0 1 0 0 0 1 0 0 0.24974 0.4941 1 0 0.49949 0 0.9882 1 0.7492 0.51764 0 1 0.9950 1 0 0 0.9950 1 0 0" selectable="true" diffuse="0.9" interpolation="1" effectiveRange="0 1"/>
 </MRML>
diff --git a/Modules/Loadable/VolumeRendering/Resources/qSlicerVolumeRenderingModule.qrc b/Modules/Loadable/VolumeRendering/Resources/qSlicerVolumeRenderingModule.qrc
index e9a351d166f..886ebca84b6 100644
--- a/Modules/Loadable/VolumeRendering/Resources/qSlicerVolumeRenderingModule.qrc
+++ b/Modules/Loadable/VolumeRendering/Resources/qSlicerVolumeRenderingModule.qrc
@@ -24,6 +24,7 @@
     <file alias="CT-Pulmonary-Arteries">Icons/CT-Pulmonary-Arteries.png</file>
     <file alias="CT-Soft-Tissue">Icons/CT-Soft-Tissue.png</file>
     <file alias="CT-Air">Icons/CT-Air.png</file>
+    <file alias="CT-X-ray">Icons/CT-X-ray.png</file>
     <file alias="DTI-FA-Brain">Icons/DTI-FA-Brain.png</file>
     <file alias="MR-Angio">Icons/MR-Angio.png</file>
     <file alias="MR-Default">Icons/MR-Default.png</file>