Commit 5c4da53b authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

BUG #13330. Fixed arrays shown in selection inspector.

The representation's domain was missing the <RequiredProperty/> element.
Consequently, the array list domain was never updated and hence the
SelectionInsecptor did not show the list of availbale arrays. Fixed that. Also
adding a test "SelectionLabels" to test this functionality.

Change-Id: I56d78c36d233517bcc1803acdeaf0aca499c9474
parent 76768dab
......@@ -119,6 +119,7 @@ SET (TESTS_WITH_BASELINES
# ${CMAKE_CURRENT_SOURCE_DIR}/SaveAnimationGeometry.xml
${CMAKE_CURRENT_SOURCE_DIR}/SaveColorMap.xml
${CMAKE_CURRENT_SOURCE_DIR}/SaveCSV.xml
${CMAKE_CURRENT_SOURCE_DIR}/SelectionLabels.xml
${CMAKE_CURRENT_SOURCE_DIR}/SelectReader.xml
${CMAKE_CURRENT_SOURCE_DIR}/SimpleInteraction.xml
${CMAKE_CURRENT_SOURCE_DIR}/Slice.xml
......@@ -264,6 +265,7 @@ set(RepresentationSelector_USE_NEW_PANELS TRUE)
set(SaveColorMap_USE_NEW_PANELS TRUE)
set(SaveCSV_USE_NEW_PANELS TRUE)
set(SelectReader_USE_NEW_PANELS TRUE)
set(SelectionLabels_USE_NEW_PANELS TRUE)
set(SimpleInteraction_USE_NEW_PANELS TRUE)
set(Slice_USE_NEW_PANELS TRUE)
set(SpreadSheet1_USE_NEW_PANELS TRUE)
......@@ -341,6 +343,9 @@ set (StructuredGridVolumeRendering_FORCE_SERIAL TRUE)
set (StructuredGridVolumeRendering_DISABLE_CRS TRUE)
# <-- since volume rendering is not supported in CRS mode.
# Since this test needs selection, disable in CRS mode.
set (SelectionLabels_DISABLE_CRS TRUE)
# Mark tests that change change state considerably requires a restart of the
# test suite when grouping tests together for faster playback.
SET (GlobalProperties_BREAK TRUE)
......
<?xml version="1.0" ?>
<pqevents>
<!-- Ensures that Selection inspector can label point/cell arrays correctly -->
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="RTAnalyticSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/pqProxyGroupMenuManager0/Calculator" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/AttributeMode/ComboBox" command="set_string" arguments="Cell Data" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Function/Function" command="set_string" arguments="12" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
<pqevent object="pqClientMainWindow/selectionToolbar/actionSelectionMode" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mousePress" arguments="(0.516667,0.11,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseMove" arguments="(0.553333,0.306667,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseRelease" arguments="(0.553333,0.306667,1,0,0)" />
<pqevent object="pqClientMainWindow/representationToolbar/displayRepresentation/comboBox" command="set_string" arguments="Surface" />
<pqevent object="pqClientMainWindow/selectionToolbar/actionSelectionMode" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mousePress" arguments="(0.316667,0.276667,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseMove" arguments="(0.316667,0.276667,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseRelease" arguments="(0.316667,0.276667,1,0,0)" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menu_Edit" />
<pqevent object="pqClientMainWindow/menubar/menu_View" command="activate" arguments="Selection Inspector" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Cell Label" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_stackedwidget/tab_CellLabel/checkBoxLabelCells" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_stackedwidget/tab_CellLabel/frame_CellLabelStyle/comboLabelMode_Cell" command="set_string" arguments="Cell IDs" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_stackedwidget/tab_CellLabel/frame_CellLabelStyle/comboLabelMode_Cell" command="set_string" arguments="Result" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_tabbar" command="set_tab_with_text" arguments="Point Label" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_stackedwidget/tab_PointLabel/checkBoxLabelPoints" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_stackedwidget/tab_PointLabel/frame_PointLabelStyle/comboLabelMode_Point" command="set_string" arguments="Point IDs" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_stackedwidget/tab_PointLabel/frame_PointLabelStyle/comboLabelMode_Point" command="set_string" arguments="RTData" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/selectionInspector/scrollArea/qt_scrollarea_viewport/scrollWidget/groupSelectionLabel/tabWidget_SelectionLabelStyle/qt_tabwidget_stackedwidget/tab_PointLabel/checkBoxLabelPoints" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
<pqevent object="pqClientMainWindow/selectionInspectorDock/qt_dockwidget_closebutton" command="activate" arguments="" />
</pqevents>
......@@ -1075,7 +1075,11 @@
number_of_elements="1"
panel_visibility="never">
<ArrayListDomain input_domain_name="input_array_cell"
name="array_list"></ArrayListDomain>
name="array_list">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<StringVectorProperty command="SetPointFieldDataArrayName"
default_values="vtkOriginalPointIds"
......@@ -1083,7 +1087,11 @@
number_of_elements="1"
panel_visibility="never">
<ArrayListDomain input_domain_name="input_array_point"
name="array_list"></ArrayListDomain>
name="array_list">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<SubProxy>
<Proxy name="SurfaceRepresentation"
......@@ -4346,7 +4354,11 @@
number_of_elements="1"
panel_visibility="never">
<ArrayListDomain input_domain_name="input_array_cell"
name="array_list"></ArrayListDomain>
name="array_list">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<StringVectorProperty command="SetPointFieldDataArrayName"
default_values="vtkOriginalPointIds"
......@@ -4354,7 +4366,11 @@
number_of_elements="1"
panel_visibility="never">
<ArrayListDomain input_domain_name="input_array_point"
name="array_list"></ArrayListDomain>
name="array_list">
<RequiredProperties>
<Property function="Input" name="Input" />
</RequiredProperties>
</ArrayListDomain>
</StringVectorProperty>
<SubProxy>
<Proxy name="CubeAxesRepresentation"
......
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