Merge branch 'refs/heads/bbpCreator'

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index aea7925dcc308cd2b3a04b36ed9790cd1bfe554d..c8739df07b93c8ba0d8f394714ec48ad030d3143 100644 (file)
--- 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 b83dbd82ad05cc30ba7c4a93b5f1f1a2a2370180..bc5b5253bffcbc0d811f8e824bcaedc755544c4b 100644 (file)
--- 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 d37aa6fb2c8a9e759174bc23d8e19c56c10af017..a252888c5a04d9bffdaddef6a76f19e3dab1f7b8 100644 (file)
--- 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 3cf69561e19d438169f50410fb16a63e734ed533..48dcfd14c3a7813ced5c105e8e12ac56d2a1d6cc 100644 (file)
--- 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);   
   //=================================================================