From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 18 May 2009 08:00:00 +0000 (+0000)
Subject: .
X-Git-Tag: EED.02Oct2009~44
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0231a36c2ca07094ce52873eb38e59f0b22a2478;p=bbtk.git

.
---

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index d528eb9..48f8bb0 100644
--- a/kernel/appli/bbfy/bbfy.cpp
+++ b/kernel/appli/bbfy/bbfy.cpp
@@ -568,11 +568,12 @@ void bbfy::CreateHeader()
     {
       mFile << "   public " << mItkParent <<",\n";
     }
-  else if ( (mType == vtkImageAlgorithm) ||
-	    (mType == vtkPolyDataAlgorithm) )
-    {
-      mFile << "   public " << mVtkParent <<",\n";
-    }
+//EED 15mai2009	
+//  else if ( (mType == vtkImageAlgorithm) ||
+//	    (mType == vtkPolyDataAlgorithm) )
+//   {
+//      mFile << "   public " << mVtkParent <<",\n";
+//    }
 
   mFile << "   public "<<mParentBlackBox << "\n";
 
@@ -599,6 +600,7 @@ void bbfy::CreateHeader()
 	    << mVtkParent 
 	    << ");\n";
     }
+	
   // Default
   else 
     {
@@ -1074,21 +1076,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 << "   mVtkObject = NULL;\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 <<  "  mVtkObject = "<< mVtkParent <<"::New();\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 << "   mVtkObject->Delete();\n";
+	}
+	mFile << mUserFinalizeProcessing << std::endl;
   mFile << "}" << std::endl;
 
 
diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index a5b0aff..c516a82 100644
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -6,7 +6,7 @@ MESSAGE ( STATUS "     LOOKING FOR LIBRARIES NEEDED")
 MESSAGE ( STATUS "=======================================")
 MESSAGE ( STATUS "")
 #-----------------------------------------------------------------------------
-  
+
 #-----------------------------------------------------------------------------
 # 11/12/08 : BBTK IS NOW BASED ON crea
 SET(CREA_VERBOSE_CMAKE TRUE)
@@ -36,9 +36,9 @@ IF(BBTK_KERNEL OR BBTK_CORE_PACKAGE)
   
 #ELSE(BBTK_USE_SHIPPED_BOOST)
   SET(USE_BOOST ON CACHE BOOL "Use boost C++ library" FORCE)
-  SET(BBTK_BOOST_LIBRARIES
-    boost_signals
-    )
+#  SET(BBTK_BOOST_LIBRARIES
+#    boost_signals
+#    )
 #ENDIF(BBTK_USE_SHIPPED_BOOST)
 
 ENDIF(BBTK_KERNEL OR BBTK_CORE_PACKAGE)