From 5b7cfc6c3826f369aa0be16f6221222ffcb11513 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 24 Jun 2009 07:56:02 +0000 Subject: [PATCH] re-indent + fix Update() --- packages/vtk/src/bbvtkImagePlanes.cxx | 17 +++--- packages/vtk/src/bbvtkImagePlanes.h | 76 +++++++++++++-------------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index fca5f6a..45de537 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/06/23 15:58:56 $ - Version: $Revision: 1.27 $ + Date: $Date: 2009/06/24 07:56:02 $ + Version: $Revision: 1.28 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -39,6 +39,7 @@ #include "vtkCellPicker.h" #include "vtkProperty.h" + #include "vtkMetaImageWriter.h" #include "vtkPNGWriter.h" @@ -135,7 +136,7 @@ namespace bbvtk }; //================================================================ - //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.27 $"); + //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.28 $"); //================================================================ @@ -377,19 +378,17 @@ void ImagePlanes::Process() _imageReslicer->SetResliceAxesDirectionCosines(vect1[0],vect1[1],vect1[2], - vect2[0],vect2[1],vect2[2], - crossp[0],crossp[1],crossp[2]); + vect2[0],vect2[1],vect2[2], + crossp[0],crossp[1],crossp[2]); //_imageReslicer->SetResliceAxesOrigin(0,0,0); _imageReslicer->SetResliceAxesOrigin(origin[0],origin[1],origin[2]); - _imageReslicer->GetOutput()->Update; + _imageReslicer->GetOutput()->Update(); _imageReslicer->GetOutput()->UpdateInformation(); bbSetOutputImage3Pts(_imageReslicer->GetOutput()); - - } - + } } } diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h index ddf3590..d2f03fe 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/06/23 15:58:56 $ - Version: $Revision: 1.17 $ + Date: $Date: 2009/06/24 07:56:02 $ + Version: $Revision: 1.18 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -65,21 +65,21 @@ namespace bbvtk { public: BBTK_BLACK_BOX_INTERFACE(ImagePlanes,bbtk::AtomicBlackBox); - // BBTK_DECLARE_INPUT(Contour,int); - BBTK_DECLARE_INPUT(In, vtkImageData *); + // BBTK_DECLARE_INPUT(Contour, int); + BBTK_DECLARE_INPUT(In, vtkImageData*); BBTK_DECLARE_INPUT(WindowLevel, winLevel); - BBTK_DECLARE_INPUT(PointsX, std::vector); - BBTK_DECLARE_INPUT(PointsY, std::vector); - BBTK_DECLARE_INPUT(PointsZ, std::vector); - - BBTK_DECLARE_OUTPUT(PlaneX,vtkImagePlaneWidget*); - BBTK_DECLARE_OUTPUT(PlaneY,vtkImagePlaneWidget*); - BBTK_DECLARE_OUTPUT(PlaneZ,vtkImagePlaneWidget*); - BBTK_DECLARE_OUTPUT(Plane3Pts,vtkInteractorObserver *); - BBTK_DECLARE_OUTPUT(ImageX,vtkImageData*); - BBTK_DECLARE_OUTPUT(ImageY,vtkImageData*); - BBTK_DECLARE_OUTPUT(ImageZ,vtkImageData*); - BBTK_DECLARE_OUTPUT(Image3Pts,vtkImageData*); + BBTK_DECLARE_INPUT(PointsX, std::vector); + BBTK_DECLARE_INPUT(PointsY, std::vector); + BBTK_DECLARE_INPUT(PointsZ, std::vector); + + BBTK_DECLARE_OUTPUT(PlaneX, vtkImagePlaneWidget*); + BBTK_DECLARE_OUTPUT(PlaneY, vtkImagePlaneWidget*); + BBTK_DECLARE_OUTPUT(PlaneZ, vtkImagePlaneWidget*); + BBTK_DECLARE_OUTPUT(Plane3Pts, vtkInteractorObserver*); + 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(); @@ -89,14 +89,13 @@ namespace bbvtk class VtkCallbackType; VtkCallbackType* mVtkCallback; vtkImageData* image; - vtkImageReslice* _imageReslicer; + vtkImageReslice* _imageReslicer; - - double* getCrossProduct(double* vect0,double* vect1); - double getPodoubleProduct(double* vect0,double* vect1); - double* getNormal(double* vect); - double getMagnitud(double* vect); - double* makeVector(double podouble0[3], double podouble1[3]); + double* getCrossProduct(double* vect0,double* vect1); + double getPodoubleProduct(double* vect0,double* vect1); + double* getNormal(double* vect); + double getMagnitud(double* vect); + double* makeVector(double podouble0[3], double podouble1[3]); }; //================================================================= @@ -104,22 +103,23 @@ namespace bbvtk BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImagePlanes,bbtk::AtomicBlackBox); BBTK_NAME("ImagePlanes"); 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_DESCRIPTION("Creates three 3D planes with the input image mapped onto which the user can interact with. 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, PointsX, "Points in X" , std::vector, ""); - BBTK_INPUT(ImagePlanes, PointsY, "Points in Y" , std::vector, ""); - BBTK_INPUT(ImagePlanes, PointsZ, "Points in Z" , std::vector, ""); - - 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) ",vtkInteractorObserver *,""); - 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_INPUT(ImagePlanes, In, "Input Image", vtkImageData *, ""); + BBTK_INPUT(ImagePlanes, WindowLevel, "Widdow Level", winLevel, ""); + BBTK_INPUT(ImagePlanes, PointsX, "Points in X", std::vector, ""); + BBTK_INPUT(ImagePlanes, PointsY, "Points in Y", std::vector, ""); + BBTK_INPUT(ImagePlanes, PointsZ, "Points in Z", std::vector, ""); + + 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) ", vtkInteractorObserver*, ""); + 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); //================================================================= -- 2.45.1