Commit 39ecd1a0 authored by Matthias Möller's avatar Matthias Möller
Browse files

- fix: VTK files with polydata will be loaded correctly now and not loaded like e.g structed points

- fix some cpp-check warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16928 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 28335f47
...@@ -1265,7 +1265,7 @@ FileVTKPlugin::BestMeshType FileVTKPlugin::findBestObjectType(QString _filename) ...@@ -1265,7 +1265,7 @@ FileVTKPlugin::BestMeshType FileVTKPlugin::findBestObjectType(QString _filename)
} }
if (dataset & (STRUCTURED_POINTS | STRUCTURED_GRID | RECTILINEAR_GRID) ) if ((dataset == STRUCTURED_POINTS) || (dataset == STRUCTURED_GRID) || (dataset == RECTILINEAR_GRID) )
{ {
// Just points so every type is ok. Just use TriMesh. (Apperently these aren't even supported.) // Just points so every type is ok. Just use TriMesh. (Apperently these aren't even supported.)
return BMT_TriMesh; return BMT_TriMesh;
...@@ -1388,14 +1388,16 @@ FileVTKPlugin::BestMeshType FileVTKPlugin::findBestObjectType(QString _filename) ...@@ -1388,14 +1388,16 @@ FileVTKPlugin::BestMeshType FileVTKPlugin::findBestObjectType(QString _filename)
bool triMeshPossible = true; bool triMeshPossible = true;
bool polyMeshPossible = true; bool polyMeshPossible = true;
bool hexahedralMeshPossible = true;
bool polyhedralMeshPossible = true;
#ifndef ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT #ifndef ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT
hexahedralMeshPossible = false; bool hexahedralMeshPossible = false;
#else
bool hexahedralMeshPossible = true;
#endif #endif
#ifndef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT #ifndef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
polyhedralMeshPossible = false; bool polyhedralMeshPossible = false;
#else
bool polyhedralMeshPossible = true;
#endif #endif
quint32 read = 0; quint32 read = 0;
......
Supports Markdown
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