From 872d0731e3000d55177c73792129926661723b56 Mon Sep 17 00:00:00 2001 From: Viktor UZLOV Date: Tue, 16 Feb 2021 14:52:43 +0300 Subject: [PATCH] fix CellLocationArray. Build completed --- src/VTKViewer/CMakeLists.txt | 2 -- src/VTKViewer/VTKViewer_CellLocationsArray.h | 2 +- src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/VTKViewer/CMakeLists.txt b/src/VTKViewer/CMakeLists.txt index 85b561eef..626793ce8 100644 --- a/src/VTKViewer/CMakeLists.txt +++ b/src/VTKViewer/CMakeLists.txt @@ -71,7 +71,6 @@ SET(_other_HEADERS VTKViewer_Algorithm.h VTKViewer_ArcBuilder.h VTKViewer_CellCenters.h - VTKViewer_CellLocationsArray.h VTKViewer_ConvexTool.h VTKViewer_DataSetMapper.h VTKViewer_ExtractUnstructuredGrid.h @@ -155,7 +154,6 @@ SET(_other_SOURCES VTKViewer_AppendFilter.cxx VTKViewer_ArcBuilder.cxx VTKViewer_CellCenters.cxx - VTKViewer_CellLocationsArray.cxx VTKViewer_ConvexTool.cxx VTKViewer_DataSetMapper.cxx VTKViewer_ExtractUnstructuredGrid.cxx diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.h b/src/VTKViewer/VTKViewer_CellLocationsArray.h index e3db50ac3..2a7b42a3d 100644 --- a/src/VTKViewer/VTKViewer_CellLocationsArray.h +++ b/src/VTKViewer/VTKViewer_CellLocationsArray.h @@ -31,7 +31,7 @@ # include # define TCellLocationsArray vtkIdTypeArray #else -# include +# include # define TCellLocationsArray vtkIntArray #endif diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx index e5ae6ff48..ef094066a 100644 --- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx +++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx @@ -24,7 +24,7 @@ // Author: Alexey PETROV #include "VTKViewer_ExtractUnstructuredGrid.h" -#include "VTKViewer_CellLocationsArray.h" +//#include "VTKViewer_CellLocationsArray.h" #include #include @@ -490,7 +490,7 @@ int VTKViewer_ExtractUnstructuredGrid::RequestData(vtkInformation *vtkNotUsed(re } } if ( vtkIdType newNbElems = aConnectivity->GetNumberOfCells() ) { - VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); + vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); aCellLocationsArray->SetNumberOfComponents(1); aCellLocationsArray->SetNumberOfTuples(newNbElems); aConnectivity->InitTraversal(); @@ -592,7 +592,7 @@ int VTKViewer_ExtractUnstructuredGrid::RequestData(vtkInformation *vtkNotUsed(re } } if (vtkIdType newNbElems = aConnectivity->GetNumberOfCells() ) { - VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); + vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); aCellLocationsArray->SetNumberOfComponents(1); aCellLocationsArray->SetNumberOfTuples( newNbElems ); aConnectivity->InitTraversal(); -- 2.39.2