Commit 47aec798 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot

Merge topic '15437_fix_multipiece_selection'

a5262238 BUG #15437: Fix multipiece selection.
87cbf2a6 Adding test for selection on a multipiece dataset.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Westphal's avatarMathieu Westphal <mathieu.westphal@kitware.com>
Merge-request: !138
parents 64eeb289 a5262238
......@@ -40,6 +40,9 @@ paraview_test_load_data(""
LoadStateMultiView.pvsm
LoadState.pvsm
minimal.nii
MultiBlockWithPieces_0_0.vtp
MultiBlockWithPieces_1_0.vtp
MultiBlockWithPieces.vtm
multicomb_0.vts
multicomb_1.vts
multicomb_2.vts
......@@ -265,6 +268,7 @@ list(APPEND TESTS_WITH_BASELINES
${CMAKE_CURRENT_SOURCE_DIR}/TensorGlyph.xml
${CMAKE_CURRENT_SOURCE_DIR}/TemporalInterpolator.xml
${CMAKE_CURRENT_SOURCE_DIR}/TemporalShiftScale.xml
${CMAKE_CURRENT_SOURCE_DIR}/TestSelectionOnMultipiece.xml
${CMAKE_CURRENT_SOURCE_DIR}/TimeInspector.xml
${CMAKE_CURRENT_SOURCE_DIR}/Tessellate.xml
${CMAKE_CURRENT_SOURCE_DIR}/Threshold.xml
......@@ -421,6 +425,7 @@ set(NonlinearSubdivisionDisplay_DISABLE_CRS TRUE)
set(InteractiveSelection_DISABLE_CRS TRUE)
set(NonConvexPolygon_DISABLE_CRS TRUE)
set(QuartilePlot_DISABLE_CRS TRUE)
set(TestSelectionOnMultipiece_DISABLE_CRS TRUE)
# These tests cannot be run using ctest -j since they are affected by focus
# changed events.
......
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/1QToolButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/FileOpenDialog" command="filesSelected" arguments="$PARAVIEW_DATA_ROOT/MultiBlockWithPieces.vtm" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/actionSelectSurfaceCells" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mousePress" arguments="(0.16,0.57,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseMove" arguments="(0.92,1.00333,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" command="mouseRelease" arguments="(0.92,1.00333,1,0,0)" />
</pqevents>
......@@ -678,10 +678,10 @@ void vtkPVGeometryFilter::AddCompositeIndex(vtkPolyData* pd, unsigned int index)
{
vtkUnsignedIntArray* cindex = vtkUnsignedIntArray::New();
cindex->SetNumberOfComponents(1);
cindex->SetNumberOfTuples(1);
cindex->SetNumberOfTuples(pd->GetNumberOfCells());
cindex->FillComponent(0, index);
cindex->SetName("vtkCompositeIndex");
pd->GetFieldData()->AddArray(cindex);
pd->GetCellData()->AddArray(cindex);
cindex->FastDelete();
}
......@@ -692,13 +692,12 @@ void vtkPVGeometryFilter::AddBlockColors(
vtkUnsignedIntArray* cindex = vtkUnsignedIntArray::New();
cindex->SetNumberOfComponents(1);
cindex->SetNumberOfTuples(1);
cindex->FillComponent(0, index % this->BlockColorsDistinctValues);
cindex->SetValue(0, index % this->BlockColorsDistinctValues);
cindex->SetName("vtkBlockColors");
pd->GetFieldData()->AddArray(cindex);
cindex->FastDelete();
}
//----------------------------------------------------------------------------
void vtkPVGeometryFilter::AddHierarchicalIndex(vtkPolyData* pd,
unsigned int level, unsigned int index)
......
df0ac2c625d9f1ae3378b7fe8d24c44d
e75a0ef04c1d4e2885ae1b33d53582a4
02af485553dd220dbd34c90cb68fc7fc
3146605ee7aa815fc92acc6a81ac12b8
9806f41ad411f4a9964a105d0aa70967
a3333a3d1132ef87e491a78ed40d795d
14a820b19fbd4db7d0e8274c7639072b
dd3a5ec093e9d144dc055079c247d593
1fe72391ad1b2632fd12262816b564ed
d983ca77b4bf42ec44a8d4e59b9608f4
066d17a8d651ec83489dfeaf9ebdf892
9f5354414805a73330fc2c8de74a49a7
95826bdabf3604a6fd9ddbec6e3788e3
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