From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 15 Jul 2013 21:16:12 +0000 (+0200)
Subject: Merge branch 'refs/heads/bbpCreator'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4fa2c10f297c466a9dff2b75f326a545c5157f84;hp=41d72edda145167a563810e16abbc2b76b72eac6;p=bbtk.git

Merge branch 'refs/heads/bbpCreator'
---

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index aea7925..c8739df 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -321,10 +321,10 @@ ENDIF(CHCON_LIBRARIES)
  #   SET(SETPATH set ${command0} &&)
 
   ADD_CUSTOM_COMMAND( 
-	 TARGET  bb${BBTK_PACKAGE_NAME} PRE_BUILD
-       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && $(OutDir)/bbpConfigurator.exe ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
+	 TARGET  bb${BBTK_PACKAGE_NAME} POST_BUILD
+#       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && $(OutDir)/bbpConfigurator.exe ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
+       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
     ) 
-	
   ELSE(WIN32)
     SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
     ADD_CUSTOM_TARGET( bb${BBTK_PACKAGE_NAME}.bbp ALL
diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.cxx b/kernel/src/bbtkWxGUIPackageBrowser2.cxx
index b83dbd8..bc5b525 100644
--- a/kernel/src/bbtkWxGUIPackageBrowser2.cxx
+++ b/kernel/src/bbtkWxGUIPackageBrowser2.cxx
@@ -264,7 +264,9 @@ namespace bbtk
 		  BlackBoxDescriptor* d = (BlackBoxDescriptor*)(info.GetData());
 		  if (d!=0)
 		  {
-			  sendtext += crea::std2wx(d->GetFullTypeName());
+		      //DFGO -> To identify it is a box
+		      sendtext += crea::std2wx("box:");
+		      sendtext += crea::std2wx(d->GetFullTypeName());
 		  }
 	  }
 	  else
diff --git a/packages/vtk/src/bbvtkFlip.cxx b/packages/vtk/src/bbvtkFlip.cxx
index d37aa6f..a252888 100644
--- a/packages/vtk/src/bbvtkFlip.cxx
+++ b/packages/vtk/src/bbvtkFlip.cxx
@@ -114,6 +114,7 @@ void Flip::Process()
 		int scalarSize	= bbGetInputIn()->GetScalarSize();
 		int lineSize	= inputdims[0]*scalarSize*nbScalComp;	   
 		int planeSize	= inputdims[1]*lineSize;
+                int volumeSize  = inputdims[2]*planeSize;
 		char *pixelsIn	= (char *)bbGetInputIn()->GetScalarPointer();
 		char *pixelsOut = (char *)mImageOut->GetScalarPointer();
 	
@@ -123,7 +124,12 @@ void Flip::Process()
 		char *debPlanOut;
 		int i,j,k;
 		
-		if ( (bbGetInputAxis()=="X") || (bbGetInputAxis()=="x") )
+		if ( (bbGetInputAxis()=="O") || (bbGetInputAxis()=="o") )
+		{  
+		        pixelsIn = (char *)bbGetInputIn()->GetScalarPointer(0,0,0);
+			pixelsOut = (char *)mImageOut->GetScalarPointer(0,0,0);
+			memcpy(pixelsOut,  pixelsIn, volumeSize );
+		} else if ( (bbGetInputAxis()=="X") || (bbGetInputAxis()=="x") )
 		{  
 
   		   	for(k=0; k<inputdims[2]; k++)  // iterate  planes
diff --git a/packages/vtk/src/bbvtkFlip.h b/packages/vtk/src/bbvtkFlip.h
index 3cf6956..48dcfd1 100644
--- a/packages/vtk/src/bbvtkFlip.h
+++ b/packages/vtk/src/bbvtkFlip.h
@@ -86,7 +86,7 @@ namespace bbvtk
   BBTK_DESCRIPTION("flips a <vtkImageData*>");
   BBTK_CATEGORY("application, image");
   BBTK_INPUT(Flip, In, "image", vtkImageData *, "");
-  BBTK_INPUT(Flip, Axis, "Axe (default Y)  X Y Z", std::string, "");
+  BBTK_INPUT(Flip, Axis, "Axe (default Y)  X Y Z O(original)", std::string, "");
   BBTK_OUTPUT(Flip, Out, "fliped image", vtkImageData *, "");
   BBTK_END_DESCRIBE_BLACK_BOX(Flip);   
   //=================================================================