Some re indent

diff --git a/packages/gdcmvtk/CMakeLists.txt b/packages/gdcmvtk/CMakeLists.txt
index 9d253a77a7aa19769de7302ad824a1b7c8984e17..d976eb682411e39c1124aea29e7d818d664b96a9 100644 (file)
--- a/packages/gdcmvtk/CMakeLists.txt
+++ b/packages/gdcmvtk/CMakeLists.txt
@@ -124,6 +124,7 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
 SET(${BBTK_PACKAGE_NAME}_LIBS 
   # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST
   # EXCEPT : the same libs than for INCLUDE_DIRS
+/usr/local/lib/gdcm/libvtkgdcm.so  
   )
 #===========================================================================
 

diff --git a/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs b/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs
index b0a94b0d1ca10e208438bc99542bda16495fcbb7..95636e925c4fc8dba169b9f0f08f47988fb4dcdb 100644 (file)
--- a/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs
+++ b/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs
@@ -9,9 +9,7 @@ load wx
 //message all 9
 
 new FileSelector openFileDialog
-print Avant_new_GetInfoGdcmReader  
 new GetInfoGdcmReader readerginf
-print Apres_new_GetInfoGdcmReader   
    connect openFileDialog.Out readerginf.In
 exec  readerginf  
    

diff --git a/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs b/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs
index d98ba90da7e23a3ee3403046ee2f428331e01404..7ced94012c440cb5540fb6090e13a21eb450f730 100644 (file)
--- a/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs
+++ b/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs
@@ -1,6 +1,5 @@
 category "example"
 
-
 load gdcmvtk
 load std
 load wx
@@ -11,23 +10,18 @@ load wx
 // To choose the directory
 new DirectorySelector ds
 // To get the image names into a vector
-print "avant FilesFromDirectory"
 new FilesFromDirectory fd
-print "apres FilesFromDirectory"
    connect ds.Out fd.In 
-print "apres connect"
 // list of files as input
-print "In $ds.Out$\n
-print "Files found : $fd.Out$\n
-
-
+#print "In $ds.Out$\n
+#print "Files found : $fd.Out$\n
+// user choosen directory as input
 new GetXCoherentInfoGdcmReader reader
-//connect fd.Out  reader.FileNames
 connect fd.Out  reader.In
 exec  reader  
 
 // No adaptor
-//print $reader.Out$
+#print $reader.Out$
 
 print IOP
 print $reader.IOP$

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
index 229b180bfae821c3624e6a6507efaae2341d357b..f676af2c0ebbab04235d056faa0f36a79f3e07c1 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.h
@@ -49,7 +49,7 @@ BBTK_AUTHOR("jpr, eduardo");
 BBTK_DESCRIPTION("Get Dicom info and read (as a vtkImageData)");
 BBTK_CATEGORY("");
 
-BBTK_INPUT(GetInfoGdcmReader,In,"Dicom image file name",std::string,"");
+BBTK_INPUT(GetInfoGdcmReader,In,           "Dicom image file name",       std::string,"");
 
 BBTK_OUTPUT(GetInfoGdcmReader,Out,         "Output image",                vtkImageData *,"");
 BBTK_OUTPUT(GetInfoGdcmReader,IPP,         "Image Position (Patient)",    std::vector<double>,"");

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
index 97064cd4c04d715c24d21b79cc533269f77d4fda..224bdcca070b705966074798fe4a86b9105cdd7d 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h
@@ -29,6 +29,8 @@ virtual void bbUserDestructor();
 //==================================================================
 
   BBTK_DECLARE_INPUT(In,            std::vector<std::string>);
+  BBTK_DECLARE_INPUT(IPPSort,       bool);
+  
   BBTK_DECLARE_OUTPUT(Out,          vtkImageData *);
   BBTK_DECLARE_OUTPUT(IPP,          std::vector<double>);
   BBTK_DECLARE_OUTPUT(IOP,          std::vector<double>);
@@ -51,7 +53,8 @@ BBTK_AUTHOR("jpr, eduardo");
 BBTK_DESCRIPTION("Get Dicom info from a File Set and read (as a vtkImageData)");
 BBTK_CATEGORY("");
 
-BBTK_INPUT(GetXCoherentInfoGdcmReader,In,"Dicom image file name",std::vector<std::string>,"");
+BBTK_INPUT(GetXCoherentInfoGdcmReader,In,     "Dicom image file name",std::vector<std::string>,"");
+BBTK_INPUT(GetXCoherentInfoGdcmReader,IPPSort,"Sort on Image Position Patient",bool,"");
 
 BBTK_OUTPUT(GetXCoherentInfoGdcmReader,Out,         "Output image",                vtkImageData *,"");
 BBTK_OUTPUT(GetXCoherentInfoGdcmReader,IPP,         "Image Position (Patient)",    std::vector<double>,"");

diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx
index 3c94907cefcf6766350425c47be9604706ee667f..a6eef68aa2e34596b3cdf12f4a973400d35beb97 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/03/12 09:36:21 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2009/04/17 09:24:02 $
+  Version:   $Revision: 1.22 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -109,7 +109,7 @@ namespace bbvtk
 {
 
   //================================================================
-  class ImagePlanes::VtkCallbackType : public vtkCommand
+ class ImagePlanes::VtkCallbackType : public vtkCommand
  {
  public:
    static VtkCallbackType *New()
@@ -133,8 +133,7 @@ namespace bbvtk
  };
   //================================================================
 
-  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.21 $");
-
+  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.22 $");
 
   //================================================================
 
@@ -266,7 +265,6 @@ namespace bbvtk
             double xSpacing, ySpacing, zSpacing;
             bbGetInputIn()->GetSpacing(xSpacing, ySpacing, zSpacing);
          
-
             bbGetOutputPlaneX()->SetInput(bbGetInputIn());
             bbGetOutputPlaneX()->SetPlaneOrientationToXAxes();  
             bbGetOutputPlaneX()->SetSlicePosition((xMax+xMin)/2.*xSpacing);
@@ -290,15 +288,12 @@ namespace bbvtk
                 bbGetOutputPlaneZ()->SetWindowLevel(range[1] - range[0],
                                                     0.5*(range[1]+range[0]));
               }
-          }
-        
+          }     
         
         // UPDATE DES SORTIES 
         bbGetOutputPlaneX()->GetResliceOutput()->Update();
         bbGetOutputPlaneY()->GetResliceOutput()->Update(); 
-        bbGetOutputPlaneZ()->GetResliceOutput()->Update(); 
-        
-                
+        bbGetOutputPlaneZ()->GetResliceOutput()->Update();              
        }
    }
 }//namespace bbtk

diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h
index f41e8a9c1f64dd3d532d76ec03f250c3d382a4ab..333f7b7856e00867cba4c70ec6af9c3c9364274b 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/02/27 11:20:26 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2009/04/17 09:24:02 $
+  Version:   $Revision: 1.14 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -43,36 +43,28 @@
  * \class bbtk::NodePatern 
  * \brief Pattern for the definition of a new type of Node 
  */
-
-
 #ifdef _USE_VTK_
 
 
 #ifndef __bbvtkImagePlanes_h_INCLUDED__
 #define __bbvtkImagePlanes_h_INCLUDED__
 
-
 #include "bbtkAtomicBlackBox.h"
 
-
 class vtkImageData;
 class vtkImagePlaneWidget;
 
-
 namespace bbvtk
 {
-
   typedef std::vector<double> winLevel;
-
-
   
   class /*BBTK_EXPORT*/ ImagePlanes : public bbtk::AtomicBlackBox
   { 
   public:
     BBTK_BLACK_BOX_INTERFACE(ImagePlanes,bbtk::AtomicBlackBox);
     //    BBTK_DECLARE_INPUT(Contour,int);
-    BBTK_DECLARE_INPUT(In,vtkImageData *);
-    BBTK_DECLARE_INPUT(WindowLevel,winLevel);
+    BBTK_DECLARE_INPUT(In,          vtkImageData *);
+    BBTK_DECLARE_INPUT(WindowLevel, winLevel);
 
     BBTK_DECLARE_OUTPUT(PlaneX,vtkImagePlaneWidget*);
     BBTK_DECLARE_OUTPUT(PlaneY,vtkImagePlaneWidget*);
@@ -101,37 +93,33 @@ 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,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,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_END_DESCRIBE_BLACK_BOX(ImagePlanes);
   //=================================================================
 
 
-
-
-
 }//namespace bbvtk
 
 
 /*
 namespace bbvtk
 {
-       typedef vtkImageData* vtkImageDataPointer;
+  typedef vtkImageData* vtkImageDataPointer;
 }
 */
-               typedef vtkImageData* vtkImageDataPointer;      
+typedef vtkImageData* vtkImageDataPointer;     
 
 namespace bbtk
 {
-  BBTK_DEFINE_HUMAN_READABLE_TYPE_NAME(vtkImageDataPointer,
-                                                                               "vtkImageDataPointer");
+  BBTK_DEFINE_HUMAN_READABLE_TYPE_NAME(vtkImageDataPointer, "vtkImageDataPointer");
 }