Commit 33dd400b authored by Nicolas Vuaille's avatar Nicolas Vuaille Committed by Kitware Robot
Browse files

Merge topic 'OpacityForNanColor'

b0c6d631

 Add opacity for nan color
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarJoachim Pouderoux <joachim.pouderoux@kitware.com>
Acked-by: Mathieu Westphal's avatarMathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !2521
parents cc50900b b0c6d631
Pipeline #108255 failed with stage
in 0 seconds
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" /> <pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/NanColor/ColorButton" command="setChosenColor" arguments="255,0,255" /> <pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/NanColor/ColorButton" command="setChosenColor" arguments="255,0,255" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/Update" command="activate" arguments="" /> <pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/Update" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/NanOpacity/DoubleRangeWidget/LineEdit" command="set_string" arguments="0.15" />
<!-- <!--
Image compare for color selected via GUI. Image compare for color selected via GUI.
--> -->
......
# OpacityForNanColor
* The color for NAN (Not A Number) values has now an opacity property.
...@@ -192,6 +192,16 @@ ...@@ -192,6 +192,16 @@
</Documentation> </Documentation>
</DoubleVectorProperty> </DoubleVectorProperty>
<DoubleVectorProperty command="SetNanOpacity"
default_values="1"
name="NanOpacity"
number_of_elements="1" >
<DoubleRangeDomain min="0" max="1" name="range" />
<Documentation>
Set the opacity to use when NaN (not-a-number) is encountered.
</Documentation>
</DoubleVectorProperty>
<IntVectorProperty command="SetDiscretize" <IntVectorProperty command="SetDiscretize"
default_values="1" default_values="1"
name="Discretize" name="Discretize"
...@@ -318,6 +328,7 @@ ...@@ -318,6 +328,7 @@
<PropertyGroup label="Color Mapping Parameters"> <PropertyGroup label="Color Mapping Parameters">
<Property name="ColorSpace" /> <Property name="ColorSpace" />
<Property name="NanColor" /> <Property name="NanColor" />
<Property name="NanOpacity" />
</PropertyGroup> </PropertyGroup>
<PropertyGroup label="Color Discretization"> <PropertyGroup label="Color Discretization">
......
c5ddc022bf21ebe1da48685e165f6c6d0145fcbdcf7944930b48cd16d918a53516203001274d41104a77f23a788cd3b2ff69abc561404974fa55902baa0cb673 cba10e9901a0772795deea6ce57b6b04917f3422a574558c1868a9c5a20b104e1fedee7cedb0e3e8636d171b8e82e2bde7e89a8eda15bad4bfa9b3e726f391a9
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