.

diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt
index 7b887c00516130a95b38994531617660eb1e21fa..6c10c6815e6601ea19d1c7d976f7e4aeed6fc441 100644 (file)
--- a/kernel/appli/CMakeLists.txt
+++ b/kernel/appli/CMakeLists.txt
@@ -26,8 +26,6 @@ SUBDIRS(bbCreateBlackBox)
 # The black box script development studio
 SUBDIRS(bbStudio)
 
-# The black box script development studio
-SUBDIRS(bbEditor)
 
 # The black box package browser
 SUBDIRS(bbPackageBrowser)

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 5b01ea221b33800082e821fe48fba1f9fec331e8..46bc76d5ea88cbdbfb0d87b5c2b03ee94791d9b2 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -267,6 +267,11 @@ CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 #SUBDIRS(ThirdParty)
 #-----------------------------------------------------------------------------
 
+#-----------------------------------------------------------------------------
+# Editor Graphic BBS
+SUBDIRS(EditorGraphicBBS)
+#-----------------------------------------------------------------------------
+
 MESSAGE(STATUS "=======================================")
 MESSAGE(STATUS "")
 

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 05d5d1f5fa3f9b5bb1e161648039e51c3185a1d9..ecaa1ccacbdf4e86fb2132a7ad8667cbb6806f95 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/06/08 14:50:04 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2009/06/09 08:42:12 $
+  Version:   $Revision: 1.31 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -231,7 +231,9 @@ namespace bbtk
 #if defined(MACOSX)
                  BlackBoxDescriptor::Pointer desc = pack.lock()->mDescriptorMap[*descname];
                  if ( (dyn==0) || (boost::dynamic_pointer_cast<ComplexBlackBoxDescriptor>(desc)) )
+                 {
                          PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
+                 } 
 #else
                  PackageReleaseBlackBoxDescriptorInternal(pack,*descname);
 #endif

diff --git a/kernel/src/cmake/bbtkConfigure.h.in b/kernel/src/cmake/bbtkConfigure.h.in
index 440835b1209c67b62153c9ecbeebf5dcac2608dd..80114ce23f332c04583da6a0064b4855bd72fbf6 100644 (file)
--- a/kernel/src/cmake/bbtkConfigure.h.in
+++ b/kernel/src/cmake/bbtkConfigure.h.in
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigure.h.in,v $
   Language:  C++
-  Date:      $Date: 2008/11/17 10:00:27 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/06/09 08:42:16 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,8 +28,9 @@
 #cmakedefine BBTK_WORDS_BIGENDIAN
 
 /* Allow access to UINT32_MAX , cf bbtkCommon.h */
+#ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
-
+#endif
 
 /* Hardcode the path to BBTK_DATA_ROOT */
 #ifndef BBTK_DATA_ROOT

diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx
index 7f0008e41c91c2e9f9f0aefa9c09ba89850f0ae1..e838e03ed8b47f61a8c6e23ef033793a78fff904 100644 (file)
--- a/packages/vtk/src/bbvtkImagePlanes.cxx
+++ b/packages/vtk/src/bbvtkImagePlanes.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:16 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2009/06/09 08:41:53 $
+  Version:   $Revision: 1.26 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -133,7 +133,7 @@ namespace bbvtk
  };
   //================================================================
 
-  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.25 $");
+  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.26 $");
 
   //================================================================
 
@@ -259,7 +259,13 @@ namespace bbvtk
             bbGetOutputPlaneX()->SetInput(bbGetInputIn());
             bbGetOutputPlaneX()->SetPlaneOrientationToXAxes();  
             bbGetOutputPlaneX()->SetSlicePosition((xMax+xMin)/2.*xSpacing);
-            
+
+                  
+//                bbGetOutputPlaneX()->SetOrigin( 58*xSpacing , 80*ySpacing , 82*zSpacing );
+//                bbGetOutputPlaneX()->SetPoint1( 0*xSpacing, 146*ySpacing, 186*zSpacing);
+//                bbGetOutputPlaneX()->SetPoint2( 126*xSpacing, 146*ySpacing, 0*zSpacing);
+                  
+                  
             bbGetOutputPlaneY()->SetInput(bbGetInputIn());
             bbGetOutputPlaneY()->SetPlaneOrientationToYAxes();
             bbGetOutputPlaneY()->SetSlicePosition((yMax+yMin)/2.*ySpacing);

diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h
index 4728f232f521eb5bade606b5654408d11b6e0a67..b0d1a0e1c559d92f2ef5e7c8814ae69f19108be2 100644 (file)
--- a/packages/vtk/src/bbvtkImagePlanes.h
+++ b/packages/vtk/src/bbvtkImagePlanes.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:58:01 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2009/06/09 08:41:53 $
+  Version:   $Revision: 1.16 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -69,9 +69,11 @@ namespace bbvtk
     BBTK_DECLARE_OUTPUT(PlaneX,vtkImagePlaneWidget*);
     BBTK_DECLARE_OUTPUT(PlaneY,vtkImagePlaneWidget*);
     BBTK_DECLARE_OUTPUT(PlaneZ,vtkImagePlaneWidget*);
+       BBTK_DECLARE_OUTPUT(Plane3Pts,vtkImagePlaneWidget*);
     BBTK_DECLARE_OUTPUT(ImageX,vtkImageData*);
     BBTK_DECLARE_OUTPUT(ImageY,vtkImageData*);        
     BBTK_DECLARE_OUTPUT(ImageZ,vtkImageData*);  
+         BBTK_DECLARE_OUTPUT(Image3Pts,vtkImageData*);  
     BBTK_PROCESS(Process);
     void Process();
     
@@ -90,15 +92,17 @@ namespace bbvtk
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Creates three 3D planes with the input image mapped onto with which the user can interact. The output vtkImagePlaneWidget objects are to be inserted into a 3D scene (e.g. a Viewer3D)");
   BBTK_CATEGORY("3D object creator");
-  BBTK_INPUT(ImagePlanes, In,          "Input Image",  vtkImageData *, "");
-  BBTK_INPUT(ImagePlanes, WindowLevel, "Widdow Level", winLevel,       "");
+  BBTK_INPUT(ImagePlanes, In                   , "Input Image"         , vtkImageData *        , "");
+  BBTK_INPUT(ImagePlanes, WindowLevel  , "Widdow Level"        , winLevel                      ,  "");
 
   BBTK_OUTPUT(ImagePlanes,PlaneX,"The image plane in X direction",vtkImagePlaneWidget*,"");
   BBTK_OUTPUT(ImagePlanes,PlaneY,"The image plane in Y direction",vtkImagePlaneWidget*,"");
   BBTK_OUTPUT(ImagePlanes,PlaneZ,"The image plane in Z direction",vtkImagePlaneWidget*,"");
+  BBTK_OUTPUT(ImagePlanes,Plane3Pts,"The image plane (3 points definition) ",vtkImagePlaneWidget*,"");
   BBTK_OUTPUT(ImagePlanes,ImageX,"The image in X direction",      vtkImageData*,       "");
   BBTK_OUTPUT(ImagePlanes,ImageY,"The image in Y direction",      vtkImageData*,       "");
   BBTK_OUTPUT(ImagePlanes,ImageZ,"The image in Z direction",      vtkImageData*,       "");    
+  BBTK_OUTPUT(ImagePlanes,Image3Pts,"The image (3 points plane definition)",      vtkImageData*,       "");    
   BBTK_END_DESCRIBE_BLACK_BOX(ImagePlanes);
   //=================================================================