From: jean-pierre roux Date: Fri, 17 Apr 2009 09:23:55 +0000 (+0000) Subject: Some re indent X-Git-Tag: EED.02Oct2009~53 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ce7e5d4d512de510794448effd19c6bbfc878063;p=bbtk.git Some re indent --- diff --git a/packages/gdcmvtk/CMakeLists.txt b/packages/gdcmvtk/CMakeLists.txt index 9d253a7..d976eb6 100644 --- 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 b0a94b0..95636e9 100644 --- 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 d98ba90..7ced940 100644 --- 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 229b180..f676af2 100644 --- 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,""); diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.h index 97064cd..224bdcc 100644 --- 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); + BBTK_DECLARE_INPUT(IPPSort, bool); + BBTK_DECLARE_OUTPUT(Out, vtkImageData *); BBTK_DECLARE_OUTPUT(IPP, std::vector); BBTK_DECLARE_OUTPUT(IOP, std::vector); @@ -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,""); +BBTK_INPUT(GetXCoherentInfoGdcmReader,In, "Dicom image file name",std::vector,""); +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,""); diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index 3c94907..a6eef68 100644 --- 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 f41e8a9..333f7b7 100644 --- 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 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"); }