*** empty log message ***

[bbtk.git] / kernel / appli / bbfy / bbfy.cpp

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index 48f8bb0e452de049f530202d7d267dbe94823ae2..390e5b0ddb8e4e24ebc29469b13a91180da05646 100644 (file)
--- a/kernel/appli/bbfy/bbfy.cpp
+++ b/kernel/appli/bbfy/bbfy.cpp
@@ -63,7 +63,7 @@ private:
   bool mIsWidget;
   std::string mParentBlackBox;
   std::string mItkParent;
-  std::string mVtkParent;
+  std::string mVtkObject;
   bool mGeneric;
   std::string mAuthor;
   std::string mDescription;
@@ -196,27 +196,27 @@ void bbfy::ParseXML()
       else if (bbtype == vtkImageAlgorithmString)
        {
          mType = vtkImageAlgorithm;
-         // Looks for <vtkparent> tag
-         if (!BB.nChildNode("vtkparent")) 
+         // Looks for <vtkobject> tag
+         if (!BB.nChildNode("vtkobject")) 
            {
              throw bbfyException("Error : blackbox type '"
                                  +vtkImageAlgorithmString
-                                 +"' but no <vtkparent> tag found (mandatory)");
+                                 +"' but no <vtkobject> tag found (mandatory)");
            }
-         bbtk::GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
+         bbtk::GetTextOrClear(BB.getChildNode("vtkobject"),mVtkObject);
          // 
        }
     else if (bbtype == vtkPolyDataAlgorithmString )
        {
          mType = vtkPolyDataAlgorithm;
-         // Looks for <vtkparent> tag
-         if (!BB.nChildNode("vtkparent")) 
+         // Looks for <vtkobject> tag
+         if (!BB.nChildNode("vtkobject")) 
            {
              throw bbfyException("Error : blackbox type '"
                                  +vtkPolyDataAlgorithmString
-                                 +"' but no <vtkparent> tag found (mandatory)");
+                                 +"' but no <vtkobject> tag found (mandatory)");
            }
-         bbtk::GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
+         bbtk::GetTextOrClear(BB.getChildNode("vtkobject"),mVtkObject);
          // 
        }
      else 
@@ -568,12 +568,6 @@ void bbfy::CreateHeader()
     {
       mFile << "   public " << mItkParent <<",\n";
     }
-//EED 15mai2009        
-//  else if ( (mType == vtkImageAlgorithm) ||
-//         (mType == vtkPolyDataAlgorithm) )
-//   {
-//      mFile << "   public " << mVtkParent <<",\n";
-//    }
 
   mFile << "   public "<<mParentBlackBox << "\n";
 
@@ -597,7 +591,7 @@ void bbfy::CreateHeader()
       mFile << "  BBTK_VTK_BLACK_BOX_INTERFACE("
            << mName << ","
            << mParentBlackBox << ","
-           << mVtkParent 
+           << mVtkObject
            << ");\n";
     }
        
@@ -614,19 +608,7 @@ void bbfy::CreateHeader()
       mFile << *i <<"\n";
     }
 
-  // Declare user constructor / copy cons /destr 
-  /*
-  mFile << "//=================================================================="<<std::endl;
-  mFile << "/// User callback called in the box contructor"<<std::endl;
-
-  mFile << "virtual void bbUserConstructor();"<<std::endl;
-  mFile << "/// User callback called in the box copy constructor"<<std::endl;
-  mFile << "virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);"<<std::endl;
-  mFile << "/// User callback called in the box destructor"<<std::endl;
-  mFile << "virtual void bbUserDestructor();"<<std::endl;
-  mFile << "//=================================================================="<<std::endl; 
 
-  */
 
   // Inputs
   std::vector<IO>::iterator ioi;
@@ -1082,7 +1064,7 @@ void bbfy::CreateCode()
   mFile << "{"<<std::endl;  
        if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
        {
-               mFile << "   mVtkObject = NULL;\n";
+               mFile << "   BBTK_VTK_SET_DEFAULT_VALUES();\n";
        }
        mFile << mUserSetDefaultValues << std::endl;
   mFile << "}" << std::endl;
@@ -1093,7 +1075,7 @@ void bbfy::CreateCode()
   mFile << "{"<<std::endl;
        if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
        {
-               mFile <<  "  mVtkObject = "<< mVtkParent <<"::New();\n";
+               mFile <<  "  BBTK_VTK_INITIALIZE_PROCESSING();\n";
        }
        mFile << mUserInitializeProcessing << std::endl;
   mFile << "}" << std::endl;
@@ -1103,7 +1085,7 @@ void bbfy::CreateCode()
   mFile << "{"<<std::endl;
        if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
        {
-               mFile << "   mVtkObject->Delete();\n";
+               mFile << "   BBTK_VTK_FINALIZE_PROCESSING();\n";
        }
        mFile << mUserFinalizeProcessing << std::endl;
   mFile << "}" << std::endl;