Merge from V6_main 01/04/2013

[modules/paravis.git] / src / Plugins / MedReader / IO / vtkGenerateStructElement.cxx

diff --git a/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx b/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx
index a59c850bd897a1018816d7847cfb527fcbc152bc..7943fd1a9246cd02fca602ae807846985500e436 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx
+++ b/src/Plugins/MedReader/IO/vtkGenerateStructElement.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2013  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -77,7 +77,7 @@ protected :
   std::map<std::string, vtkDataArray*> varAttribute;
 };
 
-vtkCxxRevisionMacro(vtkGenerateStructElement, "$Revision$");
+// vtkCxxRevisionMacro(vtkGenerateStructElement, "$Revision$");
 vtkStandardNewMacro(vtkGenerateStructElement);
 
 vtkGenerateStructElement::vtkGenerateStructElement()
@@ -108,6 +108,8 @@ int vtkGenerateStructElement::RequestData(vtkInformation* request,
   vtkMedStructElement* strelem = vtkMedStructElement::SafeDownCast(
       inug->GetInformation()->Get(vtkMedUtilities::STRUCT_ELEMENT()));
 
+  std::cout << "Inside vtkGenerateStructElement::RequestData" << std::endl;
+
   if(strelem == NULL)
     {
     vtkDebugMacro("vtkGenerateStructElement needs a vtkMedStructElement information");
@@ -131,20 +133,23 @@ int vtkGenerateStructElement::RequestData(vtkInformation* request,
 
   if(name == MED_BALL_NAME)
     {
+    std::cout << "vtkGenerateStructElement::RequestData ...  if(name == MED_BALL_NAME)" << std::endl;
     // sanity check : is the diameter defined?
     if(!cache.HasParameter(MED_BALL_DIAMETER))
       {
       vtkErrorMacro("MED_BALL elements need a diameter");
       return 1;
       }
+    std::cout << "inug->GetNumberOfCells() = " << inug->GetNumberOfCells() << std::endl;
     for(vtkIdType cellId = 0; cellId < inug->GetNumberOfCells(); cellId++)
       {
       vtkIdType ballMedId = strelemindex->GetValue(2*cellId);
       double balldiam = this->GetParameter1(MED_BALL_DIAMETER, ballMedId, cache);
-
+      std::cout << balldiam << " - ";
       //TODO
       //this->GenerateBall(inug, cellId, balldiam, outug);
       }
+    std::cout << std::endl;
     }
   else if(name == MED_PARTICLE_NAME)
     {