Merge branch V7_3_1_BR

[modules/geom.git] / src / OCC2VTK / GEOM_ShadingFace.cxx

diff --git a/src/OCC2VTK/GEOM_ShadingFace.cxx b/src/OCC2VTK/GEOM_ShadingFace.cxx
index ad2ae5b186eff507d53547bb900ddd193901ed0a..9b56761ee6d4b06a86f1ecb66b4877a1e1ada4ca 100755 (executable)
--- a/src/OCC2VTK/GEOM_ShadingFace.cxx
+++ b/src/OCC2VTK/GEOM_ShadingFace.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,26 +26,32 @@
 
 #include <vtkPolyDataMapper.h>  
 #include <vtkPolyData.h>  
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
 
 #include <BRep_Tool.hxx>
 #include <Poly_Triangulation.hxx>
- 
+
 
 vtkStandardNewMacro(GEOM_ShadingFace);
  
 GEOM_ShadingFace::GEOM_ShadingFace() 
 { 
+  this->SetNumberOfInputPorts(0);
 } 
  
 GEOM_ShadingFace::~GEOM_ShadingFace() 
 { 
 } 
  
-void
-GEOM_ShadingFace:: 
-Execute()
+int GEOM_ShadingFace::RequestData(vtkInformation *vtkNotUsed(request),
+                                  vtkInformationVector **vtkNotUsed(inputVector),
+                                  vtkInformationVector *outputVector)
 {
-  vtkPolyData* aPolyData = GetOutput();
+  vtkInformation *outInfo = outputVector->GetInformationObject(0);
+  vtkPolyData *aPolyData = vtkPolyData::SafeDownCast(
+    outInfo->Get(vtkDataObject::DATA_OBJECT()));
+
   aPolyData->Allocate();
   vtkPoints* aPts = vtkPoints::New();
   aPolyData->SetPoints(aPts);
@@ -56,6 +62,7 @@ Execute()
     const TopoDS_Face& aFace = anIter.Value();
     OCC2VTK(aFace,aPolyData,aPts);
   }
+  return 1;
 }
 
 void