Commit 87116665 authored by Mathieu Westphal's avatar Mathieu Westphal Committed by Kitware Robot

Merge topic 'StepColorSpace'

861303c4 Updating VTK
4b6fecc2 Using StepColorSpace
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Nicolas Vuaille's avatarNicolas Vuaille <nicolas.vuaille@kitware.com>
Acked-by: Michael Migliore's avatarMichael Migliore <michael.migliore@kitware.com>
Merge-request: !2834
parents 4129b4f0 861303c4
Pipeline #121707 failed with stage
in 0 seconds
......@@ -485,6 +485,7 @@ list(APPEND TESTS_WITH_BASELINES
${CMAKE_CURRENT_SOURCE_DIR}/SliceWithPlaneMultiBlock.xml
${CMAKE_CURRENT_SOURCE_DIR}/SortLineChartData.xml
${CMAKE_CURRENT_SOURCE_DIR}/ScrollAreaNativeWidget.xml
${CMAKE_CURRENT_SOURCE_DIR}/StepColorSpace.xml
${CMAKE_CURRENT_SOURCE_DIR}/StockColors.xml
${CMAKE_CURRENT_SOURCE_DIR}/StreamTracerSurface.xml
${CMAKE_CURRENT_SOURCE_DIR}/StreamTracerUpdates.xml
......
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources/Alphabetical" command="activate" arguments="RTAnalyticSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/displayColor/Variables" command="activated" arguments="RTData" />
<pqevent object="pqClientMainWindow/representationToolbar/displayRepresentation/comboBox" command="activated" arguments="Surface" />
<pqevent object="pqClientMainWindow/variableToolbar/actionEditColorMap" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mousePress" arguments="(0.273504,0.525,1,1,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseMove" arguments="(0.273504,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseRelease" arguments="(0.273504,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mousePress" arguments="(0.774929,0.55,1,1,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseMove" arguments="(0.774929,0.55,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseRelease" arguments="(0.774929,0.55,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorSpace/ComboBox" command="activated" arguments="Step" />
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/StepColorSpaceA.png" threshold="5" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ChoosePreset" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqPresetDialog/widget/groupChooser" command="activated" arguments="All" />
<pqevent object="pqClientMainWindow/pqPresetDialog/gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mousePress" arguments="1,1,0,1,49" />
<pqevent object="pqClientMainWindow/pqPresetDialog/gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseMove" arguments="1,0,0,22,443" />
<pqevent object="pqClientMainWindow/pqPresetDialog/gradients/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseRelease" arguments="1,0,0,22,443" />
<pqevent object="pqClientMainWindow/pqPresetDialog/gradients" command="setCurrent" arguments="60.1" />
<pqevent object="pqClientMainWindow/pqPresetDialog/apply" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqPresetDialog/close" command="activate" arguments="" />
</pqevents>
# Step Color Space
* Introduce a new color space called "Step".
This space allows creating step functions, where the color of each interval corresponds to the color of the second point of the interval.
We also added few presets for this color map based on the existing indexed color maps.
......@@ -15136,5 +15136,394 @@
"Uuo"
],
"Name": "BlueObeliskElements"
},
{
"Name": "KAAMS Step",
"ColorSpace": "Step",
"RGBPoints": [
0.0,
1.0,
1.0,
1.0,
0.083,
1.0,
1.0,
1.0,
0.166,
1.0,
0.0,
0.0,
0.25,
0.0,
1.0,
0.0,
0.333,
0.0,
0.0,
1.0,
0.416,
1.0,
1.0,
0.0,
0.5,
1.0,
0.0,
1.0,
0.583,
0.0,
1.0,
1.0,
0.666,
0.63,
0.63,
1.0,
0.75,
0.67,
0.5,
0.33,
0.833,
1.0,
0.5,
0.75,
0.916,
0.53,
0.35,
0.7,
1.0,
1.0,
0.75,
0.5
]
},
{
"Name": "Spectrum Step",
"ColorSpace": "Step",
"NanColor": [
0.6509803921568628,
0.3372549019607843,
0.1568627450980392
],
"RGBPoints": [
0.0,
0.0,
0.0,
0.0,
0.143,
0.0,
0.0,
0.0,
0.286,
0.8941176470588236,
0.1019607843137255,
0.1098039215686274,
0.429,
0.2156862745098039,
0.4941176470588236,
0.7215686274509804,
0.571,
0.3019607843137255,
0.6862745098039216,
0.2901960784313726,
0.714,
0.596078431372549,
0.3058823529411765,
0.6392156862745098,
0.857,
1.0,
0.4980392156862745,
0.0,
1.0,
0.6509803921568628,
0.3372549019607843,
0.1568627450980392
]
},
{
"Name": "Warm Step",
"ColorSpace": "Step",
"NanColor": [
1,
0.8980392156862745,
0.02352941176470588
],
"RGBPoints": [
0.0,
0.4745098039215686,
0.09019607843137255,
0.09019607843137255,
0.166,
0.4745098039215686,
0.09019607843137255,
0.09019607843137255,
0.333,
0.7098039215686275,
0.00392156862745098,
0.00392156862745098,
0.5,
0.9372549019607843,
0.2784313725490196,
0.09803921568627451,
0.666,
0.9764705882352941,
0.5137254901960784,
0.1411764705882353,
0.833,
1.0,
0.7058823529411765,
0.0,
1.0,
1.0,
0.8980392156862745,
0.02352941176470588
]
},
{
"Name": "Cool Step",
"ColorSpace": "Step",
"NanColor": [
0.3725490196078431,
0.2,
0.5019607843137255
],
"RGBPoints": [
0.0,
0.4588235294117647,
0.6941176470588235,
0.00392156862745098,
0.143,
0.4588235294117647,
0.6941176470588235,
0.00392156862745098,
0.286,
0.3450980392156863,
0.5019607843137255,
0.1607843137254902,
0.429,
0.3137254901960784,
0.8431372549019608,
0.7490196078431373,
0.571,
0.1098039215686274,
0.5843137254901961,
0.803921568627451,
0.714,
0.2313725490196079,
0.407843137254902,
0.6705882352941176,
0.857,
0.6039215686274509,
0.407843137254902,
1.0,
1.0,
0.3725490196078431,
0.2,
0.5019607843137255
]
},
{
"Name": "Blues Step",
"ColorSpace": "Step",
"NanColor": [
0.06274509803921569,
0.1647058823529412,
0.3215686274509804
],
"RGBPoints": [
0.0,
0.2313725490196079,
0.407843137254902,
0.6705882352941176,
0.143,
0.2313725490196079,
0.407843137254902,
0.6705882352941176,
0.286,
0.1098039215686274,
0.5843137254901961,
0.803921568627451,
0.429,
0.3058823529411765,
0.8509803921568627,
0.9176470588235294,
0.571,
0.4509803921568628,
0.6039215686274509,
0.8352941176470589,
0.714,
0.2588235294117647,
0.2392156862745098,
0.6627450980392157,
0.857,
0.3137254901960784,
0.3294117647058823,
0.5294117647058824,
1.0,
0.06274509803921569,
0.1647058823529412,
0.3215686274509804
]
},
{
"Name": "Wild Flower Step",
"ColorSpace": "Step",
"NanColor": [
0.2392156862745098,
0.06274509803921569,
0.3215686274509804
],
"RGBPoints": [
0.0,
0.1098039215686274,
0.5843137254901961,
0.803921568627451,
0.143,
0.1098039215686274,
0.5843137254901961,
0.803921568627451,
0.286,
0.2313725490196079,
0.407843137254902,
0.6705882352941176,
0.429,
0.4,
0.2431372549019608,
0.7176470588235294,
0.571,
0.6352941176470588,
0.3294117647058823,
0.8117647058823529,
0.714,
0.8705882352941177,
0.3803921568627451,
0.807843137254902,
0.857,
0.8627450980392157,
0.3803921568627451,
0.5843137254901961,
1.0,
0.2392156862745098,
0.06274509803921569,
0.3215686274509804
]
},
{
"Name": "Citrus Step",
"ColorSpace": "Step",
"NanColor": [
0.9764705882352941,
0.5137254901960784,
0.1411764705882353
],
"RGBPoints": [
0.0,
0.396078431372549,
0.4862745098039216,
0.2156862745098039,
0.166,
0.396078431372549,
0.4862745098039216,
0.2156862745098039,
0.333,
0.4588235294117647,
0.6941176470588235,
0.00392156862745098,
0.5,
0.6980392156862745,
0.7294117647058823,
0.1882352941176471,
0.666,
1.0,
0.8980392156862745,
0.02352941176470588,
0.833,
1.0,
0.7058823529411765,
0.0,
1.0,
0.9764705882352941,
0.5137254901960784,
0.1411764705882353
]
},
{
"Name": "Traffic Lights Step",
"ColorSpace": "Step",
"NanColor": [
0.803922,
0,
0.803922
],
"RGBPoints": [
0.0,
1.0,
0.0,
0.0,
0.333,
1.0,
0.0,
0.0,
0.666,
1.0,
0.862745,
0.0,
1.0,
0.0,
0.695201,
0.0
]
},
{
"Name": "Traffic Lights For Deuteranopes Step",
"ColorSpace": "Step",
"NanColor": [
0.803922,
0,
0.803922
],
"RGBPoints": [
0.0,
0.908659,
0.604013,
0.581857,
0.333,
0.908659,
0.604013,
0.581857,
0.666,
1.0,
0.862745,
0.0,
1.0,
0.0,
0.695201,
0.0
]
},
{
"Name": "Traffic Lights For Deuteranopes 2 Step",
"ColorSpace": "Step",
"NanColor": [
0.803922,
0,
0.803922
],
"RGBPoints": [
0.0,
0.4196078431372549,
0.0,
0.07058823529411765,
0.333,
0.4196078431372549,
0.0,
0.07058823529411765,
0.666,
0.9019607843137255,
0.9411764705882353,
0.0196078431372549,
1.0,
0.01568627450980392,
0.6196078431372549,
0.00784313725490196
]
}
]
......@@ -130,6 +130,7 @@
<Entry text="Lab" value="2" />
<Entry text="Diverging" value="3" />
<Entry text="Lab/CIEDE2000" value="4" />
<Entry text="Step" value="5" />
</EnumerationDomain>
<Documentation>
The color space used for interpolation: RGB, HSV, Lab (CIELAB), or
......@@ -141,6 +142,8 @@
interpolating between two saturated colors.
In Lab/CIEDE2000 mode, it will take the shortest path in the Lab color
space with respect to the CIE Delta E 2000 color distance measure.
In Step mode, the color of an interval is the color of the second point
of the interval.
</Documentation>
</IntVectorProperty>
<IntVectorProperty command="SetUseBelowRangeColor"
......@@ -984,6 +987,8 @@
value="3" />
<Entry text="Lab/CIEDE2000"
value="4" />
<Entry text="Step"
value="5" />
</EnumerationDomain>
</IntVectorProperty>
<IntVectorProperty animateable="0"
......
7f7aa2abb005152bcb0920d0d54592c93083bd5009d3c73a1274763047df936fe74dd628f9c1c0e35bf4b3ab4bcf9c4fa2c875c9cecf4bb6cef21a08763533af
a9a1d4eb15cda2dad4c0ea7849c4fa756af3eaa0429e565b4c8cb8220c1fc25f6574072a4f274459723a784501886754b36fce75895f16e935666ea2895a8058
Subproject commit ce41ee9c9ca742a948e80bb397440669f05a808d
Subproject commit f7e34a4cd734aa24d2e86b8201dec2bd7ccd60f6
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