X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FVTKViewer%2FVTKViewer_ExtractUnstructuredGrid.cxx;h=e4522508135448aac0cdc978d8dcc38c9d0c35cf;hb=39b71280d566791e1af60ea44244bf4ea8ca6020;hp=5dc5a433308e86c26bd3e2db99c27046251904fb;hpb=aa05f2a1b23a54321ea7248ae9ac3463652c734e;p=modules%2Fgui.git

diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
index 5dc5a4333..e45225081 100755
--- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
+++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
@@ -1,29 +1,27 @@
-//  VISU CONVERTOR :
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:    VISU_ExtractUnstructuredGrid.cxx
-// Author:  Alexey PETROV
-// Module : VISU
 
+// File:    VTKViewer_ExtractUnstructuredGrid.cxx
+// Author:  Alexey PETROV
 
 #include "VTKViewer_ExtractUnstructuredGrid.h"
 #include "VTKViewer_CellLocationsArray.h"
@@ -34,14 +32,12 @@
 #include <vtkCellArray.h>
 #include <vtkIdList.h>
 #include <vtkCell.h>
+#include <vtkCellData.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkVersion.h>
 
-using namespace std;
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
+#include "utilities.h"
 
 #if defined __GNUC__
   #if __GNUC__ == 2
@@ -49,6 +45,8 @@ static int MYDEBUG = 0;
   #endif
 #endif
 
+#define VTK_XVERSION (VTK_MAJOR_VERSION*10000+VTK_MINOR_VERSION*100+VTK_BUILD_VERSION)
+
 vtkStandardNewMacro(VTKViewer_ExtractUnstructuredGrid);
 
 
@@ -70,6 +68,7 @@ void VTKViewer_ExtractUnstructuredGrid::RegisterCell(vtkIdType theCellId){
 void VTKViewer_ExtractUnstructuredGrid::RegisterCellsWithType(vtkIdType theCellType){
 //  if(0 && MYDEBUG) MESSAGE("RegisterCellsWithType - theCellType = "<<theCellType);
   myCellTypes.insert(theCellType);
+  //MESSAGE("myCellTypes.insert " << theCellType);
   Modified();
 }
 
@@ -79,14 +78,14 @@ void VTKViewer_ExtractUnstructuredGrid::SetStoreMapping(int theStoreMapping){
   this->Modified();
 }
 
-vtkIdType VTKViewer_ExtractUnstructuredGrid::GetInputId(int theOutId) const{
-  if(myCellIds.empty() && myCellTypes.empty()) return theOutId;
-  if(myOut2InId.empty() || theOutId > myOut2InId.size()) return -1;
-#if defined __GNUC_2__
+vtkIdType VTKViewer_ExtractUnstructuredGrid::GetInputId(int theOutId) const
+{
+  if ( myCellIds.empty() && myCellTypes.empty() )
+    return theOutId;
+
+  if ( theOutId<0 || theOutId >= (int)myOut2InId.size() )
+    return -1;
   return myOut2InId[theOutId];
-#else
-  return myOut2InId.at(theOutId);
-#endif
 }
 
 vtkIdType VTKViewer_ExtractUnstructuredGrid::GetOutputId(int theInId) const{
@@ -97,41 +96,80 @@ vtkIdType VTKViewer_ExtractUnstructuredGrid::GetOutputId(int theInId) const{
 }
 
 
-inline void InsertCell(vtkUnstructuredGrid *theInput,
-		       vtkCellArray *theConnectivity, 
-		       vtkUnsignedCharArray* theCellTypesArray,
-		       vtkIdType theCellId, 
-		       vtkIdList *theIdList,
-		       bool theStoreMapping,
-		       vtkIdType theOutId, 
-		       VTKViewer_ExtractUnstructuredGrid::TVectorId& theOut2InId,
-		       VTKViewer_ExtractUnstructuredGrid::TMapId& theIn2OutId)
+inline int InsertCell(vtkUnstructuredGrid *theInput,
+                       vtkCellArray *theConnectivity, 
+                       vtkUnsignedCharArray* theCellTypesArray,
+                       vtkIdTypeArray*& theFaces,
+                       vtkIdTypeArray*& theFaceLocations,
+                       vtkIdType theCellId, 
+                       vtkIdList *theIdList,
+                       bool theStoreMapping,
+                       vtkIdType theOutId, 
+                       VTKViewer_ExtractUnstructuredGrid::TVectorId& theOut2InId,
+                       VTKViewer_ExtractUnstructuredGrid::TMapId& theIn2OutId)
 {
   vtkCell *aCell = theInput->GetCell(theCellId);
   vtkIdList *aPntIds = aCell->GetPointIds();
   vtkIdType aNbIds = aPntIds->GetNumberOfIds();
+  vtkIdType aCellId = -1;
   theIdList->SetNumberOfIds(aNbIds);
   for(vtkIdType i = 0; i < aNbIds; i++){
     theIdList->SetId(i,aPntIds->GetId(i));
   }
-  theConnectivity->InsertNextCell(theIdList);
-
   vtkIdType aCellType = aCell->GetCellType();
-  theCellTypesArray->InsertNextValue(aCellType);
+#if VTK_XVERSION > 50700
+  if (aCellType != VTK_POLYHEDRON)
+    {
+#endif
+      aCellId = theConnectivity->InsertNextCell(theIdList);
+      if (theFaceLocations)
+        theFaceLocations->InsertNextValue(-1);
+#if VTK_XVERSION > 50700
+    }
+  else
+    {
+      //MESSAGE("InsertCell type VTK_POLYHEDRON " << theStoreMapping);
+      if (!theFaces)
+        {
+          theFaces = vtkIdTypeArray::New();
+          theFaces->Allocate(theCellTypesArray->GetSize());
+          theFaceLocations = vtkIdTypeArray::New();
+          theFaceLocations->Allocate(theCellTypesArray->GetSize());
+          // FaceLocations must be padded until the current position
+          for (vtkIdType i = 0; i <= theCellTypesArray->GetMaxId(); i++)
+            {
+              theFaceLocations->InsertNextValue(-1);
+            }
+        }
+      // insert face location
+      theFaceLocations->InsertNextValue(theFaces->GetMaxId() + 1);
+
+      // insert cell connectivity and faces stream
+      vtkIdType nfaces;
+      vtkIdType* face;
+      vtkIdType realnpts;
+      theInput->GetFaceStream(theCellId, nfaces, face);
+      vtkUnstructuredGrid::DecomposeAPolyhedronCell(
+          nfaces, face, realnpts, theConnectivity, theFaces);
+    }
+#endif
+
+  vtkIdType anID = theCellTypesArray->InsertNextValue(aCellType);
   if(theStoreMapping){
     theOut2InId.push_back(theCellId);
     theIn2OutId[theCellId] = theOutId;
   }
+  return aCellId;
 }
 
 inline void InsertPointCell(vtkCellArray *theConnectivity, 
-			    vtkUnsignedCharArray* theCellTypesArray,
-			    vtkIdType theCellId, 
-			    vtkIdList *theIdList,
-			    bool theStoreMapping,
-			    vtkIdType theOutId, 
-			    VTKViewer_ExtractUnstructuredGrid::TVectorId& theOut2InId,
-			    VTKViewer_ExtractUnstructuredGrid::TMapId& theIn2OutId)
+                            vtkUnsignedCharArray* theCellTypesArray,
+                            vtkIdType theCellId,
+                            vtkIdList *theIdList,
+                            bool theStoreMapping,
+                            vtkIdType theOutId, 
+                            VTKViewer_ExtractUnstructuredGrid::TVectorId& theOut2InId,
+                            VTKViewer_ExtractUnstructuredGrid::TMapId& theIn2OutId)
 {
   theIdList->SetId(0,theCellId);
   theConnectivity->InsertNextCell(theIdList);
@@ -142,9 +180,24 @@ inline void InsertPointCell(vtkCellArray *theConnectivity,
   }
 }
 
-void VTKViewer_ExtractUnstructuredGrid::Execute(){
-  vtkUnstructuredGrid *anInput = this->GetInput();
-  vtkUnstructuredGrid *anOutput = this->GetOutput();
+
+int VTKViewer_ExtractUnstructuredGrid::RequestData(vtkInformation *vtkNotUsed(request),
+                                                   vtkInformationVector **inputVector,
+                                                   vtkInformationVector *outputVector)
+{
+  // get the info objects
+  vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
+  vtkInformation *outInfo = outputVector->GetInformationObject(0);
+
+  // get the input and ouptut
+  vtkUnstructuredGrid *anInput = vtkUnstructuredGrid::SafeDownCast(
+    inInfo->Get(vtkDataObject::DATA_OBJECT()));
+  vtkUnstructuredGrid *anOutput = vtkUnstructuredGrid::SafeDownCast(
+    outInfo->Get(vtkDataObject::DATA_OBJECT()));
+
+  //vtkUnstructuredGrid *anInput = this->GetInput();
+  //vtkUnstructuredGrid *anOutput = this->GetOutput();
+  
   myOut2InId.clear();  myIn2OutId.clear();
 
 /*  if(MYDEBUG){
@@ -155,16 +208,16 @@ void VTKViewer_ExtractUnstructuredGrid::Execute(){
     MESSAGE("Execute - myChangeMode = "<<myChangeMode);
   }*/
   if(myExtractionMode == eCells){
-    if(myChangeMode == ePassAll || myCellIds.empty() && myCellTypes.empty() && myChangeMode == eRemoving){
+    if(myChangeMode == ePassAll || (myCellIds.empty() && myCellTypes.empty() && myChangeMode == eRemoving)){
       if(vtkIdType aNbElems = anInput->GetNumberOfCells()){
-	if(myStoreMapping) myOut2InId.reserve(aNbElems);
-	anOutput->ShallowCopy(anInput);
-	for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	  if(myStoreMapping){
-	    myOut2InId.push_back(aCellId);
-	    myIn2OutId[aCellId] = anOutId;
-	  }
-	}
+        if(myStoreMapping) myOut2InId.reserve(aNbElems);
+        anOutput->ShallowCopy(anInput);
+        for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+          if(myStoreMapping){
+            myOut2InId.push_back(aCellId);
+            myIn2OutId[aCellId] = anOutId;
+          }
+        }
       }
     }else{
       vtkIdList *anIdList = vtkIdList::New();
@@ -174,79 +227,96 @@ void VTKViewer_ExtractUnstructuredGrid::Execute(){
       vtkUnsignedCharArray* aCellTypesArray = vtkUnsignedCharArray::New();
       aCellTypesArray->SetNumberOfComponents(1);
       aCellTypesArray->Allocate(aNbElems*aCellTypesArray->GetNumberOfComponents());
+      anOutput->GetCellData()->CopyAllocate(anInput->GetCellData(),aNbElems,aNbElems/2);
+
+      vtkIdTypeArray *newFaces = 0;
+      vtkIdTypeArray *newFaceLocations = 0;
+
       if(!myCellIds.empty() && myCellTypes.empty()){
-	if(myStoreMapping) myOut2InId.reserve(myCellIds.size());
-	if(myChangeMode == eAdding){
-	  for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	    if(myCellIds.find(aCellId) != myCellIds.end()){
-	      InsertCell(anInput,aConnectivity,aCellTypesArray,aCellId,anIdList,
-			 myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	    }
-	  }
-	}else{
-	  for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	    if(myCellIds.find(aCellId) == myCellIds.end()){
-	      InsertCell(anInput,aConnectivity,aCellTypesArray,aCellId,anIdList,
-			 myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	    }
-	  }
-	}
+        if(myStoreMapping) myOut2InId.reserve(myCellIds.size());
+        if(myChangeMode == eAdding){
+          for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+            if(myCellIds.find(aCellId) != myCellIds.end()){
+              vtkIdType newId = InsertCell(anInput,aConnectivity,aCellTypesArray,newFaces,newFaceLocations,aCellId,anIdList,
+                         myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+	      anOutput->GetCellData()->CopyData(anInput->GetCellData(),aCellId,newId);
+            }
+          }
+        }else{
+          for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+            if(myCellIds.find(aCellId) == myCellIds.end()){
+              vtkIdType newId = InsertCell(anInput,aConnectivity,aCellTypesArray,newFaces,newFaceLocations,aCellId,anIdList,
+                         myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+	      anOutput->GetCellData()->CopyData(anInput->GetCellData(),aCellId,newId);
+            }
+          }
+        }
       }else if(myCellIds.empty() && !myCellTypes.empty()){
-	if(myChangeMode == eAdding){
-	  for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	    vtkIdType aType = anInput->GetCellType(aCellId);
-	    if(myCellTypes.find(aType) != myCellTypes.end()){
-	      InsertCell(anInput,aConnectivity,aCellTypesArray,aCellId,anIdList,
-			 myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	    }
-	  }
-	}else{
-	  for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	    vtkIdType aType = anInput->GetCellType(aCellId);
-	    if(myCellTypes.find(aType) == myCellTypes.end()){
-	      InsertCell(anInput,aConnectivity,aCellTypesArray,aCellId,anIdList,
-			 myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	    }
-	  }
-	}
+        if(myChangeMode == eAdding){
+          for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+            vtkIdType aType = anInput->GetCellType(aCellId);
+            if(myCellTypes.find(aType) != myCellTypes.end()){
+              vtkIdType newId = InsertCell(anInput,aConnectivity,aCellTypesArray,newFaces,newFaceLocations,aCellId,anIdList,
+                         myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+	      anOutput->GetCellData()->CopyData(anInput->GetCellData(),aCellId,newId);
+            }
+          }
+        }else{
+          for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+            vtkIdType aType = anInput->GetCellType(aCellId);
+            if(myCellTypes.find(aType) == myCellTypes.end()){
+              vtkIdType newId = InsertCell(anInput,aConnectivity,aCellTypesArray,newFaces,newFaceLocations,aCellId,anIdList,
+                         myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+	      anOutput->GetCellData()->CopyData(anInput->GetCellData(),aCellId,newId);
+            }
+          }
+        }
       }else if(!myCellIds.empty() && !myCellTypes.empty()){
-	if(myChangeMode == eAdding){
-	  for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	    vtkIdType aType = anInput->GetCellType(aCellId);
-	    if(myCellTypes.find(aType) != myCellTypes.end()){
-	      if(myCellIds.find(aCellId) != myCellIds.end()){
-		InsertCell(anInput,aConnectivity,aCellTypesArray,aCellId,anIdList,
-			   myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	      }
-	    }
-	  }
-	}else{
-	  for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	    vtkIdType aType = anInput->GetCellType(aCellId);
-	    if(myCellTypes.find(aType) == myCellTypes.end()){
-	      if(myCellIds.find(aCellId) == myCellIds.end()){
-		InsertCell(anInput,aConnectivity,aCellTypesArray,aCellId,anIdList,
-			   myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	      }
-	    }
-	  }
-	}
+        if(myChangeMode == eAdding){
+          for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+            vtkIdType aType = anInput->GetCellType(aCellId);
+            if(myCellTypes.find(aType) != myCellTypes.end()){
+              if(myCellIds.find(aCellId) != myCellIds.end()){
+                vtkIdType newId = InsertCell(anInput,aConnectivity,aCellTypesArray,newFaces,newFaceLocations,aCellId,anIdList,
+                           myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+		anOutput->GetCellData()->CopyData(anInput->GetCellData(),aCellId,newId);
+              }
+            }
+          }
+        }else{
+          for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+            vtkIdType aType = anInput->GetCellType(aCellId);
+            if(myCellTypes.find(aType) == myCellTypes.end()){
+              if(myCellIds.find(aCellId) == myCellIds.end()){
+                vtkIdType newId = InsertCell(anInput,aConnectivity,aCellTypesArray,newFaces,newFaceLocations,aCellId,anIdList,
+                           myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+		anOutput->GetCellData()->CopyData(anInput->GetCellData(),aCellId,newId);
+              }
+            }
+          }
+        }
       }
       if((aNbElems = aConnectivity->GetNumberOfCells())){
-	VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
-	aCellLocationsArray->SetNumberOfComponents(1);
-	aCellLocationsArray->SetNumberOfTuples(aNbElems);
-	aConnectivity->InitTraversal();
-	for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
-	  aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
-	}
-	anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
-	anOutput->SetPoints(anInput->GetPoints());
-	aCellLocationsArray->Delete();
+        VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New();
+        aCellLocationsArray->SetNumberOfComponents(1);
+        aCellLocationsArray->SetNumberOfTuples(aNbElems);
+        aConnectivity->InitTraversal();
+        for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
+          aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+        }
+#if VTK_XVERSION > 50700
+        anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity,newFaceLocations,newFaces);
+#else
+        anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
+#endif
+        anOutput->SetPoints(anInput->GetPoints());
+        aCellLocationsArray->Delete();
       }
       aCellTypesArray->Delete();
       aConnectivity->Delete();
       anIdList->Delete();
+      if ( newFaceLocations ) newFaceLocations->Delete();
+      if ( newFaces ) newFaces->Delete();
     }
   }else{
     vtkIdList *anIdList = vtkIdList::New();
@@ -257,68 +327,71 @@ void VTKViewer_ExtractUnstructuredGrid::Execute(){
     vtkUnsignedCharArray* aCellTypesArray = vtkUnsignedCharArray::New();
     aCellTypesArray->SetNumberOfComponents(1);
     aCellTypesArray->Allocate(aNbElems*aCellTypesArray->GetNumberOfComponents());
-    if(myChangeMode == ePassAll || myCellIds.empty() && myCellTypes.empty() && myChangeMode == eRemoving){
+    // additional condition has been added to treat a case described in IPAL21372
+    // note that it is significant only when myExtractionMode == ePoints
+    if(myChangeMode == ePassAll || (myCellIds.empty() && myCellTypes.empty() && myChangeMode == eRemoving) ||
+       !anInput->GetCellTypesArray()){
       if(myStoreMapping) myOut2InId.reserve(aNbElems);
       for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
-			myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+        InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
+                        myStoreMapping,anOutId,myOut2InId,myIn2OutId);
       }
     }else if(!myCellIds.empty() && myCellTypes.empty()){
       if(myStoreMapping) myOut2InId.reserve(myCellIds.size());
       if(myChangeMode == eAdding){
-	for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	  if(myCellIds.find(aCellId) != myCellIds.end()){
-	    InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
-			    myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	  }
-	}
+        for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+          if(myCellIds.find(aCellId) != myCellIds.end()){
+            InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
+                            myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+          }
+        }
       }else{
-	for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	  if(myCellIds.find(aCellId) == myCellIds.end()){
-	    InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
-			    myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	  }
-	}
+        for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+          if(myCellIds.find(aCellId) == myCellIds.end()){
+            InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
+                            myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+          }
+        }
       }
     }else if(myCellIds.empty() && !myCellTypes.empty()){
       if(myChangeMode == eAdding){
-	for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	  vtkIdType aType = anInput->GetCellType(aCellId);
-	  if(myCellTypes.find(aType) != myCellTypes.end()){
-	    InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
-			    myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	  }
-	}
+        for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+          vtkIdType aType = anInput->GetCellType(aCellId);
+          if(myCellTypes.find(aType) != myCellTypes.end()){
+            InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
+                            myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+          }
+        }
       }else{
-	for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	  vtkIdType aType = anInput->GetCellType(aCellId);
-	  if(myCellTypes.find(aType) == myCellTypes.end()){
-	    InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
-			    myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	  }
-	}
+        for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+          vtkIdType aType = anInput->GetCellType(aCellId);
+          if(myCellTypes.find(aType) == myCellTypes.end()){
+            InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
+                            myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+          }
+        }
       }
     }else if(!myCellIds.empty() && !myCellTypes.empty()){
       if(myChangeMode == eAdding){
-	for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	  vtkIdType aType = anInput->GetCellType(aCellId);
-	  if(myCellTypes.find(aType) != myCellTypes.end()){
-	    if(myCellIds.find(aCellId) != myCellIds.end()){
-	      InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
-			      myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	    }
-	  }
-	}
+        for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+          vtkIdType aType = anInput->GetCellType(aCellId);
+          if(myCellTypes.find(aType) != myCellTypes.end()){
+            if(myCellIds.find(aCellId) != myCellIds.end()){
+              InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
+                              myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+            }
+          }
+        }
       }else{
-	for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
-	  vtkIdType aType = anInput->GetCellType(aCellId);
-	  if(myCellTypes.find(aType) == myCellTypes.end()){
-	    if(myCellIds.find(aCellId) == myCellIds.end()){
-	      InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
-			      myStoreMapping,anOutId,myOut2InId,myIn2OutId);
-	    }
-	  }
-	}
+        for(vtkIdType aCellId = 0, anOutId = 0; aCellId < aNbElems; aCellId++,anOutId++){
+          vtkIdType aType = anInput->GetCellType(aCellId);
+          if(myCellTypes.find(aType) == myCellTypes.end()){
+            if(myCellIds.find(aCellId) == myCellIds.end()){
+              InsertPointCell(aConnectivity,aCellTypesArray,aCellId,anIdList,
+                              myStoreMapping,anOutId,myOut2InId,myIn2OutId);
+            }
+          }
+        }
       }
     }
     if((aNbElems = aConnectivity->GetNumberOfCells())){
@@ -327,9 +400,13 @@ void VTKViewer_ExtractUnstructuredGrid::Execute(){
       aCellLocationsArray->SetNumberOfTuples(aNbElems);
       aConnectivity->InitTraversal();
       for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
-	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+        aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
       }
+#if VTK_XVERSION > 50700
+      anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity,0, 0);
+#else
       anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
+#endif
       anOutput->SetPoints(anInput->GetPoints());
       aCellLocationsArray->Delete();
     }
@@ -344,4 +421,5 @@ void VTKViewer_ExtractUnstructuredGrid::Execute(){
       MESSAGE("Execute - myIn2OutId.size() = "<<myIn2OutId.size());
     }
   }*/
+  return 1;
 }