X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fappli%2Fbbfy%2Fbbfy.cpp;h=3dd1855448bd914570019bb371625b7d18f1950f;hb=a94262289f8148799f8e319c216d5af2a6053c18;hp=48f8bb0e452de049f530202d7d267dbe94823ae2;hpb=0231a36c2ca07094ce52873eb38e59f0b22a2478;p=bbtk.git

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index 48f8bb0..3dd1855 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;
@@ -105,6 +105,8 @@ private:
   std::string mHName;
   std::string mCxxName;
 
+  void AlertString();
+
 };
 //==========================================================================
 
@@ -140,11 +142,22 @@ void bbfy::CreateBlackBox()
 }
 //==========================================================================
 
-
+void bbfy::AlertString()
+{
+	
+      mFile << "//===== \n";
+      mFile << "// Before editing this file, make sure it's a file of your own ";
+      mFile << "(i.e.: it wasn't generated from xml description; if so : your modifications will be lost)\n";
+      mFile << "//===== \n";
+	  
+}
 
 //==========================================================================
 void bbfy::ParseXML()
 {
+
+
+
   XMLResults* res = new XMLResults;
   XMLNode BB = XMLNode::parseFile(mFilename.c_str(),"blackbox",res);
 
@@ -196,27 +209,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 
@@ -426,7 +439,7 @@ void bbfy::ParseXML()
   // process tag given ?
    if (BB.nChildNode("process"))
      {
-       bbtk::GetTextOrClear(BB.getChildNode("process"),mProcess);
+		 bbtk::GetTextOrClear(BB.getChildNode("process"),mProcess);
      }
      
   // CreateWidget
@@ -501,7 +514,9 @@ void bbfy::CreateHeader()
       mess += fullname + "\"";
       throw bbfyException(mess);
     }
-  
+
+	AlertString();
+
   // If is widget 
   if (mIsWidget)
     {
@@ -568,12 +583,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 +606,7 @@ void bbfy::CreateHeader()
       mFile << "  BBTK_VTK_BLACK_BOX_INTERFACE("
 	    << mName << ","
 	    << mParentBlackBox << ","
-	    << mVtkParent 
+	    << mVtkObject
 	    << ");\n";
     }
 	
@@ -614,19 +623,8 @@ 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; 
 
-  */
+	AlertString();
 
   // Inputs
   std::vector<IO>::iterator ioi;
@@ -691,6 +689,7 @@ void bbfy::CreateHeader()
 	  throw bbfyException(mess);
 	}
     }
+
   
   // Outputs
   for (ioi=mOutput.begin(); ioi!=mOutput.end(); ++ioi) 
@@ -754,6 +753,7 @@ void bbfy::CreateHeader()
        mFile << "  void CreateWidget(wxWindow*);\n";
     }
 
+	AlertString();
 
   // EO black box declaration
   mFile << "};\n\n";
@@ -781,7 +781,8 @@ void bbfy::CreateHeader()
     {
       throw bbfyException("template bb with more than 1 templ param not impl");
     } 
-  
+
+
   // Author
   mFile << "BBTK_AUTHOR(\""<<mAuthor<< "\");\n";
 
@@ -853,6 +854,7 @@ void bbfy::CreateHeader()
       WriteGenericITKFilterHeader();
     }
 
+	AlertString();
 
   // EO namespace
   EndNamespace();
@@ -1017,7 +1019,10 @@ void bbfy::CreateCode()
       mess += "\"";
       throw bbfyException(mess);
     }
-  
+
+	AlertString();
+
+
   // Includes
   // Header of the class
   mFile << "#include \"" << mHName << "\"\n";
@@ -1064,6 +1069,7 @@ void bbfy::CreateCode()
   // Process
   if ((mType == STD)||(mProcess.size()))
     {
+	AlertString();
       mFile << "void "<<mName<<"::Process()\n{\n";
       mFile << mProcess << "\n";
       mFile << "}\n";
@@ -1071,6 +1077,7 @@ void bbfy::CreateCode()
   // CreateWidget
   if (mIsWidget)
     {
+	AlertString();
       mFile << "void "<<mName<<"::CreateWidget(wxWindow* parent)\n{\n";
       mFile << mCreateWidget << "\n";
       mFile << "}\n";
@@ -1078,32 +1085,35 @@ void bbfy::CreateCode()
 
 		
   // User Set Default Values  
+	AlertString();
   mFile <<"void "<<mName<<"::bbUserSetDefaultValues()"<<std::endl;
   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;
 
   // User Initialize Processing
+	AlertString();
   mFile <<"void "<<mName<<"::bbUserInitializeProcessing()"
 	<<std::endl;
   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;
 
 	// User Finalize Processing
+	AlertString();
   mFile <<"void "<<mName<<"::bbUserFinalizeProcessing()"<<std::endl;
   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;