OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code Packages Releases Activity

0032331: Visualization - Exception when trying to display some surfaces using iVtk with VTK 9

Browse Source 
Updated memory allocation for vtkPolyData to use more suited method for VTK versions after 9.0
This commit is contained in:
anv 2021-04-27 21:33:54 +03:00 committed by bugmaster
parent 977d3d479e
commit 2c276f91da
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/IVtkDraw/IVtkDraw_Interactor.cxx
View File

@ -20,6 +20,13 @@
#include <vtkWin32OpenGLRenderWindow.h> #include <vtkWin32OpenGLRenderWindow.h>
#else #else
#include <GL/glx.h> #include <GL/glx.h>
// Preventing naming collisions between
// GLX and VTK versions 9.0 and above
#ifdef AllValues
#undef AllValues
#endif
#include <vtkXRenderWindowInteractor.h> #include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h> #include <vtkXOpenGLRenderWindow.h>
#endif #endif

49
src/IVtkTools/IVtkTools_SubPolyDataFilter.cxx
View File

@ -165,6 +165,11 @@ int IVtkTools_SubPolyDataFilter::RequestData (vtkInformation *vtkNotUsed(theRequ
// Prepare the list of ids from the set of ids. // Prepare the list of ids from the set of ids.
// Iterate on input cells. // Iterate on input cells.
#if (VTK_MAJOR_VERSION >= 9)
// Count number of different cells.
int aNbVerts = 0, aNbLines = 0, aNbPolys = 0, aNbStrips = 0;
int aNbVertPts = 0, aNbLinePts = 0, aNbPolyPts = 0, aNbStripPts = 0;
#endif
if (!myIdsSet.IsEmpty()) if (!myIdsSet.IsEmpty())
{ {
for (vtkIdType anI = 0; anI < aSize; anI++) for (vtkIdType anI = 0; anI < aSize; anI++)
@ -173,13 +178,55 @@ int IVtkTools_SubPolyDataFilter::RequestData (vtkInformation *vtkNotUsed(theRequ
{ {
// Add a cell id to output if it's value is in the set. // Add a cell id to output if it's value is in the set.
anIdList->InsertNextId (anI); anIdList->InsertNextId (anI);
#if (VTK_MAJOR_VERSION >= 9)
switch (anInput->GetCellType(anI))
{
case VTK_VERTEX:
aNbVerts++;
aNbVertPts++;
break;
case VTK_POLY_VERTEX:
aNbVerts++;
aNbVertPts += anInput->GetCell(anI)->GetNumberOfPoints();
break;
case VTK_LINE:
aNbLines++;
aNbLinePts += 2;
break;
case VTK_POLY_LINE:
aNbLines++;
aNbLinePts += anInput->GetCell(anI)->GetNumberOfPoints();
break;
case VTK_TRIANGLE:
aNbPolys++;
aNbPolyPts += 3;
break;
case VTK_QUAD:
aNbPolys++;
aNbPolyPts += 4;
break;
case VTK_POLYGON:
aNbPolys++;
aNbPolyPts += anInput->GetCell(anI)->GetNumberOfPoints();
break;
case VTK_TRIANGLE_STRIP:
aNbStrips++;
aNbStripPts += anInput->GetCell(anI)->GetNumberOfPoints();
break;
}
#endif
} }
} }
} }
// Copy cells with their points according to the prepared list of cell ids. // Copy cells with their points according to the prepared list of cell ids.
anOutputCellData->AllocateArrays (anInputCellData->GetNumberOfArrays()); anOutputCellData->AllocateArrays (anInputCellData->GetNumberOfArrays());
anOutput->Allocate (anInput, anIdList->GetNumberOfIds()); // Allocate output cells // Allocate output cells
#if (VTK_MAJOR_VERSION >= 9)
anOutput->AllocateExact (aNbVerts, aNbVertPts, aNbLines, aNbLinePts, aNbPolys, aNbPolyPts, aNbStrips, aNbStripPts);
#else
anOutput->Allocate (anInput, anIdList->GetNumberOfIds());
#endif
// Pass data arrays. // Pass data arrays.
// Create new arrays for output data // Create new arrays for output data