X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2Fbbfy%2Fbbfy.cpp;h=390e5b0ddb8e4e24ebc29469b13a91180da05646;hb=f45b7f05b03f411759981fe13645466a1c289e6a;hp=d528eb916e4e5ae60a104655e136064b33f67a44;hpb=b8fe96fbebd153e92de1f1bfcad48ad009365df5;p=bbtk.git

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index d528eb9..390e5b0 100644
--- 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,11 +568,6 @@ void bbfy::CreateHeader()
     {
       mFile << "   public " << mItkParent <<",\n";
     }
-  else if ( (mType == vtkImageAlgorithm) ||
-	    (mType == vtkPolyDataAlgorithm) )
-    {
-      mFile << "   public " << mVtkParent <<",\n";
-    }
 
   mFile << "   public "<<mParentBlackBox << "\n";
 
@@ -596,9 +591,10 @@ void bbfy::CreateHeader()
       mFile << "  BBTK_VTK_BLACK_BOX_INTERFACE("
 	    << mName << ","
 	    << mParentBlackBox << ","
-	    << mVtkParent 
+	    << mVtkObject
 	    << ");\n";
     }
+	
   // Default
   else 
     {
@@ -612,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;
@@ -1074,21 +1058,36 @@ void bbfy::CreateCode()
       mFile << "}\n";
     }
 
-  // User constr / copy constr / destr implementation
+		
+  // User Set Default Values  
   mFile <<"void "<<mName<<"::bbUserSetDefaultValues()"<<std::endl;
   mFile << "{"<<std::endl;  
-  mFile << mUserSetDefaultValues << std::endl;
+	if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
+	{
+		mFile << "   BBTK_VTK_SET_DEFAULT_VALUES();\n";
+	}
+	mFile << mUserSetDefaultValues << std::endl;
   mFile << "}" << std::endl;
 
+  // User Initialize Processing
   mFile <<"void "<<mName<<"::bbUserInitializeProcessing()"
 	<<std::endl;
   mFile << "{"<<std::endl;
-  mFile << mUserInitializeProcessing << std::endl;
+	if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
+	{
+		mFile <<  "  BBTK_VTK_INITIALIZE_PROCESSING();\n";
+	}
+	mFile << mUserInitializeProcessing << std::endl;
   mFile << "}" << std::endl;
 
+	// User Finalize Processing
   mFile <<"void "<<mName<<"::bbUserFinalizeProcessing()"<<std::endl;
   mFile << "{"<<std::endl;
-  mFile << mUserFinalizeProcessing << std::endl;
+	if ( (mType == vtkImageAlgorithm) || (mType == vtkPolyDataAlgorithm) )
+	{
+		mFile << "   BBTK_VTK_FINALIZE_PROCESSING();\n";
+	}
+	mFile << mUserFinalizeProcessing << std::endl;
   mFile << "}" << std::endl;