Commit 8014eefc authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot

Merge topic '18151-freeze-query-selection-fix'

27bbac3f Add test for freezing a query selection with a composite dataset
6e4534ed Update VTK for freeze selection fix
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !3203
parents e2363383 27bbac3f
Pipeline #134893 running with stage
ae5c061540a20bb9e2baab9c7a4b168ecd38123ec07eabb24edc7883d44c37ace2893ae48031f8a9fd4b8aa6f4ef658b83064a7517ce11be6e169c62741b9bf0
......@@ -176,6 +176,7 @@ ExternalData_Expand_Arguments(ParaViewData _
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/FindDataDialog9.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/FindDataSelectLocation.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/FindDataSelectLocationMultiblock.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/FreezeQueryMultiblock.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ForceTimeDiamond.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Glyph3DRepresentation_Cylinder.png}"
"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Glyph3DRepresentation_Cylinder_1.png}"
......@@ -996,6 +997,7 @@ if(PARAVIEW_ENABLE_PYTHON)
FindDataSelectLocation.xml # find data needs python/numpy
FindDataSelectLocationMultiblock.xml # find data needs python/numpy
ForceTimeDiamond.xml
FreezeQueryMultiblock.xml
IndexedLookupInitialization.xml # needs Python Calculator/numpy
StructuredGridCellBlanking.xml
TestFindDataMax.xml
......
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar/menu_File" command="activate" arguments="actionFileOpen" />
<pqevent object="pqClientMainWindow/FileOpenDialog" command="filesSelected" arguments="$PARAVIEW_DATA_ROOT/Testing/Data/can.ex2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ArrayStatus/SelectionWidget/1QHeaderView0" command="mousePress" arguments="1,1,0,0,0,0" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ArrayStatus/SelectionWidget/1QHeaderView0" command="mouseRelease" arguments="1,0,0,0,0,0" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/VCRToolbar/actionVCRLastFrame" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menu_Edit" />
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionQuery" />
<pqevent object="pqClientMainWindow/FindDataDialog/createSelectionFrame/queryClauseWidget/criteria" command="activated" arguments="EQPS" />
<pqevent object="pqClientMainWindow/FindDataDialog/createSelectionFrame/queryClauseWidget/condition" command="activated" arguments="is max" />
<pqevent object="pqClientMainWindow/FindDataDialog/createSelectionFrame/runQuery" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/FindDataDialog/freezeSelection" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/FindDataDialog/extractSelection" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/cameraToolbar/actionResetCamera" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="false" />
</pqevents>
Subproject commit 24f213c304311e0d49c6b9498a335c00d6b53335
Subproject commit 51dc6ff340c34add108b9eb37c13a12e022d0d85
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